Fix T12 switch definitions

The T12 has SG instead of SF.
This commit is contained in:
Raphael Coeffic
2021-12-17 12:08:23 +01:00
committed by Raphael Coeffic
parent f8357be887
commit e854515147
7 changed files with 28 additions and 11 deletions
+2 -2
View File
@@ -352,12 +352,12 @@ enum EnumSwitchesPositions
SW_SE1,
SW_SE2,
#endif
#if defined(PCBX9D) || defined(PCBX9DP) || defined(PCBX9E) || defined(PCBX7) || defined(PCBXLITES) || defined(PCBX9LITES) || defined(RADIO_T8)
#if defined(PCBX9D) || defined(PCBX9DP) || defined(PCBX9E) || (defined(PCBX7) && !defined(RADIO_T12)) || defined(PCBXLITES) || defined(PCBX9LITES) || defined(RADIO_T8)
SW_SF0,
SW_SF1,
SW_SF2,
#endif
#if defined(PCBX9D) || defined(PCBX9DP) || defined(PCBX9E) || defined(PCBX9LITES)
#if defined(PCBX9D) || defined(PCBX9DP) || defined(PCBX9E) || defined(PCBX9LITES) || defined(RADIO_T12)
SW_SG0,
SW_SG1,
SW_SG2,
+7
View File
@@ -609,6 +609,8 @@
#elif defined(RADIO_T8) || defined(RADIO_TLITE)
// no SWF
#define STORAGE_SWITCH_F
#elif defined(RADIO_T12)
// no SWF
#elif defined(PCBX7)
#define STORAGE_SWITCH_F
#define HARDWARE_SWITCH_F
@@ -633,6 +635,11 @@
#define HARDWARE_SWITCH_G
#define SWITCHES_GPIO_REG_G GPIOC->IDR
#define SWITCHES_GPIO_PIN_G GPIO_Pin_2 // PC.02
#elif defined(RADIO_T12)
#define STORAGE_SWITCH_G
#define HARDWARE_SWITCH_G
#define SWITCHES_GPIO_REG_G GPIOE->IDR
#define SWITCHES_GPIO_PIN_G GPIO_Pin_14 // PE.14
#elif defined(PCBX7) || defined(PCBXLITE) || defined(PCBX9LITE) || defined(RADIO_T8)
// no SWG
#else
@@ -252,7 +252,11 @@ uint32_t switchState(uint8_t index)
// Only 4 switches
#elif defined(PCBX7)
ADD_3POS_CASE(D, 3);
#if defined(RADIO_T12)
ADD_2POS_CASE(G);
#else
ADD_2POS_CASE(F);
#endif
ADD_2POS_CASE(H);
ADD_2POS_CASE(I);
ADD_2POS_CASE(J);