X10: fixed optional inputs

fixed X10 conversion (MOUSE1 & 2 removed)

renamed GMBL & GMBR to SI and SJ
This commit is contained in:
Raphael Coeffic
2019-08-13 11:10:39 +02:00
parent d014ba424f
commit 6373daa319
8 changed files with 75 additions and 68 deletions
+22 -13
View File
@@ -210,8 +210,8 @@ enum EnumSwitches
SW_SF,
SW_SG,
SW_SH,
SW_GMBL,
SW_GMBR,
SW_SI,
SW_SJ,
NUM_SWITCHES
};
@@ -244,12 +244,12 @@ enum EnumSwitchesPositions
SW_SH0,
SW_SH1,
SW_SH2,
SW_SGMBL0,
SW_SGMBL1,
SW_SGMBL2,
SW_SGMBR0,
SW_SGMBR1,
SW_SGMBR2,
SW_SI0,
SW_SI1,
SW_SI2,
SW_SJ0,
SW_SJ1,
SW_SJ2,
NUM_SWITCHES_POSITIONS
};
@@ -334,21 +334,23 @@ enum Analogs {
POT1 = POT_FIRST,
POT2,
POT3,
POT_LAST = POT3,
#if defined(PCBX10)
EXT1,
EXT2,
#endif
POT_LAST = POT_FIRST + NUM_POTS - 1,
SLIDER_FIRST,
SLIDER_FRONT_LEFT = SLIDER_FIRST,
SLIDER_FRONT_RIGHT,
#if defined(PCBX12S)
SLIDER_REAR_LEFT,
SLIDER_REAR_RIGHT,
#endif
SLIDER_LAST = SLIDER_FIRST + NUM_SLIDERS - 1,
TX_VOLTAGE,
#if defined(PCBX12S)
MOUSE1, // TODO why after voltage?
MOUSE2,
#endif
#if defined(PCBX10)
EXT1,
EXT2,
#endif
NUM_ANALOGS
};
@@ -358,7 +360,12 @@ enum Analogs {
#define DEFAULT_SWITCH_CONFIG (SWITCH_TOGGLE << 14) + (SWITCH_3POS << 12) + (SWITCH_2POS << 10) + (SWITCH_3POS << 8) + (SWITCH_3POS << 6) + (SWITCH_3POS << 4) + (SWITCH_3POS << 2) + (SWITCH_3POS << 0)
#define DEFAULT_POTS_CONFIG (POT_WITH_DETENT << 4) + (POT_MULTIPOS_SWITCH << 2) + (POT_WITHOUT_DETENT << 0)
#if defined(PCBX12S)
#define DEFAULT_SLIDERS_CONFIG (SLIDER_WITH_DETENT << 3) + (SLIDER_WITH_DETENT << 2) + (SLIDER_WITH_DETENT << 1) + (SLIDER_WITH_DETENT << 0)
#else
#define DEFAULT_SLIDERS_CONFIG (SLIDER_WITH_DETENT << 1) + (SLIDER_WITH_DETENT << 0)
#endif
enum CalibratedAnalogs {
CALIBRATED_STICK1,
@@ -374,6 +381,8 @@ enum CalibratedAnalogs {
CALIBRATED_SLIDER_REAR_LEFT,
CALIBRATED_SLIDER_REAR_RIGHT,
#else
CALIBRATED_POT_EXT1,
CALIBRATED_POT_EXT2,
CALIBRATED_SLIDER_REAR_LEFT,
CALIBRATED_SLIDER_REAR_RIGHT,
#endif
+20 -16
View File
@@ -117,23 +117,27 @@
#define SWITCHES_GPIO_PIN_H GPIO_Pin_7 // PG.07
#if defined(PCBX10)
#define STORAGE_SWITCH_GMBL
#define HARDWARE_SWITCH_GMBL
#define SWITCHES_GPIO_REG_GMBL GPIOH->IDR
#define SWITCHES_GPIO_PIN_GMBL GPIO_Pin_14 // PH.14
#define STORAGE_SWITCH_GMBR
#define HARDWARE_SWITCH_GMBR
#define SWITCHES_GPIO_REG_GMBR GPIOH->IDR
#define SWITCHES_GPIO_PIN_GMBR GPIO_Pin_15 // PH.15
// Gimbal switch left
#define STORAGE_SWITCH_I
#define HARDWARE_SWITCH_I
#define SWITCHES_GPIO_REG_I GPIOH->IDR
#define SWITCHES_GPIO_PIN_I GPIO_Pin_14 // PH.14
// Gimbal switch right
#define STORAGE_SWITCH_J
#define HARDWARE_SWITCH_J
#define SWITCHES_GPIO_REG_J GPIOH->IDR
#define SWITCHES_GPIO_PIN_J GPIO_Pin_15 // PH.15
#elif defined(PCBX12S)
#define STORAGE_SWITCH_GMBL
#define HARDWARE_SWITCH_GMBL
#define SWITCHES_GPIO_REG_GMBL GPIOB->IDR
#define SWITCHES_GPIO_PIN_GMBL GPIO_Pin_1 // PB.01
#define STORAGE_SWITCH_GMBR
#define HARDWARE_SWITCH_GMBR
#define SWITCHES_GPIO_REG_GMBR GPIOB->IDR
#define SWITCHES_GPIO_PIN_GMBR GPIO_Pin_0 // PB.00
// Gimbal switch left
#define STORAGE_SWITCH_I
#define HARDWARE_SWITCH_I
#define SWITCHES_GPIO_REG_I GPIOB->IDR
#define SWITCHES_GPIO_PIN_I GPIO_Pin_1 // PB.01
// Gimbal switch right
#define STORAGE_SWITCH_J
#define HARDWARE_SWITCH_J
#define SWITCHES_GPIO_REG_J GPIOB->IDR
#define SWITCHES_GPIO_PIN_J GPIO_Pin_0 // PB.00
#endif
// Trims
+4 -2
View File
@@ -173,6 +173,8 @@ uint32_t switchState(uint8_t index)
ADD_INV_2POS_CASE(F);
ADD_3POS_CASE(G, 6);
ADD_2POS_CASE(H);
ADD_2POS_CASE(I);
ADD_2POS_CASE(J);
#else
ADD_3POS_CASE(A, 0);
ADD_INV_3POS_CASE(B, 1);
@@ -182,8 +184,8 @@ uint32_t switchState(uint8_t index)
ADD_2POS_CASE(F);
ADD_3POS_CASE(G, 6);
ADD_2POS_CASE(H);
ADD_2POS_CASE(GMBL);
ADD_2POS_CASE(GMBR);
ADD_2POS_CASE(I);
ADD_2POS_CASE(J);
#endif
default:
break;