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

fix(B&W): Avoid having constants in SRAM (#2993)

Browse Source 
fix constness to avoid having constants in data segment 
.... and thus free some precious RAM
This commit is contained in:
Raphael Coeffic
2023-01-18 20:12:35 +10:00
committed by GitHub
parent acd44516d0
commit acd95dfad4
22 changed files with 176 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/gui_common.cpp
+61 -61
View File
@@ -1164,68 +1164,68 @@ int convertMultiToOtx(int type)
// we don't need the special eeprom/flash string handling, just define them as
// local strings
const char* STR_SUBTYPE_FLYSKY[] = {"Std","V9x9","V6x6","V912","CX20"};
const char* STR_SUBTYPE_HUBSAN[] = {"H107","H301","H501"};
const char* STR_SUBTYPE_FRSKY[] = {"D16","D8","D16 8ch","V8","LBT(EU)","LBT 8ch","D8Cloned","D16Cloned"};
const char* STR_SUBTYPE_HISKY[] = {"Std","HK310"};
const char* STR_SUBTYPE_V2X2[] = {"Std","JXD506","MR101"};
const char* STR_SUBTYPE_DSM[] = {"2 1F","2 2F","X 1F","X 2F","Auto","R 1F"};
const char* STR_SUBTYPE_DEVO[] = {"8ch","10ch","12ch","6ch","7ch"};
const char* STR_SUBTYPE_YD717[] = {"Std","SkyWlkr","Syma X4","XINXUN","NIHUI"};
const char* STR_SUBTYPE_KN[] = {"WLtoys","FeiLun"};
const char* STR_SUBTYPE_SYMAX[] = {"Std","X5C"};
const char* STR_SUBTYPE_SLT[] = {"V1_6ch","V2_8ch","Q100","Q200","MR100"};
const char* STR_SUBTYPE_CX10[] = {"Green","Blue","DM007","-","JC3015a","JC3015b","MK33041"};
const char* STR_SUBTYPE_CG023[] = {"Std","YD829"};
const char* STR_SUBTYPE_BAYANG[] = {"Std","H8S3D","X16 AH","IRDrone","DHD D4","QX100"};
const char* STR_SUBTYPE_ESky[] = {"Std","ET4"};
const char* STR_SUBTYPE_MT99[] = {"MT99","H7","YZ","LS","FY805","A180","Dragon","F949G"};
const char* STR_SUBTYPE_MJXQ[] = {"WLH08","X600","X800","H26D","E010","H26WH","Phoenix"};
const char* STR_SUBTYPE_FY326[] = {"Std","FY319"};
const char* STR_SUBTYPE_FUTABA[] = {"SFHSS"};
const char* STR_SUBTYPE_HONTAI[] = {"Std","JJRC X1","X5C1","FQ_951"};
const char* STR_SUBTYPE_AFHDS2A[] = {"PWM,IBUS","PPM,IBUS","PWM,SBUS","PPM,SBUS","PWM,IB16","PPM,IB16"};
const char* STR_SUBTYPE_Q2X2[] = {"Q222","Q242","Q282"};
const char* STR_SUBTYPE_WK2x01[] = {"WK2801","WK2401","W6_5_1","W6_6_1","W6_HeL","W6_HeI"};
const char* STR_SUBTYPE_Q303[] = {"Std","CX35","CX10D","CX10WD"};
const char* STR_SUBTYPE_CABELL[] = {"V3","V3 Telm","-","-","-","-","F-Safe","Unbind"};
const char* STR_SUBTYPE_ESKY150[] = {"4ch","7ch"};
const char* STR_SUBTYPE_H83D[] = {"Std","H20H","H20Mini","H30Mini"};
const char* STR_SUBTYPE_CORONA[] = {"V1","V2","FD V3"};
const char* STR_SUBTYPE_HITEC[] = {"Optima","Opt Hub","Minima"};
const char* STR_SUBTYPE_WFLY[] = {"WFR0x"};
const char* STR_SUBTYPE_BUGS_MINI[] = {"Std","Bugs3H"};
const char* STR_SUBTYPE_TRAXXAS[] = {"6519"};
const char* STR_SUBTYPE_E01X[] = {"E012","E015"};
const char* STR_SUBTYPE_V911S[] = {"Std","E119"};
const char* STR_SUBTYPE_GD00X[] = {"GD_V1","GD_V2"};
const char* STR_SUBTYPE_V761[] = {"3ch","4ch"};
const char* STR_SUBTYPE_KF606[] = {"KF606","MIG320"};
const char* STR_SUBTYPE_REDPINE[] = {"Fast","Slow"};
const char* STR_SUBTYPE_POTENSIC[] = {"A20"};
const char* STR_SUBTYPE_ZSX[] = {"280JJRC"};
const char* STR_SUBTYPE_HEIGHT[] = {"5ch","8ch"};
const char* STR_SUBTYPE_FRSKYX_RX[] = {"RX","CloneTX"};
const char* STR_SUBTYPE_HOTT[] = {"Sync","No_Sync"};
const char* STR_SUBTYPE_FX816[] = {"P38"};
const char* STR_SUBTYPE_PELIKAN[] = {"Pro","Lite","SCX24"};
const char* STR_SUBTYPE_XK[] = {"X450","X420"};
const char* STR_SUBTYPE_XN297DUMP[] = {"250K","1M","2M","AUTO","NRF","CC2500"};
const char* STR_SUBTYPE_FRSKYX2[] = {"D16","D16 8ch","LBT(EU)","LBT 8ch","Cloned","Clone8ch"};
const char* STR_SUBTYPE_FRSKYR9[] = {"915MHz","868MHz","915 8ch","868 8ch","FCC","---","FCC 8ch"};
const char* STR_SUBTYPE_PROPEL[] = {"74-Z"};
const char* STR_SUBTYPE_FRSKYL[] = {"LR12","LR12 6ch"};
const char* STR_SUBTYPE_ESKY150V2[] = {"150 V2"};
const char* STR_SUBTYPE_JJRC345[] = {"Std","SkyTmbr"};
const char* STR_SUBTYPE_KYOSHO[] = {"FHSS","Hype"};
const char* STR_SUBTYPE_RLINK[] = {"Surface","Air","DumboRC"};
const char* STR_SUBTYPE_ELRS[] = {"N/A WIP"};
const char* STR_SUBTYPE_REALACC[] = {"R11"};
const char* STR_SUBTYPE_WFLY2[] = {"RF20x"};
const char* STR_SUBTYPE_MOULDKG[] = {"Analog","Digital"};
const char* STR_SUBTYPE_MT992[] = {"PA18"};
const char* const STR_SUBTYPE_FLYSKY[] = {"Std","V9x9","V6x6","V912","CX20"};
const char* const STR_SUBTYPE_HUBSAN[] = {"H107","H301","H501"};
const char* const STR_SUBTYPE_FRSKY[] = {"D16","D8","D16 8ch","V8","LBT(EU)","LBT 8ch","D8Cloned","D16Cloned"};
const char* const STR_SUBTYPE_HISKY[] = {"Std","HK310"};
const char* const STR_SUBTYPE_V2X2[] = {"Std","JXD506","MR101"};
const char* const STR_SUBTYPE_DSM[] = {"2 1F","2 2F","X 1F","X 2F","Auto","R 1F"};
const char* const STR_SUBTYPE_DEVO[] = {"8ch","10ch","12ch","6ch","7ch"};
const char* const STR_SUBTYPE_YD717[] = {"Std","SkyWlkr","Syma X4","XINXUN","NIHUI"};
const char* const STR_SUBTYPE_KN[] = {"WLtoys","FeiLun"};
const char* const STR_SUBTYPE_SYMAX[] = {"Std","X5C"};
const char* const STR_SUBTYPE_SLT[] = {"V1_6ch","V2_8ch","Q100","Q200","MR100"};
const char* const STR_SUBTYPE_CX10[] = {"Green","Blue","DM007","-","JC3015a","JC3015b","MK33041"};
const char* const STR_SUBTYPE_CG023[] = {"Std","YD829"};
const char* const STR_SUBTYPE_BAYANG[] = {"Std","H8S3D","X16 AH","IRDrone","DHD D4","QX100"};
const char* const STR_SUBTYPE_ESky[] = {"Std","ET4"};
const char* const STR_SUBTYPE_MT99[] = {"MT99","H7","YZ","LS","FY805","A180","Dragon","F949G"};
const char* const STR_SUBTYPE_MJXQ[] = {"WLH08","X600","X800","H26D","E010","H26WH","Phoenix"};
const char* const STR_SUBTYPE_FY326[] = {"Std","FY319"};
const char* const STR_SUBTYPE_FUTABA[] = {"SFHSS"};
const char* const STR_SUBTYPE_HONTAI[] = {"Std","JJRC X1","X5C1","FQ_951"};
const char* const STR_SUBTYPE_AFHDS2A[] = {"PWM,IBUS","PPM,IBUS","PWM,SBUS","PPM,SBUS","PWM,IB16","PPM,IB16"};
const char* const STR_SUBTYPE_Q2X2[] = {"Q222","Q242","Q282"};
const char* const STR_SUBTYPE_WK2x01[] = {"WK2801","WK2401","W6_5_1","W6_6_1","W6_HeL","W6_HeI"};
const char* const STR_SUBTYPE_Q303[] = {"Std","CX35","CX10D","CX10WD"};
const char* const STR_SUBTYPE_CABELL[] = {"V3","V3 Telm","-","-","-","-","F-Safe","Unbind"};
const char* const STR_SUBTYPE_ESKY150[] = {"4ch","7ch"};
const char* const STR_SUBTYPE_H83D[] = {"Std","H20H","H20Mini","H30Mini"};
const char* const STR_SUBTYPE_CORONA[] = {"V1","V2","FD V3"};
const char* const STR_SUBTYPE_HITEC[] = {"Optima","Opt Hub","Minima"};
const char* const STR_SUBTYPE_WFLY[] = {"WFR0x"};
const char* const STR_SUBTYPE_BUGS_MINI[] = {"Std","Bugs3H"};
const char* const STR_SUBTYPE_TRAXXAS[] = {"6519"};
const char* const STR_SUBTYPE_E01X[] = {"E012","E015"};
const char* const STR_SUBTYPE_V911S[] = {"Std","E119"};
const char* const STR_SUBTYPE_GD00X[] = {"GD_V1","GD_V2"};
const char* const STR_SUBTYPE_V761[] = {"3ch","4ch"};
const char* const STR_SUBTYPE_KF606[] = {"KF606","MIG320"};
const char* const STR_SUBTYPE_REDPINE[] = {"Fast","Slow"};
const char* const STR_SUBTYPE_POTENSIC[] = {"A20"};
const char* const STR_SUBTYPE_ZSX[] = {"280JJRC"};
const char* const STR_SUBTYPE_HEIGHT[] = {"5ch","8ch"};
const char* const STR_SUBTYPE_FRSKYX_RX[] = {"RX","CloneTX"};
const char* const STR_SUBTYPE_HOTT[] = {"Sync","No_Sync"};
const char* const STR_SUBTYPE_FX816[] = {"P38"};
const char* const STR_SUBTYPE_PELIKAN[] = {"Pro","Lite","SCX24"};
const char* const STR_SUBTYPE_XK[] = {"X450","X420"};
const char* const STR_SUBTYPE_XN297DUMP[] = {"250K","1M","2M","AUTO","NRF","CC2500"};
const char* const STR_SUBTYPE_FRSKYX2[] = {"D16","D16 8ch","LBT(EU)","LBT 8ch","Cloned","Clone8ch"};
const char* const STR_SUBTYPE_FRSKYR9[] = {"915MHz","868MHz","915 8ch","868 8ch","FCC","---","FCC 8ch"};
const char* const STR_SUBTYPE_PROPEL[] = {"74-Z"};
const char* const STR_SUBTYPE_FRSKYL[] = {"LR12","LR12 6ch"};
const char* const STR_SUBTYPE_ESKY150V2[] = {"150 V2"};
const char* const STR_SUBTYPE_JJRC345[] = {"Std","SkyTmbr"};
const char* const STR_SUBTYPE_KYOSHO[] = {"FHSS","Hype"};
const char* const STR_SUBTYPE_RLINK[] = {"Surface","Air","DumboRC"};
const char* const STR_SUBTYPE_ELRS[] = {"N/A WIP"};
const char* const STR_SUBTYPE_REALACC[] = {"R11"};
const char* const STR_SUBTYPE_WFLY2[] = {"RF20x"};
const char* const STR_SUBTYPE_MOULDKG[] = {"Analog","Digital"};
const char* const STR_SUBTYPE_MT992[] = {"PA18"};
const char* mm_options_strings::options[] = {
const char* const mm_options_strings::options[] = {
nullptr,
STR_MULTI_OPTION,
STR_MULTI_RFTUNE,