Mercurial > public > ostc4
changeset 982:22d5b477c903 GasConsumption
Code cleanup: Remove disabled option to switch deco calc on/off
author | Ideenmodellierer |
---|---|
date | Sun, 02 Mar 2025 21:42:45 +0100 (13 days ago) |
parents | c6c781a2e85b |
children | 7891160acde3 |
files | Common/Inc/settings.h Discovery/Src/settings.c Discovery/Src/tMenuEditGasOC.c Discovery/Src/vpm.c |
diffstat | 4 files changed, 3 insertions(+), 69 deletions(-) [+] |
line wrap: on
line diff
--- a/Common/Inc/settings.h Tue Feb 11 18:12:00 2025 +0100 +++ b/Common/Inc/settings.h Sun Mar 02 21:42:45 2025 +0100 @@ -120,9 +120,6 @@ uint8_t deco:1; uint8_t travel:1; uint8_t off:1; -#ifdef ENABLE_DECOCALC_OPTION -uint8_t decocalc:1; -#endif uint8_t spare:2; } gasubit8_t;
--- a/Discovery/Src/settings.c Tue Feb 11 18:12:00 2025 +0100 +++ b/Discovery/Src/settings.c Sun Mar 02 21:42:45 2025 +0100 @@ -588,20 +588,6 @@ pSettings->cv_config_BigScreen |= tmp; // no break; case 0xFFFF0028: -#ifdef ENABLE_DECOCALC_OPTION - /* In previous version deco gases were automatically used for deco calculation */ - for(tmp=1; tmp<=2*NUM_GASES; tmp++) /* This is now handled by an additional parameter. Set it to true to maintain same behavior as before */ - { - if(Settings.gas[tmp].note.ub.deco) - { - Settings.gas[tmp].note.ub.decocalc = 1; - } - else - { - Settings.gas[tmp].note.ub.decocalc = 0; - } - } -#endif // no break; case 0xFFFF0029: Settings.cvAutofocus = 0;
--- a/Discovery/Src/tMenuEditGasOC.c Tue Feb 11 18:12:00 2025 +0100 +++ b/Discovery/Src/tMenuEditGasOC.c Sun Mar 02 21:42:45 2025 +0100 @@ -66,9 +66,6 @@ uint8_t OnAction_GasType (uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action); uint8_t OnAction_ChangeDepth (uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action); uint8_t OnAction_SetToMOD (uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action); -#ifdef ENABLE_DECOCALC_OPTION -uint8_t OnAction_CalcDeco (uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action); -#endif uint8_t OnAction_BottleSize (uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action); uint8_t OnAction_First (uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action); @@ -387,10 +384,6 @@ { uint8_t gasID, oxygen, helium, depthDeco, active, first, depthMOD, deco, travel, inactive, off ;//, bottleSizeLiter; -#ifdef ENABLE_DECOCALC_OPTION - uint8_t decocalc; -#endif - char text[32]; char textMOD[32]; uint8_t txtptr; @@ -428,9 +421,7 @@ deco = editGasPage.pGasLine[gasID].note.ub.deco; travel = editGasPage.pGasLine[gasID].note.ub.travel; off = editGasPage.pGasLine[gasID].note.ub.off; -#ifdef ENABLE_DECOCALC_OPTION - decocalc = editGasPage.pGasLine[gasID].note.ub.decocalc; -#endif + //bottleSizeLiter = editGasPage.pGasLine[gasID].bottle_size_liter; if(active) @@ -516,17 +507,6 @@ text[txtptr++] = TXT2BYTE_SetToMOD; text[txtptr++] = 0; write_field_button(StMOG_SetToMOD, 20, 710, ME_Y_LINE4, &FontT48,text); -#ifdef ENABLE_DECOCALC_OPTION - if(deco) - { - txtptr = 0; - text[txtptr++] = TXT_2BYTE; - text[txtptr++] = TXT2BYTE_CalculateDeco; - text[txtptr++] = 0; - - write_field_on_off(StMOG_CalcDeco, 20, 710, ME_Y_LINE5, &FontT48, text, decocalc); - } -#endif } else { @@ -578,12 +558,6 @@ setEvent(StMOG_ChangeDepth, (uint32_t)OnAction_ChangeDepth); setEvent(StMOG_SetToMOD, (uint32_t)OnAction_SetToMOD); } -#ifdef ENABLE_DECOCALC_OPTION - if(deco) - { - setEvent(StMOG_CalcDeco, (uint32_t)OnAction_CalcDeco); - } -#endif /* setEvent(StMOG_Bottle, (uint32_t)OnAction_BottleSize); */ @@ -1135,22 +1109,7 @@ return UPDATE_DIVESETTINGS; } -#ifdef ENABLE_DECOCALC_OPTION -uint8_t OnAction_CalcDeco (uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action) -{ - if(editGasPage.pGasLine[editGasPage.gasID].note.ub.decocalc) - { - editGasPage.pGasLine[editGasPage.gasID].note.ub.decocalc = 0; - } - else - { - editGasPage.pGasLine[editGasPage.gasID].note.ub.decocalc = 1; - } - tMenuEdit_set_on_off(editId, editGasPage.pGasLine[editGasPage.gasID].note.ub.decocalc); - return UPDATE_DIVESETTINGS; -} -#endif uint8_t OnAction_ChangeDepth(uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action) { uint8_t digitContentNew;
--- a/Discovery/Src/vpm.c Tue Feb 11 18:12:00 2025 +0100 +++ b/Discovery/Src/vpm.c Sun Mar 02 21:42:45 2025 +0100 @@ -542,18 +542,10 @@ for (i = 1; i < BUEHLMANN_STRUCT_MAX_GASES; i++) { - if((pDiveSettings->decogaslist[i].change_during_ascent_depth_meter_otherwise_zero >= depth_change[0] + 1) -#ifdef ENABLE_DECOCALC_OPTION - && (pDiveSettings->gas[pDiveSettings->decogaslist[i].GasIdInSettings].note.ub.decocalc) -#endif - ) + if(pDiveSettings->decogaslist[i].change_during_ascent_depth_meter_otherwise_zero >= depth_change[0] + 1) continue; - if((pDiveSettings->decogaslist[i].change_during_ascent_depth_meter_otherwise_zero <= 0) -#ifdef ENABLE_DECOCALC_OPTION - || (pDiveSettings->gas[pDiveSettings->decogaslist[i].GasIdInSettings].note.ub.decocalc == 0) -#endif - ) + if(pDiveSettings->decogaslist[i].change_during_ascent_depth_meter_otherwise_zero <= 0) break; j++;