Mercurial > public > ostc4

diff Discovery/Src/data_exchange_main.c @ 924:4d98fb2a178e Evo_2_23

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bugfix real scrubber time decreased in sim mode: In the previous version the condition check for dive / simulation had been commented out causing the scrubber timer to be decreased during simulator usage. The problem has been fixed. In addition the scrubbertimer will now be maintained in simulator mode. In case the +5 minutes option is used the scrubber time is decreased by 5 minutes as well.
author Ideenmodellierer
date Wed, 13 Nov 2024 17:55:05 +0100
parents c4c9850a2039
children 908d9a8e8c84
line wrap: on
line diff
--- a/Discovery/Src/data_exchange_main.c	Mon Nov 04 20:21:02 2024 +0100
+++ b/Discovery/Src/data_exchange_main.c	Wed Nov 13 17:55:05 2024 +0100
@@ -1039,6 +1039,8 @@
 			//Init dive Mode
 			decoLock = DECO_CALC_init_as_is_start_of_dive;
 			pStateReal->lifeData.boolResetAverageDepth = 1;
+
+			memcpy(pStateReal->scrubberDataDive, pSettings->scrubberData, sizeof(pStateReal->scrubberDataDive));
 		}
 
 		pStateReal->lifeData.cns = dataIn.data[dataIn.boolToxicData].cns;
@@ -1066,6 +1068,8 @@
 			}
 			if(pStateReal->warnings.decoMissed)
 				dataOut.setAccidentFlag += ACCIDENT_DECOSTOP;
+
+			memcpy(pSettings->scrubberData, pStateReal->scrubberDataDive, sizeof(pStateReal->scrubberDataDive)); /* Store value of current usage */
 		}
 		pStateReal->mode = dataIn.mode;
 		pStateReal->chargeStatus = dataIn.chargeStatus;