Merge against latest 2.3

2019-09-17 13:28:42 +02:00
parent 04ba756cd9 573d305b58
commit 9e83c5d10f
247 changed files with 35085 additions and 42445 deletions
@@ -40,22 +40,21 @@ enum LogicalSwitchContextState {
  SWITCH_ENABLE
 };

-PACK(typedef struct {
+PACK(struct LogicalSwitchContext {
  uint8_t state:1;
  uint8_t timerState:2;
  uint8_t spare:5;
  uint8_t timer;
  int16_t lastValue;
-}) LogicalSwitchContext;
+});

-PACK(typedef struct {
+PACK(struct LogicalSwitchesFlightModeContext {
  LogicalSwitchContext lsw[MAX_LOGICAL_SWITCHES];
-}) LogicalSwitchesFlightModeContext;
+});
 LogicalSwitchesFlightModeContext lswFm[MAX_FLIGHT_MODES];

 #define LS_LAST_VALUE(fm, idx) lswFm[fm].lsw[idx].lastValue

-
 #if defined(PCBFRSKY) || defined(PCBFLYSKY)
 #if defined(PCBX9E)
 tmr10ms_t switchesMidposStart[16];