Compilation fixes on all boards

This commit is contained in:
Bertrand Songis
2019-03-15 12:24:22 +01:00
parent 90959c8817
commit cb6ee5e0b0
7 changed files with 25 additions and 21 deletions
+12 -14
View File
@@ -844,7 +844,7 @@ static inline void check_struct()
/* Difference between Taranis/Horus is LEN_EXPOMIX_NAME */ /* Difference between Taranis/Horus is LEN_EXPOMIX_NAME */
/* LEN_FUNCTION_NAME is the difference in CustomFunctionData */ /* LEN_FUNCTION_NAME is the difference in CustomFunctionData */
#if defined(PCBX7) || defined(PCBXLITE) #if defined(PCBX7) || defined(PCBXLITE) || defined(PCBX3)
CHKSIZE(MixData, 20); CHKSIZE(MixData, 20);
CHKSIZE(ExpoData, 17); CHKSIZE(ExpoData, 17);
CHKSIZE(LimitData, 11); CHKSIZE(LimitData, 11);
@@ -859,8 +859,6 @@ static inline void check_struct()
CHKSIZE(FrSkyTelemetryData, 104); CHKSIZE(FrSkyTelemetryData, 104);
CHKSIZE(ModelHeader, 12); CHKSIZE(ModelHeader, 12);
CHKSIZE(CurveData, 4); CHKSIZE(CurveData, 4);
#elif defined(PCBX3)
// TODO
#elif defined(PCBTARANIS) #elif defined(PCBTARANIS)
CHKSIZE(MixData, 22); CHKSIZE(MixData, 22);
CHKSIZE(ExpoData, 19); CHKSIZE(ExpoData, 19);
@@ -925,7 +923,7 @@ static inline void check_struct()
CHKSIZE(LogicalSwitchData, 9); CHKSIZE(LogicalSwitchData, 9);
CHKSIZE(TelemetrySensor, 13); CHKSIZE(TelemetrySensor, 13);
// TODO CHKSIZE(ModuleData,70); CHKSIZE(ModuleData, 6);
CHKSIZE(GVarData, 7); CHKSIZE(GVarData, 7);
@@ -933,26 +931,26 @@ static inline void check_struct()
CHKSIZE(TrainerData, 16); CHKSIZE(TrainerData, 16);
#if defined(PCBXLITES) #if defined(PCBXLITES)
// TODO CHKSIZE(RadioData, 850); CHKSIZE(RadioData, 858);
// TODO CHKSIZE(ModelData, 6025); CHKSIZE(ModelData, 5940);
#elif defined(PCBXLITE) #elif defined(PCBXLITE)
// TODO CHKSIZE(RadioData, 844); CHKSIZE(RadioData, 852);
// TODO CHKSIZE(ModelData, 6025); CHKSIZE(ModelData, 5940);
#elif defined(PCBX7) #elif defined(PCBX7)
// TODO CHKSIZE(RadioData, 850); CHKSIZE(RadioData, 858);
// TODO CHKSIZE(ModelData, 6025); CHKSIZE(ModelData, 5940);
#elif defined(PCBX9E) #elif defined(PCBX9E)
CHKSIZE(RadioData, 952); CHKSIZE(RadioData, 952);
CHKSIZE(ModelData, 6520); CHKSIZE(ModelData, 6520);
#elif defined(PCBX9D) #elif defined(PCBX9D)
// CHKSIZE(RadioData, 872); CHKSIZE(RadioData, 880);
// CHKSIZE(ModelData, 6507); CHKSIZE(ModelData, 6422);
#elif defined(PCBSKY9X) #elif defined(PCBSKY9X)
CHKSIZE(RadioData, 727); CHKSIZE(RadioData, 727);
CHKSIZE(ModelData, 5188); CHKSIZE(ModelData, 5188);
#elif defined(PCBHORUS) #elif defined(PCBHORUS)
// TODO CHKSIZE(RadioData, 847); CHKSIZE(RadioData, 847);
// TODO CHKSIZE(ModelData, 9380); CHKSIZE(ModelData, 9380);
#endif #endif
#undef CHKSIZE #undef CHKSIZE
+2 -2
View File
@@ -244,7 +244,7 @@ uint8_t getTextWidth(const char * s, uint8_t len, LcdFlags flags)
{ {
uint8_t width = 0; uint8_t width = 0;
for (int i=0; len==0 || i<len; ++i) { for (int i=0; len==0 || i<len; ++i) {
unsigned char c = (flags & ZCHAR) ? idx2char(*s) : *s; unsigned char c = (flags & ZCHAR) ? zchar2char(*s) : *s;
if (!c) { if (!c) {
break; break;
} }
@@ -274,7 +274,7 @@ void lcdDrawSizedText(coord_t x, coord_t y, const char * s, uint8_t len, LcdFlag
#if defined(BOOT) #if defined(BOOT)
unsigned char c = *s; unsigned char c = *s;
#else #else
unsigned char c = (flags & ZCHAR) ? idx2char(*s) : *s; unsigned char c = (flags & ZCHAR) ? zchar2char(*s) : *s;
#endif #endif
if (setx) { if (setx) {
+4 -4
View File
@@ -1280,11 +1280,11 @@ void menuModelFailsafe(event_t event)
if (menuVerticalPosition < sentModuleChannels(g_moduleIdx)) { if (menuVerticalPosition < sentModuleChannels(g_moduleIdx)) {
if (s_editMode) { if (s_editMode) {
g_model.moduleData[g_moduleIdx].failsafeChannels[menuVerticalPosition] = channelOutputs[menuVerticalPosition+channelStart]; g_model.failsafeChannels[menuVerticalPosition] = channelOutputs[menuVerticalPosition+channelStart];
s_editMode = 0; s_editMode = 0;
} }
else { else {
int16_t & failsafe = g_model.moduleData[g_moduleIdx].failsafeChannels[menuVerticalPosition]; int16_t & failsafe = g_model.failsafeChannels[menuVerticalPosition];
if (failsafe < FAILSAFE_CHANNEL_HOLD) if (failsafe < FAILSAFE_CHANNEL_HOLD)
failsafe = FAILSAFE_CHANNEL_HOLD; failsafe = FAILSAFE_CHANNEL_HOLD;
else if (failsafe == FAILSAFE_CHANNEL_HOLD) else if (failsafe == FAILSAFE_CHANNEL_HOLD)
@@ -1330,7 +1330,7 @@ void menuModelFailsafe(event_t event)
for (; line < 8; line++) { for (; line < 8; line++) {
const int32_t channelValue = channelOutputs[ch+channelStart]; const int32_t channelValue = channelOutputs[ch+channelStart];
int32_t failsafeValue = g_model.moduleData[g_moduleIdx].failsafeChannels[8*col+line]; int32_t failsafeValue = g_model.failsafeChannels[8*col+line];
uint8_t lenLabel = ZLEN(g_model.limitData[ch+channelStart].name); uint8_t lenLabel = ZLEN(g_model.limitData[ch+channelStart].name);
uint8_t barW = colW - FW * maxNameLen - FWNUM * 3; // default bar width uint8_t barW = colW - FW * maxNameLen - FWNUM * 3; // default bar width
@@ -1359,7 +1359,7 @@ void menuModelFailsafe(event_t event)
} }
else { else {
flags |= BLINK; flags |= BLINK;
CHECK_INCDEC_MODELVAR(event, g_model.moduleData[g_moduleIdx].failsafeChannels[8*col+line], -lim, +lim); CHECK_INCDEC_MODELVAR(event, g_model.failsafeChannels[8*col+line], -lim, +lim);
} }
} }
} }
+1 -1
View File
@@ -347,7 +347,7 @@ getvalue_t getValue(mixsrc_t i)
else if ((i >= MIXSRC_FIRST_SWITCH) && (i <= MIXSRC_LAST_SWITCH)) { else if ((i >= MIXSRC_FIRST_SWITCH) && (i <= MIXSRC_LAST_SWITCH)) {
mixsrc_t sw = i-MIXSRC_FIRST_SWITCH; mixsrc_t sw = i-MIXSRC_FIRST_SWITCH;
if (SWITCH_EXISTS(sw)) { if (SWITCH_EXISTS(sw)) {
return (switchState(3*sw) ? -1024 : (switchState(3*sw+1) ? 0 : 1024)); return (switchState(3*sw) ? -1024 : (IS_CONFIG_3POS(sw) && switchState(3*sw+1) ? 0 : 1024));
} }
else { else {
return 0; return 0;
+2
View File
@@ -275,7 +275,9 @@ void setupPulsesExternalModule(uint8_t protocol)
extmodulePulsesData.pxx.setupFrame(EXTERNAL_MODULE); extmodulePulsesData.pxx.setupFrame(EXTERNAL_MODULE);
scheduleNextMixerCalculation(EXTERNAL_MODULE, PXX_PULSES_PERIOD); scheduleNextMixerCalculation(EXTERNAL_MODULE, PXX_PULSES_PERIOD);
break; break;
#endif
#if defined(PXX1) && defined(EXTMODULE_USART)
case PROTOCOL_CHANNELS_PXX1_SERIAL: case PROTOCOL_CHANNELS_PXX1_SERIAL:
extmodulePulsesData.pxx_uart.setupFrame(EXTERNAL_MODULE); extmodulePulsesData.pxx_uart.setupFrame(EXTERNAL_MODULE);
scheduleNextMixerCalculation(EXTERNAL_MODULE, EXTMODULE_PXX_SERIAL_PERIOD); scheduleNextMixerCalculation(EXTERNAL_MODULE, EXTMODULE_PXX_SERIAL_PERIOD);
@@ -275,7 +275,9 @@ void extmoduleSendNextFrame()
EXTMODULE_TIMER_DMA_STREAM->NDTR = extmodulePulsesData.pxx.getSize(); EXTMODULE_TIMER_DMA_STREAM->NDTR = extmodulePulsesData.pxx.getSize();
EXTMODULE_TIMER_DMA_STREAM->CR |= DMA_SxCR_EN | DMA_SxCR_TCIE; // Enable DMA EXTMODULE_TIMER_DMA_STREAM->CR |= DMA_SxCR_EN | DMA_SxCR_TCIE; // Enable DMA
break; break;
#endif
#if defined(PXX1) && defined(EXTMODULE_USART)
case PROTOCOL_CHANNELS_PXX1_SERIAL: case PROTOCOL_CHANNELS_PXX1_SERIAL:
extmoduleSendBuffer(extmodulePulsesData.pxx_uart.getData(), extmodulePulsesData.pxx_uart.getSize()); extmoduleSendBuffer(extmodulePulsesData.pxx_uart.getData(), extmodulePulsesData.pxx_uart.getSize());
break; break;
@@ -33,8 +33,10 @@ void init_pxx1_serial(uint8_t module)
{ {
if (module == INTERNAL_MODULE) if (module == INTERNAL_MODULE)
intmodulePxxStart(); intmodulePxxStart();
#if defined(EXTMODULE_USART)
else else
extmodulePxxSerialStart(); extmodulePxxSerialStart();
#endif
} }
void disable_pxx1_pulses(uint8_t module) void disable_pxx1_pulses(uint8_t module)