Mercurial > public > ostc4

diff Discovery/Src/t3.c @ 788:4abfb8a2a435

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Define explicit setpoints for low / high / deco. Add an option to delay the switch to SPlow until all decompression has been cleared. (mikeller)
author heinrichsweikamp
date Tue, 04 Jul 2023 14:39:06 +0200
parents b6d8a6fbf4fd
children 107c29934671
line wrap: on
line diff
--- a/Discovery/Src/t3.c	Sun Jun 04 21:59:26 2023 +0200
+++ b/Discovery/Src/t3.c	Tue Jul 04 14:39:06 2023 +0200
@@ -258,20 +258,10 @@
     char text[TEXTSIZE];
     point_t start, stop;
     uint16_t diveMinutes = 0;
-    const SDecoinfo * pDecoinfo;
 
 	SSettings* pSettings;
 	pSettings = settingsGetPointer();
 
-    if(stateUsed->diveSettings.deco_type.ub.standard == GF_MODE)
-    {
-        pDecoinfo = &stateUsed->decolistBuehlmann;
-    }
-    else
-    {
-        pDecoinfo = &stateUsed->decolistVPM;
-    }
-
    	wintemp.top = 479 - BigFontSeperationTopBottom + 5;
    	wintemp.bottom = 479 - 5;
 
@@ -333,6 +323,7 @@
     	wasDecoDive = 0;
     }
 
+    const SDecoinfo * pDecoinfo = getDecoInfo();
     if((pDecoinfo->output_time_to_surface_seconds) || (wasDecoDive))		/* draw deco data first => will be overlayed by all other informations */
     {
     	wasDecoDive = 1;
@@ -920,11 +911,7 @@
 	pSettings = settingsGetPointer();
 
     // CVIEW_T3_Decostop and CVIEW_T3_TTS
-    const SDecoinfo * pDecoinfo;
-    if(stateUsed->diveSettings.deco_type.ub.standard == GF_MODE)
-        pDecoinfo = &stateUsed->decolistBuehlmann;
-    else
-        pDecoinfo = &stateUsed->decolistVPM;
+    const SDecoinfo * pDecoinfo = getDecoInfo();
 
     // CVIEW_T3_Decostop
     uint16_t 	nextstopLengthSeconds = 0;
@@ -1687,12 +1674,6 @@
 
 void t3_basics_change_customview(uint8_t *tX_selection_customview,const uint8_t *tX_customviews, uint8_t action)
 {
-    const SDecoinfo * pDecoinfo;
-    if(stateUsed->diveSettings.deco_type.ub.standard == GF_MODE)
-        pDecoinfo = &stateUsed->decolistBuehlmann;
-    else
-        pDecoinfo = &stateUsed->decolistVPM;
-
     uint8_t curViewIdx = 0xff;
     uint8_t index = 0;
     uint8_t indexOverrun = 0;
@@ -1762,6 +1743,7 @@
 		{
 			if(settingsGetPointer()->MotionDetection != MOTION_DETECT_SECTOR)		/* no hiding in case of active sector view option (fixed mapping would change during dive) */
 			{
+                const SDecoinfo * pDecoinfo = getDecoInfo();
 				/* Skip TTS if value is 0 */
 				if((tX_customviews[index] == CVIEW_T3_TTS) && (!pDecoinfo->output_time_to_surface_seconds))
 				{