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

Minor build fixes (#4142)

Browse Source 
* [480x272] Fix compiler warnings with awkward extern define in layout.h.

* [firmware][misc] Fix build error with undefined SPLASH; Fix 128x64 syntax error in model_setup.cpp; Fix compiler warning on static init in diskio.cpp.

* [480x272] Revert "Fix compiler warnings with awkward extern define in layout.h." and modify lcd::drawSource() to use mixsrc_t for consistency.

This reverts commit d85d994c877a94c1933c6ece806565ca822d0f54.

* [firmware] Cleanup struct init in diskio modules.
This commit is contained in:
Max Paperno
2016-12-17 13:48:55 +01:00
committed by Bertrand Songis
parent 143f5ce05e
commit a2e37c5dbc
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/128x64/model_setup.cpp
+1 -1
View File
@@ -1175,7 +1175,7 @@ void menuModelFailsafe(event_t event)
#if defined(PPM_UNIT_PERCENT_PREC1) #if defined(PPM_UNIT_PERCENT_PREC1)
uint8_t wbar = SLIDER_W-6; uint8_t wbar = SLIDER_W-6;
#else #else
uint8_t wbar = SLIDER_W); uint8_t wbar = SLIDER_W;
#endif #endif
uint8_t xValue = x+LCD_W-4-wbar; uint8_t xValue = x+LCD_W-4-wbar;
radio/src/gui/480x272/lcd.cpp
+1 -1
View File
@@ -238,7 +238,7 @@ void putsStickName(coord_t x, coord_t y, uint8_t idx, LcdFlags att)
lcdDrawSizedText(x, y, STR_VSRCRAW+2+length*(idx+1), length-1, att); lcdDrawSizedText(x, y, STR_VSRCRAW+2+length*(idx+1), length-1, att);
} }
void drawSource(coord_t x, coord_t y, uint32_t idx, LcdFlags flags) void drawSource(coord_t x, coord_t y, mixsrc_t idx, LcdFlags flags)
{ {
char s[16]; char s[16];
getSourceString(s, idx); getSourceString(s, idx);
radio/src/gui/480x272/lcd.h
+1 -1
View File
@@ -134,7 +134,7 @@ void lcdDrawNumber(coord_t x, coord_t y, int32_t val, LcdFlags flags=0, uint8_t
void putsModelName(coord_t x, coord_t y, char *name, uint8_t id, LcdFlags att); void putsModelName(coord_t x, coord_t y, char *name, uint8_t id, LcdFlags att);
void putsStickName(coord_t x, coord_t y, uint8_t idx, LcdFlags att=0); void putsStickName(coord_t x, coord_t y, uint8_t idx, LcdFlags att=0);
void drawSwitch(coord_t x, coord_t y, swsrc_t swtch, LcdFlags flags=0); void drawSwitch(coord_t x, coord_t y, swsrc_t swtch, LcdFlags flags=0);
void drawSource(coord_t x, coord_t y, uint32_t idx, LcdFlags att=0); void drawSource(coord_t x, coord_t y, mixsrc_t idx, LcdFlags att=0);
void drawCurveName(coord_t x, coord_t y, int8_t idx, LcdFlags att=0); void drawCurveName(coord_t x, coord_t y, int8_t idx, LcdFlags att=0);
void drawTimerMode(coord_t x, coord_t y, int32_t mode, LcdFlags att=0); void drawTimerMode(coord_t x, coord_t y, int32_t mode, LcdFlags att=0);
void drawTrimMode(coord_t x, coord_t y, uint8_t phase, uint8_t idx, LcdFlags att); void drawTrimMode(coord_t x, coord_t y, uint8_t phase, uint8_t idx, LcdFlags att);
radio/src/opentx.cpp
+1 -1
View File
@@ -2572,7 +2572,7 @@ int main()
// lcdSetRefVolt(25); // lcdSetRefVolt(25);
#endif #endif
#if defined(PCBTARANIS) || defined(PCBHORUS) #if defined(SPLASH) && (defined(PCBTARANIS) || defined(PCBHORUS))
drawSplash(); drawSplash();
#endif #endif
radio/src/targets/horus/diskio.cpp
+1 -1
View File
@@ -310,7 +310,7 @@ DRESULT disk_ioctl (
FATFS g_FATFS_Obj __DMA; FATFS g_FATFS_Obj __DMA;
#if defined(LOG_TELEMETRY) #if defined(LOG_TELEMETRY)
FIL g_telemetryFile = {0}; FIL g_telemetryFile = {};
#endif #endif
void sdInit() void sdInit()
radio/src/targets/taranis/diskio.cpp
+1 -1
View File
@@ -978,7 +978,7 @@ void sdPoll10ms()
FATFS g_FATFS_Obj; FATFS g_FATFS_Obj;
#if defined(LOG_TELEMETRY) #if defined(LOG_TELEMETRY)
FIL g_telemetryFile = {0}; FIL g_telemetryFile = {};
#endif #endif
#if defined(BOOT) #if defined(BOOT)