Skip to content

rework rc channel remapping #8150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Woga65 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

rework rc channel remapping #8150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b20f87
rework rc channel remapping
Woga65 Jun 22, 2022
f620448
channel remapping respect MAX_MAPPABLE_RX_INPUTS
Woga65 Jun 23, 2022
e007966
Merge pull request #1 from iNavFlight/master
Woga65 Jun 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/main/fc/cli.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2790,15 +2790,15 @@ static void printMap(uint8_t dumpMask, const rxConfig_t *rxConfig, const rxConfi
static void cliMap(char *cmdline)
{
uint32_t len;
char out[5];
char out[MAX_MAPPABLE_RX_INPUTS + 1];

len = strlen(cmdline);

if (len == 4) {
if (len == MAX_MAPPABLE_RX_INPUTS) {
// uppercase it
for (uint32_t i = 0; i < 4; i++)
for (uint32_t i = 0; i < len; i++)
cmdline[i] = sl_toupper((unsigned char)cmdline[i]);
for (uint32_t i = 0; i < 4; i++) {
for (uint32_t i = 0; i < len; i++) {
if (strchr(rcChannelLetters, cmdline[i]) && !strchr(cmdline + i + 1, cmdline[i]))
continue;
cliShowParseError();
Expand All @@ -2809,7 +2809,7 @@ static void cliMap(char *cmdline)
cliShowParseError();
cliPrint("Map: ");
uint32_t i;
for (i = 0; i < 4; i++)
for (i = 0; i < MAX_MAPPABLE_RX_INPUTS; i++)
out[rxConfig()->rcmap[i]] = rcChannelLetters[i];
out[i] = '\0';
cliPrintLinef("%s", out);
Expand Down
9 changes: 8 additions & 1 deletion src/main/rx/rx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,11 @@
#include "rx/mavlink.h"

//#define DEBUG_RX_SIGNAL_LOSS

#if (MAX_MAPPABLE_RX_INPUTS == 4)
const char rcChannelLetters[] = "AERT";
#else
const char rcChannelLetters[] = "AERT1234";
#endif

static uint16_t rssi = 0; // range: [0;1023]
static timeUs_t lastMspRssiUpdateUs = 0;
Expand Down Expand Up @@ -124,7 +127,11 @@ PG_REGISTER_WITH_RESET_TEMPLATE(rxConfig_t, rxConfig, PG_RX_CONFIG, 10);
#define RX_MIN_USEX 885
PG_RESET_TEMPLATE(rxConfig_t, rxConfig,
.receiverType = DEFAULT_RX_TYPE,
#if (MAX_MAPPABLE_RX_INPUTS == 4)
.rcmap = {0, 1, 3, 2}, // Default to AETR map
#else
.rcmap = {0, 1, 3, 2, 4, 5, 6, 7}, // Default to AETR1234 map
#endif
.halfDuplex = SETTING_SERIALRX_HALFDUPLEX_DEFAULT,
.serialrx_provider = SERIALRX_PROVIDER,
#ifdef USE_RX_SPI
Expand Down
2 changes: 1 addition & 1 deletion src/main/rx/rx.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ typedef enum {

extern const char rcChannelLetters[];

#define MAX_MAPPABLE_RX_INPUTS 4
#define MAX_MAPPABLE_RX_INPUTS 4 //either 4 or 8

#define MAX_INVALID_RX_PULSE_TIME 300

Expand Down