From 700594680826e716caca9c5092c4270e50c68d2a Mon Sep 17 00:00:00 2001 From: dlktdr Date: Sat, 20 Nov 2021 08:40:27 -0800 Subject: [PATCH] Fix compiler error when Debug_Timers is enabled Lug BG/FG is never used. Only LUA. Removed extra + Change my oopsie (model_select.cpp) compiler warning that didn't show up until I started using docker --- radio/src/debug.cpp | 3 +-- radio/src/gui/colorlcd/model_select.cpp | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/radio/src/debug.cpp b/radio/src/debug.cpp index dcf3454ca..6c1d29bbc 100644 --- a/radio/src/debug.cpp +++ b/radio/src/debug.cpp @@ -244,9 +244,8 @@ const char * const debugTimerNames[DEBUG_TIMERS_COUNT] = { ,"perMain dur" // debugTimerPerMain, ," perMain s1" // debugTimerPerMain1, ," guiMain " // debugTimerGuiMain, - ," LUA bg " // debugTimerLuaBg, + ," LUA " // debugTimerLua, ," LCD wait " // debugTimerLcdRefreshWait, - ," LUA fg " // debugTimerLuaFg, ," LCD refr." // debugTimerLcdRefresh, ," Menus " // debugTimerMenus, ," Menu hnd" // debugTimerMenuHandlers, diff --git a/radio/src/gui/colorlcd/model_select.cpp b/radio/src/gui/colorlcd/model_select.cpp index d87f9998a..60aa4bf8f 100644 --- a/radio/src/gui/colorlcd/model_select.cpp +++ b/radio/src/gui/colorlcd/model_select.cpp @@ -431,9 +431,9 @@ class CategoryEditPage : public PageTab // Details char cnt[19]; - snprintf(cnt, sizeof(cnt), "%d %s", category->size(), STR_MODELS); - new StaticText(window, grid.getFieldSlot(3,1), cnt); - + snprintf(cnt, sizeof(cnt), "%lu %s", category->size(), STR_MODELS); + new StaticText(window, grid.getFieldSlot(3,1), cnt); + if(category->empty()) { new TextButton(window, grid.getFieldSlot(3,2),TR_DELETE, [=]() -> uint8_t { new ConfirmDialog(window, STR_DELETE_CATEGORY,