X9Lite switches fix
This commit is contained in:
@@ -684,7 +684,11 @@ enum MixSources {
|
|||||||
MIXSRC_SA = MIXSRC_FIRST_SWITCH, LUA_EXPORT("sa", "Switch A")
|
MIXSRC_SA = MIXSRC_FIRST_SWITCH, LUA_EXPORT("sa", "Switch A")
|
||||||
MIXSRC_SB, LUA_EXPORT("sb", "Switch B")
|
MIXSRC_SB, LUA_EXPORT("sb", "Switch B")
|
||||||
MIXSRC_SC, LUA_EXPORT("sc", "Switch C")
|
MIXSRC_SC, LUA_EXPORT("sc", "Switch C")
|
||||||
|
#endif
|
||||||
|
#if defined(HARDWARE_SWITCH_D)
|
||||||
MIXSRC_SD, LUA_EXPORT("sd", "Switch D")
|
MIXSRC_SD, LUA_EXPORT("sd", "Switch D")
|
||||||
|
#elif defined(STORAGE_SWITCH_D)
|
||||||
|
MIXSRC_SD,
|
||||||
#endif
|
#endif
|
||||||
#if defined(HARDWARE_SWITCH_E)
|
#if defined(HARDWARE_SWITCH_E)
|
||||||
MIXSRC_SE, LUA_EXPORT("se", "Switch E")
|
MIXSRC_SE, LUA_EXPORT("se", "Switch E")
|
||||||
@@ -792,7 +796,7 @@ enum MixSources {
|
|||||||
};
|
};
|
||||||
|
|
||||||
#if defined(__cplusplus)
|
#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
|
#endif
|
||||||
|
|
||||||
#define MIXSRC_FIRST (MIXSRC_NONE + 1)
|
#define MIXSRC_FIRST (MIXSRC_NONE + 1)
|
||||||
|
|||||||
@@ -352,7 +352,10 @@
|
|||||||
#define SWITCHES_GPIO_REG_D_H GPIOE->IDR
|
#define SWITCHES_GPIO_REG_D_H GPIOE->IDR
|
||||||
#define SWITCHES_GPIO_PIN_D_H GPIO_Pin_2 // PE.02
|
#define SWITCHES_GPIO_PIN_D_H GPIO_Pin_2 // PE.02
|
||||||
#elif defined(PCBX9LITE)
|
#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
|
#else
|
||||||
#define STORAGE_SWITCH_D
|
#define STORAGE_SWITCH_D
|
||||||
#define HARDWARE_SWITCH_D
|
#define HARDWARE_SWITCH_D
|
||||||
@@ -377,8 +380,8 @@
|
|||||||
#elif defined(PCBX9LITE)
|
#elif defined(PCBX9LITE)
|
||||||
#define STORAGE_SWITCH_E
|
#define STORAGE_SWITCH_E
|
||||||
#define HARDWARE_SWITCH_E
|
#define HARDWARE_SWITCH_E
|
||||||
#define SWITCHES_GPIO_REG_E GPIOC->IDR
|
#define SWITCHES_GPIO_REG_E GPIOA->IDR
|
||||||
#define SWITCHES_GPIO_PIN_E GPIO_Pin_13 // PC.13
|
#define SWITCHES_GPIO_PIN_E GPIO_Pin_5 // PA.05
|
||||||
#elif defined(PCBX7) || defined(PCBXLITE)
|
#elif defined(PCBX7) || defined(PCBXLITE)
|
||||||
// no SWE
|
// no SWE
|
||||||
#else
|
#else
|
||||||
@@ -400,18 +403,13 @@
|
|||||||
#define HARDWARE_SWITCH_F
|
#define HARDWARE_SWITCH_F
|
||||||
#define SWITCHES_GPIO_REG_F GPIOC->IDR
|
#define SWITCHES_GPIO_REG_F GPIOC->IDR
|
||||||
#define SWITCHES_GPIO_PIN_F GPIO_Pin_3 // PC.03
|
#define SWITCHES_GPIO_PIN_F GPIO_Pin_3 // PC.03
|
||||||
#elif defined(PCBXLITE)
|
#elif defined(PCBXLITE) || defined(PCBX9LITE)
|
||||||
// no SWF
|
// no SWF
|
||||||
#elif defined(PCBX7)
|
#elif defined(PCBX7)
|
||||||
#define STORAGE_SWITCH_F
|
#define STORAGE_SWITCH_F
|
||||||
#define HARDWARE_SWITCH_F
|
#define HARDWARE_SWITCH_F
|
||||||
#define SWITCHES_GPIO_REG_F GPIOE->IDR
|
#define SWITCHES_GPIO_REG_F GPIOE->IDR
|
||||||
#define SWITCHES_GPIO_PIN_F GPIO_Pin_14 // PE.14
|
#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
|
#else
|
||||||
#define STORAGE_SWITCH_F
|
#define STORAGE_SWITCH_F
|
||||||
#define HARDWARE_SWITCH_F
|
#define HARDWARE_SWITCH_F
|
||||||
|
|||||||
Reference in New Issue
Block a user