[X3] More fixes

This commit is contained in:
Bertrand Songis
2019-03-13 16:49:11 +01:00
parent 1872d40978
commit 1aed951571
4 changed files with 39 additions and 21 deletions
+18 -4
View File
@@ -103,7 +103,9 @@ enum MenuRadioHardwareItems {
ITEM_RADIO_HARDWARE_STICK4,
ITEM_RADIO_HARDWARE_LABEL_POTS,
ITEM_RADIO_HARDWARE_POT1,
#if !defined(PCBX3)
ITEM_RADIO_HARDWARE_POT2,
#endif
ITEM_RADIO_HARDWARE_LABEL_SWITCHES,
ITEM_RADIO_HARDWARE_SA,
ITEM_RADIO_HARDWARE_SB,
@@ -111,6 +113,8 @@ enum MenuRadioHardwareItems {
ITEM_RADIO_HARDWARE_SD,
#if NUM_SWITCHES > 4
ITEM_RADIO_HARDWARE_SF,
#endif
#if NUM_SWITCHES > 5
ITEM_RADIO_HARDWARE_SH,
#endif
#if defined(CROSSFIRE) && SPORT_MAX_BAUDRATE < 400000
@@ -128,11 +132,17 @@ enum MenuRadioHardwareItems {
ITEM_RADIO_HARDWARE_MAX
};
#define POTS_ROWS NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1
#if NUM_SWITCHES > 4
#define SWITCHES_ROWS NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1
#if defined(PCBX3)
#define POTS_ROWS NAVIGATION_LINE_BY_LINE|1
#else
#define POTS_ROWS NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1
#endif
#if NUM_SWITCHES == 6
#define SWITCHES_ROWS NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1
#elif NUM_SWITCHES == 5
#define SWITCHES_ROWS NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1
#elif NUM_SWITCHES == 4
#define SWITCHES_ROWS NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1
#endif
@@ -206,7 +216,9 @@ void menuRadioHardware(event_t event)
break;
case ITEM_RADIO_HARDWARE_POT1:
#if !defined(PCBX3)
case ITEM_RADIO_HARDWARE_POT2:
#endif
{
int idx = k - ITEM_RADIO_HARDWARE_POT1;
uint8_t shift = (2*idx);
@@ -233,6 +245,8 @@ void menuRadioHardware(event_t event)
case ITEM_RADIO_HARDWARE_SD:
#if NUM_SWITCHES > 4
case ITEM_RADIO_HARDWARE_SF:
#endif
#if NUM_SWITCHES > 5
case ITEM_RADIO_HARDWARE_SH:
#endif
{