piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

X9Lite switches fix

Browse Source
This commit is contained in:
Bertrand Songis
2019-06-27 14:10:05 +02:00
parent 2f394d1b6e
commit 7b7ae1a494
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/dataconstants.h
+5 -1
View File
@@ -684,7 +684,11 @@ enum MixSources {
MIXSRC_SA = MIXSRC_FIRST_SWITCH, LUA_EXPORT("sa", "Switch A")
MIXSRC_SB, LUA_EXPORT("sb", "Switch B")
MIXSRC_SC, LUA_EXPORT("sc", "Switch C")
#endif
#if defined(HARDWARE_SWITCH_D)
MIXSRC_SD, LUA_EXPORT("sd", "Switch D")
#elif defined(STORAGE_SWITCH_D)
MIXSRC_SD,
#endif
#if defined(HARDWARE_SWITCH_E)
MIXSRC_SE, LUA_EXPORT("se", "Switch E")
@@ -792,7 +796,7 @@ enum MixSources {
};
#if defined(__cplusplus)
static_assert(MIXSRC_FIRST_LOGICAL_SWITCH == MIXSRC_FIRST_SWITCH + NUM_SWITCHES, "Wrong switches definition in MIXSRC list");
static_assert(MIXSRC_FIRST_LOGICAL_SWITCH == MIXSRC_FIRST_SWITCH + STORAGE_NUM_SWITCHES, "Wrong switches definition in MIXSRC list");
#endif
#define MIXSRC_FIRST (MIXSRC_NONE + 1)
radio/src/targets/taranis/hal.h
+7 -9
View File
@@ -352,7 +352,10 @@
#define SWITCHES_GPIO_REG_D_H GPIOE->IDR
#define SWITCHES_GPIO_PIN_D_H GPIO_Pin_2 // PE.02
#elif defined(PCBX9LITE)
// no SWD
#define STORAGE_SWITCH_D
#define HARDWARE_SWITCH_D
#define SWITCHES_GPIO_REG_D GPIOC->IDR
#define SWITCHES_GPIO_PIN_D GPIO_Pin_13 // PC.13
#else
#define STORAGE_SWITCH_D
#define HARDWARE_SWITCH_D
@@ -377,8 +380,8 @@
#elif defined(PCBX9LITE)
#define STORAGE_SWITCH_E
#define HARDWARE_SWITCH_E
#define SWITCHES_GPIO_REG_E GPIOC->IDR
#define SWITCHES_GPIO_PIN_E GPIO_Pin_13 // PC.13
#define SWITCHES_GPIO_REG_E GPIOA->IDR
#define SWITCHES_GPIO_PIN_E GPIO_Pin_5 // PA.05
#elif defined(PCBX7) || defined(PCBXLITE)
// no SWE
#else
@@ -400,18 +403,13 @@
#define HARDWARE_SWITCH_F
#define SWITCHES_GPIO_REG_F GPIOC->IDR
#define SWITCHES_GPIO_PIN_F GPIO_Pin_3 // PC.03
#elif defined(PCBXLITE)
#elif defined(PCBXLITE) || defined(PCBX9LITE)
// no SWF
#elif defined(PCBX7)
#define STORAGE_SWITCH_F
#define HARDWARE_SWITCH_F
#define SWITCHES_GPIO_REG_F GPIOE->IDR
#define SWITCHES_GPIO_PIN_F GPIO_Pin_14 // PE.14
#elif defined(PCBX9LITE)
#define STORAGE_SWITCH_F
#define HARDWARE_SWITCH_F
#define SWITCHES_GPIO_REG_F GPIOA->IDR
#define SWITCHES_GPIO_PIN_F GPIO_Pin_5 // PA.05
#else
#define STORAGE_SWITCH_F
#define HARDWARE_SWITCH_F