diff --git a/radio/src/buzzer.cpp b/radio/src/buzzer.cpp index ae63001ea..0948bf2cb 100644 --- a/radio/src/buzzer.cpp +++ b/radio/src/buzzer.cpp @@ -28,7 +28,7 @@ bool warble = false; bool warbleC; // The various "beep" tone lengths -static const pm_uint8_t beepTab[] = { +static const uint8_t beepTab[] = { // key, trim, warn2, warn1, error 1, 1, 2, 10, 60, //xShort 1, 1, 4, 20, 80, //short @@ -54,7 +54,7 @@ void beep(uint8_t val) #endif if (g_eeGeneral.beepMode>0 || (g_eeGeneral.beepMode==0 && val!=0) || (g_eeGeneral.beepMode==-1 && val>=3)) { - _beep(pgm_read_byte(beepTab+5*(2+g_eeGeneral.beepLength)+val)); + _beep(*(beepTab+5*(2+g_eeGeneral.beepLength)+val)); } } diff --git a/radio/src/fonts.h b/radio/src/fonts.h index d102cf67e..d6b41b085 100644 --- a/radio/src/fonts.h +++ b/radio/src/fonts.h @@ -38,21 +38,21 @@ void loadFonts(); #else -extern const pm_uchar font_5x7[]; -extern const pm_uchar font_10x14[]; +extern const unsigned char font_5x7[]; +extern const unsigned char font_10x14[]; #if defined(BOLD_FONT) && ((!defined(CPUM64) && !defined(PCBMEGA2560)) || defined(TELEMETRY_NONE)) && !defined(BOOT) #define BOLD_SPECIFIC_FONT - extern const pm_uchar font_5x7_B[]; + extern const unsigned char font_5x7_B[]; #endif -extern const pm_uchar font_3x5[]; -extern const pm_uchar font_4x6[]; -extern const pm_uchar font_8x10[]; -extern const pm_uchar font_22x38_num[]; -extern const pm_uchar font_5x7_extra[]; -extern const pm_uchar font_10x14_extra[]; -extern const pm_uchar font_4x6_extra[]; +extern const unsigned char font_3x5[]; +extern const unsigned char font_4x6[]; +extern const unsigned char font_8x10[]; +extern const unsigned char font_22x38_num[]; +extern const unsigned char font_5x7_extra[]; +extern const unsigned char font_10x14_extra[]; +extern const unsigned char font_4x6_extra[]; #endif diff --git a/radio/src/gui/128x64/fonts.cpp b/radio/src/gui/128x64/fonts.cpp index 299deb2a2..5d1c02382 100644 --- a/radio/src/gui/128x64/fonts.cpp +++ b/radio/src/gui/128x64/fonts.cpp @@ -20,7 +20,7 @@ #include "opentx.h" -const pm_uchar font_5x7[] = { +const unsigned char font_5x7[] = { #include "font_05x07.lbm" #if defined(TRANSLATIONS_DE) #include "font_de_05x07.lbm" @@ -44,13 +44,13 @@ const pm_uchar font_5x7[] = { }; #if defined(BOLD_SPECIFIC_FONT) -const pm_uchar font_5x7_B[] = { +const unsigned char font_5x7_B[] = { #include "font_05x07_B_compressed.lbm" }; #endif #if !defined(BOOT) -const pm_uchar font_10x14[] = { +const unsigned char font_10x14[] = { #include "font_10x14_compressed.lbm" #if defined(TRANSLATIONS_DE) #include "font_de_10x14.lbm" @@ -75,10 +75,10 @@ const pm_uchar font_10x14[] = { #endif #if !defined(BOOT) -const pm_uchar font_3x5[] = { +const unsigned char font_3x5[] = { #include "font_03x05.lbm" }; -const pm_uchar font_4x6[] = { +const unsigned char font_4x6[] = { #include "font_04x06.lbm" #if defined(TRANSLATIONS_DE) #include "font_de_04x06.lbm" @@ -101,7 +101,7 @@ const pm_uchar font_4x6[] = { #endif }; -const pm_uchar font_8x10[] = { +const unsigned char font_8x10[] = { #include "font_08x10.lbm" #if defined(TRANSLATIONS_DE) #include "font_de_08x10.lbm" @@ -124,19 +124,19 @@ const pm_uchar font_8x10[] = { #endif }; -const pm_uchar font_22x38_num[] = { +const unsigned char font_22x38_num[] = { #include "font_22x38_num.lbm" }; -const pm_uchar font_4x6_extra[] = { +const unsigned char font_4x6_extra[] = { #include "font_04x06_extra.lbm" }; -const pm_uchar font_5x7_extra[] = { +const unsigned char font_5x7_extra[] = { #include "font_05x07_extra.lbm" }; -const pm_uchar font_10x14_extra[] = { +const unsigned char font_10x14_extra[] = { #include "font_10x14_extra.lbm" }; diff --git a/radio/src/gui/128x64/gui.h b/radio/src/gui/128x64/gui.h index d2ecd6bf2..98b3fc235 100644 --- a/radio/src/gui/128x64/gui.h +++ b/radio/src/gui/128x64/gui.h @@ -160,11 +160,11 @@ int checkIncDec(event_t event, int val, int i_min, int i_max, unsigned int i_fla #define CURSOR_ON_LINE() (0) #endif -void check(event_t event, uint8_t curr, const MenuHandlerFunc *menuTab, uint8_t menuTabSize, const pm_uint8_t *horTab, uint8_t horTabMax, vertpos_t maxrow); +void check(event_t event, uint8_t curr, const MenuHandlerFunc *menuTab, uint8_t menuTabSize, const uint8_t *horTab, uint8_t horTabMax, vertpos_t maxrow); void check_simple(event_t event, uint8_t curr, const MenuHandlerFunc *menuTab, uint8_t menuTabSize, vertpos_t maxrow); void check_submenu_simple(event_t event, uint8_t maxrow); -void title(const pm_char * s); +void title(const char * s); #define TITLE(str) title(str) #define MENU_TAB(...) const uint8_t mstate_tab[] = __VA_ARGS__ @@ -225,8 +225,8 @@ void title(const pm_char * s); typedef int choice_t; -choice_t editChoice(coord_t x, coord_t y, const pm_char * label, const pm_char *values, choice_t value, choice_t min, choice_t max, LcdFlags attr, event_t event); -uint8_t editCheckBox(uint8_t value, coord_t x, coord_t y, const pm_char * label, LcdFlags attr, event_t event); +choice_t editChoice(coord_t x, coord_t y, const char * label, const char *values, choice_t value, choice_t min, choice_t max, LcdFlags attr, event_t event); +uint8_t editCheckBox(uint8_t value, coord_t x, coord_t y, const char * label, LcdFlags attr, event_t event); int8_t editSwitch(coord_t x, coord_t y, int8_t value, LcdFlags attr, event_t event); #define ON_OFF_MENU_ITEM(value, x, y, label, attr, event) value = editCheckBox(value, x, y, label, attr, event) @@ -258,17 +258,17 @@ void gvarWeightItem(coord_t x, coord_t y, MixData * md, LcdFlags attr, event_t e void editName(coord_t x, coord_t y, char * name, uint8_t size, event_t event, uint8_t active, LcdFlags attr=ZCHAR); -void editSingleName(coord_t x, coord_t y, const pm_char * label, char * name, uint8_t size, event_t event, uint8_t active); +void editSingleName(coord_t x, coord_t y, const char * label, char * name, uint8_t size, event_t event, uint8_t active); -uint8_t editDelay(coord_t y, event_t event, uint8_t attr, const pm_char * str, uint8_t delay); +uint8_t editDelay(coord_t y, event_t event, uint8_t attr, const char * str, uint8_t delay); #define EDIT_DELAY(x, y, event, attr, str, delay) editDelay(y, event, attr, str, delay) #define WARNING_TYPE_ASTERISK 0 #define WARNING_TYPE_CONFIRM 1 #define WARNING_TYPE_INPUT 2 -extern const pm_char * warningText; -extern const pm_char * warningInfoText; +extern const char * warningText; +extern const char * warningInfoText; extern uint8_t warningInfoLength; extern uint8_t warningResult; extern uint8_t warningType; @@ -361,7 +361,7 @@ void deleteExpoMix(uint8_t expo, uint8_t idx); void drawCheckBox(coord_t x, coord_t y, uint8_t value, LcdFlags attr); -extern const pm_uchar sticks[] ; +extern const unsigned char sticks[] ; void drawSplash(); void drawSecondSplash(); @@ -376,10 +376,10 @@ void drawSleepBitmap(); void drawVerticalScrollbar(coord_t x, coord_t y, coord_t h, uint16_t offset, uint16_t count, uint8_t visible); #if defined(PCBTARANIS) -void drawAlertBox(const pm_char * title, const pm_char * text, const char * action); +void drawAlertBox(const char * title, const char * text, const char * action); #endif -void showAlertBox(const pm_char * title, const pm_char * text, const char * action , uint8_t sound); +void showAlertBox(const char * title, const char * text, const char * action , uint8_t sound); #define SET_SCROLLBAR_X(x) #define LOAD_MODEL_BITMAP() diff --git a/radio/src/gui/128x64/lcd.cpp b/radio/src/gui/128x64/lcd.cpp index 0f05b4836..fa1cd058c 100644 --- a/radio/src/gui/128x64/lcd.cpp +++ b/radio/src/gui/128x64/lcd.cpp @@ -67,7 +67,7 @@ void lcdPutPattern(coord_t x, coord_t y, const uint8_t * pattern, uint8_t width, else if (i<=width) { uint8_t skip = true; for (uint8_t j=0; j= displayBuf && (p) < DISPLAY_END) - #if defined(PCBSKY9X) extern volatile uint8_t lcdLock ; extern volatile uint32_t lcdInputs ; #endif -#if defined(BOOT) -// TODO quick & dirty :( -typedef const unsigned char pm_uchar; -typedef const char pm_char; -#endif - void lcdDrawChar(coord_t x, coord_t y, const unsigned char c); void lcdDrawChar(coord_t x, coord_t y, const unsigned char c, LcdFlags flags); -void lcdDrawText(coord_t x, coord_t y, const pm_char * s, LcdFlags flags); -void lcdDrawTextAtIndex(coord_t x, coord_t y, const pm_char * s, uint8_t idx, LcdFlags flags); -void lcdDrawSizedText(coord_t x, coord_t y, const pm_char * s, unsigned char len, LcdFlags flags); -void lcdDrawText(coord_t x, coord_t y, const pm_char * s); -void lcdDrawSizedText(coord_t x, coord_t y, const pm_char * s, unsigned char len); -void lcdDrawTextAlignedLeft(coord_t y, const pm_char * s); +void lcdDrawText(coord_t x, coord_t y, const char * s, LcdFlags flags); +void lcdDrawTextAtIndex(coord_t x, coord_t y, const char * s, uint8_t idx, LcdFlags flags); +void lcdDrawSizedText(coord_t x, coord_t y, const char * s, unsigned char len, LcdFlags flags); +void lcdDrawText(coord_t x, coord_t y, const char * s); +void lcdDrawSizedText(coord_t x, coord_t y, const char * s, unsigned char len); +void lcdDrawTextAlignedLeft(coord_t y, const char * s); #define lcdDrawTextAlignedCenter(y, s) lcdDrawText((LCD_W-sizeof(TR_##s)*FW+FW+1)/2, y, STR_##s) @@ -137,7 +130,7 @@ void lcdDrawNumber(coord_t x, coord_t y, lcdint_t val, LcdFlags mode, uint8_t le void lcdDrawNumber(coord_t x, coord_t y, lcdint_t val, LcdFlags mode=0); void lcdDraw8bitsNumber(coord_t x, coord_t y, int8_t val); -void drawStringWithIndex(coord_t x, coord_t y, const pm_char * str, uint8_t idx, LcdFlags att=0); +void drawStringWithIndex(coord_t x, coord_t y, const char * str, uint8_t idx, LcdFlags att=0); void putsModelName(coord_t x, coord_t y, char * name, uint8_t id, LcdFlags att); #if !defined(BOOT) // TODO not here ... void drawSwitch(coord_t x, coord_t y, swsrc_t swtch, LcdFlags att=0); @@ -202,7 +195,7 @@ void drawTelemetryTopBar(); void lcdClear(void); -void lcdDraw1bitBitmap(coord_t x, coord_t y, const pm_uchar * img, uint8_t idx, LcdFlags att=0); +void lcdDraw1bitBitmap(coord_t x, coord_t y, const unsigned char * img, uint8_t idx, LcdFlags att=0); inline void lcdDrawBitmap(coord_t x, coord_t y, const uint8_t * bitmap) { lcdDraw1bitBitmap(x, y, bitmap, 0); diff --git a/radio/src/gui/128x64/menu_model.cpp b/radio/src/gui/128x64/menu_model.cpp index b2ebba5b0..8d4f80dd0 100644 --- a/radio/src/gui/128x64/menu_model.cpp +++ b/radio/src/gui/128x64/menu_model.cpp @@ -21,7 +21,7 @@ #include "opentx.h" -uint8_t editDelay(coord_t y, event_t event, uint8_t attr, const pm_char * str, uint8_t delay) +uint8_t editDelay(coord_t y, event_t event, uint8_t attr, const char * str, uint8_t delay) { lcdDrawTextAlignedLeft(y, str); lcdDrawNumber(MIXES_2ND_COLUMN, y, (10/DELAY_STEP)*delay, attr|PREC1|LEFT); @@ -39,7 +39,7 @@ uint8_t s_copySrcCh; uint8_t editNameCursorPos = 0; -void editSingleName(coord_t x, coord_t y, const pm_char * label, char * name, uint8_t size, event_t event, uint8_t active) +void editSingleName(coord_t x, coord_t y, const char * label, char * name, uint8_t size, event_t event, uint8_t active) { lcdDrawTextAlignedLeft(y, label); editName(x, y, name, size, event, active); diff --git a/radio/src/gui/128x64/model_flightmodes.cpp b/radio/src/gui/128x64/model_flightmodes.cpp index e96d7c2d7..f6f46800b 100644 --- a/radio/src/gui/128x64/model_flightmodes.cpp +++ b/radio/src/gui/128x64/model_flightmodes.cpp @@ -67,12 +67,12 @@ void menuModelFlightModeOne(event_t event) #if defined(GVARS) && !defined(GVARS_IN_CURVES_SCREEN) #if defined(PCBTARANIS) #define VERTICAL_SHIFT (ITEM_MODEL_FLIGHT_MODE_FADE_IN-ITEM_MODEL_FLIGHT_MODE_TRIMS) - static const pm_uint8_t mstate_tab_fm1[] = {0, 3, 0, 0, (uint8_t)-1, 1, 1, 1, 1, 1, 1}; + static const uint8_t mstate_tab_fm1[] = {0, 3, 0, 0, (uint8_t)-1, 1, 1, 1, 1, 1, 1}; #else #define VERTICAL_SHIFT (ITEM_MODEL_FLIGHT_MODE_FADE_IN-ITEM_MODEL_FLIGHT_MODE_SWITCH) - static const pm_uint8_t mstate_tab_fm1[] = {0, 0, 0, (uint8_t)-1, 1, 1, 1, 1, 1}; + static const uint8_t mstate_tab_fm1[] = {0, 0, 0, (uint8_t)-1, 1, 1, 1, 1, 1}; #endif - static const pm_uint8_t mstate_tab_others[] = {0, 0, 3, IF_ROTARY_ENCODERS(NUM_ROTARY_ENCODERS-1) 0, 0, (uint8_t)-1, 2, 2, 2, 2, 2}; + static const uint8_t mstate_tab_others[] = {0, 0, 3, IF_ROTARY_ENCODERS(NUM_ROTARY_ENCODERS-1) 0, 0, (uint8_t)-1, 2, 2, 2, 2, 2}; check(event, 0, NULL, 0, (s_currIdx == 0) ? mstate_tab_fm1 : mstate_tab_others, DIM(mstate_tab_others)-1, ITEM_MODEL_FLIGHT_MODE_MAX - HEADER_LINE - (s_currIdx==0 ? (ITEM_MODEL_FLIGHT_MODE_FADE_IN-ITEM_MODEL_FLIGHT_MODE_SWITCH-1) : 0)); diff --git a/radio/src/gui/128x64/model_outputs_arm.cpp b/radio/src/gui/128x64/model_outputs_arm.cpp index 970cfc1b6..e3e27b387 100644 --- a/radio/src/gui/128x64/model_outputs_arm.cpp +++ b/radio/src/gui/128x64/model_outputs_arm.cpp @@ -266,7 +266,6 @@ void menuModelLimits(event_t event) } for (uint8_t j=0; j0 || p1valdiff)) STICK_SCROLL_DISABLE(); switch (j) { case ITEM_OUTPUTS_OFFSET: #if defined(PPM_UNIT_US) diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp index b8c9570a0..4647a225f 100644 --- a/radio/src/gui/128x64/model_setup.cpp +++ b/radio/src/gui/128x64/model_setup.cpp @@ -493,7 +493,7 @@ void menuModelSetup(event_t event) #if defined(PCBTARANIS) { #define FIRSTSW_STR STR_VSRCRAW+(MIXSRC_FIRST_SWITCH-MIXSRC_Rud+1)*length - uint8_t length = pgm_read_byte(STR_VSRCRAW); + uint8_t length = STR_VSRCRAW[0]; horzpos_t l_posHorz = menuHorizontalPosition; if (i>=NUM_BODY_LINES-2 && getSwitchWarningsCount() > 5*(NUM_BODY_LINES-i)) { @@ -606,7 +606,7 @@ void menuModelSetup(event_t event) else { if ((states & 0x01) && swactive) attr = INVERS; - c = pgm_read_byte(STR_VSWITCHES - 2 + 9 + (3*(i+1))); + c = *(STR_VSWITCHES - 2 + 9 + (3*(i+1))); states >>= 1; } if (line && (menuHorizontalPosition == i)) { diff --git a/radio/src/gui/128x64/popups.cpp b/radio/src/gui/128x64/popups.cpp index c00357a4f..25b9e28a3 100644 --- a/radio/src/gui/128x64/popups.cpp +++ b/radio/src/gui/128x64/popups.cpp @@ -20,8 +20,8 @@ #include "opentx.h" -const pm_char * warningText = NULL; -const pm_char * warningInfoText; +const char * warningText = NULL; +const char * warningInfoText; uint8_t warningInfoLength; uint8_t warningType; uint8_t warningResult = 0; @@ -39,7 +39,7 @@ void drawMessageBox() // could be a place for a warningInfoText } -void showMessageBox(const pm_char * str) +void showMessageBox(const char * str) { warningText = str; drawMessageBox(); @@ -47,11 +47,11 @@ void showMessageBox(const pm_char * str) lcdRefresh(); } -const pm_uchar ASTERISK_BITMAP[] = { +const unsigned char ASTERISK_BITMAP[] = { #include "asterisk.lbm" }; -void drawAlertBox(const pm_char * title, const pm_char * text, const char * action) +void drawAlertBox(const char * title, const char * text, const char * action) { lcdClear(); lcdDraw1bitBitmap(2, 0, ASTERISK_BITMAP, 0, 0); @@ -77,7 +77,7 @@ void drawAlertBox(const pm_char * title, const pm_char * text, const char * acti #undef MESSAGE_LCD_OFFSET } -void showAlertBox(const pm_char * title, const pm_char * text, const char * action , uint8_t sound) +void showAlertBox(const char * title, const char * text, const char * action , uint8_t sound) { drawAlertBox(title, text, action); diff --git a/radio/src/gui/128x64/popups.h b/radio/src/gui/128x64/popups.h index ff429d489..bc413305e 100644 --- a/radio/src/gui/128x64/popups.h +++ b/radio/src/gui/128x64/popups.h @@ -29,7 +29,7 @@ #define WARNING_LINE_Y 3*FH void drawMessageBox(); -void showMessageBox(const pm_char * title); +void showMessageBox(const char * title); void runPopupWarning(event_t event); #define DRAW_MESSAGE_BOX(title) (warningText = title, drawMessageBox(), warningText = NULL) diff --git a/radio/src/gui/128x64/radio_calibration.cpp b/radio/src/gui/128x64/radio_calibration.cpp index cb4c092d6..de1a5e3c7 100644 --- a/radio/src/gui/128x64/radio_calibration.cpp +++ b/radio/src/gui/128x64/radio_calibration.cpp @@ -118,7 +118,6 @@ void menuCommonCalib(event_t event) case CALIB_MOVE_STICKS: // MOVE STICKS/POTS - STICK_SCROLL_DISABLE(); lcdDrawText(0*FW, MENU_HEADER_HEIGHT+FH, STR_MOVESTICKSPOTS, INVERS); lcdDrawTextAlignedLeft(MENU_HEADER_HEIGHT+2*FH, STR_MENUWHENDONE); for (uint8_t i=0; i 9 coord_t y = MENU_HEADER_HEIGHT + 1 + (i/3)*FH; diff --git a/radio/src/gui/128x64/radio_setup.cpp b/radio/src/gui/128x64/radio_setup.cpp index a962a490f..1a3b687b9 100644 --- a/radio/src/gui/128x64/radio_setup.cpp +++ b/radio/src/gui/128x64/radio_setup.cpp @@ -22,7 +22,7 @@ #include "opentx.h" -const pm_uchar sticks[] = { +const unsigned char sticks[] = { #include "sticks.lbm" }; @@ -166,8 +166,8 @@ void menuRadioSetup(event_t event) { int16_t year = TM_YEAR_BASE + t.tm_year; int8_t dlim = (((((year%4==0) && (year%100!=0)) || (year%400==0)) && (t.tm_mon==1)) ? 1 : 0); - static const pm_uint8_t dmon[] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; - dlim += pgm_read_byte(&dmon[t.tm_mon]); + static const uint8_t dmon[] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; + dlim += dmon[t.tm_mon]; lcdDrawNumber(RADIO_SETUP_DATE_COLUMN+6*FW-4, y, t.tm_mday, rowattr|LEADING0|RIGHT, 2); if (rowattr && (s_editMode>0 || p1valdiff)) t.tm_mday = checkIncDec(event, t.tm_mday, 1, dlim, 0); break; @@ -559,7 +559,7 @@ void menuRadioSetup(event_t event) case ITEM_SETUP_STICK_MODE: lcdDrawChar(2*FW, y, '1'+reusableBuffer.generalSettings.stickMode, attr); for (uint8_t i=0; i0) { CHECK_INCDEC_GENVAR(event, reusableBuffer.generalSettings.stickMode, 0, 3); diff --git a/radio/src/gui/128x64/splash.cpp b/radio/src/gui/128x64/splash.cpp index 7cfeb5778..0a6b0719d 100644 --- a/radio/src/gui/128x64/splash.cpp +++ b/radio/src/gui/128x64/splash.cpp @@ -41,12 +41,12 @@ #endif #if defined(SPLASH) -const pm_uchar splashdata[] = { +const unsigned char splashdata[] = { 'S','P','S',0, #include "bitmaps/128x64/splash.lbm" 'S','P','E',0 }; -const pm_uchar * const splash_lbm = splashdata+4; +const unsigned char * const splash_lbm = splashdata+4; void drawSplash() { @@ -65,12 +65,12 @@ void drawSplash() #endif #if defined(SPLASH_FRSKY) -const pm_uchar splashdata2[] = { +const unsigned char splashdata2[] = { 'S','F','S',0, #include "bitmaps/128x64/splash_frsky.lbm" 'S','F','E',0 }; -const pm_uchar * const splash2_lbm = splashdata2+4; +const unsigned char * const splash2_lbm = splashdata2+4; void drawSecondSplash() { diff --git a/radio/src/gui/128x64/view_about.cpp b/radio/src/gui/128x64/view_about.cpp index cf325469f..dec2f7f94 100644 --- a/radio/src/gui/128x64/view_about.cpp +++ b/radio/src/gui/128x64/view_about.cpp @@ -20,7 +20,7 @@ #include "opentx.h" -const pm_uchar about_bmp[] = { +const unsigned char about_bmp[] = { #include "about.lbm" }; diff --git a/radio/src/gui/128x64/view_main.cpp b/radio/src/gui/128x64/view_main.cpp index 3459c77e8..590a12b01 100644 --- a/radio/src/gui/128x64/view_main.cpp +++ b/radio/src/gui/128x64/view_main.cpp @@ -303,8 +303,6 @@ void onMainViewMenu(const char *result) void menuMainView(event_t event) { - STICK_SCROLL_DISABLE(); - uint8_t view = g_eeGeneral.view; uint8_t view_base = view & 0x0f; diff --git a/radio/src/gui/128x64/widgets.cpp b/radio/src/gui/128x64/widgets.cpp index 232352eee..cec799981 100644 --- a/radio/src/gui/128x64/widgets.cpp +++ b/radio/src/gui/128x64/widgets.cpp @@ -65,12 +65,12 @@ void drawVerticalScrollbar(coord_t x, coord_t y, coord_t h, uint16_t offset, uin lcdDrawVerticalLine(x, y + yofs, yhgt, SOLID, FORCE); } -void title(const pm_char * s) +void title(const char * s) { lcdDrawText(0, 0, s, INVERS); } -choice_t editChoice(coord_t x, coord_t y, const pm_char * label, const pm_char *values, choice_t value, choice_t min, choice_t max, LcdFlags attr, event_t event) +choice_t editChoice(coord_t x, coord_t y, const char * label, const char *values, choice_t value, choice_t min, choice_t max, LcdFlags attr, event_t event) { drawFieldLabel(x, y, label); if (values) lcdDrawTextAtIndex(x, y, values, value-min, attr); @@ -78,7 +78,7 @@ choice_t editChoice(coord_t x, coord_t y, const pm_char * label, const pm_char * return value; } -uint8_t editCheckBox(uint8_t value, coord_t x, coord_t y, const pm_char *label, LcdFlags attr, event_t event ) +uint8_t editCheckBox(uint8_t value, coord_t x, coord_t y, const char *label, LcdFlags attr, event_t event ) { #if defined(GRAPHICS) drawCheckBox(x, y, value, attr); @@ -246,7 +246,7 @@ void drawProgressBar(const char * label, int num, int den) lcdRefresh(); } -const pm_uchar SLEEP_BITMAP[] = { +const unsigned char SLEEP_BITMAP[] = { #include "sleep.lbm" }; diff --git a/radio/src/gui/212x64/fonts.cpp b/radio/src/gui/212x64/fonts.cpp index 86e660c3a..a83d04ae6 100644 --- a/radio/src/gui/212x64/fonts.cpp +++ b/radio/src/gui/212x64/fonts.cpp @@ -20,7 +20,7 @@ #include "opentx.h" -const pm_uchar font_5x7[] = { +const unsigned char font_5x7[] = { #include "font_05x07.lbm" #if defined(TRANSLATIONS_DE) #include "font_de_05x07.lbm" @@ -43,12 +43,12 @@ const pm_uchar font_5x7[] = { #endif }; -const pm_uchar font_5x7_B[] = { +const unsigned char font_5x7_B[] = { #include "font_05x07_B_compressed.lbm" }; #if !defined(BOOT) -const pm_uchar font_10x14[] = { +const unsigned char font_10x14[] = { #include "font_10x14_compressed.lbm" #if defined(TRANSLATIONS_DE) #include "font_de_10x14.lbm" @@ -71,11 +71,11 @@ const pm_uchar font_10x14[] = { #endif }; -const pm_uchar font_3x5[] = { +const unsigned char font_3x5[] = { #include "font_03x05.lbm" }; -const pm_uchar font_4x6[] = { +const unsigned char font_4x6[] = { #include "font_04x06.lbm" #if defined(TRANSLATIONS_DE) #include "font_de_04x06.lbm" @@ -98,7 +98,7 @@ const pm_uchar font_4x6[] = { #endif }; -const pm_uchar font_8x10[] = { +const unsigned char font_8x10[] = { #include "font_08x10.lbm" #if defined(TRANSLATIONS_DE) #include "font_de_08x10.lbm" @@ -121,19 +121,19 @@ const pm_uchar font_8x10[] = { #endif }; -const pm_uchar font_22x38_num[] = { +const unsigned char font_22x38_num[] = { #include "font_22x38_num.lbm" }; -const pm_uchar font_4x6_extra[] = { +const unsigned char font_4x6_extra[] = { #include "font_04x06_extra.lbm" }; -const pm_uchar font_5x7_extra[] = { +const unsigned char font_5x7_extra[] = { #include "font_05x07_extra.lbm" }; -const pm_uchar font_10x14_extra[] = { +const unsigned char font_10x14_extra[] = { #include "font_10x14_extra.lbm" }; diff --git a/radio/src/gui/212x64/gui.h b/radio/src/gui/212x64/gui.h index 0e192086e..843cc41d9 100644 --- a/radio/src/gui/212x64/gui.h +++ b/radio/src/gui/212x64/gui.h @@ -178,11 +178,11 @@ int checkIncDec(event_t event, int val, int i_min, int i_max, unsigned int i_fla #define CURSOR_ON_LINE() (menuHorizontalPosition<0) #define CHECK_FLAG_NO_SCREEN_INDEX 1 -void check(const char * title, event_t event, uint8_t curr, const MenuHandlerFunc *menuTab, uint8_t menuTabSize, const pm_uint8_t *horTab, uint8_t horTabMax, vertpos_t maxrow, uint8_t flags=0); +void check(const char * title, event_t event, uint8_t curr, const MenuHandlerFunc *menuTab, uint8_t menuTabSize, const uint8_t *horTab, uint8_t horTabMax, vertpos_t maxrow, uint8_t flags=0); void check_simple(const char *title, event_t event, uint8_t curr, const MenuHandlerFunc *menuTab, uint8_t menuTabSize, vertpos_t maxrow); void check_submenu_simple(const char * title, event_t event, uint8_t maxrow); -void title(const pm_char * s); +void title(const char * s); #define TITLE(str) title(str) #define MENU_TAB(...) const uint8_t mstate_tab[] = __VA_ARGS__ @@ -224,8 +224,8 @@ void title(const pm_char * s); typedef int choice_t; -choice_t editChoice(coord_t x, coord_t y, const pm_char *label, const pm_char *values, choice_t value, choice_t min, choice_t max, LcdFlags attr, event_t event); -uint8_t editCheckBox(uint8_t value, coord_t x, coord_t y, const pm_char *label, LcdFlags attr, event_t event); +choice_t editChoice(coord_t x, coord_t y, const char *label, const char *values, choice_t value, choice_t min, choice_t max, LcdFlags attr, event_t event); +uint8_t editCheckBox(uint8_t value, coord_t x, coord_t y, const char *label, LcdFlags attr, event_t event); swsrc_t editSwitch(coord_t x, coord_t y, swsrc_t value, LcdFlags attr, event_t event); #define ON_OFF_MENU_ITEM(value, x, y, label, attr, event) value = editCheckBox(value, x, y, label, attr, event) @@ -249,7 +249,7 @@ void editCurveRef(coord_t x, coord_t y, CurveRef & curve, event_t event, LcdFlag extern uint8_t editNameCursorPos; void editName(coord_t x, coord_t y, char * name, uint8_t size, event_t event, uint8_t active, LcdFlags attr=ZCHAR); -void editSingleName(coord_t x, coord_t y, const pm_char * label, char * name, uint8_t size, event_t event, uint8_t active); +void editSingleName(coord_t x, coord_t y, const char * label, char * name, uint8_t size, event_t event, uint8_t active); uint8_t editDelay(coord_t y, event_t event, uint8_t attr, const char * str, uint8_t delay); #define EDIT_DELAY(y, event, attr, str, delay) editDelay(y, event, attr, str, delay) @@ -260,8 +260,8 @@ uint8_t editDelay(coord_t y, event_t event, uint8_t attr, const char * str, uint void copySelection(char * dst, const char * src, uint8_t size); -extern const pm_char * warningText; -extern const pm_char * warningInfoText; +extern const char * warningText; +extern const char * warningInfoText; extern uint8_t warningInfoLength; extern uint8_t warningResult; extern uint8_t warningType; @@ -326,7 +326,7 @@ uint8_t switchToMix(uint8_t source); extern coord_t scrollbar_X; #define SET_SCROLLBAR_X(x) scrollbar_X = (x); -extern const pm_uchar sticks[] ; +extern const unsigned char sticks[] ; #if defined(FLIGHT_MODES) void displayFlightModes(coord_t x, coord_t y, FlightModesType value); diff --git a/radio/src/gui/212x64/lcd.cpp b/radio/src/gui/212x64/lcd.cpp index 9d22ca982..104bbcc34 100644 --- a/radio/src/gui/212x64/lcd.cpp +++ b/radio/src/gui/212x64/lcd.cpp @@ -103,7 +103,7 @@ void lcdPutPattern(coord_t x, coord_t y, const uint8_t * pattern, uint8_t width, else if (i<=width) { uint8_t skip = true; for (uint8_t j=0; j= displayBuf && (p) < DISPLAY_END) -#if defined(BOOT) -// TODO quick & dirty :( -typedef const unsigned char pm_uchar; -typedef const char pm_char; -#endif - void lcdDrawChar(coord_t x, coord_t y, const unsigned char c); void lcdDrawChar(coord_t x, coord_t y, const unsigned char c, LcdFlags mode); -void lcdDrawText(coord_t x, coord_t y, const pm_char * s, LcdFlags mode); -void lcdDrawTextAtIndex(coord_t x, coord_t y, const pm_char * s,uint8_t idx, LcdFlags mode); -void lcdDrawSizedText(coord_t x, coord_t y, const pm_char * s,unsigned char len, LcdFlags mode); -void lcdDrawText(coord_t x, coord_t y, const pm_char * s); -void lcdDrawSizedText(coord_t x, coord_t y, const pm_char * s, unsigned char len); -void lcdDrawTextAlignedLeft(coord_t y, const pm_char * s); +void lcdDrawText(coord_t x, coord_t y, const char * s, LcdFlags mode); +void lcdDrawTextAtIndex(coord_t x, coord_t y, const char * s,uint8_t idx, LcdFlags mode); +void lcdDrawSizedText(coord_t x, coord_t y, const char * s,unsigned char len, LcdFlags mode); +void lcdDrawText(coord_t x, coord_t y, const char * s); +void lcdDrawSizedText(coord_t x, coord_t y, const char * s, unsigned char len); +void lcdDrawTextAlignedLeft(coord_t y, const char * s); #define lcdDrawTextAlignedCenter(y, s) lcdDrawText((LCD_W-sizeof(TR_##s)*FW+FW+1)/2, y, STR_##s) @@ -125,7 +119,7 @@ void lcdDrawHexNumber(coord_t x, coord_t y, uint32_t val, LcdFlags mode=0); void lcdDrawNumber(coord_t x, coord_t y, int32_t val, LcdFlags mode, uint8_t len); void lcdDrawNumber(coord_t x, coord_t y, int32_t val, LcdFlags mode=0); -void drawStringWithIndex(coord_t x, coord_t y, const pm_char *str, uint8_t idx, LcdFlags att=0); +void drawStringWithIndex(coord_t x, coord_t y, const char *str, uint8_t idx, LcdFlags att=0); void putsModelName(coord_t x, coord_t y, char *name, uint8_t id, LcdFlags att); void drawSwitch(coord_t x, coord_t y, int32_t swtch, LcdFlags att=0); void putsStickName(coord_t x, coord_t y, uint8_t idx, LcdFlags att=0); @@ -182,7 +176,7 @@ void drawTelemetryTopBar(); lcdDrawSolidVerticalLine(xx ,yy-ll,ll); \ lcdDrawSolidVerticalLine(xx+1,yy-ll,ll) -void lcdDraw1bitBitmap(coord_t x, coord_t y, const pm_uchar * img, uint8_t idx, LcdFlags att=0); +void lcdDraw1bitBitmap(coord_t x, coord_t y, const unsigned char * img, uint8_t idx, LcdFlags att=0); void lcdDrawBitmap(coord_t x, coord_t y, const uint8_t * img, coord_t offset=0, coord_t width=0); #define LCD_ICON(x, y, icon) lcdDrawBitmap(x, y, icons, icon) diff --git a/radio/src/gui/212x64/menu_model.cpp b/radio/src/gui/212x64/menu_model.cpp index 547c76cd8..94829aee5 100644 --- a/radio/src/gui/212x64/menu_model.cpp +++ b/radio/src/gui/212x64/menu_model.cpp @@ -60,7 +60,7 @@ uint8_t s_copySrcCh; uint8_t editNameCursorPos = 0; -void editSingleName(coord_t x, coord_t y, const pm_char * label, char *name, uint8_t size, event_t event, uint8_t active) +void editSingleName(coord_t x, coord_t y, const char * label, char *name, uint8_t size, event_t event, uint8_t active) { lcdDrawTextAlignedLeft(y, label); editName(x, y, name, size, event, active); diff --git a/radio/src/gui/212x64/model_outputs.cpp b/radio/src/gui/212x64/model_outputs.cpp index bfa527112..f3f776285 100644 --- a/radio/src/gui/212x64/model_outputs.cpp +++ b/radio/src/gui/212x64/model_outputs.cpp @@ -148,7 +148,6 @@ void menuModelLimits(event_t event) for (int j=0; j0) ? BLINK|INVERS : INVERS) : 0); uint8_t active = (attr && s_editMode>0) ; - if (active) STICK_SCROLL_DISABLE(); switch(j) { case ITEM_LIMITS_CH_NAME: diff --git a/radio/src/gui/212x64/popups.cpp b/radio/src/gui/212x64/popups.cpp index db3bf4d26..dee7c4e72 100644 --- a/radio/src/gui/212x64/popups.cpp +++ b/radio/src/gui/212x64/popups.cpp @@ -44,7 +44,7 @@ void showMessageBox(const char * title) lcdRefresh(); } -const pm_uchar ASTERISK_BITMAP[] = { +const unsigned char ASTERISK_BITMAP[] = { #include "asterisk.lbm" }; diff --git a/radio/src/gui/212x64/radio_calibration.cpp b/radio/src/gui/212x64/radio_calibration.cpp index cc5162782..339db6a02 100644 --- a/radio/src/gui/212x64/radio_calibration.cpp +++ b/radio/src/gui/212x64/radio_calibration.cpp @@ -126,7 +126,6 @@ void menuCommonCalib(event_t event) case CALIB_MOVE_STICKS: // MOVE STICKS/POTS - STICK_SCROLL_DISABLE(); lcdDrawText(0*FW, MENU_HEADER_HEIGHT+FH, STR_MOVESTICKSPOTS, INVERS); lcdDrawTextAlignedLeft(MENU_HEADER_HEIGHT+2*FH, STR_MENUWHENDONE); for (uint8_t i=0; i0) t.tm_mday = checkIncDec(event, t.tm_mday, 1, dlim, 0); break; @@ -495,7 +495,7 @@ void menuRadioSetup(event_t event) case ITEM_SETUP_STICK_MODE: lcdDrawChar(2*FW, y, '1'+reusableBuffer.generalSettings.stickMode, attr); for (uint8_t i=0; i<4; i++) { - putsStickName((6+4*i)*FW, y, pgm_read_byte(modn12x3 + 4*reusableBuffer.generalSettings.stickMode + i), 0); + putsStickName((6+4*i)*FW, y, *(modn12x3 + 4*reusableBuffer.generalSettings.stickMode + i), 0); } if (attr && s_editMode>0) { CHECK_INCDEC_GENVAR(event, reusableBuffer.generalSettings.stickMode, 0, 3); diff --git a/radio/src/gui/212x64/splash.cpp b/radio/src/gui/212x64/splash.cpp index 6066f81e6..354501248 100644 --- a/radio/src/gui/212x64/splash.cpp +++ b/radio/src/gui/212x64/splash.cpp @@ -21,11 +21,11 @@ #include "opentx.h" #if defined(SPLASH) -const pm_uchar splashdata[] = { +const unsigned char splashdata[] = { 'S','P','S',0, #include "bitmaps/212x64/splash.lbm" 'S','P','E',0 }; -const pm_uchar * const splash_lbm = splashdata+4; +const unsigned char * const splash_lbm = splashdata+4; void drawSplash() { @@ -44,11 +44,11 @@ void drawSplash() #endif #if defined(SPLASH_FRSKY) -const pm_uchar splashdata2[] = { +const unsigned char splashdata2[] = { 'S','F','S',0, #include "bitmaps/212x64/splash_frsky.lbm" 'S','F','E',0 }; -const pm_uchar * const splash2_lbm = splashdata2+4; +const unsigned char * const splash2_lbm = splashdata2+4; void drawSecondSplash() { diff --git a/radio/src/gui/212x64/view_about.cpp b/radio/src/gui/212x64/view_about.cpp index 731b715c3..b75ff1095 100644 --- a/radio/src/gui/212x64/view_about.cpp +++ b/radio/src/gui/212x64/view_about.cpp @@ -20,7 +20,7 @@ #include "opentx.h" -const pm_uchar about_bmp[] = { +const unsigned char about_bmp[] = { #include "about.lbm" }; diff --git a/radio/src/gui/212x64/view_main.cpp b/radio/src/gui/212x64/view_main.cpp index 61e0e12ac..8d3c5fbef 100644 --- a/radio/src/gui/212x64/view_main.cpp +++ b/radio/src/gui/212x64/view_main.cpp @@ -49,11 +49,11 @@ #define TRIM_LEN 27 #define MARKER_WIDTH 5 -const pm_uchar logo_taranis[] = { +const unsigned char logo_taranis[] = { #include "logo.lbm" }; -const pm_uchar icons[] = { +const unsigned char icons[] = { #include "icons.lbm" }; @@ -439,8 +439,6 @@ void menuMainView(event_t event) { static bool secondPage = false; - STICK_SCROLL_DISABLE(); - switch(event) { case EVT_ENTRY: diff --git a/radio/src/gui/212x64/widgets.cpp b/radio/src/gui/212x64/widgets.cpp index 03193e1ce..8eb631d09 100644 --- a/radio/src/gui/212x64/widgets.cpp +++ b/radio/src/gui/212x64/widgets.cpp @@ -20,7 +20,7 @@ #include "opentx.h" -const pm_uchar SLEEP_BITMAP[] = { +const unsigned char SLEEP_BITMAP[] = { #include "../../bitmaps/212x64/sleep.lbm" }; @@ -34,7 +34,7 @@ void drawSleepBitmap() } #if defined(PWR_BUTTON_PRESS) -const pm_uchar SHUTDOWN_BITMAP[] = { +const unsigned char SHUTDOWN_BITMAP[] = { #include "../../bitmaps/212x64/shutdown.lbm" }; @@ -125,12 +125,12 @@ void drawGauge(coord_t x, coord_t y, coord_t w, coord_t h, int32_t val, int32_t } } -void title(const pm_char * s) +void title(const char * s) { lcdDrawText(0, 0, s, INVERS); } -choice_t editChoice(coord_t x, coord_t y, const pm_char * label, const pm_char *values, choice_t value, choice_t min, choice_t max, LcdFlags attr, event_t event) +choice_t editChoice(coord_t x, coord_t y, const char * label, const char *values, choice_t value, choice_t min, choice_t max, LcdFlags attr, event_t event) { drawFieldLabel(x, y, label); if (values) lcdDrawTextAtIndex(x, y, values, value-min, attr); @@ -138,7 +138,7 @@ choice_t editChoice(coord_t x, coord_t y, const pm_char * label, const pm_char * return value; } -uint8_t editCheckBox(uint8_t value, coord_t x, coord_t y, const pm_char *label, LcdFlags attr, event_t event ) +uint8_t editCheckBox(uint8_t value, coord_t x, coord_t y, const char *label, LcdFlags attr, event_t event ) { drawCheckBox(x, y, value, attr); return editChoice(x, y, label, NULL, value, 0, 1, attr, event); diff --git a/radio/src/gui/480x272/bitmapbuffer.cpp b/radio/src/gui/480x272/bitmapbuffer.cpp index 8f0134e8a..3fe5b9c6e 100644 --- a/radio/src/gui/480x272/bitmapbuffer.cpp +++ b/radio/src/gui/480x272/bitmapbuffer.cpp @@ -318,7 +318,7 @@ void BitmapBuffer::drawSizedText(coord_t x, coord_t y, const char * s, uint8_t l int width = getTextWidth(s, len, flags); int height = getFontHeight(flags); uint32_t fontindex = FONTINDEX(flags); - const pm_uchar * font = fontsTable[fontindex]; + const unsigned char * font = fontsTable[fontindex]; const uint16_t * fontspecs = fontspecsTable[fontindex]; BitmapBuffer * fontcache = NULL; diff --git a/radio/src/gui/480x272/fonts.cpp b/radio/src/gui/480x272/fonts.cpp index 8a3d65112..20245f081 100644 --- a/radio/src/gui/480x272/fonts.cpp +++ b/radio/src/gui/480x272/fonts.cpp @@ -26,7 +26,7 @@ const uint16_t font_tinsize_specs[] = { #include "font_tinsize.specs" }; -const pm_uchar font_tinsize[] = { +const unsigned char font_tinsize[] = { #include "font_tinsize.lbm" }; @@ -34,7 +34,7 @@ const uint16_t font_smlsize_specs[] = { #include "font_smlsize.specs" }; -const pm_uchar font_smlsize[] = { +const unsigned char font_smlsize[] = { #include "font_smlsize.lbm" }; #endif @@ -43,7 +43,7 @@ const uint16_t font_stdsize_specs[] = { #include "font_stdsize.specs" }; -const pm_uchar font_stdsize[] = { +const unsigned char font_stdsize[] = { #include "font_stdsize.lbm" }; @@ -52,7 +52,7 @@ const uint16_t font_midsize_specs[] = { #include "font_midsize.specs" }; -const pm_uchar font_midsize[] = { +const unsigned char font_midsize[] = { #include "font_midsize.lbm" }; @@ -60,7 +60,7 @@ const uint16_t font_dblsize_specs[] = { #include "font_dblsize.specs" }; -const pm_uchar font_dblsize[] = { +const unsigned char font_dblsize[] = { #include "font_dblsize.lbm" }; @@ -68,7 +68,7 @@ const uint16_t font_xxlsize_specs[] = { #include "font_xxlsize.specs" }; -const pm_uchar font_xxlsize[] = { +const unsigned char font_xxlsize[] = { #include "font_xxlsize.lbm" }; @@ -76,7 +76,7 @@ const uint16_t font_stdsizebold_specs[] = { #include "font_stdsizebold.specs" }; -const pm_uchar font_stdsizebold[] = { +const unsigned char font_stdsizebold[] = { #include "font_stdsizebold.lbm" }; #endif diff --git a/radio/src/gui/480x272/lcd.cpp b/radio/src/gui/480x272/lcd.cpp index 357d36154..3d5fae358 100644 --- a/radio/src/gui/480x272/lcd.cpp +++ b/radio/src/gui/480x272/lcd.cpp @@ -102,7 +102,7 @@ void lcdPutFontPattern(coord_t x, coord_t y, const uint8_t * font, const uint16_ void lcdDrawChar(coord_t x, coord_t y, char c, LcdFlags flags) { uint32_t fontindex = FONTINDEX(flags); - const pm_uchar * font = fontsTable[fontindex]; + const unsigned char * font = fontsTable[fontindex]; const uint16_t * fontspecs = fontspecsTable[fontindex]; lcdPutFontPattern(x, y, font, fontspecs, getMappedChar(c), flags); } @@ -142,10 +142,10 @@ int getTextWidth(const char * s, int len, LcdFlags flags) return result; } -void lcdDrawTextAtIndex(coord_t x, coord_t y, const pm_char * s, uint8_t idx, LcdFlags flags) +void lcdDrawTextAtIndex(coord_t x, coord_t y, const char * s, uint8_t idx, LcdFlags flags) { uint8_t length; - length = pgm_read_byte(s++); + length = *(s++); lcdDrawSizedText(x, y, s+length*idx, length, flags & ~ZCHAR); } diff --git a/radio/src/gui/480x272/lcd.h b/radio/src/gui/480x272/lcd.h index 873a27453..cee3e5804 100644 --- a/radio/src/gui/480x272/lcd.h +++ b/radio/src/gui/480x272/lcd.h @@ -120,7 +120,7 @@ extern coord_t lcdNextPos; void lcdDrawChar(coord_t x, coord_t y, char c, LcdFlags flags=0); -void lcdDrawTextAtIndex(coord_t x, coord_t y, const pm_char * s, uint8_t idx, LcdFlags flags=0); +void lcdDrawTextAtIndex(coord_t x, coord_t y, const char * s, uint8_t idx, LcdFlags flags=0); inline void lcdClear() { @@ -132,7 +132,7 @@ inline void lcdDrawText(coord_t x, coord_t y, const char * s, LcdFlags attr=0) lcd->drawText(x, y, s, attr); } -inline void lcdDrawSizedText(coord_t x, coord_t y, const pm_char * s, uint8_t len, LcdFlags attr=0) +inline void lcdDrawSizedText(coord_t x, coord_t y, const char * s, uint8_t len, LcdFlags attr=0) { lcd->drawSizedText(x, y, s, len, attr); } diff --git a/radio/src/gui/480x272/menus.h b/radio/src/gui/480x272/menus.h index 3b6a41a66..6aafa5036 100644 --- a/radio/src/gui/480x272/menus.h +++ b/radio/src/gui/480x272/menus.h @@ -428,8 +428,8 @@ extern uint8_t s_curveChan; #define WARNING_TYPE_INPUT 3 #define WARNING_TYPE_INFO 4 -extern const pm_char * warningText; -extern const pm_char * warningInfoText; +extern const char * warningText; +extern const char * warningInfoText; extern uint8_t warningInfoLength; extern uint8_t warningResult; extern uint8_t warningType; diff --git a/radio/src/gui/480x272/model_outputs.cpp b/radio/src/gui/480x272/model_outputs.cpp index df1cdcc33..af5128fd7 100644 --- a/radio/src/gui/480x272/model_outputs.cpp +++ b/radio/src/gui/480x272/model_outputs.cpp @@ -139,7 +139,6 @@ bool menuModelLimits(event_t event) for (uint8_t j=0; j0) ? BLINK|INVERS : INVERS) : 0); uint8_t active = (attr && s_editMode>0) ; - if (active) STICK_SCROLL_DISABLE(); switch(j) { case ITEM_LIMITS_CH_NAME: diff --git a/radio/src/gui/480x272/radio_setup.cpp b/radio/src/gui/480x272/radio_setup.cpp index 932d71049..a4e86b44e 100644 --- a/radio/src/gui/480x272/radio_setup.cpp +++ b/radio/src/gui/480x272/radio_setup.cpp @@ -154,8 +154,8 @@ bool menuRadioSetup(event_t event) { int16_t year = TM_YEAR_BASE + t.tm_year; int8_t dlim = (((((year%4==0) && (year%100!=0)) || (year%400==0)) && (t.tm_mon==1)) ? 1 : 0); - static const pm_uint8_t dmon[] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; - dlim += pgm_read_byte(&dmon[t.tm_mon]); + static const uint8_t dmon[] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; + dlim += dmon[t.tm_mon]; lcdDrawNumber(lcdNextPos+3, y, t.tm_mday, flags|rowattr|LEADING0, 2); if (rowattr && s_editMode>0) t.tm_mday = checkIncDec(event, t.tm_mday, 1, dlim, 0); break; @@ -473,7 +473,7 @@ bool menuRadioSetup(event_t event) s[0] = '1'+reusableBuffer.generalSettings.stickMode; lcdDrawText(RADIO_SETUP_2ND_COLUMN, y, s, attr); for (uint8_t i=0; i<4; i++) { - drawSource(RADIO_SETUP_2ND_COLUMN + 40 + 50*i, y, MIXSRC_Rud + pgm_read_byte(modn12x3 + 4*reusableBuffer.generalSettings.stickMode + i)); + drawSource(RADIO_SETUP_2ND_COLUMN + 40 + 50*i, y, MIXSRC_Rud + *(modn12x3 + 4*reusableBuffer.generalSettings.stickMode + i)); } if (attr && s_editMode>0) { CHECK_INCDEC_GENVAR(event, reusableBuffer.generalSettings.stickMode, 0, 3); diff --git a/radio/src/gui/480x272/view_channels.cpp b/radio/src/gui/480x272/view_channels.cpp index 3bf334932..8e164b254 100644 --- a/radio/src/gui/480x272/view_channels.cpp +++ b/radio/src/gui/480x272/view_channels.cpp @@ -162,7 +162,7 @@ void drawComboOutputBar(coord_t x, coord_t y, coord_t w, coord_t h, uint8_t chan lcdDrawNumber(x + limPos, y + h, chanVal, SMLSIZE | TEXT_COLOR, 0, NULL, "%"); } -coord_t drawChannelsMonitorLegend(coord_t x, const pm_char * s, int color) +coord_t drawChannelsMonitorLegend(coord_t x, const char * s, int color) { lcdDrawSolidFilledRect(x, MENU_FOOTER_TOP + 2, LEG_COLORBOX + 2, LEG_COLORBOX + 2, BARGRAPH_BGCOLOR); lcdDrawSolidFilledRect(x + 1, MENU_FOOTER_TOP + 3, LEG_COLORBOX, LEG_COLORBOX, color); diff --git a/radio/src/gui/common/stdlcd/widgets.cpp b/radio/src/gui/common/stdlcd/widgets.cpp index a3bc1fd58..c1b60ec32 100644 --- a/radio/src/gui/common/stdlcd/widgets.cpp +++ b/radio/src/gui/common/stdlcd/widgets.cpp @@ -20,7 +20,7 @@ #include "opentx.h" -void drawStringWithIndex(coord_t x, coord_t y, const pm_char * str, uint8_t idx, LcdFlags flags) +void drawStringWithIndex(coord_t x, coord_t y, const char * str, uint8_t idx, LcdFlags flags) { if (flags & RIGHT) { lcdDrawNumber(x, y, idx, flags); diff --git a/radio/src/gui/gui_common.h b/radio/src/gui/gui_common.h index f95943b28..bec8e1d6b 100644 --- a/radio/src/gui/gui_common.h +++ b/radio/src/gui/gui_common.h @@ -132,7 +132,7 @@ struct mm_protocol_definition { uint8_t protocol; uint8_t maxSubtype; bool failsafe; - const pm_char *subTypeString; + const char *subTypeString; const char *optionsstr; }; diff --git a/radio/src/gui/gui_common_arm.cpp b/radio/src/gui/gui_common_arm.cpp index 1832043f0..db231bef5 100644 --- a/radio/src/gui/gui_common_arm.cpp +++ b/radio/src/gui/gui_common_arm.cpp @@ -647,53 +647,53 @@ int getFirstAvailable(int min, int max, IsValueAvailable isValueAvailable) // we don't need the special eeprom/flash string handling, just define them as // local strings -const pm_char STR_SUBTYPE_FLYSKY[] = "\004""Std\0""V9x9""V6x6""V912""CX20"; +const char STR_SUBTYPE_FLYSKY[] = "\004""Std\0""V9x9""V6x6""V912""CX20"; -const pm_char STR_SUBTYPE_AFHDS2A[] = "\010""PWM,IBUS""PPM,IBUS""PWM,SBUS""PPM,SBUS"; +const char STR_SUBTYPE_AFHDS2A[] = "\010""PWM,IBUS""PPM,IBUS""PWM,SBUS""PPM,SBUS"; -const pm_char STR_SUBTYPE_FRSKY[] = "\007""D16\0 ""D8\0 ""D16 8ch""V8\0 ""LBT(EU)""LBT 8ch"; +const char STR_SUBTYPE_FRSKY[] = "\007""D16\0 ""D8\0 ""D16 8ch""V8\0 ""LBT(EU)""LBT 8ch"; -const pm_char STR_SUBTYPE_HISKY[] = "\005""HiSky""HK310"; +const char STR_SUBTYPE_HISKY[] = "\005""HiSky""HK310"; -const pm_char STR_SUBTYPE_DSM[] = "\006""2 22ms""2 11ms""X 22ms""X 11ms"; +const char STR_SUBTYPE_DSM[] = "\006""2 22ms""2 11ms""X 22ms""X 11ms"; -const pm_char STR_SUBTYPE_YD717[] = "\007""YD717\0 ""SKYWLKR""Syma X2""XINXUN\0""NIHUI\0 "; +const char STR_SUBTYPE_YD717[] = "\007""YD717\0 ""SKYWLKR""Syma X2""XINXUN\0""NIHUI\0 "; -const pm_char STR_SUBTYPE_SYMAX[] = "\003""Std""5c\0"; +const char STR_SUBTYPE_SYMAX[] = "\003""Std""5c\0"; -const pm_char STR_SUBTYPE_SLT[] = "\005""SLT\0 ""Vista"; +const char STR_SUBTYPE_SLT[] = "\005""SLT\0 ""Vista"; -const pm_char STR_SUBTYPE_CX10[] = "\007""Green\0 ""Blue\0 ""DM007\0 ""-\0 ""JC3015a""JC3015b""MK33041""Q242\0 "; +const char STR_SUBTYPE_CX10[] = "\007""Green\0 ""Blue\0 ""DM007\0 ""-\0 ""JC3015a""JC3015b""MK33041""Q242\0 "; -const pm_char STR_SUBTYPE_CG023[] = "\005""CG023""YD829"; +const char STR_SUBTYPE_CG023[] = "\005""CG023""YD829"; -const pm_char STR_SUBTYPE_KN[] = "\006""WLtoys""FeiLun"; +const char STR_SUBTYPE_KN[] = "\006""WLtoys""FeiLun"; -const pm_char STR_SUBTYPE_MT99[] = "\005""MT99\0""H7\0 ""YZ\0 ""LS\0 ""FY805"; +const char STR_SUBTYPE_MT99[] = "\005""MT99\0""H7\0 ""YZ\0 ""LS\0 ""FY805"; -const pm_char STR_SUBTYPE_MJXQ[] = "\005""WLH08""X600\0""X800\0""H26D\0""E010\0""H26WH"; +const char STR_SUBTYPE_MJXQ[] = "\005""WLH08""X600\0""X800\0""H26D\0""E010\0""H26WH"; -const pm_char STR_SUBTYPE_HONTAI[] = "\007""Std\0 ""JJRC X1""X5C1cln"; +const char STR_SUBTYPE_HONTAI[] = "\007""Std\0 ""JJRC X1""X5C1cln"; -const pm_char STR_SUBTYPE_Q2X2[] = "\004""Q222""Q242""Q282"; +const char STR_SUBTYPE_Q2X2[] = "\004""Q222""Q242""Q282"; -const pm_char STR_SUBTYPE_Q303[] = "\006""Q303\0 ""CX35\0 ""CX10D\0""CX10WD"; +const char STR_SUBTYPE_Q303[] = "\006""Q303\0 ""CX35\0 ""CX10D\0""CX10WD"; -const pm_char STR_SUBTYPE_WK2x01[] = "\006""WK2801""WK2401""W6_5_1""W6_6_1""W6_Hel""W6_HeI"; +const char STR_SUBTYPE_WK2x01[] = "\006""WK2801""WK2401""W6_5_1""W6_6_1""W6_Hel""W6_HeI"; -const pm_char STR_SUBTYPE_V2X2[] = "\006""V2x2\0 ""JXD506"; +const char STR_SUBTYPE_V2X2[] = "\006""V2x2\0 ""JXD506"; -const pm_char STR_SUBTYPE_BAYANG[] = "\007""Bayang\0""H8S3D\0 ""X16 AH\0 ""irdrone"; +const char STR_SUBTYPE_BAYANG[] = "\007""Bayang\0""H8S3D\0 ""X16 AH\0 ""irdrone"; -const pm_char STR_SUBTYPE_FY326[] = "\005""FY326""FY319"; +const char STR_SUBTYPE_FY326[] = "\005""FY326""FY319"; -const pm_char STR_SUBTYPE_CABELL[] = "\006""CAB_V3""C_TELM""-\0 ""-\0 ""-\0 ""-\0 ""F_SAFE""UNBIND"; +const char STR_SUBTYPE_CABELL[] = "\006""CAB_V3""C_TELM""-\0 ""-\0 ""-\0 ""-\0 ""F_SAFE""UNBIND"; -const pm_char STR_SUBTYPE_H83D[] = "\006""H8_3D\0""H20H\0 ""H20Mini""H30Mini"; +const char STR_SUBTYPE_H83D[] = "\006""H8_3D\0""H20H\0 ""H20Mini""H30Mini"; -const pm_char STR_SUBTYPE_CORONA[] = "\005""V1\0 ""V2\0 ""FD V3"; +const char STR_SUBTYPE_CORONA[] = "\005""V1\0 ""V2\0 ""FD V3"; -const pm_char STR_SUBTYPE_HITEC[] = "\006""Optima\0""Minima"; +const char STR_SUBTYPE_HITEC[] = "\006""Optima\0""Minima"; const mm_protocol_definition multi_protocols[] = { diff --git a/radio/src/gui/navigation/navigation_9x.cpp b/radio/src/gui/navigation/navigation_9x.cpp index dea81579e..63569e4b9 100644 --- a/radio/src/gui/navigation/navigation_9x.cpp +++ b/radio/src/gui/navigation/navigation_9x.cpp @@ -182,10 +182,10 @@ int checkIncDec(event_t event, int val, int i_min, int i_max, unsigned int i_fla tmr10ms_t menuEntryTime; -#define MAXCOL(row) (horTab ? pgm_read_byte(horTab+min(row, (vertpos_t)horTabMax)) : (const uint8_t)0) +#define MAXCOL(row) (horTab ? *(horTab+min(row, (vertpos_t)horTabMax)) : (const uint8_t)0) #define POS_HORZ_INIT(posVert) 0 -void check(event_t event, uint8_t curr, const MenuHandlerFunc *menuTab, uint8_t menuTabSize, const pm_uint8_t *horTab, uint8_t horTabMax, vertpos_t maxrow) +void check(event_t event, uint8_t curr, const MenuHandlerFunc *menuTab, uint8_t menuTabSize, const uint8_t *horTab, uint8_t horTabMax, vertpos_t maxrow) { vertpos_t l_posVert = menuVerticalPosition; horzpos_t l_posHorz = menuHorizontalPosition; @@ -275,7 +275,7 @@ void check(event_t event, uint8_t curr, const MenuHandlerFunc *menuTab, uint8_t } if (cc != curr) { - chainMenu((MenuHandlerFunc)pgm_read_adr(&menuTab[cc])); + chainMenu(menuTab[cc]); } #if defined(ROTARY_ENCODER_NAVIGATION) diff --git a/radio/src/gui/navigation/navigation_horus.cpp b/radio/src/gui/navigation/navigation_horus.cpp index 24f57f56a..cf8bcd483 100644 --- a/radio/src/gui/navigation/navigation_horus.cpp +++ b/radio/src/gui/navigation/navigation_horus.cpp @@ -339,7 +339,7 @@ int8_t navigate(event_t event, int count, int rows, int columns, bool loop) return (prevPosHorz != menuHorizontalPosition || prevPosVert != menuVerticalPosition) ? result : 0; } -bool check(event_t event, uint8_t curr, const MenuHandlerFunc * menuTab, uint8_t menuTabSize, const pm_uint8_t * horTab, uint8_t horTabMax, int rowcount, uint8_t flags) +bool check(event_t event, uint8_t curr, const MenuHandlerFunc * menuTab, uint8_t menuTabSize, const uint8_t * horTab, uint8_t horTabMax, int rowcount, uint8_t flags) { uint8_t maxcol = MAXCOL(menuVerticalPosition); @@ -372,7 +372,7 @@ bool check(event_t event, uint8_t curr, const MenuHandlerFunc * menuTab, uint8_t } if (cc != curr) { - chainMenu((MenuHandlerFunc)pgm_read_adr(&menuTab[cc])); + chainMenu(menuTab[cc]); return false; } diff --git a/radio/src/gui/navigation/navigation_x7.cpp b/radio/src/gui/navigation/navigation_x7.cpp index 29838f63b..4ffbf596e 100644 --- a/radio/src/gui/navigation/navigation_x7.cpp +++ b/radio/src/gui/navigation/navigation_x7.cpp @@ -240,13 +240,13 @@ int checkIncDec(event_t event, int val, int i_min, int i_max, unsigned int i_fla tmr10ms_t menuEntryTime; -#define MAXCOL_RAW(row) (horTab ? pgm_read_byte(horTab+min(row, (vertpos_t)horTabMax)) : (const uint8_t)0) +#define MAXCOL_RAW(row) (horTab ? *(horTab+min(row, (vertpos_t)horTabMax)) : (const uint8_t)0) #define MAXCOL(row) (MAXCOL_RAW(row) >= HIDDEN_ROW ? MAXCOL_RAW(row) : (const uint8_t)(MAXCOL_RAW(row) & (~NAVIGATION_LINE_BY_LINE))) #define COLATTR(row) (MAXCOL_RAW(row) == (uint8_t)-1 ? (const uint8_t)0 : (const uint8_t)(MAXCOL_RAW(row) & NAVIGATION_LINE_BY_LINE)) #define MENU_FIRST_LINE_EDIT (menuTab ? (MAXCOL((uint16_t)0) >= HIDDEN_ROW ? (MAXCOL((uint16_t)1) >= HIDDEN_ROW ? 2 : 1) : 0) : 0) #define POS_HORZ_INIT(posVert) ((COLATTR(posVert) & NAVIGATION_LINE_BY_LINE) ? -1 : 0) -void check(event_t event, uint8_t curr, const MenuHandlerFunc * menuTab, uint8_t menuTabSize, const pm_uint8_t * horTab, uint8_t horTabMax, vertpos_t rowcount) +void check(event_t event, uint8_t curr, const MenuHandlerFunc * menuTab, uint8_t menuTabSize, const uint8_t * horTab, uint8_t horTabMax, vertpos_t rowcount) { vertpos_t l_posVert = menuVerticalPosition; horzpos_t l_posHorz = menuHorizontalPosition; @@ -273,7 +273,7 @@ void check(event_t event, uint8_t curr, const MenuHandlerFunc * menuTab, uint8_t } if (!menuCalibrationState && cc != curr) { - chainMenu((MenuHandlerFunc)pgm_read_adr(&menuTab[cc])); + chainMenu(menuTab[cc]); } drawScreenIndex(curr, menuTabSize, 0); diff --git a/radio/src/gui/navigation/navigation_x9d.cpp b/radio/src/gui/navigation/navigation_x9d.cpp index 0e79afea0..dcd7b8967 100644 --- a/radio/src/gui/navigation/navigation_x9d.cpp +++ b/radio/src/gui/navigation/navigation_x9d.cpp @@ -316,7 +316,7 @@ int checkIncDec(event_t event, int val, int i_min, int i_max, unsigned int i_fla } #define CURSOR_NOT_ALLOWED_IN_ROW(row) ((int8_t)MAXCOL(row) < 0) -#define MAXCOL_RAW(row) (horTab ? pgm_read_byte(horTab+min(row, (vertpos_t)horTabMax)) : (const uint8_t)0) +#define MAXCOL_RAW(row) (horTab ? *(horTab+min(row, (vertpos_t)horTabMax)) : (const uint8_t)0) #define MAXCOL(row) (MAXCOL_RAW(row) >= HIDDEN_ROW ? MAXCOL_RAW(row) : (const uint8_t)(MAXCOL_RAW(row) & (~NAVIGATION_LINE_BY_LINE))) #define COLATTR(row) (MAXCOL_RAW(row) == (uint8_t)-1 ? (const uint8_t)0 : (const uint8_t)(MAXCOL_RAW(row) & NAVIGATION_LINE_BY_LINE)) #define INC(val, min, max) if (valmin) {val=min;} @@ -336,7 +336,7 @@ void onLongMenuPress(const char * result) tmr10ms_t menuEntryTime; -void check(const char * name, event_t event, uint8_t curr, const MenuHandlerFunc *menuTab, uint8_t menuTabSize, const pm_uint8_t *horTab, uint8_t horTabMax, vertpos_t rowcount, uint8_t flags) +void check(const char * name, event_t event, uint8_t curr, const MenuHandlerFunc *menuTab, uint8_t menuTabSize, const uint8_t *horTab, uint8_t horTabMax, vertpos_t rowcount, uint8_t flags) { vertpos_t l_posVert = menuVerticalPosition; horzpos_t l_posHorz = menuHorizontalPosition; @@ -377,7 +377,7 @@ void check(const char * name, event_t event, uint8_t curr, const MenuHandlerFunc } if (!menuCalibrationState && cc != curr) { - chainMenu((MenuHandlerFunc)pgm_read_adr(&menuTab[cc])); + chainMenu(menuTab[cc]); } if (!(flags&CHECK_FLAG_NO_SCREEN_INDEX)) { diff --git a/radio/src/gui/navigation/navigation_xlite.cpp b/radio/src/gui/navigation/navigation_xlite.cpp index 8759f38c6..c0210caef 100644 --- a/radio/src/gui/navigation/navigation_xlite.cpp +++ b/radio/src/gui/navigation/navigation_xlite.cpp @@ -302,11 +302,11 @@ int checkIncDec(event_t event, int val, int i_min, int i_max, unsigned int i_fla tmr10ms_t menuEntryTime; -#define MAXCOL_RAW(row) (horTab ? pgm_read_byte(horTab+min(row, (vertpos_t)horTabMax)) : (const uint8_t)0) +#define MAXCOL_RAW(row) (horTab ? *(horTab+min(row, (vertpos_t)horTabMax)) : (const uint8_t)0) #define MAXCOL(row) (MAXCOL_RAW(row) >= HIDDEN_ROW ? MAXCOL_RAW(row) : (const uint8_t)(MAXCOL_RAW(row) & (~NAVIGATION_LINE_BY_LINE))) #define POS_HORZ_INIT(posVert) 0 -void check(event_t event, uint8_t curr, const MenuHandlerFunc *menuTab, uint8_t menuTabSize, const pm_uint8_t *horTab, uint8_t horTabMax, vertpos_t maxrow) +void check(event_t event, uint8_t curr, const MenuHandlerFunc *menuTab, uint8_t menuTabSize, const uint8_t *horTab, uint8_t horTabMax, vertpos_t maxrow) { vertpos_t l_posVert = menuVerticalPosition; horzpos_t l_posHorz = menuHorizontalPosition; @@ -362,7 +362,7 @@ void check(event_t event, uint8_t curr, const MenuHandlerFunc *menuTab, uint8_t } if (cc != curr) { - chainMenu((MenuHandlerFunc)pgm_read_adr(&menuTab[cc])); + chainMenu(menuTab[cc]); } #if defined(ROTARY_ENCODER_NAVIGATION) diff --git a/radio/src/logs.cpp b/radio/src/logs.cpp index fc73f762e..f5fcda516 100644 --- a/radio/src/logs.cpp +++ b/radio/src/logs.cpp @@ -22,7 +22,7 @@ #include "ff.h" FIL g_oLogFile __DMA; -const pm_char * g_logError = NULL; +const char * g_logError = NULL; uint8_t logDelay; void writeHeader(); @@ -41,7 +41,7 @@ void logsInit() memset(&g_oLogFile, 0, sizeof(g_oLogFile)); } -const pm_char * logsOpen() +const char * logsOpen() { // Determine and set log file filename FRESULT result; @@ -192,7 +192,7 @@ uint32_t getLogicalSwitchesStates(uint8_t first) void logsWrite() { - static const pm_char * error_displayed = NULL; + static const char * error_displayed = NULL; if (isFunctionActive(FUNCTION_LOGS) && logDelay > 0) { tmr10ms_t tmr10ms = get_tmr10ms(); @@ -200,7 +200,7 @@ void logsWrite() lastLogTime = tmr10ms; if (!g_oLogFile.obj.fs) { - const pm_char * result = logsOpen(); + const char * result = logsOpen(); if (result != NULL) { if (result != error_displayed) { error_displayed = result; diff --git a/radio/src/main_arm.cpp b/radio/src/main_arm.cpp index a0e4a97df..5b601ff5a 100644 --- a/radio/src/main_arm.cpp +++ b/radio/src/main_arm.cpp @@ -423,13 +423,6 @@ void perMain() event_t evt = getEvent(false); -#if defined(NAVIGATION_STICKS) - uint8_t sticks_evt = getSticksNavigationEvent(); - if (sticks_evt) { - evt = sticks_evt; - } -#endif - #if defined(RAMBACKUP) if (unexpectedShutdown) { drawFatalErrorScreen(STR_EMERGENCY_MODE); diff --git a/radio/src/mixer.cpp b/radio/src/mixer.cpp index ee922733c..6e01ec28c 100644 --- a/radio/src/mixer.cpp +++ b/radio/src/mixer.cpp @@ -992,9 +992,7 @@ void evalMixes(uint8_t tick10ms) int16_t value = applyLimits(i, q); // applyLimits will remove the 256 100% basis - cli(); channelOutputs[i] = value; // copy consistent word to int-level - sei(); } if (tick10ms && flightModesFade) { diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp index 45713f56a..fb9aaefcc 100644 --- a/radio/src/opentx.cpp +++ b/radio/src/opentx.cpp @@ -48,7 +48,7 @@ union ReusableBuffer reusableBuffer __DMA; uint8_t* MSC_BOT_Data = reusableBuffer.MSC_BOT_Data; #endif -const pm_uint8_t bchout_ar[] = { +const uint8_t bchout_ar[] = { 0x1B, 0x1E, 0x27, 0x2D, 0x36, 0x39, 0x4B, 0x4E, 0x63, 0x6C, 0x72, 0x78, 0x87, 0x8D, 0x93, 0x9C, 0xB1, 0xB4, @@ -56,7 +56,7 @@ const pm_uint8_t bchout_ar[] = { uint8_t channel_order(uint8_t x) { - return ( ((pgm_read_byte(bchout_ar + g_eeGeneral.templateSetup) >> (6-(x-1) * 2)) & 3 ) + 1 ); + return ( ((*(bchout_ar + g_eeGeneral.templateSetup) >> (6-(x-1) * 2)) & 3 ) + 1 ); } /* @@ -65,7 +65,7 @@ mode2 rud thr ele ail mode3 ail ele thr rud mode4 ail thr ele rud */ -const pm_uint8_t modn12x3[] = { +const uint8_t modn12x3[] = { 0, 1, 2, 3, 0, 2, 1, 3, 3, 1, 2, 0, @@ -1026,7 +1026,7 @@ void checkAlarm() // added by Gohst } } -void alert(const pm_char * title, const pm_char * msg , uint8_t sound) +void alert(const char * title, const char * msg , uint8_t sound) { LED_ERROR_BEGIN(); @@ -1562,34 +1562,8 @@ void doMixerCalculations() s_mixer_first_run_done = true; } -#if defined(NAVIGATION_STICKS) -uint8_t StickScrollAllowed; -uint8_t StickScrollTimer; -static const pm_uint8_t rate[] = { 0, 0, 100, 40, 16, 7, 3, 1 } ; - -uint8_t calcStickScroll( uint8_t index ) -{ - uint8_t direction; - int8_t value; - - if ( ( g_eeGeneral.stickMode & 1 ) == 0 ) - index ^= 3; - - value = calibratedAnalogs[index] / 128; - direction = value > 0 ? 0x80 : 0; - if (value < 0) - value = -value; // (abs) - if (value > 7) - value = 7; - value = pgm_read_byte(rate+(uint8_t)value); - if (value) - StickScrollTimer = STICK_SCROLL_TIMEOUT; // Seconds - return value | direction; -} -#endif - - #define OPENTX_START_ARGS uint8_t splash=true - #define OPENTX_START_SPLASH_NEEDED() (splash) +#define OPENTX_START_ARGS uint8_t splash=true +#define OPENTX_START_SPLASH_NEEDED() (splash) void opentxStart(OPENTX_START_ARGS) { @@ -1717,81 +1691,7 @@ void opentxResume() } #endif -#if defined(NAVIGATION_STICKS) -uint8_t getSticksNavigationEvent() -{ - uint8_t evt = 0; - if (StickScrollAllowed) { - if ( StickScrollTimer ) { - static uint8_t repeater; - uint8_t direction; - uint8_t value; - - if ( repeater < 128 ) - { - repeater += 1; - } - value = calcStickScroll( 2 ); - direction = value & 0x80; - value &= 0x7F; - if ( value ) - { - if ( repeater > value ) - { - repeater = 0; - if ( evt == 0 ) - { - if ( direction ) - { - evt = EVT_KEY_FIRST(KEY_UP); - } - else - { - evt = EVT_KEY_FIRST(KEY_DOWN); - } - } - } - } - else - { - value = calcStickScroll( 3 ); - direction = value & 0x80; - value &= 0x7F; - if ( value ) - { - if ( repeater > value ) - { - repeater = 0; - if ( evt == 0 ) - { - if ( direction ) - { - evt = EVT_KEY_FIRST(KEY_RIGHT); - } - else - { - evt = EVT_KEY_FIRST(KEY_LEFT); - } - } - } - } - } - } - } - else { - StickScrollTimer = 0; // Seconds - } - StickScrollAllowed = 1 ; - return evt; -} -#endif - - - - - - - #define INSTANT_TRIM_MARGIN 10 /* around 1% */ +#define INSTANT_TRIM_MARGIN 10 /* around 1% */ void instantTrim() { @@ -2108,17 +2008,10 @@ int main() drawSplash(); #endif - sei(); // interrupts needed now - - #if defined(DSM2_SERIAL) && !defined(TELEMETRY_FRSKY) DSM2_Init(); #endif - - - - #if defined(MENU_ROTARY_SW) init_rotary_sw(); #endif diff --git a/radio/src/opentx.h b/radio/src/opentx.h index 608283283..5961ec64e 100644 --- a/radio/src/opentx.h +++ b/radio/src/opentx.h @@ -228,17 +228,6 @@ #if defined(SIMU) #include "targets/simu/simpgmspace.h" -#else - typedef const unsigned char pm_uchar; - typedef const char pm_char; - typedef const uint16_t pm_uint16_t; - typedef const uint8_t pm_uint8_t; - typedef const int16_t pm_int16_t; - typedef const int8_t pm_int8_t; - #define pgm_read_byte(address_short) (*(uint8_t*)(address_short)) - #define pgm_read_adr(x) *(x) - #define cli() - #define sei() #endif #include "debug.h" @@ -309,20 +298,14 @@ void memswap(void * a, void * b, uint8_t size); #define PPM_CH_CENTER(ch) (PPM_CENTER) #endif - #include "fifo.h" - #include "io/io_arm.h" - // This doesn't need protection on this processor - extern volatile tmr10ms_t g_tmr10ms; - #define get_tmr10ms() g_tmr10ms +#include "fifo.h" +#include "io/io_arm.h" -#if defined(NAVIGATION_STICKS) - extern uint8_t StickScrollAllowed; - extern uint8_t StickScrollTimer; - #define STICK_SCROLL_TIMEOUT 9 - #define STICK_SCROLL_DISABLE() StickScrollAllowed = 0 -#else - #define STICK_SCROLL_DISABLE() -#endif +extern volatile tmr10ms_t g_tmr10ms; +static inline tmr10ms_t get_tmr10ms() +{ + return g_tmr10ms; +} #if defined(CLI) #include "cli.h" @@ -331,12 +314,10 @@ void memswap(void * a, void * b, uint8_t size); #include "timers.h" #include "storage/storage.h" #include "pulses/pulses.h" - #include "pulses/modules.h" - - #define MASK_CFN_TYPE uint64_t // current max = 64 function switches - #define MASK_FUNC_TYPE uint32_t // current max = 32 functions +#define MASK_CFN_TYPE uint64_t // current max = 64 function switches +#define MASK_FUNC_TYPE uint32_t // current max = 32 functions typedef struct { MASK_FUNC_TYPE activeFunctions; @@ -365,8 +346,8 @@ typedef struct { #endif #endif -extern const pm_uint8_t bchout_ar[]; -extern const pm_uint8_t modn12x3[]; +extern const uint8_t bchout_ar[]; +extern const uint8_t modn12x3[]; //convert from mode 1 to mode stickMode //NOTICE! => 0..3 -> 0..3 @@ -374,7 +355,7 @@ extern const pm_uint8_t modn12x3[]; #define ELE_STICK 1 #define THR_STICK 2 #define AIL_STICK 3 -#define CONVERT_MODE(x) (((x)<=AIL_STICK) ? pgm_read_byte(modn12x3 + 4*g_eeGeneral.stickMode + (x)) : (x) ) +#define CONVERT_MODE(x) (((x)<=AIL_STICK) ? *(modn12x3 + 4*g_eeGeneral.stickMode + (x)) : (x) ) #if defined(PCBXLITE) #define CONVERT_MODE_TRIMS(x) (((x) == RUD_STICK) ? AIL_STICK : ((x) == AIL_STICK) ? RUD_STICK : (x)) @@ -488,7 +469,7 @@ uint16_t evalChkSum(); #define ALERT(title, msg, sound) alert(title, msg, sound) #endif -void alert(const pm_char * t, const pm_char * s , uint8_t sound); +void alert(const char * t, const char * s , uint8_t sound); enum PerOutMode { e_perout_mode_normal = 0, @@ -610,7 +591,7 @@ extern uint8_t unexpectedShutdown; extern uint16_t maxMixerDuration; - #define DURATION_MS_PREC2(x) ((x)/20) +#define DURATION_MS_PREC2(x) ((x)/20) #if defined(THRTRACE) #if defined(COLORLCD) @@ -660,10 +641,16 @@ void checkSwitches(); void checkAlarm(); void checkAll(); -#if !defined(SIMU) void getADC(); -#define GET_ADC_IF_MIXER_NOT_RUNNING() do { if (s_pulses_paused) getADC(); } while(0) -#endif +static inline void GET_ADC_IF_MIXER_NOT_RUNNING() +{ + do { + if (s_pulses_paused) { + getADC(); + } + } + while(0); +} #include "sbus.h" @@ -1287,7 +1274,7 @@ inline int div_and_round(int num, int den) #if defined(TELEMETRY_FRSKY) -extern const pm_uint8_t bchunit_ar[]; +extern const uint8_t bchunit_ar[]; #define FRSKY_MULTIPLIER_MAX 5 @@ -1327,7 +1314,7 @@ void varioWakeup(); #endif #if defined(PCBTARANIS) - extern const pm_uchar logo_taranis[]; + extern const unsigned char logo_taranis[]; #endif #if defined(STM32) diff --git a/radio/src/sdcard.h b/radio/src/sdcard.h index 3f273e724..4211e395f 100644 --- a/radio/src/sdcard.h +++ b/radio/src/sdcard.h @@ -107,7 +107,7 @@ uint32_t sdGetFreeSectors(); const char * sdCheckAndCreateDirectory(const char * path); #if !defined(BOOT) -inline const pm_char * SDCARD_ERROR(FRESULT result) +inline const char * SDCARD_ERROR(FRESULT result) { if (result == FR_NOT_READY) return STR_NO_SDCARD; diff --git a/radio/src/stamp.cpp b/radio/src/stamp.cpp index 40e207eae..e3fe4148f 100644 --- a/radio/src/stamp.cpp +++ b/radio/src/stamp.cpp @@ -31,14 +31,14 @@ #endif #if defined(COLORLCD) - const pm_char vers_stamp[] = "VERS" TAB ": " "opentx-" FLAVOUR "-" VERSION " (" GIT_STR ")"; - const pm_char date_stamp[] = "DATE" TAB ": " DATE; - const pm_char time_stamp[] = "TIME" TAB ": " TIME; - const pm_char eeprom_stamp[] = "EEPR" TAB ": " EEPROM_STR; + const char vers_stamp[] = "VERS" TAB ": " "opentx-" FLAVOUR "-" VERSION " (" GIT_STR ")"; + const char date_stamp[] = "DATE" TAB ": " DATE; + const char time_stamp[] = "TIME" TAB ": " TIME; + const char eeprom_stamp[] = "EEPR" TAB ": " EEPROM_STR; #elif defined(PCBTARANIS) - const pm_char vers_stamp[] = "FW\037\033: " "opentx-" FLAVOUR "\036VERS\037\033: " VERSION " (" GIT_STR ")" "\036DATE\037\033: " DATE " " TIME "\036EEPR\037\033: " EEPROM_STR; + const char vers_stamp[] = "FW\037\033: " "opentx-" FLAVOUR "\036VERS\037\033: " VERSION " (" GIT_STR ")" "\036DATE\037\033: " DATE " " TIME "\036EEPR\037\033: " EEPROM_STR; #else - const pm_char vers_stamp[] = "FW\037\033: " "opentx-" FLAVOUR "\036VERS\037\033: " VERSION "\036DATE\037\033: " DATE "\036TIME\037\033: " TIME "\036EEPR\037\033: " EEPROM_STR; + const char vers_stamp[] = "FW\037\033: " "opentx-" FLAVOUR "\036VERS\037\033: " VERSION "\036DATE\037\033: " DATE "\036TIME\037\033: " TIME "\036EEPR\037\033: " EEPROM_STR; #endif /** diff --git a/radio/src/storage/eeprom_raw.cpp b/radio/src/storage/eeprom_raw.cpp index f84785c6e..ef3fe4c37 100644 --- a/radio/src/storage/eeprom_raw.cpp +++ b/radio/src/storage/eeprom_raw.cpp @@ -440,7 +440,7 @@ uint16_t eeModelSize(uint8_t index) } #if defined(SDCARD) -const pm_char * eeBackupModel(uint8_t i_fileSrc) +const char * eeBackupModel(uint8_t i_fileSrc) { char * buf = reusableBuffer.modelsel.mainname; FIL archiveFile; @@ -507,7 +507,7 @@ const pm_char * eeBackupModel(uint8_t i_fileSrc) return NULL; } -const pm_char * eeRestoreModel(uint8_t i_fileDst, char *model_name) +const char * eeRestoreModel(uint8_t i_fileDst, char *model_name) { char * buf = reusableBuffer.modelsel.mainname; FIL restoreFile; diff --git a/radio/src/storage/eeprom_raw.h b/radio/src/storage/eeprom_raw.h index 542b9e4fb..64ac9f182 100644 --- a/radio/src/storage/eeprom_raw.h +++ b/radio/src/storage/eeprom_raw.h @@ -32,8 +32,8 @@ void eeSwapModels(uint8_t id1, uint8_t id2); #define DISPLAY_PROGRESS_BAR(x) #if defined(SDCARD) -const pm_char * eeBackupModel(uint8_t i_fileSrc); -const pm_char * eeRestoreModel(uint8_t i_fileDst, char *model_name); +const char * eeBackupModel(uint8_t i_fileSrc); +const char * eeRestoreModel(uint8_t i_fileDst, char *model_name); #endif enum EepromWriteState { diff --git a/radio/src/storage/eeprom_rlc.cpp b/radio/src/storage/eeprom_rlc.cpp index 40a88c0ca..8ee311473 100644 --- a/radio/src/storage/eeprom_rlc.cpp +++ b/radio/src/storage/eeprom_rlc.cpp @@ -441,7 +441,7 @@ bool RlcFile::copy(uint8_t i_fileDst, uint8_t i_fileSrc) } #if defined(SDCARD) -const pm_char * eeBackupModel(uint8_t i_fileSrc) +const char * eeBackupModel(uint8_t i_fileSrc) { char * buf = reusableBuffer.modelsel.mainname; UINT written; @@ -524,7 +524,7 @@ const pm_char * eeBackupModel(uint8_t i_fileSrc) return NULL; } -const pm_char * eeRestoreModel(uint8_t i_fileDst, char *model_name) +const char * eeRestoreModel(uint8_t i_fileDst, char *model_name) { char * buf = reusableBuffer.modelsel.mainname; UINT read; diff --git a/radio/src/storage/eeprom_rlc.h b/radio/src/storage/eeprom_rlc.h index 8fb78c27d..8b44d4f38 100644 --- a/radio/src/storage/eeprom_rlc.h +++ b/radio/src/storage/eeprom_rlc.h @@ -183,8 +183,8 @@ void eeSwapModels(uint8_t id1, uint8_t id2); void eeDeleteModel(uint8_t idx); #if defined(SDCARD) -const pm_char * eeBackupModel(uint8_t i_fileSrc); -const pm_char * eeRestoreModel(uint8_t i_fileDst, char *model_name); +const char * eeBackupModel(uint8_t i_fileSrc); +const char * eeRestoreModel(uint8_t i_fileDst, char *model_name); #endif // For conversions diff --git a/radio/src/strhelpers.cpp b/radio/src/strhelpers.cpp index e6c4d75bb..33c32c883 100644 --- a/radio/src/strhelpers.cpp +++ b/radio/src/strhelpers.cpp @@ -21,7 +21,7 @@ #include "opentx.h" #if !defined(BOOT) -const pm_char s_charTab[] = "_-.,"; +const char s_charTab[] = "_-.,"; char hex2zchar(uint8_t hex) { @@ -37,7 +37,7 @@ char idx2char(int8_t idx) } if (idx < 27) return 'A' + idx - 1; if (idx < 37) return '0' + idx - 27; - if (idx <= 40) return pgm_read_byte(s_charTab+idx-37); + if (idx <= 40) return *(s_charTab+idx-37); #if LEN_SPECIAL_CHARS > 0 if (idx <= (LEN_STD_CHARS + LEN_SPECIAL_CHARS)) return 'z' + 5 + idx - 40; #endif diff --git a/radio/src/switches.cpp b/radio/src/switches.cpp index 8791e30bc..521ab235f 100644 --- a/radio/src/switches.cpp +++ b/radio/src/switches.cpp @@ -553,11 +553,10 @@ void checkSwitches() while (1) { -#if defined(TELEMETRY_MOD_14051) || defined(TELEMETRY_MOD_14051_SWAPPED) - #define GETADC_COUNT (MUX_MAX+1) -#elif defined(PCBTARANIS) || defined(PCBHORUS) +#if defined(PCBTARANIS) || defined(PCBHORUS) #define GETADC_COUNT 1 #endif + #ifdef GETADC_COUNT for (uint8_t i=0; i= 212 const char * const STR_PHASES_HEADERS[] = TR_PHASES_HEADERS; @@ -574,181 +574,181 @@ const pm_char STR_BLCOLOR[] = TR_BLCOLOR; const char * const STR_GVAR_HEADERS[] = TR_GVAR_HEADERS; #endif - const pm_char STR_TRAINER[] = TR_TRAINER; - const pm_char STR_MODULE_BIND[] = TR_MODULE_BIND; - const pm_char STR_BINDING_1_8_TELEM_ON[] = TR_BINDING_CH1_8_TELEM_ON; - const pm_char STR_BINDING_1_8_TELEM_OFF[] = TR_BINDING_CH1_8_TELEM_OFF; - const pm_char STR_BINDING_9_16_TELEM_ON[] = TR_BINDING_CH9_16_TELEM_ON; - const pm_char STR_BINDING_9_16_TELEM_OFF[] = TR_BINDING_CH9_16_TELEM_OFF; - const pm_char STR_CHANNELRANGE[] = TR_CHANNELRANGE; - const pm_char STR_ANTENNASELECTION[] = TR_ANTENNASELECTION; - const pm_char STR_ANTENNACONFIRM1[] = TR_ANTENNACONFIRM1; - const pm_char STR_ANTENNACONFIRM2[] = TR_ANTENNACONFIRM2; - const pm_char STR_SET[] = TR_SET; - const pm_char STR_PREFLIGHT[] = TR_PREFLIGHT; - const pm_char STR_CHECKLIST[] = TR_CHECKLIST; - const pm_char STR_VIEW_NOTES[] = TR_VIEW_NOTES; - const pm_char STR_MODEL_SELECT[] = TR_MODEL_SELECT; - const pm_char STR_RESET_SUBMENU[] = TR_RESET_SUBMENU; - const pm_char STR_LOWALARM[] = TR_LOWALARM; - const pm_char STR_CRITICALALARM[] = TR_CRITICALALARM; - const pm_char STR_RSSIALARM_WARN[] = TR_RSSIALARM_WARN; - const pm_char STR_NO_RSSIALARM[] = TR_NO_RSSIALARM; - const pm_char STR_DISABLE_ALARM[] = TR_DISABLE_ALARM; - const pm_char STR_TELEMETRY_TYPE[] = TR_TELEMETRY_TYPE; - const pm_char STR_TELEMETRY_SENSORS[] = TR_TELEMETRY_SENSORS; - const pm_char STR_VALUE[] = TR_VALUE; - const pm_char STR_TOPLCDTIMER[] = TR_TOPLCDTIMER; - const pm_char STR_UNIT[] = TR_UNIT; - const pm_char STR_TELEMETRY_NEWSENSOR[] = TR_TELEMETRY_NEWSENSOR; - const pm_char STR_ID[] = TR_ID; - const pm_char STR_PRECISION[] = TR_PRECISION; - const pm_char STR_RATIO[] = TR_RATIO; - const pm_char STR_FORMULA[] = TR_FORMULA; - const pm_char STR_CELLINDEX[] = TR_CELLINDEX; - const pm_char STR_LOGS[] = TR_LOGS; - const pm_char STR_OPTIONS[] = TR_OPTIONS; - const pm_char STR_ALTSENSOR[] = TR_ALTSENSOR; - const pm_char STR_CELLSENSOR[] = TR_CELLSENSOR; - const pm_char STR_GPSSENSOR[] = TR_GPSSENSOR; - const pm_char STR_CURRENTSENSOR[] = TR_CURRENTSENSOR; - const pm_char STR_AUTOOFFSET[] = TR_AUTOOFFSET; - const pm_char STR_ONLYPOSITIVE[] = TR_ONLYPOSITIVE; - const pm_char STR_FILTER[] = TR_FILTER; - const pm_char STR_TELEMETRYFULL[] = TR_TELEMETRYFULL; - const pm_char STR_SERVOS_OK[] = TR_SERVOS_OK; - const pm_char STR_SERVOS_KO[] = TR_SERVOS_KO; - const pm_char STR_INVERTED_SERIAL[] = TR_INVERTED_SERIAL; - const pm_char STR_IGNORE_INSTANCE[] = TR_IGNORE_INSTANCE; - const pm_char STR_DISCOVER_SENSORS[] = TR_DISCOVER_SENSORS; - const pm_char STR_STOP_DISCOVER_SENSORS[] = TR_STOP_DISCOVER_SENSORS; - const pm_char STR_DELETE_ALL_SENSORS[] = TR_DELETE_ALL_SENSORS; - const pm_char STR_CONFIRMDELETE[] = TR_CONFIRMDELETE; - const pm_char STR_SELECT_WIDGET[] = TR_SELECT_WIDGET; - const pm_char STR_REMOVE_WIDGET[] = TR_REMOVE_WIDGET; - const pm_char STR_WIDGET_SETTINGS[] = TR_WIDGET_SETTINGS; - const pm_char STR_REMOVE_SCREEN[] = TR_REMOVE_SCREEN; - const pm_char STR_SETUP_WIDGETS[] = TR_SETUP_WIDGETS; - const pm_char STR_USER_INTERFACE[] = TR_USER_INTERFACE; - const pm_char STR_THEME[] = TR_THEME; - const pm_char STR_SETUP[] = TR_SETUP; - const pm_char STR_MAINVIEWX[] = TR_MAINVIEWX; - const pm_char STR_LAYOUT[] = TR_LAYOUT; - const pm_char STR_ADDMAINVIEW[] = TR_ADDMAINVIEW; - const pm_char STR_BACKGROUND_COLOR[] = TR_BACKGROUND_COLOR; - const pm_char STR_MAIN_COLOR[] = TR_MAIN_COLOR; - const pm_char STR_TEXT_VIEWER[] = TR_TEXT_VIEWER; - const pm_char STR_MULTI_RFPOWER[] = TR_MULTI_RFPOWER; + const char STR_TRAINER[] = TR_TRAINER; + const char STR_MODULE_BIND[] = TR_MODULE_BIND; + const char STR_BINDING_1_8_TELEM_ON[] = TR_BINDING_CH1_8_TELEM_ON; + const char STR_BINDING_1_8_TELEM_OFF[] = TR_BINDING_CH1_8_TELEM_OFF; + const char STR_BINDING_9_16_TELEM_ON[] = TR_BINDING_CH9_16_TELEM_ON; + const char STR_BINDING_9_16_TELEM_OFF[] = TR_BINDING_CH9_16_TELEM_OFF; + const char STR_CHANNELRANGE[] = TR_CHANNELRANGE; + const char STR_ANTENNASELECTION[] = TR_ANTENNASELECTION; + const char STR_ANTENNACONFIRM1[] = TR_ANTENNACONFIRM1; + const char STR_ANTENNACONFIRM2[] = TR_ANTENNACONFIRM2; + const char STR_SET[] = TR_SET; + const char STR_PREFLIGHT[] = TR_PREFLIGHT; + const char STR_CHECKLIST[] = TR_CHECKLIST; + const char STR_VIEW_NOTES[] = TR_VIEW_NOTES; + const char STR_MODEL_SELECT[] = TR_MODEL_SELECT; + const char STR_RESET_SUBMENU[] = TR_RESET_SUBMENU; + const char STR_LOWALARM[] = TR_LOWALARM; + const char STR_CRITICALALARM[] = TR_CRITICALALARM; + const char STR_RSSIALARM_WARN[] = TR_RSSIALARM_WARN; + const char STR_NO_RSSIALARM[] = TR_NO_RSSIALARM; + const char STR_DISABLE_ALARM[] = TR_DISABLE_ALARM; + const char STR_TELEMETRY_TYPE[] = TR_TELEMETRY_TYPE; + const char STR_TELEMETRY_SENSORS[] = TR_TELEMETRY_SENSORS; + const char STR_VALUE[] = TR_VALUE; + const char STR_TOPLCDTIMER[] = TR_TOPLCDTIMER; + const char STR_UNIT[] = TR_UNIT; + const char STR_TELEMETRY_NEWSENSOR[] = TR_TELEMETRY_NEWSENSOR; + const char STR_ID[] = TR_ID; + const char STR_PRECISION[] = TR_PRECISION; + const char STR_RATIO[] = TR_RATIO; + const char STR_FORMULA[] = TR_FORMULA; + const char STR_CELLINDEX[] = TR_CELLINDEX; + const char STR_LOGS[] = TR_LOGS; + const char STR_OPTIONS[] = TR_OPTIONS; + const char STR_ALTSENSOR[] = TR_ALTSENSOR; + const char STR_CELLSENSOR[] = TR_CELLSENSOR; + const char STR_GPSSENSOR[] = TR_GPSSENSOR; + const char STR_CURRENTSENSOR[] = TR_CURRENTSENSOR; + const char STR_AUTOOFFSET[] = TR_AUTOOFFSET; + const char STR_ONLYPOSITIVE[] = TR_ONLYPOSITIVE; + const char STR_FILTER[] = TR_FILTER; + const char STR_TELEMETRYFULL[] = TR_TELEMETRYFULL; + const char STR_SERVOS_OK[] = TR_SERVOS_OK; + const char STR_SERVOS_KO[] = TR_SERVOS_KO; + const char STR_INVERTED_SERIAL[] = TR_INVERTED_SERIAL; + const char STR_IGNORE_INSTANCE[] = TR_IGNORE_INSTANCE; + const char STR_DISCOVER_SENSORS[] = TR_DISCOVER_SENSORS; + const char STR_STOP_DISCOVER_SENSORS[] = TR_STOP_DISCOVER_SENSORS; + const char STR_DELETE_ALL_SENSORS[] = TR_DELETE_ALL_SENSORS; + const char STR_CONFIRMDELETE[] = TR_CONFIRMDELETE; + const char STR_SELECT_WIDGET[] = TR_SELECT_WIDGET; + const char STR_REMOVE_WIDGET[] = TR_REMOVE_WIDGET; + const char STR_WIDGET_SETTINGS[] = TR_WIDGET_SETTINGS; + const char STR_REMOVE_SCREEN[] = TR_REMOVE_SCREEN; + const char STR_SETUP_WIDGETS[] = TR_SETUP_WIDGETS; + const char STR_USER_INTERFACE[] = TR_USER_INTERFACE; + const char STR_THEME[] = TR_THEME; + const char STR_SETUP[] = TR_SETUP; + const char STR_MAINVIEWX[] = TR_MAINVIEWX; + const char STR_LAYOUT[] = TR_LAYOUT; + const char STR_ADDMAINVIEW[] = TR_ADDMAINVIEW; + const char STR_BACKGROUND_COLOR[] = TR_BACKGROUND_COLOR; + const char STR_MAIN_COLOR[] = TR_MAIN_COLOR; + const char STR_TEXT_VIEWER[] = TR_TEXT_VIEWER; + const char STR_MULTI_RFPOWER[] = TR_MULTI_RFPOWER; - const pm_char STR_BYTES[] = TR_BYTES; - const pm_char STR_ANTENNAPROBLEM[] = TR_ANTENNAPROBLEM; - const pm_char STR_MODULE[] = TR_MODULE; - const pm_char STR_ENABLE_POPUP[] = TR_ENABLE_POPUP; - const pm_char STR_DISABLE_POPUP[] = TR_DISABLE_POPUP; - const pm_char STR_POPUP[] = TR_POPUP; - const pm_char STR_MIN[] = TR_MIN; - const pm_char STR_MAX[] = TR_MAX; - const pm_char STR_CURVE_PRESET[] = TR_CURVE_PRESET; - const pm_char STR_PRESET[] = TR_PRESET; - const pm_char STR_MIRROR[] = TR_MIRROR; - const pm_char STR_CLEAR[] = TR_CLEAR; - const pm_char STR_RESET[] = TR_RESET; - const pm_char STR_COUNT[] = TR_COUNT; - const pm_char STR_PT[] = TR_PT; - const pm_char STR_PTS[] = TR_PTS; - const pm_char STR_SMOOTH[] = TR_SMOOTH; - const pm_char STR_COPY_STICKS_TO_OFS[] = TR_COPY_STICKS_TO_OFS; - const pm_char STR_COPY_TRIMS_TO_OFS[] = TR_COPY_TRIMS_TO_OFS; - const pm_char STR_INCDEC[] = TR_INCDEC; - const pm_char STR_GLOBALVAR[] = TR_GLOBALVAR; - const pm_char STR_MIXSOURCE[] = TR_MIXSOURCE; - const pm_char STR_CONSTANT[] = TR_CONSTANT; - const pm_char STR_TOP_BAR[] = TR_TOP_BAR; - const pm_char STR_ALTITUDE[] = TR_ALTITUDE; - const pm_char STR_SCALE[] = TR_SCALE; - const pm_char STR_VIEW_CHANNELS[] = TR_VIEW_CHANNELS; - const pm_char STR_UART3MODE[] = TR_UART3MODE; - const pm_char STR_THROTTLE_LABEL[] = TR_THROTTLE_LABEL; - const pm_char STR_SCRIPT[] = TR_SCRIPT; - const pm_char STR_INPUTS[] = TR_INPUTS; - const pm_char STR_OUTPUTS[] = TR_OUTPUTS; - const pm_char STR_MENU_INPUTS[] = TR_MENU_INPUTS; - const pm_char STR_MENU_LUA[] = TR_MENU_LUA; - const pm_char STR_MENU_STICKS[] = TR_MENU_STICKS; - const pm_char STR_MENU_POTS[] = TR_MENU_POTS; - const pm_char STR_MENU_MAX[] = TR_MENU_MAX; - const pm_char STR_MENU_HELI[] = TR_MENU_HELI; - const pm_char STR_MENU_TRIMS[] = TR_MENU_TRIMS; - const pm_char STR_MENU_SWITCHES[] = TR_MENU_SWITCHES; - const pm_char STR_MENU_LOGICAL_SWITCHES[] = TR_MENU_LOGICAL_SWITCHES; - const pm_char STR_MENU_TRAINER[] = TR_MENU_TRAINER; - const pm_char STR_MENU_CHANNELS[] = TR_MENU_CHANNELS; - const pm_char STR_MENU_GVARS[] = TR_MENU_GVARS; - const pm_char STR_MENU_TELEMETRY[] = TR_MENU_TELEMETRY; - const pm_char STR_MENU_DISPLAY[] = TR_MENU_DISPLAY; - const pm_char STR_MENU_OTHER[] = TR_MENU_OTHER; - const pm_char STR_MENU_INVERT[] = TR_MENU_INVERT; - const pm_char STR_JITTER_FILTER[] = TR_JITTER_FILTER; + const char STR_BYTES[] = TR_BYTES; + const char STR_ANTENNAPROBLEM[] = TR_ANTENNAPROBLEM; + const char STR_MODULE[] = TR_MODULE; + const char STR_ENABLE_POPUP[] = TR_ENABLE_POPUP; + const char STR_DISABLE_POPUP[] = TR_DISABLE_POPUP; + const char STR_POPUP[] = TR_POPUP; + const char STR_MIN[] = TR_MIN; + const char STR_MAX[] = TR_MAX; + const char STR_CURVE_PRESET[] = TR_CURVE_PRESET; + const char STR_PRESET[] = TR_PRESET; + const char STR_MIRROR[] = TR_MIRROR; + const char STR_CLEAR[] = TR_CLEAR; + const char STR_RESET[] = TR_RESET; + const char STR_COUNT[] = TR_COUNT; + const char STR_PT[] = TR_PT; + const char STR_PTS[] = TR_PTS; + const char STR_SMOOTH[] = TR_SMOOTH; + const char STR_COPY_STICKS_TO_OFS[] = TR_COPY_STICKS_TO_OFS; + const char STR_COPY_TRIMS_TO_OFS[] = TR_COPY_TRIMS_TO_OFS; + const char STR_INCDEC[] = TR_INCDEC; + const char STR_GLOBALVAR[] = TR_GLOBALVAR; + const char STR_MIXSOURCE[] = TR_MIXSOURCE; + const char STR_CONSTANT[] = TR_CONSTANT; + const char STR_TOP_BAR[] = TR_TOP_BAR; + const char STR_ALTITUDE[] = TR_ALTITUDE; + const char STR_SCALE[] = TR_SCALE; + const char STR_VIEW_CHANNELS[] = TR_VIEW_CHANNELS; + const char STR_UART3MODE[] = TR_UART3MODE; + const char STR_THROTTLE_LABEL[] = TR_THROTTLE_LABEL; + const char STR_SCRIPT[] = TR_SCRIPT; + const char STR_INPUTS[] = TR_INPUTS; + const char STR_OUTPUTS[] = TR_OUTPUTS; + const char STR_MENU_INPUTS[] = TR_MENU_INPUTS; + const char STR_MENU_LUA[] = TR_MENU_LUA; + const char STR_MENU_STICKS[] = TR_MENU_STICKS; + const char STR_MENU_POTS[] = TR_MENU_POTS; + const char STR_MENU_MAX[] = TR_MENU_MAX; + const char STR_MENU_HELI[] = TR_MENU_HELI; + const char STR_MENU_TRIMS[] = TR_MENU_TRIMS; + const char STR_MENU_SWITCHES[] = TR_MENU_SWITCHES; + const char STR_MENU_LOGICAL_SWITCHES[] = TR_MENU_LOGICAL_SWITCHES; + const char STR_MENU_TRAINER[] = TR_MENU_TRAINER; + const char STR_MENU_CHANNELS[] = TR_MENU_CHANNELS; + const char STR_MENU_GVARS[] = TR_MENU_GVARS; + const char STR_MENU_TELEMETRY[] = TR_MENU_TELEMETRY; + const char STR_MENU_DISPLAY[] = TR_MENU_DISPLAY; + const char STR_MENU_OTHER[] = TR_MENU_OTHER; + const char STR_MENU_INVERT[] = TR_MENU_INVERT; + const char STR_JITTER_FILTER[] = TR_JITTER_FILTER; #if MENUS_LOCK == 1 - const pm_char STR_UNLOCKED[] = TR_UNLOCKED; - const pm_char STR_MODS_FORBIDDEN[] = TR_MODS_FORBIDDEN; + const char STR_UNLOCKED[] = TR_UNLOCKED; + const char STR_MODS_FORBIDDEN[] = TR_MODS_FORBIDDEN; #endif #if defined(PCBTARANIS) || defined(DSM2) - const pm_char STR_MODULE_RANGE[] = TR_MODULE_RANGE; + const char STR_MODULE_RANGE[] = TR_MODULE_RANGE; #endif #if defined(BLUETOOTH) - const pm_char STR_BLUETOOTH[] = TR_BLUETOOTH; - const pm_char STR_BLUETOOTH_DISC[] = TR_BLUETOOTH_DISC; - const pm_char STR_BLUETOOTH_INIT[] = TR_BLUETOOTH_INIT; - const pm_char STR_BLUETOOTH_DIST_ADDR[] = TR_BLUETOOTH_DIST_ADDR; - const pm_char STR_BLUETOOTH_LOCAL_ADDR[] = TR_BLUETOOTH_LOCAL_ADDR; - const pm_char STR_BLUETOOTH_PIN_CODE[] = TR_BLUETOOTH_PIN_CODE; + const char STR_BLUETOOTH[] = TR_BLUETOOTH; + const char STR_BLUETOOTH_DISC[] = TR_BLUETOOTH_DISC; + const char STR_BLUETOOTH_INIT[] = TR_BLUETOOTH_INIT; + const char STR_BLUETOOTH_DIST_ADDR[] = TR_BLUETOOTH_DIST_ADDR; + const char STR_BLUETOOTH_LOCAL_ADDR[] = TR_BLUETOOTH_LOCAL_ADDR; + const char STR_BLUETOOTH_PIN_CODE[] = TR_BLUETOOTH_PIN_CODE; #endif - const pm_char STR_ABOUTUS[] = TR_ABOUTUS; - const pm_char STR_ABOUT_OPENTX_1[] = TR_ABOUT_OPENTX_1; - const pm_char STR_ABOUT_OPENTX_2[] = TR_ABOUT_OPENTX_2; - const pm_char STR_ABOUT_OPENTX_3[] = TR_ABOUT_OPENTX_3; - const pm_char STR_ABOUT_OPENTX_4[] = TR_ABOUT_OPENTX_4; - const pm_char STR_ABOUT_OPENTX_5[] = TR_ABOUT_OPENTX_5; + const char STR_ABOUTUS[] = TR_ABOUTUS; + const char STR_ABOUT_OPENTX_1[] = TR_ABOUT_OPENTX_1; + const char STR_ABOUT_OPENTX_2[] = TR_ABOUT_OPENTX_2; + const char STR_ABOUT_OPENTX_3[] = TR_ABOUT_OPENTX_3; + const char STR_ABOUT_OPENTX_4[] = TR_ABOUT_OPENTX_4; + const char STR_ABOUT_OPENTX_5[] = TR_ABOUT_OPENTX_5; - const pm_char STR_ABOUT_BERTRAND_1[] = TR_ABOUT_BERTRAND_1; - const pm_char STR_ABOUT_BERTRAND_2[] = TR_ABOUT_BERTRAND_2; - const pm_char STR_ABOUT_BERTRAND_3[] = TR_ABOUT_BERTRAND_3; + const char STR_ABOUT_BERTRAND_1[] = TR_ABOUT_BERTRAND_1; + const char STR_ABOUT_BERTRAND_2[] = TR_ABOUT_BERTRAND_2; + const char STR_ABOUT_BERTRAND_3[] = TR_ABOUT_BERTRAND_3; - const pm_char STR_ABOUT_MIKE_1[] = TR_ABOUT_MIKE_1; - const pm_char STR_ABOUT_MIKE_2[] = TR_ABOUT_MIKE_2; - const pm_char STR_ABOUT_MIKE_3[] = TR_ABOUT_MIKE_3; - const pm_char STR_ABOUT_MIKE_4[] = TR_ABOUT_MIKE_4; + const char STR_ABOUT_MIKE_1[] = TR_ABOUT_MIKE_1; + const char STR_ABOUT_MIKE_2[] = TR_ABOUT_MIKE_2; + const char STR_ABOUT_MIKE_3[] = TR_ABOUT_MIKE_3; + const char STR_ABOUT_MIKE_4[] = TR_ABOUT_MIKE_4; - const pm_char STR_ABOUT_ROMOLO_1[] = TR_ABOUT_ROMOLO_1; - const pm_char STR_ABOUT_ROMOLO_2[] = TR_ABOUT_ROMOLO_2; - const pm_char STR_ABOUT_ROMOLO_3[] = TR_ABOUT_ROMOLO_3; + const char STR_ABOUT_ROMOLO_1[] = TR_ABOUT_ROMOLO_1; + const char STR_ABOUT_ROMOLO_2[] = TR_ABOUT_ROMOLO_2; + const char STR_ABOUT_ROMOLO_3[] = TR_ABOUT_ROMOLO_3; - const pm_char STR_ABOUT_ANDRE_1[] = TR_ABOUT_ANDRE_1; - const pm_char STR_ABOUT_ANDRE_2[] = TR_ABOUT_ANDRE_2; - const pm_char STR_ABOUT_ANDRE_3[] = TR_ABOUT_ANDRE_3; + const char STR_ABOUT_ANDRE_1[] = TR_ABOUT_ANDRE_1; + const char STR_ABOUT_ANDRE_2[] = TR_ABOUT_ANDRE_2; + const char STR_ABOUT_ANDRE_3[] = TR_ABOUT_ANDRE_3; - const pm_char STR_ABOUT_ROB_1[] = TR_ABOUT_ROB_1; - const pm_char STR_ABOUT_ROB_2[] = TR_ABOUT_ROB_2; + const char STR_ABOUT_ROB_1[] = TR_ABOUT_ROB_1; + const char STR_ABOUT_ROB_2[] = TR_ABOUT_ROB_2; - const pm_char STR_ABOUT_MARTIN_1[] = TR_ABOUT_MARTIN_1; - const pm_char STR_ABOUT_MARTIN_2[] = TR_ABOUT_MARTIN_2; + const char STR_ABOUT_MARTIN_1[] = TR_ABOUT_MARTIN_1; + const char STR_ABOUT_MARTIN_2[] = TR_ABOUT_MARTIN_2; - const pm_char STR_ABOUT_KJELL_1[] = TR_ABOUT_KJELL_1; - const pm_char STR_ABOUT_KJELL_2[] = TR_ABOUT_KJELL_2; - const pm_char STR_ABOUT_KJELL_3[] = TR_ABOUT_KJELL_3; - const pm_char STR_ABOUT_KJELL_4[] = TR_ABOUT_KJELL_4; + const char STR_ABOUT_KJELL_1[] = TR_ABOUT_KJELL_1; + const char STR_ABOUT_KJELL_2[] = TR_ABOUT_KJELL_2; + const char STR_ABOUT_KJELL_3[] = TR_ABOUT_KJELL_3; + const char STR_ABOUT_KJELL_4[] = TR_ABOUT_KJELL_4; - const pm_char STR_ABOUT_HARDWARE_1[] = TR_ABOUT_HARDWARE_1; - const pm_char STR_ABOUT_HARDWARE_2[] = TR_ABOUT_HARDWARE_2; - const pm_char STR_ABOUT_HARDWARE_3[] = TR_ABOUT_HARDWARE_3; + const char STR_ABOUT_HARDWARE_1[] = TR_ABOUT_HARDWARE_1; + const char STR_ABOUT_HARDWARE_2[] = TR_ABOUT_HARDWARE_2; + const char STR_ABOUT_HARDWARE_3[] = TR_ABOUT_HARDWARE_3; - const pm_char STR_ABOUT_PARENTS_1[] = TR_ABOUT_PARENTS_1; - const pm_char STR_ABOUT_PARENTS_2[] = TR_ABOUT_PARENTS_2; - const pm_char STR_ABOUT_PARENTS_3[] = TR_ABOUT_PARENTS_3; - const pm_char STR_ABOUT_PARENTS_4[] = TR_ABOUT_PARENTS_4; + const char STR_ABOUT_PARENTS_1[] = TR_ABOUT_PARENTS_1; + const char STR_ABOUT_PARENTS_2[] = TR_ABOUT_PARENTS_2; + const char STR_ABOUT_PARENTS_3[] = TR_ABOUT_PARENTS_3; + const char STR_ABOUT_PARENTS_4[] = TR_ABOUT_PARENTS_4; diff --git a/radio/src/translations.h b/radio/src/translations.h index 98d9bc7e9..49be5d4b7 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -104,7 +104,7 @@ // The non-0-terminated-strings -extern const pm_char STR_OPEN9X[]; +extern const char STR_OPEN9X[]; #define OFS_OFFON 0 #define OFS_MMMINV (OFS_OFFON + sizeof(TR_OFFON)) @@ -311,12 +311,12 @@ extern const pm_char STR_OPEN9X[]; #define STR_VANTENNATYPES (STR_OPEN9X + OFS_VANTENNATYPES) #if defined(BLUETOOTH) - extern const pm_char STR_BLUETOOTH[]; -extern const pm_char STR_BLUETOOTH_DISC[]; -extern const pm_char STR_BLUETOOTH_INIT[]; -extern const pm_char STR_BLUETOOTH_DIST_ADDR[]; -extern const pm_char STR_BLUETOOTH_LOCAL_ADDR[]; - extern const pm_char STR_BLUETOOTH_PIN_CODE[]; + extern const char STR_BLUETOOTH[]; +extern const char STR_BLUETOOTH_DISC[]; +extern const char STR_BLUETOOTH_INIT[]; +extern const char STR_BLUETOOTH_DIST_ADDR[]; +extern const char STR_BLUETOOTH_LOCAL_ADDR[]; + extern const char STR_BLUETOOTH_PIN_CODE[]; #define STR_BLUETOOTH_MODES (STR_OPEN9X + OFS_BLUETOOTH_MODES) #endif @@ -324,293 +324,293 @@ extern const pm_char STR_BLUETOOTH_LOCAL_ADDR[]; // The 0-terminated-strings #define NO_INDENT(x) (x)+LEN_INDENT -extern const pm_char STR_POPUPS[]; +extern const char STR_POPUPS[]; #if defined(OFS_EXIT) #define STR_EXIT (STR_POPUPS + OFS_EXIT) #else - extern const pm_char STR_EXIT[]; + extern const char STR_EXIT[]; #endif #if !defined(PCBHORUS) - extern const pm_char STR_MENUWHENDONE[]; + extern const char STR_MENUWHENDONE[]; #endif -extern const pm_char STR_FREE[]; +extern const char STR_FREE[]; #define LEN_FREE PSIZE(TR_FREE) -extern const pm_char STR_DELETEMODEL[]; -extern const pm_char STR_COPYINGMODEL[]; -extern const pm_char STR_MOVINGMODEL[]; -extern const pm_char STR_LOADINGMODEL[]; -extern const pm_char STR_NAME[]; -extern const pm_char STR_BITMAP[]; -extern const pm_char STR_TIMER[]; -extern const pm_char STR_ELIMITS[]; -extern const pm_char STR_ETRIMS[]; -extern const pm_char STR_TRIMINC[]; -extern const pm_char STR_DISPLAY_TRIMS[]; -extern const pm_char STR_TTRACE[]; -extern const pm_char STR_TTRIM[]; -extern const pm_char STR_BEEPCTR[]; -extern const pm_char STR_USE_GLOBAL_FUNCS[]; +extern const char STR_DELETEMODEL[]; +extern const char STR_COPYINGMODEL[]; +extern const char STR_MOVINGMODEL[]; +extern const char STR_LOADINGMODEL[]; +extern const char STR_NAME[]; +extern const char STR_BITMAP[]; +extern const char STR_TIMER[]; +extern const char STR_ELIMITS[]; +extern const char STR_ETRIMS[]; +extern const char STR_TRIMINC[]; +extern const char STR_DISPLAY_TRIMS[]; +extern const char STR_TTRACE[]; +extern const char STR_TTRIM[]; +extern const char STR_BEEPCTR[]; +extern const char STR_USE_GLOBAL_FUNCS[]; #if defined(PCBSKY9X) && defined(REVX) - extern const pm_char STR_OUTPUT_TYPE[]; + extern const char STR_OUTPUT_TYPE[]; #endif -extern const pm_char STR_PROTO[]; -extern const pm_char STR_PPMFRAME[]; -extern const pm_char STR_REFRESHRATE[]; -extern const pm_char SSTR_WARN_BATTVOLTAGE[]; -extern const pm_char STR_MS[]; -extern const pm_char STR_SWITCH[]; -extern const pm_char STR_TRIMS[]; -extern const pm_char STR_FADEIN[]; -extern const pm_char STR_FADEOUT[]; -extern const pm_char STR_DEFAULT[]; -extern const pm_char STR_CHECKTRIMS[]; -extern const pm_char STR_SWASHTYPE[]; -extern const pm_char STR_COLLECTIVE[]; -extern const pm_char STR_AILERON[]; -extern const pm_char STR_ELEVATOR[]; -extern const pm_char STR_SWASHRING[]; -extern const pm_char STR_ELEDIRECTION[]; -extern const pm_char STR_AILDIRECTION[]; -extern const pm_char STR_COLDIRECTION[]; -extern const pm_char STR_MODE[]; +extern const char STR_PROTO[]; +extern const char STR_PPMFRAME[]; +extern const char STR_REFRESHRATE[]; +extern const char SSTR_WARN_BATTVOLTAGE[]; +extern const char STR_MS[]; +extern const char STR_SWITCH[]; +extern const char STR_TRIMS[]; +extern const char STR_FADEIN[]; +extern const char STR_FADEOUT[]; +extern const char STR_DEFAULT[]; +extern const char STR_CHECKTRIMS[]; +extern const char STR_SWASHTYPE[]; +extern const char STR_COLLECTIVE[]; +extern const char STR_AILERON[]; +extern const char STR_ELEVATOR[]; +extern const char STR_SWASHRING[]; +extern const char STR_ELEDIRECTION[]; +extern const char STR_AILDIRECTION[]; +extern const char STR_COLDIRECTION[]; +extern const char STR_MODE[]; #if defined(AUDIO) && defined(BUZZER) -extern const pm_char STR_SPEAKER[]; -extern const pm_char STR_BUZZER[]; +extern const char STR_SPEAKER[]; +extern const char STR_BUZZER[]; #else #define STR_SPEAKER STR_MODE #define STR_BUZZER STR_MODE #endif -extern const pm_char STR_NOFREEEXPO[]; -extern const pm_char STR_NOFREEMIXER[]; -extern const pm_char STR_SOURCE[]; -extern const pm_char STR_WEIGHT[]; -extern const pm_char STR_EXPO[]; -extern const pm_char STR_SIDE[]; -extern const pm_char STR_DIFFERENTIAL[]; -extern const pm_char STR_OFFSET[]; -extern const pm_char STR_TRIM[]; -extern const pm_char STR_DREX[]; -extern const pm_char STR_CURVE[]; -extern const pm_char STR_FLMODE[]; -extern const pm_char STR_MIXWARNING[]; -extern const pm_char STR_OFF[]; -extern const pm_char STR_MULTPX[]; -extern const pm_char STR_DELAYDOWN[]; -extern const pm_char STR_DELAYUP[]; -extern const pm_char STR_SLOWDOWN[]; -extern const pm_char STR_SLOWUP[]; -extern const pm_char STR_MIXER[]; -extern const pm_char STR_CV[]; -extern const pm_char STR_GV[]; -extern const pm_char STR_ACHANNEL[]; -extern const pm_char STR_RANGE[]; -extern const pm_char STR_CENTER[]; -extern const pm_char STR_BAR[]; -extern const pm_char STR_ALARM[]; -extern const pm_char STR_USRDATA[]; -extern const pm_char STR_BLADES[]; -extern const pm_char STR_SCREEN[]; -extern const pm_char STR_SOUND_LABEL[]; -extern const pm_char STR_LENGTH[]; -extern const pm_char STR_BEEP_LENGTH[]; -extern const pm_char STR_BEEP_LENGTH[]; -extern const pm_char STR_SPKRPITCH[]; -extern const pm_char STR_HAPTIC_LABEL[]; -extern const pm_char STR_HAPTICSTRENGTH[]; -extern const pm_char STR_CONTRAST[]; -extern const pm_char STR_ALARMS_LABEL[]; -extern const pm_char STR_BATTERY_RANGE[]; -extern const pm_char STR_BATTERYWARNING[]; -extern const pm_char STR_INACTIVITYALARM[]; -extern const pm_char STR_MEMORYWARNING[]; -extern const pm_char STR_ALARMWARNING[]; -extern const pm_char STR_RSSISHUTDOWNALARM[]; -extern const pm_char STR_MODEL_STILL_POWERED[]; -extern const pm_char STR_MODEL_SHUTDOWN[]; -extern const pm_char STR_PRESS_ENTER_TO_CONFIRM[]; -extern const pm_char STR_RENAVIG[]; -extern const pm_char STR_THROTTLEREVERSE[]; -extern const pm_char STR_TIMER_NAME[]; -extern const pm_char STR_MINUTEBEEP[]; -extern const pm_char STR_BEEPCOUNTDOWN[]; -extern const pm_char STR_PERSISTENT[]; -extern const pm_char STR_BACKLIGHT_LABEL[]; -extern const pm_char STR_BLDELAY[]; +extern const char STR_NOFREEEXPO[]; +extern const char STR_NOFREEMIXER[]; +extern const char STR_SOURCE[]; +extern const char STR_WEIGHT[]; +extern const char STR_EXPO[]; +extern const char STR_SIDE[]; +extern const char STR_DIFFERENTIAL[]; +extern const char STR_OFFSET[]; +extern const char STR_TRIM[]; +extern const char STR_DREX[]; +extern const char STR_CURVE[]; +extern const char STR_FLMODE[]; +extern const char STR_MIXWARNING[]; +extern const char STR_OFF[]; +extern const char STR_MULTPX[]; +extern const char STR_DELAYDOWN[]; +extern const char STR_DELAYUP[]; +extern const char STR_SLOWDOWN[]; +extern const char STR_SLOWUP[]; +extern const char STR_MIXER[]; +extern const char STR_CV[]; +extern const char STR_GV[]; +extern const char STR_ACHANNEL[]; +extern const char STR_RANGE[]; +extern const char STR_CENTER[]; +extern const char STR_BAR[]; +extern const char STR_ALARM[]; +extern const char STR_USRDATA[]; +extern const char STR_BLADES[]; +extern const char STR_SCREEN[]; +extern const char STR_SOUND_LABEL[]; +extern const char STR_LENGTH[]; +extern const char STR_BEEP_LENGTH[]; +extern const char STR_BEEP_LENGTH[]; +extern const char STR_SPKRPITCH[]; +extern const char STR_HAPTIC_LABEL[]; +extern const char STR_HAPTICSTRENGTH[]; +extern const char STR_CONTRAST[]; +extern const char STR_ALARMS_LABEL[]; +extern const char STR_BATTERY_RANGE[]; +extern const char STR_BATTERYWARNING[]; +extern const char STR_INACTIVITYALARM[]; +extern const char STR_MEMORYWARNING[]; +extern const char STR_ALARMWARNING[]; +extern const char STR_RSSISHUTDOWNALARM[]; +extern const char STR_MODEL_STILL_POWERED[]; +extern const char STR_MODEL_SHUTDOWN[]; +extern const char STR_PRESS_ENTER_TO_CONFIRM[]; +extern const char STR_RENAVIG[]; +extern const char STR_THROTTLEREVERSE[]; +extern const char STR_TIMER_NAME[]; +extern const char STR_MINUTEBEEP[]; +extern const char STR_BEEPCOUNTDOWN[]; +extern const char STR_PERSISTENT[]; +extern const char STR_BACKLIGHT_LABEL[]; +extern const char STR_BLDELAY[]; #if defined(PWM_BACKLIGHT) || defined(PCBHORUS) -extern const pm_char STR_BLONBRIGHTNESS[]; -extern const pm_char STR_BLOFFBRIGHTNESS[]; +extern const char STR_BLONBRIGHTNESS[]; +extern const char STR_BLOFFBRIGHTNESS[]; #endif -extern const pm_char STR_SPLASHSCREEN[]; -extern const pm_char STR_THROTTLEWARNING[]; -extern const pm_char STR_SWITCHWARNING[]; -extern const pm_char STR_POTWARNINGSTATE[]; -extern const pm_char STR_POTWARNING[]; -extern const pm_char STR_SLIDERWARNING[]; -extern const pm_char STR_TIMEZONE[]; -extern const pm_char STR_ADJUST_RTC[]; -extern const pm_char STR_GPS[]; -extern const pm_char STR_GPSCOORD[]; -extern const pm_char STR_VARIO[]; -extern const pm_char STR_PITCH_AT_ZERO[]; -extern const pm_char STR_PITCH_AT_MAX[]; -extern const pm_char STR_REPEAT_AT_ZERO[]; -extern const pm_char STR_RXCHANNELORD[]; -extern const pm_char STR_STICKS[]; -extern const pm_char STR_POTS[]; -extern const pm_char STR_SWITCHES[]; -extern const pm_char STR_SWITCHES_DELAY[]; -extern const pm_char STR_SLAVE[]; -extern const pm_char STR_MODESRC[]; -extern const pm_char STR_MULTIPLIER[]; +extern const char STR_SPLASHSCREEN[]; +extern const char STR_THROTTLEWARNING[]; +extern const char STR_SWITCHWARNING[]; +extern const char STR_POTWARNINGSTATE[]; +extern const char STR_POTWARNING[]; +extern const char STR_SLIDERWARNING[]; +extern const char STR_TIMEZONE[]; +extern const char STR_ADJUST_RTC[]; +extern const char STR_GPS[]; +extern const char STR_GPSCOORD[]; +extern const char STR_VARIO[]; +extern const char STR_PITCH_AT_ZERO[]; +extern const char STR_PITCH_AT_MAX[]; +extern const char STR_REPEAT_AT_ZERO[]; +extern const char STR_RXCHANNELORD[]; +extern const char STR_STICKS[]; +extern const char STR_POTS[]; +extern const char STR_SWITCHES[]; +extern const char STR_SWITCHES_DELAY[]; +extern const char STR_SLAVE[]; +extern const char STR_MODESRC[]; +extern const char STR_MULTIPLIER[]; #define LEN_MULTIPLIER PSIZE(TR_MULTIPLIER) -extern const pm_char STR_CAL[]; -extern const pm_char STR_VTRIM[]; -extern const pm_char STR_BG[]; -extern const pm_char STR_MENUTOSTART[]; -extern const pm_char STR_SETMIDPOINT[]; -extern const pm_char STR_MOVESTICKSPOTS[]; -extern const pm_char STR_RXBATT[]; -extern const pm_char STR_TX[]; +extern const char STR_CAL[]; +extern const char STR_VTRIM[]; +extern const char STR_BG[]; +extern const char STR_MENUTOSTART[]; +extern const char STR_SETMIDPOINT[]; +extern const char STR_MOVESTICKSPOTS[]; +extern const char STR_RXBATT[]; +extern const char STR_TX[]; #define STR_RX (STR_TX+OFS_RX) -extern const pm_char STR_ACCEL[]; -extern const pm_char STR_NODATA[]; -extern const pm_char STR_TOTTM1TM2THRTHP[]; -extern const pm_char STR_TMR1LATMAXUS[]; -extern const pm_char STR_TMR1LATMINUS[]; -extern const pm_char STR_TMR1JITTERUS[]; -extern const pm_char STR_TMIXMAXMS[]; -extern const pm_char STR_FREESTACKMINB[]; -extern const pm_char STR_MENUTORESET[]; -extern const pm_char STR_PPM_TRAINER[]; -extern const pm_char STR_CH[]; -extern const pm_char STR_MODEL[]; -extern const pm_char STR_FP[]; -extern const pm_char STR_MIX[]; -extern const pm_char STR_EEPROMLOWMEM[]; -extern const pm_char STR_ALERT[]; -extern const pm_char STR_PRESSANYKEYTOSKIP[]; -extern const pm_char STR_THROTTLENOTIDLE[]; -extern const pm_char STR_ALARMSDISABLED[]; -extern const pm_char STR_PRESSANYKEY[]; +extern const char STR_ACCEL[]; +extern const char STR_NODATA[]; +extern const char STR_TOTTM1TM2THRTHP[]; +extern const char STR_TMR1LATMAXUS[]; +extern const char STR_TMR1LATMINUS[]; +extern const char STR_TMR1JITTERUS[]; +extern const char STR_TMIXMAXMS[]; +extern const char STR_FREESTACKMINB[]; +extern const char STR_MENUTORESET[]; +extern const char STR_PPM_TRAINER[]; +extern const char STR_CH[]; +extern const char STR_MODEL[]; +extern const char STR_FP[]; +extern const char STR_MIX[]; +extern const char STR_EEPROMLOWMEM[]; +extern const char STR_ALERT[]; +extern const char STR_PRESSANYKEYTOSKIP[]; +extern const char STR_THROTTLENOTIDLE[]; +extern const char STR_ALARMSDISABLED[]; +extern const char STR_PRESSANYKEY[]; #define LEN_PRESSANYKEY PSIZE(TR_PRESSANYKEY) -extern const pm_char STR_BAD_RADIO_DATA[]; -extern const pm_char STR_STORAGE_FORMAT[]; -extern const pm_char STR_EEPROMOVERFLOW[]; -extern const pm_char STR_TRIMS2OFFSETS[]; -extern const pm_char STR_OUTPUTS2FAILSAFE[]; -extern const pm_char STR_MENURADIOSETUP[]; -extern const pm_char STR_MENUDATEANDTIME[]; -extern const pm_char STR_MENUTRAINER[]; -extern const pm_char STR_MENUSPECIALFUNCS[]; -extern const pm_char STR_MENUVERSION[]; -extern const pm_char STR_MENU_RADIO_SWITCHES[]; -extern const pm_char STR_MENU_RADIO_ANALOGS[]; -extern const pm_char STR_MENUCALIBRATION[]; -extern const pm_char STR_MENUMODELSEL[]; -extern const pm_char STR_MENUSETUP[]; -extern const pm_char STR_MENUFLIGHTMODE[]; -extern const pm_char STR_MENUFLIGHTMODES[]; -extern const pm_char STR_MENUHELISETUP[]; -extern const pm_char STR_MENUINPUTS[]; -extern const pm_char STR_MENULIMITS[]; -extern const pm_char STR_MENUCURVES[]; -extern const pm_char STR_MENUCURVE[]; -extern const pm_char STR_MENULOGICALSWITCH[]; -extern const pm_char STR_MENULOGICALSWITCHES[]; -extern const pm_char STR_MENUCUSTOMFUNC[]; -extern const pm_char STR_MENUCUSTOMSCRIPTS[]; -extern const pm_char STR_MENUTELEMETRY[]; -extern const pm_char STR_MENUTEMPLATES[]; -extern const pm_char STR_MENUSTAT[]; -extern const pm_char STR_MENUDEBUG[]; +extern const char STR_BAD_RADIO_DATA[]; +extern const char STR_STORAGE_FORMAT[]; +extern const char STR_EEPROMOVERFLOW[]; +extern const char STR_TRIMS2OFFSETS[]; +extern const char STR_OUTPUTS2FAILSAFE[]; +extern const char STR_MENURADIOSETUP[]; +extern const char STR_MENUDATEANDTIME[]; +extern const char STR_MENUTRAINER[]; +extern const char STR_MENUSPECIALFUNCS[]; +extern const char STR_MENUVERSION[]; +extern const char STR_MENU_RADIO_SWITCHES[]; +extern const char STR_MENU_RADIO_ANALOGS[]; +extern const char STR_MENUCALIBRATION[]; +extern const char STR_MENUMODELSEL[]; +extern const char STR_MENUSETUP[]; +extern const char STR_MENUFLIGHTMODE[]; +extern const char STR_MENUFLIGHTMODES[]; +extern const char STR_MENUHELISETUP[]; +extern const char STR_MENUINPUTS[]; +extern const char STR_MENULIMITS[]; +extern const char STR_MENUCURVES[]; +extern const char STR_MENUCURVE[]; +extern const char STR_MENULOGICALSWITCH[]; +extern const char STR_MENULOGICALSWITCHES[]; +extern const char STR_MENUCUSTOMFUNC[]; +extern const char STR_MENUCUSTOMSCRIPTS[]; +extern const char STR_MENUTELEMETRY[]; +extern const char STR_MENUTEMPLATES[]; +extern const char STR_MENUSTAT[]; +extern const char STR_MENUDEBUG[]; extern const char * const STR_MONITOR_CHANNELS[]; -extern const pm_char STR_MONITOR_SWITCHES[]; -extern const pm_char STR_MONITOR_OUTPUT_DESC[]; -extern const pm_char STR_MONITOR_MIXER_DESC[]; -extern const pm_char STR_MENUGLOBALVARS[]; -extern const pm_char STR_INVERT_THR[]; -extern const pm_char STR_AND_SWITCH[]; -extern const pm_char STR_SF[]; -extern const pm_char STR_GF[]; +extern const char STR_MONITOR_SWITCHES[]; +extern const char STR_MONITOR_OUTPUT_DESC[]; +extern const char STR_MONITOR_MIXER_DESC[]; +extern const char STR_MENUGLOBALVARS[]; +extern const char STR_INVERT_THR[]; +extern const char STR_AND_SWITCH[]; +extern const char STR_SF[]; +extern const char STR_GF[]; -extern const pm_char STR_FAS_OFFSET[]; +extern const char STR_FAS_OFFSET[]; #if defined(MULTIMODULE) -extern const pm_char STR_MULTI_CUSTOM[]; -extern const pm_char STR_MULTI_OPTION[]; -extern const pm_char STR_MULTI_VIDFREQ[]; -extern const pm_char STR_MULTI_RFTUNE[]; -extern const pm_char STR_MULTI_TELEMETRY[]; -extern const pm_char STR_MULTI_AUTOBIND[]; -extern const pm_char STR_MULTI_DSM_AUTODTECT[]; -extern const pm_char STR_MULTI_LOWPOWER[]; -extern const pm_char STR_MODULE_NO_SERIAL_MODE[]; -extern const pm_char STR_MODULE_NO_INPUT[]; -extern const pm_char STR_MODULE_WAITFORBIND[]; -extern const pm_char STR_MODULE_NO_TELEMETRY[]; -extern const pm_char STR_MODULE_BINDING[]; -extern const pm_char STR_PROTOCOL_INVALID[]; -extern const pm_char STR_MODULE_STATUS[]; -extern const pm_char STR_MODULE_SYNC[]; -extern const pm_char STR_MULTI_SERVOFREQ[]; +extern const char STR_MULTI_CUSTOM[]; +extern const char STR_MULTI_OPTION[]; +extern const char STR_MULTI_VIDFREQ[]; +extern const char STR_MULTI_RFTUNE[]; +extern const char STR_MULTI_TELEMETRY[]; +extern const char STR_MULTI_AUTOBIND[]; +extern const char STR_MULTI_DSM_AUTODTECT[]; +extern const char STR_MULTI_LOWPOWER[]; +extern const char STR_MODULE_NO_SERIAL_MODE[]; +extern const char STR_MODULE_NO_INPUT[]; +extern const char STR_MODULE_WAITFORBIND[]; +extern const char STR_MODULE_NO_TELEMETRY[]; +extern const char STR_MODULE_BINDING[]; +extern const char STR_PROTOCOL_INVALID[]; +extern const char STR_MODULE_STATUS[]; +extern const char STR_MODULE_SYNC[]; +extern const char STR_MULTI_SERVOFREQ[]; #if LCD_W < 212 -extern const pm_char STR_SUBTYPE[]; +extern const char STR_SUBTYPE[]; #endif #endif #if defined(DSM2) || defined(PXX) -extern const pm_char STR_RECEIVER_NUM[]; -extern const pm_char STR_RECEIVER[]; -extern const pm_char STR_REBIND[]; +extern const char STR_RECEIVER_NUM[]; +extern const char STR_RECEIVER[]; +extern const char STR_REBIND[]; #endif -extern const pm_char STR_SYNCMENU[]; -extern const pm_char STR_INTERNALRF[]; -extern const pm_char STR_EXTERNALRF[]; -extern const pm_char STR_MODULE_TELEMETRY[]; -extern const pm_char STR_MODULE_TELEM_ON[]; -extern const pm_char STR_FAILSAFE[]; -extern const pm_char STR_FAILSAFESET[]; -extern const pm_char STR_HOLD[]; -extern const pm_char STR_NONE[]; -extern const pm_char STR_MENUSENSOR[]; -extern const pm_char STR_SENSOR[]; -extern const pm_char STR_COUNTRYCODE[]; -extern const pm_char STR_USBMODE[]; -extern const pm_char STR_DISABLE_INTERNAL[]; +extern const char STR_SYNCMENU[]; +extern const char STR_INTERNALRF[]; +extern const char STR_EXTERNALRF[]; +extern const char STR_MODULE_TELEMETRY[]; +extern const char STR_MODULE_TELEM_ON[]; +extern const char STR_FAILSAFE[]; +extern const char STR_FAILSAFESET[]; +extern const char STR_HOLD[]; +extern const char STR_NONE[]; +extern const char STR_MENUSENSOR[]; +extern const char STR_SENSOR[]; +extern const char STR_COUNTRYCODE[]; +extern const char STR_USBMODE[]; +extern const char STR_DISABLE_INTERNAL[]; #if defined(TELEMETRY_FRSKY) -extern const pm_char STR_LIMIT[]; +extern const char STR_LIMIT[]; #endif #ifdef FRSKY_HUB -extern const pm_char STR_MINRSSI[]; -extern const pm_char STR_LATITUDE[]; -extern const pm_char STR_LONGITUDE[]; +extern const char STR_MINRSSI[]; +extern const char STR_LATITUDE[]; +extern const char STR_LONGITUDE[]; #endif -extern const pm_char STR_SHUTDOWN[]; -extern const pm_char STR_SAVEMODEL[]; +extern const char STR_SHUTDOWN[]; +extern const char STR_SAVEMODEL[]; #if defined(PCBX9E) -extern const pm_char STR_POWEROFF[]; +extern const char STR_POWEROFF[]; #endif -extern const pm_char STR_BATT_CALIB[]; +extern const char STR_BATT_CALIB[]; -extern const pm_char STR_VOLTAGE[]; -extern const pm_char STR_CURRENT[]; +extern const char STR_VOLTAGE[]; +extern const char STR_CURRENT[]; -extern const pm_char STR_CURRENT_CALIB[]; -extern const pm_char STR_UNITSSYSTEM[]; -extern const pm_char STR_VOICELANG[]; -extern const pm_char STR_MODELIDUSED[]; -extern const pm_char STR_BEEP_VOLUME[]; -extern const pm_char STR_WAV_VOLUME[]; -extern const pm_char STR_BG_VOLUME[]; -extern const pm_char STR_PERSISTENT_MAH[]; +extern const char STR_CURRENT_CALIB[]; +extern const char STR_UNITSSYSTEM[]; +extern const char STR_VOICELANG[]; +extern const char STR_MODELIDUSED[]; +extern const char STR_BEEP_VOLUME[]; +extern const char STR_WAV_VOLUME[]; +extern const char STR_BG_VOLUME[]; +extern const char STR_PERSISTENT_MAH[]; #if defined(PCBSKY9X) #define LEN_CALIB_FIELDS (PSIZE(TR_BATT_CALIB) > PSIZE(TR_CURRENT_CALIB) ? PSIZE(TR_BATT_CALIB) : PSIZE(TR_CURRENT_CALIB)) @@ -619,143 +619,143 @@ extern const pm_char STR_PERSISTENT_MAH[]; #endif #if defined(NAVIGATION_MENUS) - extern const pm_char STR_SELECT_MODEL[]; - extern const pm_char STR_CREATE_CATEGORY[]; - extern const pm_char STR_RENAME_CATEGORY[]; - extern const pm_char STR_DELETE_CATEGORY[]; - extern const pm_char STR_CREATE_MODEL[]; - extern const pm_char STR_DUPLICATE_MODEL[]; - extern const pm_char STR_COPY_MODEL[]; - extern const pm_char STR_MOVE_MODEL[]; - extern const pm_char STR_DELETE_MODEL[]; - extern const pm_char STR_EDIT[]; - extern const pm_char STR_INSERT_BEFORE[]; - extern const pm_char STR_INSERT_AFTER[]; - extern const pm_char STR_COPY[]; - extern const pm_char STR_MOVE[]; - extern const pm_char STR_PASTE[]; - extern const pm_char STR_INSERT[]; - extern const pm_char STR_DELETE[]; - extern const pm_char STR_RESET_FLIGHT[]; - extern const pm_char STR_RESET_TIMER1[]; - extern const pm_char STR_RESET_TIMER2[]; - extern const pm_char STR_RESET_TIMER3[]; - extern const pm_char STR_RESET_TELEMETRY[]; - extern const pm_char STR_STATISTICS[]; - extern const pm_char STR_ABOUT_US[]; - extern const pm_char STR_USB_JOYSTICK[]; - extern const pm_char STR_USB_MASS_STORAGE[]; - extern const pm_char STR_USB_SERIAL[]; - extern const pm_char STR_SETUP_SCREENS[]; - extern const pm_char STR_MONITOR_SCREENS[]; + extern const char STR_SELECT_MODEL[]; + extern const char STR_CREATE_CATEGORY[]; + extern const char STR_RENAME_CATEGORY[]; + extern const char STR_DELETE_CATEGORY[]; + extern const char STR_CREATE_MODEL[]; + extern const char STR_DUPLICATE_MODEL[]; + extern const char STR_COPY_MODEL[]; + extern const char STR_MOVE_MODEL[]; + extern const char STR_DELETE_MODEL[]; + extern const char STR_EDIT[]; + extern const char STR_INSERT_BEFORE[]; + extern const char STR_INSERT_AFTER[]; + extern const char STR_COPY[]; + extern const char STR_MOVE[]; + extern const char STR_PASTE[]; + extern const char STR_INSERT[]; + extern const char STR_DELETE[]; + extern const char STR_RESET_FLIGHT[]; + extern const char STR_RESET_TIMER1[]; + extern const char STR_RESET_TIMER2[]; + extern const char STR_RESET_TIMER3[]; + extern const char STR_RESET_TELEMETRY[]; + extern const char STR_STATISTICS[]; + extern const char STR_ABOUT_US[]; + extern const char STR_USB_JOYSTICK[]; + extern const char STR_USB_MASS_STORAGE[]; + extern const char STR_USB_SERIAL[]; + extern const char STR_SETUP_SCREENS[]; + extern const char STR_MONITOR_SCREENS[]; #endif -extern const pm_char STR_RESET_BTN[]; +extern const char STR_RESET_BTN[]; #if defined(SDCARD) - extern const pm_char STR_BACKUP_MODEL[]; - extern const pm_char STR_RESTORE_MODEL[]; - extern const pm_char STR_DELETE_ERROR[]; - extern const pm_char STR_SDCARD_ERROR[]; - extern const pm_char STR_NO_SDCARD[]; - extern const pm_char STR_SDCARD_FULL[]; - extern const pm_char STR_INCOMPATIBLE[]; - extern const pm_char STR_LOGS_PATH[]; - extern const pm_char STR_LOGS_EXT[]; - extern const pm_char STR_MODELS_PATH[]; - extern const pm_char STR_MODELS_EXT[]; + extern const char STR_BACKUP_MODEL[]; + extern const char STR_RESTORE_MODEL[]; + extern const char STR_DELETE_ERROR[]; + extern const char STR_SDCARD_ERROR[]; + extern const char STR_NO_SDCARD[]; + extern const char STR_SDCARD_FULL[]; + extern const char STR_INCOMPATIBLE[]; + extern const char STR_LOGS_PATH[]; + extern const char STR_LOGS_EXT[]; + extern const char STR_MODELS_PATH[]; + extern const char STR_MODELS_EXT[]; #define STR_UPDATE_LIST STR_DELAYDOWN #endif -extern const pm_char STR_CAT_NOT_EMPTY[]; -extern const pm_char STR_WARNING[]; -extern const pm_char STR_STORAGE_WARNING[]; -extern const pm_char STR_EEPROM_CONVERTING[]; -extern const pm_char STR_THROTTLEWARN[]; -extern const pm_char STR_ALARMSWARN[]; -extern const pm_char STR_SWITCHWARN[]; -extern const pm_char STR_FAILSAFEWARN[]; -extern const pm_char STR_NIGHTLY_WARNING[]; -extern const pm_char STR_NIGHTLY_NOTSAFE[]; -extern const pm_char STR_WRONG_SDCARDVERSION[]; -extern const pm_char STR_WRONG_PCBREV[]; -extern const pm_char STR_EMERGENCY_MODE[]; -extern const pm_char STR_PCBREV_ERROR[]; -extern const pm_char STR_NO_FAILSAFE[]; -extern const pm_char STR_KEYSTUCK[]; +extern const char STR_CAT_NOT_EMPTY[]; +extern const char STR_WARNING[]; +extern const char STR_STORAGE_WARNING[]; +extern const char STR_EEPROM_CONVERTING[]; +extern const char STR_THROTTLEWARN[]; +extern const char STR_ALARMSWARN[]; +extern const char STR_SWITCHWARN[]; +extern const char STR_FAILSAFEWARN[]; +extern const char STR_NIGHTLY_WARNING[]; +extern const char STR_NIGHTLY_NOTSAFE[]; +extern const char STR_WRONG_SDCARDVERSION[]; +extern const char STR_WRONG_PCBREV[]; +extern const char STR_EMERGENCY_MODE[]; +extern const char STR_PCBREV_ERROR[]; +extern const char STR_NO_FAILSAFE[]; +extern const char STR_KEYSTUCK[]; -extern const pm_char STR_SPEAKER_VOLUME[]; -extern const pm_char STR_LCD[]; -extern const pm_char STR_BRIGHTNESS[]; -extern const pm_char STR_CPU_TEMP[]; -extern const pm_char STR_CPU_CURRENT[]; -extern const pm_char STR_CPU_MAH[]; -extern const pm_char STR_COPROC[]; -extern const pm_char STR_COPROC_TEMP[]; -extern const pm_char STR_CAPAWARNING[]; -extern const pm_char STR_TEMPWARNING[]; -extern const pm_char STR_FUNC[]; -extern const pm_char STR_V1[]; -extern const pm_char STR_V2[]; -extern const pm_char STR_DURATION[]; -extern const pm_char STR_DELAY[]; -extern const pm_char STR_SD_CARD[]; -extern const pm_char STR_SDHC_CARD[]; -extern const pm_char STR_NO_SOUNDS_ON_SD[]; -extern const pm_char STR_NO_MODELS_ON_SD[]; -extern const pm_char STR_NO_BITMAPS_ON_SD[]; -extern const pm_char STR_NO_SCRIPTS_ON_SD[]; -extern const pm_char STR_SCRIPT_SYNTAX_ERROR[]; -extern const pm_char STR_SCRIPT_PANIC[]; -extern const pm_char STR_SCRIPT_KILLED[]; -extern const pm_char STR_SCRIPT_ERROR[]; -extern const pm_char STR_PLAY_FILE[]; -extern const pm_char STR_ASSIGN_BITMAP[]; +extern const char STR_SPEAKER_VOLUME[]; +extern const char STR_LCD[]; +extern const char STR_BRIGHTNESS[]; +extern const char STR_CPU_TEMP[]; +extern const char STR_CPU_CURRENT[]; +extern const char STR_CPU_MAH[]; +extern const char STR_COPROC[]; +extern const char STR_COPROC_TEMP[]; +extern const char STR_CAPAWARNING[]; +extern const char STR_TEMPWARNING[]; +extern const char STR_FUNC[]; +extern const char STR_V1[]; +extern const char STR_V2[]; +extern const char STR_DURATION[]; +extern const char STR_DELAY[]; +extern const char STR_SD_CARD[]; +extern const char STR_SDHC_CARD[]; +extern const char STR_NO_SOUNDS_ON_SD[]; +extern const char STR_NO_MODELS_ON_SD[]; +extern const char STR_NO_BITMAPS_ON_SD[]; +extern const char STR_NO_SCRIPTS_ON_SD[]; +extern const char STR_SCRIPT_SYNTAX_ERROR[]; +extern const char STR_SCRIPT_PANIC[]; +extern const char STR_SCRIPT_KILLED[]; +extern const char STR_SCRIPT_ERROR[]; +extern const char STR_PLAY_FILE[]; +extern const char STR_ASSIGN_BITMAP[]; #if defined(PCBHORUS) -extern const pm_char STR_ASSIGN_SPLASH[]; +extern const char STR_ASSIGN_SPLASH[]; #endif -extern const pm_char STR_EXECUTE_FILE[]; -extern const pm_char STR_DELETE_FILE[]; -extern const pm_char STR_COPY_FILE[]; -extern const pm_char STR_RENAME_FILE[]; -extern const pm_char STR_REMOVED[]; -extern const pm_char STR_SD_INFO[]; -extern const pm_char STR_SD_FORMAT[]; -extern const pm_char STR_NA[]; -extern const pm_char STR_HARDWARE[]; -extern const pm_char STR_FORMATTING[]; -extern const pm_char STR_TEMP_CALIB[]; -extern const pm_char STR_TIME[]; -extern const pm_char STR_MAXBAUDRATE[]; -extern const pm_char STR_BAUDRATE[]; -extern const pm_char STR_SD_INFO_TITLE[]; -extern const pm_char STR_SD_TYPE[]; -extern const pm_char STR_SD_SPEED[]; -extern const pm_char STR_SD_SECTORS[]; -extern const pm_char STR_SD_SIZE[]; -extern const pm_char STR_TYPE[]; -extern const pm_char STR_GLOBAL_VARS[]; -extern const pm_char STR_GVARS[]; -extern const pm_char STR_GLOBAL_VAR[]; -extern const pm_char STR_OWN[]; -extern const pm_char STR_ROTARY_ENCODER[]; -extern const pm_char STR_DATE[]; -extern const pm_char STR_CHANNELS_MONITOR[]; -extern const pm_char STR_MIXERS_MONITOR[]; -extern const pm_char STR_PATH_TOO_LONG[]; -extern const pm_char STR_VIEW_TEXT[]; -extern const pm_char STR_FLASH_BOOTLOADER[]; -extern const pm_char STR_FLASH_EXTERNAL_DEVICE[]; -extern const pm_char STR_FLASH_INTERNAL_MODULE[]; -extern const pm_char STR_FLASH_EXTERNAL_MODULE[]; -extern const pm_char STR_FIRMWARE_UPDATE_ERROR[]; -extern const pm_char STR_WRITING[]; -extern const pm_char STR_CONFIRM_FORMAT[]; -extern const pm_char STR_EEBACKUP[]; -extern const pm_char STR_FACTORYRESET[]; -extern const pm_char STR_CONFIRMRESET[]; -extern const pm_char STR_TOO_MANY_LUA_SCRIPTS[]; -extern const pm_char STR_BLCOLOR[]; +extern const char STR_EXECUTE_FILE[]; +extern const char STR_DELETE_FILE[]; +extern const char STR_COPY_FILE[]; +extern const char STR_RENAME_FILE[]; +extern const char STR_REMOVED[]; +extern const char STR_SD_INFO[]; +extern const char STR_SD_FORMAT[]; +extern const char STR_NA[]; +extern const char STR_HARDWARE[]; +extern const char STR_FORMATTING[]; +extern const char STR_TEMP_CALIB[]; +extern const char STR_TIME[]; +extern const char STR_MAXBAUDRATE[]; +extern const char STR_BAUDRATE[]; +extern const char STR_SD_INFO_TITLE[]; +extern const char STR_SD_TYPE[]; +extern const char STR_SD_SPEED[]; +extern const char STR_SD_SECTORS[]; +extern const char STR_SD_SIZE[]; +extern const char STR_TYPE[]; +extern const char STR_GLOBAL_VARS[]; +extern const char STR_GVARS[]; +extern const char STR_GLOBAL_VAR[]; +extern const char STR_OWN[]; +extern const char STR_ROTARY_ENCODER[]; +extern const char STR_DATE[]; +extern const char STR_CHANNELS_MONITOR[]; +extern const char STR_MIXERS_MONITOR[]; +extern const char STR_PATH_TOO_LONG[]; +extern const char STR_VIEW_TEXT[]; +extern const char STR_FLASH_BOOTLOADER[]; +extern const char STR_FLASH_EXTERNAL_DEVICE[]; +extern const char STR_FLASH_INTERNAL_MODULE[]; +extern const char STR_FLASH_EXTERNAL_MODULE[]; +extern const char STR_FIRMWARE_UPDATE_ERROR[]; +extern const char STR_WRITING[]; +extern const char STR_CONFIRM_FORMAT[]; +extern const char STR_EEBACKUP[]; +extern const char STR_FACTORYRESET[]; +extern const char STR_CONFIRMRESET[]; +extern const char STR_TOO_MANY_LUA_SCRIPTS[]; +extern const char STR_BLCOLOR[]; struct LanguagePack { const char * id; @@ -807,11 +807,11 @@ extern const pm_char STR_BLCOLOR[]; inline PLAY_FUNCTION(playNumber, getvalue_t number, uint8_t unit, uint8_t flags) { currentLanguagePack->playNumber(number, unit, flags, id); } inline PLAY_FUNCTION(playDuration, int seconds, uint8_t flags) { currentLanguagePack->playDuration(seconds, flags, id); } - extern const pm_char STR_MODELNAME[]; - extern const pm_char STR_PHASENAME[]; - extern const pm_char STR_MIXNAME[]; - extern const pm_char STR_INPUTNAME[]; - extern const pm_char STR_EXPONAME[]; + extern const char STR_MODELNAME[]; + extern const char STR_PHASENAME[]; + extern const char STR_MIXNAME[]; + extern const char STR_INPUTNAME[]; + extern const char STR_EXPONAME[]; #if defined(COLORLCD) #define TR_PHASES_HEADERS { TR_PHASES_HEADERS_NAME, TR_PHASES_HEADERS_SW, TR_PHASES_HEADERS_RUD_TRIM, TR_PHASES_HEADERS_ELE_TRIM, TR_PHASES_HEADERS_THT_TRIM, TR_PHASES_HEADERS_AIL_TRIM, TR_PHASES_HEADERS_CH5_TRIM, TR_PHASES_HEADERS_CH6_TRIM, TR_PHASES_HEADERS_FAD_IN, TR_PHASES_HEADERS_FAD_OUT } @@ -831,176 +831,176 @@ extern const pm_char STR_BLCOLOR[]; extern const char * const STR_GVAR_HEADERS[]; #endif - extern const pm_char STR_TRAINER[]; - extern const pm_char STR_MODULE_BIND[]; - extern const pm_char STR_BINDING_1_8_TELEM_ON[]; - extern const pm_char STR_BINDING_1_8_TELEM_OFF[]; - extern const pm_char STR_BINDING_9_16_TELEM_ON[]; - extern const pm_char STR_BINDING_9_16_TELEM_OFF[]; - extern const pm_char STR_CHANNELRANGE[]; - extern const pm_char STR_ANTENNASELECTION[]; - extern const pm_char STR_ANTENNACONFIRM1[]; - extern const pm_char STR_ANTENNACONFIRM2[]; - extern const pm_char STR_SET[]; - extern const pm_char STR_PREFLIGHT[]; - extern const pm_char STR_CHECKLIST[]; - extern const pm_char STR_VIEW_NOTES[]; - extern const pm_char STR_MODEL_SELECT[]; - extern const pm_char STR_RESET_SUBMENU[]; - extern const pm_char STR_LOWALARM[]; - extern const pm_char STR_CRITICALALARM[]; - extern const pm_char STR_RSSIALARM_WARN[]; - extern const pm_char STR_NO_RSSIALARM[]; - extern const pm_char STR_DISABLE_ALARM[]; - extern const pm_char STR_TELEMETRY_TYPE[]; - extern const pm_char STR_TELEMETRY_SENSORS[]; - extern const pm_char STR_VALUE[]; - extern const pm_char STR_TOPLCDTIMER[]; - extern const pm_char STR_UNIT[] ; - extern const pm_char STR_TELEMETRY_NEWSENSOR[]; - extern const pm_char STR_ID[]; - extern const pm_char STR_PRECISION[]; - extern const pm_char STR_RATIO[]; - extern const pm_char STR_FORMULA[]; - extern const pm_char STR_CELLINDEX[]; - extern const pm_char STR_LOGS[]; - extern const pm_char STR_OPTIONS[]; - extern const pm_char STR_ALTSENSOR[]; - extern const pm_char STR_CELLSENSOR[]; - extern const pm_char STR_GPSSENSOR[]; - extern const pm_char STR_CURRENTSENSOR[]; - extern const pm_char STR_AUTOOFFSET[]; - extern const pm_char STR_ONLYPOSITIVE[]; - extern const pm_char STR_FILTER[]; - extern const pm_char STR_TELEMETRYFULL[]; - extern const pm_char STR_SERVOS_OK[]; - extern const pm_char STR_SERVOS_KO[]; - extern const pm_char STR_INVERTED_SERIAL[]; - extern const pm_char STR_IGNORE_INSTANCE[]; - extern const pm_char STR_DISCOVER_SENSORS[]; - extern const pm_char STR_STOP_DISCOVER_SENSORS[]; - extern const pm_char STR_DELETE_ALL_SENSORS[]; - extern const pm_char STR_CONFIRMDELETE[]; - extern const pm_char STR_SELECT_WIDGET[]; - extern const pm_char STR_REMOVE_WIDGET[]; - extern const pm_char STR_WIDGET_SETTINGS[]; - extern const pm_char STR_REMOVE_SCREEN[]; - extern const pm_char STR_SETUP_WIDGETS[]; - extern const pm_char STR_USER_INTERFACE[]; - extern const pm_char STR_THEME[]; - extern const pm_char STR_SETUP[]; - extern const pm_char STR_MAINVIEWX[]; - extern const pm_char STR_LAYOUT[]; - extern const pm_char STR_ADDMAINVIEW[]; - extern const pm_char STR_BACKGROUND_COLOR[]; - extern const pm_char STR_MAIN_COLOR[]; - extern const pm_char STR_TEXT_VIEWER[]; - extern const pm_char STR_MULTI_RFPOWER[]; + extern const char STR_TRAINER[]; + extern const char STR_MODULE_BIND[]; + extern const char STR_BINDING_1_8_TELEM_ON[]; + extern const char STR_BINDING_1_8_TELEM_OFF[]; + extern const char STR_BINDING_9_16_TELEM_ON[]; + extern const char STR_BINDING_9_16_TELEM_OFF[]; + extern const char STR_CHANNELRANGE[]; + extern const char STR_ANTENNASELECTION[]; + extern const char STR_ANTENNACONFIRM1[]; + extern const char STR_ANTENNACONFIRM2[]; + extern const char STR_SET[]; + extern const char STR_PREFLIGHT[]; + extern const char STR_CHECKLIST[]; + extern const char STR_VIEW_NOTES[]; + extern const char STR_MODEL_SELECT[]; + extern const char STR_RESET_SUBMENU[]; + extern const char STR_LOWALARM[]; + extern const char STR_CRITICALALARM[]; + extern const char STR_RSSIALARM_WARN[]; + extern const char STR_NO_RSSIALARM[]; + extern const char STR_DISABLE_ALARM[]; + extern const char STR_TELEMETRY_TYPE[]; + extern const char STR_TELEMETRY_SENSORS[]; + extern const char STR_VALUE[]; + extern const char STR_TOPLCDTIMER[]; + extern const char STR_UNIT[] ; + extern const char STR_TELEMETRY_NEWSENSOR[]; + extern const char STR_ID[]; + extern const char STR_PRECISION[]; + extern const char STR_RATIO[]; + extern const char STR_FORMULA[]; + extern const char STR_CELLINDEX[]; + extern const char STR_LOGS[]; + extern const char STR_OPTIONS[]; + extern const char STR_ALTSENSOR[]; + extern const char STR_CELLSENSOR[]; + extern const char STR_GPSSENSOR[]; + extern const char STR_CURRENTSENSOR[]; + extern const char STR_AUTOOFFSET[]; + extern const char STR_ONLYPOSITIVE[]; + extern const char STR_FILTER[]; + extern const char STR_TELEMETRYFULL[]; + extern const char STR_SERVOS_OK[]; + extern const char STR_SERVOS_KO[]; + extern const char STR_INVERTED_SERIAL[]; + extern const char STR_IGNORE_INSTANCE[]; + extern const char STR_DISCOVER_SENSORS[]; + extern const char STR_STOP_DISCOVER_SENSORS[]; + extern const char STR_DELETE_ALL_SENSORS[]; + extern const char STR_CONFIRMDELETE[]; + extern const char STR_SELECT_WIDGET[]; + extern const char STR_REMOVE_WIDGET[]; + extern const char STR_WIDGET_SETTINGS[]; + extern const char STR_REMOVE_SCREEN[]; + extern const char STR_SETUP_WIDGETS[]; + extern const char STR_USER_INTERFACE[]; + extern const char STR_THEME[]; + extern const char STR_SETUP[]; + extern const char STR_MAINVIEWX[]; + extern const char STR_LAYOUT[]; + extern const char STR_ADDMAINVIEW[]; + extern const char STR_BACKGROUND_COLOR[]; + extern const char STR_MAIN_COLOR[]; + extern const char STR_TEXT_VIEWER[]; + extern const char STR_MULTI_RFPOWER[]; - extern const pm_char STR_BYTES[]; - extern const pm_char STR_ANTENNAPROBLEM[]; - extern const pm_char STR_MODULE[]; - extern const pm_char STR_ENABLE_POPUP[]; - extern const pm_char STR_DISABLE_POPUP[]; - extern const pm_char STR_POPUP[]; - extern const pm_char STR_MIN[]; - extern const pm_char STR_MAX[]; - extern const pm_char STR_CURVE_PRESET[]; - extern const pm_char STR_PRESET[]; - extern const pm_char STR_MIRROR[]; - extern const pm_char STR_CLEAR[]; - extern const pm_char STR_RESET[]; - extern const pm_char STR_COUNT[]; - extern const pm_char STR_PT[]; - extern const pm_char STR_PTS[]; - extern const pm_char STR_SMOOTH[]; - extern const pm_char STR_COPY_STICKS_TO_OFS[]; - extern const pm_char STR_COPY_TRIMS_TO_OFS[]; - extern const pm_char STR_INCDEC[]; - extern const pm_char STR_GLOBALVAR[]; - extern const pm_char STR_MIXSOURCE[]; - extern const pm_char STR_CONSTANT[]; - extern const pm_char STR_TOP_BAR[]; - extern const pm_char STR_ALTITUDE[]; - extern const pm_char STR_SCALE[]; - extern const pm_char STR_VIEW_CHANNELS[]; - extern const pm_char STR_POTWARNING[]; - extern const pm_char STR_UART3MODE[]; - extern const pm_char STR_THROTTLE_LABEL[]; - extern const pm_char STR_SCRIPT[]; - extern const pm_char STR_INPUTS[]; - extern const pm_char STR_OUTPUTS[]; - extern const pm_char STR_MENU_INPUTS[]; - extern const pm_char STR_MENU_LUA[]; - extern const pm_char STR_MENU_STICKS[]; - extern const pm_char STR_MENU_POTS[]; - extern const pm_char STR_MENU_MAX[]; - extern const pm_char STR_MENU_HELI[]; - extern const pm_char STR_MENU_TRIMS[]; - extern const pm_char STR_MENU_SWITCHES[]; - extern const pm_char STR_MENU_LOGICAL_SWITCHES[]; - extern const pm_char STR_MENU_TRAINER[]; - extern const pm_char STR_MENU_CHANNELS[]; - extern const pm_char STR_MENU_GVARS[]; - extern const pm_char STR_MENU_TELEMETRY[]; - extern const pm_char STR_MENU_DISPLAY[]; - extern const pm_char STR_MENU_OTHER[]; - extern const pm_char STR_MENU_INVERT[]; - extern const pm_char STR_JITTER_FILTER[]; + extern const char STR_BYTES[]; + extern const char STR_ANTENNAPROBLEM[]; + extern const char STR_MODULE[]; + extern const char STR_ENABLE_POPUP[]; + extern const char STR_DISABLE_POPUP[]; + extern const char STR_POPUP[]; + extern const char STR_MIN[]; + extern const char STR_MAX[]; + extern const char STR_CURVE_PRESET[]; + extern const char STR_PRESET[]; + extern const char STR_MIRROR[]; + extern const char STR_CLEAR[]; + extern const char STR_RESET[]; + extern const char STR_COUNT[]; + extern const char STR_PT[]; + extern const char STR_PTS[]; + extern const char STR_SMOOTH[]; + extern const char STR_COPY_STICKS_TO_OFS[]; + extern const char STR_COPY_TRIMS_TO_OFS[]; + extern const char STR_INCDEC[]; + extern const char STR_GLOBALVAR[]; + extern const char STR_MIXSOURCE[]; + extern const char STR_CONSTANT[]; + extern const char STR_TOP_BAR[]; + extern const char STR_ALTITUDE[]; + extern const char STR_SCALE[]; + extern const char STR_VIEW_CHANNELS[]; + extern const char STR_POTWARNING[]; + extern const char STR_UART3MODE[]; + extern const char STR_THROTTLE_LABEL[]; + extern const char STR_SCRIPT[]; + extern const char STR_INPUTS[]; + extern const char STR_OUTPUTS[]; + extern const char STR_MENU_INPUTS[]; + extern const char STR_MENU_LUA[]; + extern const char STR_MENU_STICKS[]; + extern const char STR_MENU_POTS[]; + extern const char STR_MENU_MAX[]; + extern const char STR_MENU_HELI[]; + extern const char STR_MENU_TRIMS[]; + extern const char STR_MENU_SWITCHES[]; + extern const char STR_MENU_LOGICAL_SWITCHES[]; + extern const char STR_MENU_TRAINER[]; + extern const char STR_MENU_CHANNELS[]; + extern const char STR_MENU_GVARS[]; + extern const char STR_MENU_TELEMETRY[]; + extern const char STR_MENU_DISPLAY[]; + extern const char STR_MENU_OTHER[]; + extern const char STR_MENU_INVERT[]; + extern const char STR_JITTER_FILTER[]; #if MENUS_LOCK == 1 - extern const pm_char STR_UNLOCKED[]; - extern const pm_char STR_MODS_FORBIDDEN[]; + extern const char STR_UNLOCKED[]; + extern const char STR_MODS_FORBIDDEN[]; #endif #if defined(PCBTARANIS) || defined(DSM2) - extern const pm_char STR_MODULE_RANGE[]; + extern const char STR_MODULE_RANGE[]; #endif - extern const pm_char STR_ABOUTUS[]; - extern const pm_char STR_ABOUT_OPENTX_1[]; - extern const pm_char STR_ABOUT_OPENTX_2[]; - extern const pm_char STR_ABOUT_OPENTX_3[]; - extern const pm_char STR_ABOUT_OPENTX_4[]; - extern const pm_char STR_ABOUT_OPENTX_5[]; + extern const char STR_ABOUTUS[]; + extern const char STR_ABOUT_OPENTX_1[]; + extern const char STR_ABOUT_OPENTX_2[]; + extern const char STR_ABOUT_OPENTX_3[]; + extern const char STR_ABOUT_OPENTX_4[]; + extern const char STR_ABOUT_OPENTX_5[]; - extern const pm_char STR_ABOUT_BERTRAND_1[]; - extern const pm_char STR_ABOUT_BERTRAND_2[]; - extern const pm_char STR_ABOUT_BERTRAND_3[]; + extern const char STR_ABOUT_BERTRAND_1[]; + extern const char STR_ABOUT_BERTRAND_2[]; + extern const char STR_ABOUT_BERTRAND_3[]; - extern const pm_char STR_ABOUT_MIKE_1[]; - extern const pm_char STR_ABOUT_MIKE_2[]; - extern const pm_char STR_ABOUT_MIKE_3[]; - extern const pm_char STR_ABOUT_MIKE_4[]; + extern const char STR_ABOUT_MIKE_1[]; + extern const char STR_ABOUT_MIKE_2[]; + extern const char STR_ABOUT_MIKE_3[]; + extern const char STR_ABOUT_MIKE_4[]; - extern const pm_char STR_ABOUT_ROMOLO_1[]; - extern const pm_char STR_ABOUT_ROMOLO_2[]; - extern const pm_char STR_ABOUT_ROMOLO_3[]; + extern const char STR_ABOUT_ROMOLO_1[]; + extern const char STR_ABOUT_ROMOLO_2[]; + extern const char STR_ABOUT_ROMOLO_3[]; - extern const pm_char STR_ABOUT_ANDRE_1[]; - extern const pm_char STR_ABOUT_ANDRE_2[]; - extern const pm_char STR_ABOUT_ANDRE_3[]; + extern const char STR_ABOUT_ANDRE_1[]; + extern const char STR_ABOUT_ANDRE_2[]; + extern const char STR_ABOUT_ANDRE_3[]; - extern const pm_char STR_ABOUT_ROB_1[]; - extern const pm_char STR_ABOUT_ROB_2[]; + extern const char STR_ABOUT_ROB_1[]; + extern const char STR_ABOUT_ROB_2[]; - extern const pm_char STR_ABOUT_MARTIN_1[]; - extern const pm_char STR_ABOUT_MARTIN_2[]; + extern const char STR_ABOUT_MARTIN_1[]; + extern const char STR_ABOUT_MARTIN_2[]; - extern const pm_char STR_ABOUT_KJELL_1[]; - extern const pm_char STR_ABOUT_KJELL_2[]; - extern const pm_char STR_ABOUT_KJELL_3[]; - extern const pm_char STR_ABOUT_KJELL_4[]; + extern const char STR_ABOUT_KJELL_1[]; + extern const char STR_ABOUT_KJELL_2[]; + extern const char STR_ABOUT_KJELL_3[]; + extern const char STR_ABOUT_KJELL_4[]; - extern const pm_char STR_ABOUT_HARDWARE_1[]; - extern const pm_char STR_ABOUT_HARDWARE_2[]; - extern const pm_char STR_ABOUT_HARDWARE_3[]; + extern const char STR_ABOUT_HARDWARE_1[]; + extern const char STR_ABOUT_HARDWARE_2[]; + extern const char STR_ABOUT_HARDWARE_3[]; - extern const pm_char STR_ABOUT_PARENTS_1[]; - extern const pm_char STR_ABOUT_PARENTS_2[]; - extern const pm_char STR_ABOUT_PARENTS_3[]; - extern const pm_char STR_ABOUT_PARENTS_4[]; + extern const char STR_ABOUT_PARENTS_1[]; + extern const char STR_ABOUT_PARENTS_2[]; + extern const char STR_ABOUT_PARENTS_3[]; + extern const char STR_ABOUT_PARENTS_4[]; #define CHR_SHORT TR_CHR_SHORT #define CHR_LONG TR_CHR_LONG diff --git a/radio/util/addtr.py b/radio/util/addtr.py index af5310be3..adcc2b0b1 100755 --- a/radio/util/addtr.py +++ b/radio/util/addtr.py @@ -25,13 +25,13 @@ def modifyTranslations(constant, translation, after): def modifyDeclaration(constant, after): - newline = "extern const pm_char S" + constant + "[];" + newline = "extern const char S" + constant + "[];" filename = "translations.h" addLine(filename, newline, after + "[];") def modifyDefinition(constant, after): - newline = "const pm_char S" + constant + "[] = " + constant + ";" + newline = "const char S" + constant + "[] = " + constant + ";" filename = "translations.cpp" addLine(filename, newline, after + "[] ")