Mercurial > public > ostc4
annotate Discovery/Src/timer.c @ 196:2885628ab3ba div-fixes-cleaup-2
Bugfix, minor: color the overview customview correctly
When using a custom color (from the SYS2 menu, layout), the overview
customview was the only one presented in the wrong color. While the fix
for this is rather simple (in hindsight), it was a non trivial search
trough rather obfuscated code.
There is a specific function to set the text color index on this page, but
this only worked for a single line text string, that has the color index
byte as the very first character. The original author already recognized
that this function "could be extended", but left this extension as an
exercise to the reader.
So, the coloring is fixed by extending the function, and actually using
it for the overview customview.
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
| author | Jan Mulder <jlmulder@xs4all.nl> |
|---|---|
| date | Wed, 20 Mar 2019 16:24:10 +0100 |
| parents | f11f0bf6ef2d |
| children | 90e65971f15d |
| rev | line source |
|---|---|
| 38 | 1 /////////////////////////////////////////////////////////////////////////////// |
| 2 /// -*- coding: UTF-8 -*- | |
| 3 /// | |
| 4 /// \file Discovery/Src/timer.c | |
| 5 /// \brief Contains timer related functionality like stopwatch and security stop | |
| 6 /// \author Peter Ryser & heinrichs weikamp gmbh | |
| 7 /// \date 5. Feb.2015 (maybe) | |
| 8 /// | |
| 9 /// \details | |
| 10 /// | |
| 11 /// $Id$ | |
| 12 /////////////////////////////////////////////////////////////////////////////// | |
| 13 /// \par Copyright (c) 2014-2018 Heinrichs Weikamp gmbh | |
| 14 /// | |
| 15 /// This program is free software: you can redistribute it and/or modify | |
| 16 /// it under the terms of the GNU General Public License as published by | |
| 17 /// the Free Software Foundation, either version 3 of the License, or | |
| 18 /// (at your option) any later version. | |
| 19 /// | |
| 20 /// This program is distributed in the hope that it will be useful, | |
| 21 /// but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 22 /// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 23 /// GNU General Public License for more details. | |
| 24 /// | |
| 25 /// You should have received a copy of the GNU General Public License | |
| 26 /// along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 27 ////////////////////////////////////////////////////////////////////////////// | |
| 28 | |
| 29 #include "data_central.h" | |
| 30 | |
|
186
f11f0bf6ef2d
cleanup: remove obsolete code, make static, etc.
Jan Mulder <jlmulder@xs4all.nl>
parents:
38
diff
changeset
|
31 static long stopWatchTime_Second = 0; |
|
f11f0bf6ef2d
cleanup: remove obsolete code, make static, etc.
Jan Mulder <jlmulder@xs4all.nl>
parents:
38
diff
changeset
|
32 static _Bool bStopWatch = false; |
|
f11f0bf6ef2d
cleanup: remove obsolete code, make static, etc.
Jan Mulder <jlmulder@xs4all.nl>
parents:
38
diff
changeset
|
33 static float stopWatchAverageDepth_Meter = 0.0f; |
|
f11f0bf6ef2d
cleanup: remove obsolete code, make static, etc.
Jan Mulder <jlmulder@xs4all.nl>
parents:
38
diff
changeset
|
34 static long safetyStopCountDown_Second = 0; |
| 38 | 35 |
| 36 void timer_init(void) | |
| 37 { | |
| 38 stopWatchTime_Second = 0; | |
| 39 stopWatchAverageDepth_Meter = 0.0f; | |
| 40 bStopWatch = true; | |
| 41 safetyStopCountDown_Second = 0; | |
| 42 | |
| 43 } | |
| 44 | |
| 45 void timer_UpdateSecond(_Bool checkOncePerSecond) | |
| 46 { | |
| 47 static int last_second = -1; | |
| 48 static _Bool bSafetyStop = false; | |
| 49 static float last_depth_meter = 0; | |
|
186
f11f0bf6ef2d
cleanup: remove obsolete code, make static, etc.
Jan Mulder <jlmulder@xs4all.nl>
parents:
38
diff
changeset
|
50 |
| 38 | 51 if(checkOncePerSecond) |
| 52 { | |
| 53 int now = current_second(); | |
| 54 if( last_second == now) | |
| 55 return; | |
| 56 last_second = now; | |
| 57 } | |
| 58 | |
| 59 /** Stopwatch **/ | |
| 60 if(bStopWatch && stateUsed->lifeData.depth_meter > 1) | |
| 61 { | |
| 62 if((stopWatchTime_Second == 0) && (stateUsed->lifeData.dive_time_seconds >= 1)) | |
| 63 { | |
| 64 stopWatchTime_Second = stateUsed->lifeData.dive_time_seconds - 1; | |
| 65 stopWatchAverageDepth_Meter = stateUsed->lifeData.average_depth_meter * (stopWatchTime_Second - 1) / stopWatchTime_Second; | |
| 66 } | |
| 67 else | |
| 68 { | |
| 69 stopWatchAverageDepth_Meter = (stopWatchAverageDepth_Meter * stopWatchTime_Second + stateUsed->lifeData.depth_meter)/ (stopWatchTime_Second + 1); | |
| 70 stopWatchTime_Second++; | |
| 71 } | |
| 72 } | |
| 73 | |
| 74 /** SafetyStop **/ | |
| 75 float depthToStopSafetyStopCount; | |
| 76 if(settingsGetPointer()->safetystopDuration && (stateUsed->lifeData.max_depth_meter > 10.0f) && (stateUsed->lifeData.dive_time_seconds > 60)) | |
| 77 { | |
| 78 | |
| 79 //No deco when 10 meters are crossed from below => Activate SecurityStop | |
| 80 if( last_depth_meter > 10.0f && stateUsed->lifeData.depth_meter <= 10.0f) | |
| 81 { | |
| 82 if(stateUsed->diveSettings.deco_type.ub.standard == GF_MODE) | |
| 83 { | |
| 84 if(stateUsed->decolistBuehlmann.output_ndl_seconds > 0) | |
| 85 bSafetyStop = true; | |
| 86 } | |
| 87 else | |
| 88 { | |
| 89 if(stateUsed->decolistVPM.output_ndl_seconds > 0) | |
| 90 bSafetyStop = true; | |
| 91 } | |
| 92 } | |
| 93 | |
| 94 //Countdown starts at 5 meters | |
| 95 if(bSafetyStop && (stateUsed->lifeData.depth_meter - 0.0001f <= (settingsGetPointer()->safetystopDepth) )) | |
| 96 { | |
| 97 if(safetyStopCountDown_Second == 0) | |
| 98 { | |
| 99 safetyStopCountDown_Second = (settingsGetPointer()->safetystopDuration) * 60; | |
| 100 } | |
| 101 else | |
| 102 safetyStopCountDown_Second--; | |
| 103 } | |
| 104 | |
| 105 // after safetystopDuration minutes or below 3 (2) meter safetyStop is disabled | |
| 106 if(settingsGetPointer()->safetystopDepth == 3) | |
| 107 depthToStopSafetyStopCount = 1.999f; // instead of 2 | |
| 108 else | |
| 109 depthToStopSafetyStopCount = 2.999f;// instead of 3 | |
| 110 | |
| 111 if((safetyStopCountDown_Second == 1) || (stateUsed->lifeData.depth_meter <= depthToStopSafetyStopCount)) | |
| 112 { | |
| 113 bSafetyStop = false; | |
| 114 safetyStopCountDown_Second = 0; | |
| 115 } | |
| 116 } | |
| 117 else | |
| 118 { | |
| 119 bSafetyStop = false; | |
| 120 safetyStopCountDown_Second = 0; | |
| 121 } | |
| 122 last_depth_meter = stateUsed->lifeData.depth_meter; | |
| 123 } | |
| 124 | |
| 125 | |
| 126 void timer_Stopwatch_Restart(void) | |
| 127 { | |
| 128 stopWatchTime_Second = 1; | |
| 129 stopWatchAverageDepth_Meter = stateUsed->lifeData.depth_meter; | |
| 130 bStopWatch = true; | |
| 131 } | |
| 132 | |
| 133 void timer_Stopwatch_Stop(void) | |
| 134 { | |
| 135 bStopWatch = false; | |
| 136 } | |
| 137 | |
| 138 long timer_Stopwatch_GetTime(void) | |
| 139 { | |
| 140 return stopWatchTime_Second; | |
| 141 } | |
| 142 | |
| 143 float timer_Stopwatch_GetAvarageDepth_Meter(void) | |
| 144 { | |
| 145 return stopWatchAverageDepth_Meter; | |
| 146 } | |
| 147 | |
| 148 long timer_Safetystop_GetCountDown(void) | |
| 149 { | |
| 150 return safetyStopCountDown_Second; | |
| 151 } | |
| 152 | |
| 153 uint8_t timer_Safetystop_GetDepthUpperLimit(void) | |
| 154 { | |
| 155 if(settingsGetPointer()->safetystopDepth == 3) | |
| 156 return 2; | |
| 157 else | |
| 158 return 3; | |
| 159 } | |
| 160 |