# HG changeset patch # User Jan Mulder # Date 1554126641 -7200 # Node ID 2bb1db22b5f5dd59cb4423a4d52b85454ccc1e15 # Parent ceecabfddb57574976e8bb6039f26c6e59f57587 cleanup: random set of cleanups A random set of cleanups, as found during code reading, and looking around fixing issues. Contains all kinds of things: typo's in comment, typo in variable name, removal of unused code, making things static where possible. Does not contain any functional changes. Signed-off-by: Jan Mulder diff -r ceecabfddb57 -r 2bb1db22b5f5 Common/Inc/data_central.h --- a/Common/Inc/data_central.h Sun Mar 31 19:35:51 2019 +0200 +++ b/Common/Inc/data_central.h Mon Apr 01 15:50:41 2019 +0200 @@ -391,12 +391,10 @@ uint8_t uw; } bit8_Type; -//extern SDiveState stateReal; only via const SDiveState stateRealGetPointer(void); extern SDiveState stateSim; extern SDiveState stateDeco; extern uint8_t decoLock; extern const SDiveState * stateUsed; -extern SLifeData2 secondaryInformation; enum DECO_LOCK{ diff -r ceecabfddb57 -r 2bb1db22b5f5 Discovery/Inc/simulation.h --- a/Discovery/Inc/simulation.h Sun Mar 31 19:35:51 2019 +0200 +++ b/Discovery/Inc/simulation.h Mon Apr 01 15:50:41 2019 +0200 @@ -45,10 +45,8 @@ void simulation_start(int aim_depth); void simulation_exit(void); -void simulation_set_aim_depth(int depth_meter); void simulation_set_heed_decostops(_Bool heed_decostops_while_ascending); -void simulation_add_time(int minutes); void simulation_UpdateLifeData( _Bool checkOncePerSecond); void simulation_set_zero_time_descent(void); diff -r ceecabfddb57 -r 2bb1db22b5f5 Discovery/Inc/text_multilanguage.h --- a/Discovery/Inc/text_multilanguage.h Sun Mar 31 19:35:51 2019 +0200 +++ b/Discovery/Inc/text_multilanguage.h Mon Apr 01 15:50:41 2019 +0200 @@ -137,16 +137,6 @@ TXT_Information, /* */ TXT_END, - /* */ - // unused TXT_Conservatism, - // unused TXT_enter, - // unused TXT_down, - // unused TXT_Change, - // unused TXT_Luftintegration, - // unused TXT_FirmwareUpdate, - // unused TXT_ppo2_setting, - // unused TXT_Yes, - // unused TXT_No, TXT_MINIMAL = '\xFE', TXT_2BYTE = '\xFF', @@ -305,13 +295,6 @@ /* */ TXT2BYTE_FLIPDISPLAY, TXT2BYTE_END - - // unused TXT2BYTE_Button1, - // unused TXT2BYTE_Button2, - // unused TXT2BYTE_Button3, - // unused TXT2BYTE_Button4, - }; #endif /* TEXT_MULTILINGUAGE_H */ - diff -r ceecabfddb57 -r 2bb1db22b5f5 Discovery/Src/base.c --- a/Discovery/Src/base.c Sun Mar 31 19:35:51 2019 +0200 +++ b/Discovery/Src/base.c Mon Apr 01 15:50:41 2019 +0200 @@ -260,7 +260,9 @@ RTC_HandleTypeDef RtcHandle; /* used to change time and date, no RTC is running on this MCU */ TIM_HandleTypeDef TimHandle; /* used in stm32f4xx_it.c too */ TIM_HandleTypeDef TimBacklightHandle; /* used in stm32f4xx_it.c too */ +#ifdef DEMOMODE TIM_HandleTypeDef TimDemoHandle; /* used in stm32f4xx_it.c too */ +#endif uint8_t LastButtonPressed; uint32_t LastButtonPressedTick; @@ -660,26 +662,6 @@ timeout_in_seconds = 0; } break; -/* why was this here? 160317 hw - case BaseInfo: - if(status.page == InfoPageLogList) - { - exitLog(); - } - else - if(status.page == InfoPageLogShow) - { - show_logbook_exit(); - exitLog(); - } - else - if(status.page != InfoPageCompass) - { - exitInfo(); - } - timeout_in_seconds = 0; - break; -*/ default: break; } diff -r ceecabfddb57 -r 2bb1db22b5f5 Discovery/Src/data_central.c --- a/Discovery/Src/data_central.c Sun Mar 31 19:35:51 2019 +0200 +++ b/Discovery/Src/data_central.c Mon Apr 01 15:50:41 2019 +0200 @@ -71,12 +71,10 @@ #include "tCCR.h" #include "crcmodel.h" -SDiveState stateReal = { 0 }; +static SDiveState stateReal = { 0 }; SDiveState stateSim = { 0 }; SDiveState stateDeco = { 0 }; -SLifeData2 secondaryInformation = { 0 }; - SDevice stateDevice = { /* max is 0x7FFFFFFF, min is 0x80000000 but also defined in stdint.h :-) */ @@ -117,11 +115,7 @@ _Bool is_stateUsedSetToSim(void) { - if(stateUsed == &stateSim) - return 1; - else - return 0; - + return stateUsed == &stateSim; } const SDiveState * stateRealGetPointer(void) diff -r ceecabfddb57 -r 2bb1db22b5f5 Discovery/Src/externLogbookFlash.c --- a/Discovery/Src/externLogbookFlash.c Sun Mar 31 19:35:51 2019 +0200 +++ b/Discovery/Src/externLogbookFlash.c Mon Apr 01 15:50:41 2019 +0200 @@ -2025,7 +2025,7 @@ { } } - +/* uint8_t ext_flash_erase_firmware_if_not_empty(void) { const uint8_t TESTSIZE_FW = 4; @@ -2076,4 +2076,4 @@ } else return 0; -} +}*/ diff -r ceecabfddb57 -r 2bb1db22b5f5 Discovery/Src/logbook.c --- a/Discovery/Src/logbook.c Sun Mar 31 19:35:51 2019 +0200 +++ b/Discovery/Src/logbook.c Mon Apr 01 15:50:41 2019 +0200 @@ -1342,6 +1342,7 @@ static void logbook_SetCompartmentDesaturation(void) { const SDiveState * pStateReal = stateRealGetPointer(); + SLifeData2 secondaryInformation = { 0 }; decom_tissues_desaturation_time(&pStateReal->lifeData, &secondaryInformation); for(int i=0;i<16;i++) diff -r ceecabfddb57 -r 2bb1db22b5f5 Discovery/Src/simulation.c --- a/Discovery/Src/simulation.c Sun Mar 31 19:35:51 2019 +0200 +++ b/Discovery/Src/simulation.c Mon Apr 01 15:50:41 2019 +0200 @@ -44,15 +44,16 @@ #include "logbook_miniLive.h" //Private state variables -float sim_aim_depth_meter; -_Bool sim_head_decostops = 1; +static float sim_aim_depth_meter; +static _Bool sim_heed_decostops = 1; -const float sim_descent_rate_meter_per_min = 20; +static const float sim_descent_rate_meter_per_min = 20; //Private functions -float sim_get_ambiant_pressure(SDiveState * pDiveState); -void sim_reduce_deco_time_one_second(SDiveState* pDiveState); +static float sim_get_ambiant_pressure(SDiveState * pDiveState); +static void sim_reduce_deco_time_one_second(SDiveState* pDiveState); +static void simulation_set_aim_depth(int depth_meter); /** ****************************************************************************** @@ -63,7 +64,7 @@ */ void simulation_set_heed_decostops(_Bool heed_decostops_while_ascending) { - sim_head_decostops = heed_decostops_while_ascending; + sim_heed_decostops = heed_decostops_while_ascending; } /** @@ -83,7 +84,7 @@ aim_depth = 20; simulation_set_aim_depth(aim_depth); timer_init(); - stateUsed = &stateSim; + set_stateUsedToSim(); stateSim.lifeData.boolResetAverageDepth = 1; decoLock = DECO_CALC_init_as_is_start_of_dive; @@ -262,7 +263,7 @@ *@param minutes * @return float : new pressure */ -void simulation_add_time(int minutes) +static void simulation_add_time(int minutes) { for(int i = 0; i < 60 * minutes; i++) { @@ -293,7 +294,7 @@ _Bool simulation_get_heed_decostops(void) { - return sim_head_decostops; + return sim_heed_decostops; } /** @@ -303,7 +304,7 @@ *@param depth_meter * @return float : new pressure */ -void simulation_set_aim_depth(int depth_meter) +static void simulation_set_aim_depth(int depth_meter) { sim_aim_depth_meter = depth_meter; } @@ -317,7 +318,7 @@ * @param SDiveState* pDiveState: * @return float : new ambiant pressure */ -float sim_get_ambiant_pressure(SDiveState * pDiveState) +static float sim_get_ambiant_pressure(SDiveState * pDiveState) { //Calc next depth uint8_t actual_deco_stop = decom_get_actual_deco_stop(pDiveState); @@ -336,7 +337,7 @@ if(depth_meter < sim_aim_depth_meter) depth_meter = sim_aim_depth_meter; - if(sim_head_decostops && depth_meter < actual_deco_stop) + if(sim_heed_decostops && depth_meter < actual_deco_stop) { if(actual_deco_stop < (depth_meter + pDiveState->diveSettings.ascentRate_meterperminute / 60)) depth_meter = actual_deco_stop; @@ -461,7 +462,7 @@ } } -float sGChelper_bar(uint16_t depth_meter) +static float sGChelper_bar(uint16_t depth_meter) { SDiveState * pDiveState = &stateSim; float ambient, surface, density, meter; diff -r ceecabfddb57 -r 2bb1db22b5f5 Discovery/Src/t6_apnea.c --- a/Discovery/Src/t6_apnea.c Sun Mar 31 19:35:51 2019 +0200 +++ b/Discovery/Src/t6_apnea.c Mon Apr 01 15:50:41 2019 +0200 @@ -48,7 +48,7 @@ uint8_t t6_selection_customview = 0; -/* Importend function prototypes ---------------------------------------------*/ +/* Imported function prototypes ---------------------------------------------*/ /* Private types -------------------------------------------------------------*/ diff -r ceecabfddb57 -r 2bb1db22b5f5 Discovery/Src/t7.c --- a/Discovery/Src/t7.c Sun Mar 31 19:35:51 2019 +0200 +++ b/Discovery/Src/t7.c Mon Apr 01 15:50:41 2019 +0200 @@ -56,7 +56,6 @@ void t7_debug(void); void t7_miniLiveLogProfile(void); -//void t7_clock(void); void t7_logo_OSTC(void); static void t7_colorscheme_mod(char *text); @@ -549,8 +548,6 @@ void t7_refresh(void) { static uint8_t last_mode = MODE_SURFACE; - -// uint32_t oldScreen;//, oldPlugin; SStateList status; get_globalStateList(&status); @@ -1131,7 +1128,6 @@ draw_frame(0,0, CLUT_pluginboxSurface, CLUT_Font020); } - void t7_refresh_surface_debugmode_wireless_info(void) { char text[400]; @@ -1483,8 +1479,6 @@ selection_customview = settingsGetPointer()->tX_customViewPrimary; } - -// for CVIEW_END is none_or_debug void t7_change_customview(void) { const uint8_t *pViews; @@ -2658,7 +2652,6 @@ } } - void draw_frame(_Bool PluginBoxHeader, _Bool LinesOnTheSides, uint8_t colorBox, uint8_t colorLinesOnTheSide) { point_t LeftLow, WidthHeight; @@ -3122,212 +3115,8 @@ GFX_write_string(&FontT42, &t7cY0free, text, 1); } - - - -/* - point_t start, change, stop; - float value; - uint16_t front; - uint8_t color; - - - start.y = t7cH.WindowY0 - 5; - start.x = CUSTOMBOX_LINE_LEFT + CUSTOMBOX_INSIDE_OFFSET; - stop.x = start.x + CUSTOMBOX_SPACE_INSIDE; - - - for(int i=0;i<16;i++) - { - stop.y = start.y; - change.y = start.y; - - value = pState->lifeData.tissue_nitrogen_bar[i] - 0.7512f; - value *= 20; - - if(value < 0) - front = 0; - else - if(value > CUSTOMBOX_SPACE_INSIDE) - front = CUSTOMBOX_SPACE_INSIDE; - else - front = (uint16_t)value; - - change.x = start.x + front; - if(change.x != start.x) - GFX_draw_thick_line(1,&t7screen, start, change, CLUT_Font020); - if(change.x != stop.x) - GFX_draw_thick_line(1,&t7screen, change, stop, CLUT_Font021); - - start.y -= 3; - } - - // He - start.y -= 28 + 14; - for(int i=0;i<16;i++) - { - stop.y = start.y; - change.y = start.y; - - value = pState->lifeData.tissue_helium_bar[i]; - value *= 20; - - if(value < 0) - front = 0; - else - if(value > CUSTOMBOX_SPACE_INSIDE) - front = CUSTOMBOX_SPACE_INSIDE; - else - front = (uint16_t)value; - - change.x = start.x + front; - if(change.x != start.x) - GFX_draw_thick_line(1,&t7screen, start, change, CLUT_Font020); - if(change.x != stop.x) - GFX_draw_thick_line(1,&t7screen, change, stop, CLUT_Font021); - - start.y -= 3; - } - - // CNS == Oxygen - start.y -= 28 + 14; - - value = pState->lifeData.cns; - value *= (CUSTOMBOX_SPACE_INSIDE/2); - value /= 100; - - if(value < 0) - front = 0; - else - if(value > CUSTOMBOX_SPACE_INSIDE) - front = CUSTOMBOX_SPACE_INSIDE; - else - front = (uint16_t)value; - - if(pState->lifeData.cns < 95) - color = CLUT_Font020; - else - if(pState->lifeData.cns < 100) - color = CLUT_WarningYellow; - else - color = CLUT_WarningRed; - - for(int i=0;i<16;i++) - { - stop.y = start.y; - change.y = start.y; - - change.x = start.x + front; - if(change.x != start.x) - GFX_draw_thick_line(1,&t7screen, start, change, color); - if(change.x != stop.x) - GFX_draw_thick_line(1,&t7screen, change, stop, CLUT_Font021); - - start.y -= 3; - } - - // where is the onload/offload limit for N2 and He - decom_get_inert_gases(pState->lifeData.pressure_ambient_bar, &pState->lifeData.actualGas, &percent_N2, &percent_He); - partial_pressure_N2 = (pState->lifeData.pressure_ambient_bar - WATER_VAPOUR_PRESSURE) * percent_N2; - partial_pressure_He = (pState->lifeData.pressure_ambient_bar - WATER_VAPOUR_PRESSURE) * percent_He; - - if((percent_N2 > 0) && (partial_pressure_N2 > (0.8f + 0.5f))) - { - start.y = t7cH.WindowY0 + 1 - 5; - stop.y = start.y - (3 * 15) - 1; - - value = partial_pressure_N2; - value *= 20; - - if(value < 0) - front = 3; - else - if(value + 5 > CUSTOMBOX_SPACE_INSIDE) - front = CUSTOMBOX_SPACE_INSIDE - 3; - else - front = (uint16_t)value; - - start.x = CUSTOMBOX_LINE_LEFT + CUSTOMBOX_INSIDE_OFFSET + front; - stop.x = start.x; - GFX_draw_thick_line(2,&t7screen, start, stop, CLUT_EverythingOkayGreen); - } - - if((percent_He > 0) && (partial_pressure_He > 0.5f)) - { - start.y = t7cH.WindowY0 + 1 - 5 - 3*16 - 28 - 14; - stop.y = start.y - (3 * 15) - 1; - - value = partial_pressure_He; - value *= 20; - - if(value < 0) - front = 3; - else - if(value + 5 > CUSTOMBOX_SPACE_INSIDE) - front = CUSTOMBOX_SPACE_INSIDE - 3; - else - front = (uint16_t)value; - - start.x = CUSTOMBOX_LINE_LEFT + CUSTOMBOX_INSIDE_OFFSET + front; - stop.x = start.x; - GFX_draw_thick_line(2,&t7screen, start, stop, CLUT_EverythingOkayGreen); - } - - start.y = t7cH.WindowY0 + 1 - 5 - 6*16 - 2*28 - 2*14; - stop.y = start.y - (3 * 15) - 1; - - start.x = CUSTOMBOX_LINE_LEFT + CUSTOMBOX_INSIDE_OFFSET + CUSTOMBOX_SPACE_INSIDE/2; - stop.x = start.x; - GFX_draw_thick_line(2, &t7screen, start, stop, CLUT_WarningRed); -*/ - -/* -void t7_clock(void) -{ - point_t start, stop; - - - for(uint16_t i=0;i<360;i+=30) - { - start = t7_compass_circle(1,i); - stop = t7_compass_circle(2,i); - start.x += 280; // standard center is 400, 250 - stop.x += 280; - GFX_draw_thick_line(5,&t7screen, start, stop, CLUT_CompassSubTick); - - start.x = 400+280; - start.y = 250; - stop = t7_compass_circle(2,58); - stop.x += 280; - GFX_draw_thick_line(3,&t7screen, start, stop, CLUT_CompassNorthTick); - stop = t7_compass_circle(0,302); - stop.x += 280; - GFX_draw_thick_line(3,&t7screen, start, stop, CLUT_CompassNorthTick); - } -} -*/ - -//static float testCC = 180; void t7_compass(uint16_t ActualHeading, uint16_t UserSetHeading) { - -/* - static uint16_t lastHeading = 0; - float differenceCompass, resultKalman; - - if(testCC > lastHeading) - differenceCompass = testCC - lastHeading; - else - differenceCompass = lastHeading - testCC; - - resultKalman = Kalman_getAngle(differenceCompass, 2, 0.1); - if(testCC > lastHeading) - ActualHeading = lastHeading + resultKalman; - else - ActualHeading = lastHeading - resultKalman; - - lastHeading = ActualHeading; -*/ uint16_t ActualHeadingRose; uint16_t LeftBorderHeading, LineHeading; uint32_t offsetPicture; @@ -3375,22 +3164,7 @@ LastHeading = newHeading; ActualHeading = newHeading; ActualHeadingRose = ActualHeading; -/* - if (ActualHeading < 90) - ActualHeading += 360; - - if(ActualHeading > LastHeading) - { - if((ActualHeading - LastHeading) < 25) - ActualHeading = LastHeading + 1; - } - else - if(ActualHeading < LastHeading) - { - if((LastHeading - ActualHeading) < 25) - ActualHeading = LastHeading - 1; - } -*/ + if(pSettings->FlipDisplay) { ActualHeadingRose = 360 - ActualHeadingRose; diff -r ceecabfddb57 -r 2bb1db22b5f5 Discovery/Src/tInfo.c --- a/Discovery/Src/tInfo.c Sun Mar 31 19:35:51 2019 +0200 +++ b/Discovery/Src/tInfo.c Mon Apr 01 15:50:41 2019 +0200 @@ -88,9 +88,7 @@ /* Private function prototypes -----------------------------------------------*/ void tInfo_build_page(void); -void tInfo_showlog(void); -void tI_draw_tIdesign(void); void tI_set_cursor(uint8_t forThisIdentID); void tI_startInfoFieldSelect(void); void tInfo_write_content_of_actual_Id(void); @@ -100,9 +98,6 @@ void tI_clean_content(uint16_t XleftGimpStyle, uint16_t XrightGimpStyle, uint16_t YtopGimpStyle, const tFont *Font); void tInfo_write_content(uint16_t XleftGimpStyle, uint16_t XrightGimpStyle, uint16_t YtopGimpStyle, const tFont *Font, const char *text, uint8_t color); -void tI_resetInfo(uint8_t color); - -void tI_tInfo_refresh_live_content(void); void tI_evaluateNewString (uint32_t editID, uint32_t *pNewValue1, uint32_t *pNewValue2, uint32_t *pNewValue3, uint32_t *pNewValue4); //void tI_tInfo_newInput (uint32_t editID, uint32_t int1, uint32_t int2, uint32_t int3, uint32_t int4); diff -r ceecabfddb57 -r 2bb1db22b5f5 Discovery/Src/tMenu.c --- a/Discovery/Src/tMenu.c Sun Mar 31 19:35:51 2019 +0200 +++ b/Discovery/Src/tMenu.c Mon Apr 01 15:50:41 2019 +0200 @@ -398,22 +398,6 @@ write_content_simple(&tMscreen, 0, 800, 480-KEY_LABEL_HIGH, &FontT24,localtext,CLUT_ButtonSurfaceScreen); } -/* -_Bool skipCCRpage(uint8_t page) -{ - if(menu.ccrOnlyContentForPage[page]) - { - if(actual_menu_content == MENU_SURFACE) - { - SSettings *data = settingsGetPointer(); - if((data->dive_mode != DIVEMODE_CCR) && data->hideCCRinOCmode) - return 1; - } - } - return 0; -} -*/ - static void findValidPosition(uint8_t *pageOuput, uint8_t *lineOutput) { uint8_t page = 0; @@ -568,9 +552,6 @@ char subtext[MAX_PAGE_TEXTSIZE]; uint16_t tabPosition; -// if(menu.modeFlipPages == 0) -// return; - if((get_globalState() == StMSYS) && (actual_menu_content == MENU_SURFACE)) { page = menu.pageMemoryForNavigation; diff -r ceecabfddb57 -r 2bb1db22b5f5 Discovery/Src/tMenuEdit.c --- a/Discovery/Src/tMenuEdit.c Sun Mar 31 19:35:51 2019 +0200 +++ b/Discovery/Src/tMenuEdit.c Mon Apr 01 15:50:41 2019 +0200 @@ -111,7 +111,6 @@ /* Private function prototypes -----------------------------------------------*/ void draw_tMEdesign(void); -void set_cursor(uint8_t forThisIdentID); void set_cursorNew(uint8_t forThisIdentID); void startMenuEditFieldSelect(void); void create_newText_for_actual_Id(void); diff -r ceecabfddb57 -r 2bb1db22b5f5 Discovery/Src/text_multilanguage.c --- a/Discovery/Src/text_multilanguage.c Sun Mar 31 19:35:51 2019 +0200 +++ b/Discovery/Src/text_multilanguage.c Mon Apr 01 15:50:41 2019 +0200 @@ -1517,14 +1517,6 @@ static uint8_t text_IT_WirelessDisconnect[] = "Disconnesso"; static uint8_t text_ES_WirelessDisconnect[] = "Desconectado"; -/* -static uint8_t text_EN_Luftintegration[] = "air integration"; -static uint8_t text_DE_Luftintegration[] = "Luftintegration"; -static uint8_t text_FR_Luftintegration[] = ""; -static uint8_t text_IT_Luftintegration[] = "ARIA"; -static uint8_t text_ES_Luftintegration[] = "aire integrado"; -*/ - static uint8_t text_EN_FlipDisplay[] = "Flip display"; static uint8_t text_DE_FlipDisplay[] = "Anzeige spiegeln"; static uint8_t text_FR_FlipDisplay[] = ""; @@ -1609,15 +1601,6 @@ {(uint8_t)TXT_LogbookEmpty, {text_EN_LogbookEmpty, text_DE_LogbookEmpty, text_FR_LogbookEmpty, text_IT_LogbookEmpty, text_ES_LogbookEmpty}}, {(uint8_t)TXT_Start_Calculation,{text_EN_Start_Calculation, text_DE_Start_Calculation, text_FR_Start_Calculation, text_IT_Start_Calculation, text_ES_Start_Calculation}}, {(uint8_t)TXT_Information, {text_EN_Information, text_DE_Information, text_FR_Information, text_IT_Information, text_ES_Information}}, - // unused{(uint8_t)TXT_Conservatism, {text_EN_Conservatism, text_DE_Conservatism, text_FR_Conservatism, text_IT_Conservatism, text_ES_Conservatism}}, - // unused{(uint8_t)TXT_Change, {text_EN_Change, text_DE_Change, text_FR_Change, text_IT_Change, text_ES_Change}}, - // unused{(uint8_t)TXT_enter, {text_EN_enter, text_DE_enter, text_FR_enter, text_IT_enter, text_ES_enter}}, - // unused{(uint8_t)TXT_down, {text_EN_down, text_DE_down, text_FR_down, text_IT_down, text_ES_down}}, - // unused{(uint8_t)TXT_Luftintegration, {text_EN_Luftintegration, text_DE_Luftintegration, text_FR_Luftintegration, text_IT_Luftintegration, text_ES_Luftintegration}}, - // unused{(uint8_t)TXT_FirmwareUpdate, {text_EN_FirmwareUpdate, text_DE_FirmwareUpdate, text_FR_FirmwareUpdate, text_IT_FirmwareUpdate, text_ES_FirmwareUpdate}}, - // unused{(uint8_t)TXT_ppo2_setting, {text_EN_ppo2_setting, text_DE_ppo2_setting, text_FR_ppo2_setting, text_IT_ppo2_setting, text_ES_ppo2_setting}}, - // unused{(uint8_t)TXT_Yes, {text_EN_Yes, text_DE_Yes, text_FR_Yes, text_IT_Yes, text_ES_Yes}}, - // unused{(uint8_t)TXT_No, {text_EN_No, text_DE_No, text_FR_No, text_IT_No, text_ES_No}}, }; const tText text_array2[] = @@ -1743,7 +1726,6 @@ {(uint8_t)TXT2BYTE_SetBatteryCharge,{text_EN_SetBatteryCharge, text_DE_SetBatteryCharge, text_FR_SetBatteryCharge, text_IT_SetBatteryCharge, text_ES_SetBatteryCharge}}, {(uint8_t)TXT2BYTE_SetFactoryDefaults,{text_EN_SetFactoryDefaults, text_DE_SetFactoryDefaults, text_FR_SetFactoryDefaults, text_IT_SetFactoryDefaults, text_ES_SetFactoryDefaults}}, - {(uint8_t)TXT2BYTE_Reboot, {text_EN_Reboot, text_DE_Reboot, text_FR_Reboot, text_IT_Reboot, text_ES_Reboot}}, {(uint8_t)TXT2BYTE_ButtonLeft, {text_EN_ButtonLeft, text_DE_ButtonLeft, text_FR_ButtonLeft, text_IT_ButtonLeft, text_ES_ButtonLeft}}, {(uint8_t)TXT2BYTE_ButtonMitte, {text_EN_ButtonMitte, text_DE_ButtonMitte, text_FR_ButtonMitte, text_IT_ButtonMitte, text_ES_ButtonMitte}}, @@ -1755,11 +1737,4 @@ {(uint8_t)TXT2BYTE_FLIPDISPLAY, {text_EN_FlipDisplay, text_DE_FlipDisplay, text_FR_FlipDisplay, text_IT_FlipDisplay, text_ES_FlipDisplay}}, - -// {(uint8_t)TXT2BYTE_ApneaCount, {text_EN_ApneaCount, text_DE_ApneaCount, text_FR_ApneaCount, text_IT_ApneaCount, text_ES_ApneaCount}}, - // unused {(uint8_t)TXT2BYTE_Button1, {text_EN_Button1, text_DE_Button1, text_FR_Button1, text_IT_Button1, text_ES_Button1}}, - // unused {(uint8_t)TXT2BYTE_Button2, {text_EN_Button2, text_DE_Button2, text_FR_Button2, text_IT_Button2, text_ES_Button2}}, - // unused {(uint8_t)TXT2BYTE_Button3, {text_EN_Button3, text_DE_Button3, text_FR_Button3, text_IT_Button3, text_ES_Button3}}, - // unused {(uint8_t)TXT2BYTE_Button4, {text_EN_Button4, text_DE_Button4, text_FR_Button4, text_IT_Button4, text_ES_Button4}}, }; -