Mercurial > public > ostc4

annotate Discovery/Src/tMenuEditXtra.c @ 859:d32901746950 Evo_2_23

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Improvment battery charger visualization: In the previous version the green flash (charge complete) was shown even battery had not reached 100% charge. Root cause was that the pin signaling the end of charge could be raised for other reasons then a full battery. The new version will show the green flash only in case the battery is rated as full. In addition the graph visualization has been updated to continously progress. In the previous version it only progressed in case the charge value changed. Especially at charging start the charger is doing some battery evaluation which does not increase the charge state. In such a case the graph seemed to be frozen.
author Ideenmodellierer
date Tue, 07 May 2024 21:20:33 +0200
parents 17d9d6eddd8d
children 7755a476f164
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
1 ///////////////////////////////////////////////////////////////////////////////
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
2 /// -*- coding: UTF-8 -*-
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
3 ///
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
4 /// \file Discovery/Src/tMenuEditXtra.c
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
5 /// \brief Menu Edit Xtra - Specials in Divemode like Reset Stopwatch
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
6 /// \author heinrichs weikamp gmbh
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
7 /// \date 02-Mar-2015
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
8 ///
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
9 /// \details
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
10 ///
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
11 /// $Id$
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
12 ///////////////////////////////////////////////////////////////////////////////
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
13 /// \par Copyright (c) 2014-2018 Heinrichs Weikamp gmbh
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
14 ///
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
15 /// This program is free software: you can redistribute it and/or modify
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
16 /// it under the terms of the GNU General Public License as published by
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
17 /// the Free Software Foundation, either version 3 of the License, or
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
18 /// (at your option) any later version.
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
19 ///
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
20 /// This program is distributed in the hope that it will be useful,
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
21 /// but WITHOUT ANY WARRANTY; without even the implied warranty of
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
22 /// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
23 /// GNU General Public License for more details.
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
24 ///
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
25 /// You should have received a copy of the GNU General Public License
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
26 /// along with this program. If not, see <http://www.gnu.org/licenses/>.
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
27 //////////////////////////////////////////////////////////////////////////////
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
28
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
29 /* Includes ------------------------------------------------------------------*/
774
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
30 #include <stdbool.h>
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
31
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
32 #include "tMenuEditXtra.h"
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
33
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
34 #include "gfx_fonts.h"
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
35 #include "simulation.h"
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
36 #include "timer.h"
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
37 #include "tMenuEdit.h"
347
77de014928d6 Added option to manually leave dive mode to system menu
ideenmodellierer
parents: 288
diff changeset
38 #include "data_exchange_main.h"
547
12f8745c8a94 Added viewport calibration to dive menu:
Ideenmodellierer
parents: 347
diff changeset
39 #include "motion.h"
662
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
40 #include "configuration.h"
845
17d9d6eddd8d Added new PreDiveCheck info page:
Ideenmodellierer
parents: 827
diff changeset
41 #include "tInfoPreDive.h"
347
77de014928d6 Added option to manually leave dive mode to system menu
ideenmodellierer
parents: 288
diff changeset
42
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
43
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
44 /* Private function prototypes -----------------------------------------------*/
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
45 void openEdit_CompassHeading(void);
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
46 void openEdit_ResetStopwatch(void);
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
47 void openEdit_SimFollowDecostops(void);
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
48 void openEdit_SetManualMarker(void);
347
77de014928d6 Added option to manually leave dive mode to system menu
ideenmodellierer
parents: 288
diff changeset
49 void openEdit_SetEndDive(void);
552
531e7818b737 Added menu structure to acces viewport calibration:
Ideenmodellierer
parents: 547
diff changeset
50 void openEdit_CalibViewport(void);
707
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
51
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
52 static void openEdit_CCRModeSensorOrFixedSP(void);
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
53 static void openEdit_Fallback(void);
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
54 static void openEdit_Scrubber(void);
662
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
55 #ifdef ENABLE_PSCR_MODE
707
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
56 static void openEdit_PSCR(void);
662
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
57 #endif
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
58
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
59 /* Announced function prototypes -----------------------------------------------*/
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
60 uint8_t OnAction_CompassHeading (uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action);
710
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
61 uint8_t OnAction_ScrubberTimerId(uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action);
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
62 static uint8_t OnAction_ScrubberTimerMax(uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action);
707
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
63 static uint8_t OnAction_ScrubberReset(uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action);
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
64 static uint8_t OnAction_ScrubberMode(uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action);
662
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
65 #ifdef ENABLE_PSCR_MODE
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
66 static uint8_t OnAction_PSCRO2Drop(uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action);
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
67 static uint8_t OnAction_PSCRLungRation(uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action);
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
68 #endif
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
69
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
70 /* Exported functions --------------------------------------------------------*/
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
71
710
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
72
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
73 void openEdit_Xtra(uint8_t line)
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
74 {
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
75 set_globalState_Menu_Line(line);
707
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
76
654
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
77 /* DIVE MODE */
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
78 if(actual_menu_content != MENU_SURFACE)
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
79 {
707
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
80 resetMenuEdit(CLUT_MenuPageXtra);
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
81
654
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
82 switch(line)
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
83 {
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
84 case 1:
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
85 default:
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
86 openEdit_ResetStopwatch();
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
87 break;
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
88 case 2:
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
89 openEdit_CompassHeading();
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
90 break;
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
91 case 3:
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
92 openEdit_SetManualMarker();
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
93 break;
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
94 case 4:
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
95 openEdit_CalibViewport();
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
96 break;
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
97 case 5:
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
98 if(is_stateUsedSetToSim())
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
99 {
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
100 openEdit_SimFollowDecostops();
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
101 }
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
102 else
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
103 {
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
104 openEdit_SetEndDive();
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
105 }
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
106 break;
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
107 }
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
108 }
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
109 else /* surface mode */
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
110 {
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
111 switch(line)
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
112 {
707
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
113 case 1: openEdit_CCRModeSensorOrFixedSP();
654
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
114 break;
707
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
115 case 2: openEdit_Fallback();
654
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
116 break;
707
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
117 case 3: openEdit_Scrubber();
654
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
118 break;
662
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
119 #ifdef ENABLE_PSCR_MODE
707
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
120 case 4: openEdit_PSCR();
662
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
121 break;
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
122 #endif
845
17d9d6eddd8d Added new PreDiveCheck info page:
Ideenmodellierer
parents: 827
diff changeset
123 case 5: openInfo_PreDive();
17d9d6eddd8d Added new PreDiveCheck info page:
Ideenmodellierer
parents: 827
diff changeset
124 break;
654
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
125 default:
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
126 break;
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
127 }
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
128 }
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
129 }
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
130
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
131 /* Private functions ---------------------------------------------------------*/
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
132 void openEdit_ResetStopwatch(void)
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
133 {
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
134 timer_Stopwatch_Restart();
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
135 exitMenuEdit_to_Home();
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
136 }
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
137
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
138 void openEdit_SetManualMarker(void)
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
139 {
288
ba229a012ac7 cleanup: no useless checks for simulator state
Jan Mulder <jlmulder@xs4all.nl>
parents: 272
diff changeset
140 stateUsedWrite->events.manualMarker = 1;
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
141 exitMenuEdit_to_Home();
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
142 }
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
143
347
77de014928d6 Added option to manually leave dive mode to system menu
ideenmodellierer
parents: 288
diff changeset
144 void openEdit_SetEndDive(void)
77de014928d6 Added option to manually leave dive mode to system menu
ideenmodellierer
parents: 288
diff changeset
145 {
77de014928d6 Added option to manually leave dive mode to system menu
ideenmodellierer
parents: 288
diff changeset
146 dataOutGetPointer()->setEndDive = 1;
77de014928d6 Added option to manually leave dive mode to system menu
ideenmodellierer
parents: 288
diff changeset
147 exitMenuEdit_to_Home();
77de014928d6 Added option to manually leave dive mode to system menu
ideenmodellierer
parents: 288
diff changeset
148 }
77de014928d6 Added option to manually leave dive mode to system menu
ideenmodellierer
parents: 288
diff changeset
149
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
150 void openEdit_SimFollowDecostops(void)
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
151 {
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
152 simulation_set_heed_decostops(!simulation_get_heed_decostops());
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
153 exitMenuEdit_to_Menu_with_Menu_Update();
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
154 }
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
155
547
12f8745c8a94 Added viewport calibration to dive menu:
Ideenmodellierer
parents: 347
diff changeset
156 void openEdit_CalibViewport(void)
12f8745c8a94 Added viewport calibration to dive menu:
Ideenmodellierer
parents: 347
diff changeset
157 {
12f8745c8a94 Added viewport calibration to dive menu:
Ideenmodellierer
parents: 347
diff changeset
158 calibrateViewport(stateUsed->lifeData.compass_roll, stateUsed->lifeData.compass_pitch, stateUsed->lifeData.compass_heading);
648
ff2b393e290f Motion detection: Enable focus after focus calibration:
Ideenmodellierer
parents: 552
diff changeset
159 suspendMotionDetection(0); /* exit to focus mode directly */
547
12f8745c8a94 Added viewport calibration to dive menu:
Ideenmodellierer
parents: 347
diff changeset
160 exitMenuEdit_to_Home();
12f8745c8a94 Added viewport calibration to dive menu:
Ideenmodellierer
parents: 347
diff changeset
161 }
12f8745c8a94 Added viewport calibration to dive menu:
Ideenmodellierer
parents: 347
diff changeset
162
654
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
163
707
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
164 static void openEdit_CCRModeSensorOrFixedSP(void)
654
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
165 {
707
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
166 SSettings *pSettings = settingsGetPointer();
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
167
816
c4ee952b9425 Fix a bug that disables arbitrary menu lines in dive mode if lines are disabled / inactive in surface mode. (mikeller)
heinrichsweikamp
parents: 811
diff changeset
168 if(pSettings->CCR_Mode == CCRMODE_Sensors) {
707
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
169 pSettings->CCR_Mode = CCRMODE_FixedSetpoint;
816
c4ee952b9425 Fix a bug that disables arbitrary menu lines in dive mode if lines are disabled / inactive in surface mode. (mikeller)
heinrichsweikamp
parents: 811
diff changeset
170 } else {
707
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
171 pSettings->CCR_Mode = CCRMODE_Sensors;
811
4c41d9a18c7f Added function to skip lines which are not needed for operation:
Ideenmodellierer
parents: 793
diff changeset
172 }
654
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
173
707
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
174 exitEditWithUpdate();
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
175 }
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
176
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
177 static void openEdit_Fallback(void)
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
178 {
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
179 /* does not work like this resetEnterPressedToStateBeforeButtonAction(); */
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
180
654
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
181 SSettings *pSettings = settingsGetPointer();
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
182
769
6b248bcdbf28 Deactivation of the 'fallback' option when the CCR mode is set to 'Fixed' - this makes it a little clearer that the option has no influence in this mode.
heinrichsweikamp
parents: 758
diff changeset
183 if (pSettings->CCR_Mode == CCRMODE_Sensors) {
6b248bcdbf28 Deactivation of the 'fallback' option when the CCR mode is set to 'Fixed' - this makes it a little clearer that the option has no influence in this mode.
heinrichsweikamp
parents: 758
diff changeset
184 pSettings->fallbackToFixedSetpoint = (pSettings->fallbackToFixedSetpoint + 1) % 2;
707
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
185 }
769
6b248bcdbf28 Deactivation of the 'fallback' option when the CCR mode is set to 'Fixed' - this makes it a little clearer that the option has no influence in this mode.
heinrichsweikamp
parents: 758
diff changeset
186
707
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
187 exitMenuEdit_to_Menu_with_Menu_Update_do_not_write_settings_for_this_only();
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
188 }
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
189
654
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
190
758
b6d8a6fbf4fd - Colours for scrubber display when time remaining falls below a threshold value
heinrichsweikamp
parents: 748
diff changeset
191 static void printScrubberResetText(char *text, SSettings *settings)
b6d8a6fbf4fd - Colours for scrubber display when time remaining falls below a threshold value
heinrichsweikamp
parents: 748
diff changeset
192 {
b6d8a6fbf4fd - Colours for scrubber display when time remaining falls below a threshold value
heinrichsweikamp
parents: 748
diff changeset
193 int16_t currentTimerMinutes = settings->scrubberData[settings->scubberActiveId].TimerCur;
b6d8a6fbf4fd - Colours for scrubber display when time remaining falls below a threshold value
heinrichsweikamp
parents: 748
diff changeset
194 char colour = '\020';
b6d8a6fbf4fd - Colours for scrubber display when time remaining falls below a threshold value
heinrichsweikamp
parents: 748
diff changeset
195 if (currentTimerMinutes <= 0) {
b6d8a6fbf4fd - Colours for scrubber display when time remaining falls below a threshold value
heinrichsweikamp
parents: 748
diff changeset
196 colour = '\025';
b6d8a6fbf4fd - Colours for scrubber display when time remaining falls below a threshold value
heinrichsweikamp
parents: 748
diff changeset
197 } else if (currentTimerMinutes <= 30) {
b6d8a6fbf4fd - Colours for scrubber display when time remaining falls below a threshold value
heinrichsweikamp
parents: 748
diff changeset
198 colour = '\024';
b6d8a6fbf4fd - Colours for scrubber display when time remaining falls below a threshold value
heinrichsweikamp
parents: 748
diff changeset
199 }
b6d8a6fbf4fd - Colours for scrubber display when time remaining falls below a threshold value
heinrichsweikamp
parents: 748
diff changeset
200 snprintf(text, 32, "%c\002%c%03i\016\016 %c\017", TXT_ScrubTimeReset, colour, currentTimerMinutes, TXT_Minutes);
b6d8a6fbf4fd - Colours for scrubber display when time remaining falls below a threshold value
heinrichsweikamp
parents: 748
diff changeset
201 }
b6d8a6fbf4fd - Colours for scrubber display when time remaining falls below a threshold value
heinrichsweikamp
parents: 748
diff changeset
202
b6d8a6fbf4fd - Colours for scrubber display when time remaining falls below a threshold value
heinrichsweikamp
parents: 748
diff changeset
203
707
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
204 static void openEdit_Scrubber(void)
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
205 {
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
206 char text[32];
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
207 uint8_t textIndex = 0;
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
208 uint16_t localScrubTimer;
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
209
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
210 SSettings *pSettings = settingsGetPointer();
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
211
710
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
212 localScrubTimer = pSettings->scrubberData[pSettings->scubberActiveId].TimerMax;
707
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
213
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
214 resetMenuEdit(CLUT_MenuPageXtra);
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
215
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
216
710
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
217 snprintf(&text[0], 32,"\001%c",TXT_ScrubTime);
654
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
218 write_topline(text);
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
219
707
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
220
710
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
221 snprintf(&text[0], 32,"%c \002#%d",TXT_ScrubTime,pSettings->scubberActiveId);
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
222 write_field_button(StMXTRA_ScrubTimer, 20, 780, ME_Y_LINE1, &FontT48, text);
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
223
707
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
224 snprintf(&text[textIndex], 32,\
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
225 "%c"
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
226 "\016\016(%c)\017"
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
227 ,TXT_ScrubTime
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
228 ,TXT_Maximum);
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
229
710
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
230 write_label_var( 20, 340, ME_Y_LINE2, &FontT48, text);
707
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
231 snprintf(&text[textIndex], 32, "\002###\016\016 %c\017",TXT_Minutes);
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
232
710
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
233 write_field_udigit(StMXTRA_ScrubTimer_Max, 610, 780, ME_Y_LINE2, &FontT48, text,localScrubTimer, 0, 0, 0);
707
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
234
758
b6d8a6fbf4fd - Colours for scrubber display when time remaining falls below a threshold value
heinrichsweikamp
parents: 748
diff changeset
235 printScrubberResetText(text, pSettings);
710
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
236 write_field_button(StMXTRA_ScrubTimer_Reset, 20, 780, ME_Y_LINE3, &FontT48, text);
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
237
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
238 if(pSettings->scrubberData[pSettings->scubberActiveId].lastDive.WeekDay != 0)
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
239 {
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
240 snprintf(&text[0], 32,"%c%c\002 %02d.%02d.%02d", TXT_2BYTE, TXT2BYTE_SimDiveTime, pSettings->scrubberData[pSettings->scubberActiveId].lastDive.Date,
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
241 pSettings->scrubberData[pSettings->scubberActiveId].lastDive.Month,
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
242 pSettings->scrubberData[pSettings->scubberActiveId].lastDive.Year);
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
243 }
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
244 else
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
245 {
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
246 snprintf(&text[0], 32,"%c%c\002 --.--.--", TXT_2BYTE, TXT2BYTE_SimDiveTime);
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
247 }
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
248 write_label_var( 20, 780, ME_Y_LINE4, &FontT48, text);
654
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
249
707
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
250 switch(pSettings->scrubTimerMode)
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
251 {
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
252 case SCRUB_TIMER_OFF:
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
253 default: snprintf(&text[0], 32,"%c\002%c%c",TXT_ScrubTimeMode, TXT_2BYTE, TXT2BYTE_MoCtrlNone );
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
254 break;
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
255 case SCRUB_TIMER_MINUTES: snprintf(&text[0], 32,"%c\002%c",TXT_ScrubTimeMode, TXT_Minutes );
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
256 break;
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
257 case SCRUB_TIMER_PERCENT: snprintf(&text[0], 32,"%c\002%c",TXT_ScrubTimeMode, TXT_Percent );
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
258 break;
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
259 }
710
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
260 write_field_button(StMXTRA_ScrubTimer_OP_Mode, 20, 780, ME_Y_LINE5, &FontT48, text);
707
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
261
710
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
262 setEvent(StMXTRA_ScrubTimer, (uint32_t)OnAction_ScrubberTimerId);
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
263 setEvent(StMXTRA_ScrubTimer_Max, (uint32_t)OnAction_ScrubberTimerMax);
707
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
264 setEvent(StMXTRA_ScrubTimer_Reset, (uint32_t)OnAction_ScrubberReset);
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
265 setEvent(StMXTRA_ScrubTimer_OP_Mode, (uint32_t)OnAction_ScrubberMode);
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
266
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
267 write_buttonTextline(TXT2BYTE_ButtonBack,TXT2BYTE_ButtonEnter,TXT2BYTE_ButtonNext);
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
268
654
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
269 }
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
270
707
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
271 static void openEdit_PSCR(void)
654
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
272 {
707
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
273 uint8_t localO2Drop,localLungRatio;
662
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
274 char text[32];
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
275 SSettings *pSettings = settingsGetPointer();
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
276 localO2Drop = pSettings->pscr_o2_drop;
707
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
277 localLungRatio = pSettings->pscr_lung_ratio;
662
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
278
707
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
279 resetMenuEdit(CLUT_MenuPageXtra);
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
280
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
281 snprintf(text, 32, "\001%c",TXT_PSClosedCircuit);
662
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
282 write_topline(text);
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
283
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
284 text[0] = '\002';
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
285 text[1] = '\016';
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
286 text[2] = '\016';
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
287 text[3] = '%';
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
288 text[4] = 0;
707
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
289 write_label_fix( 20, 800, ME_Y_LINE1, &FontT48, TXT_PSCRO2Drop);
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
290 write_label_var( 435, 780, ME_Y_LINE1, &FontT48, text);
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
291 write_field_udigit(StMXTRA_PSCR_O2_Drop, 710, 779, ME_Y_LINE1, &FontT48, "##", (uint32_t)localO2Drop, 0, 0, 0);
662
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
292
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
293
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
294 text[0] = '\002';
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
295 text[1] = '1';
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
296 text[2] = '/';
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
297 text[3] = 0;
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
298
707
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
299 write_label_fix( 20, 800, ME_Y_LINE2, &FontT48, TXT_PSCRLungRatio);
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
300 write_label_var( 435, 710, ME_Y_LINE2, &FontT48, text);
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
301 write_field_udigit(StMXTRA_PSCR_LUNG_RATIO, 710, 779, ME_Y_LINE2, &FontT48, "##", (uint32_t)localLungRatio, 0, 0, 0);
662
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
302
712
062deb659531 Bugfix PSCR menu button label:
Ideenmodellierer
parents: 710
diff changeset
303 write_buttonTextline(TXT2BYTE_ButtonBack,TXT2BYTE_ButtonEnter,TXT2BYTE_ButtonNext);
662
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
304
707
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
305 setEvent(StMXTRA_PSCR_O2_Drop, (uint32_t)OnAction_PSCRO2Drop);
662
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
306 setEvent(StMXTRA_PSCR_LUNG_RATIO, (uint32_t)OnAction_PSCRLungRation);
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
307 }
707
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
308
662
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
309
774
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
310
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
311 static uint8_t OnAction_CompassHeadingClear(uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action)
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
312 {
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
313 stateUsedWrite->diveSettings.compassHeading = 0;
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
314
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
315 exitMenuEdit_to_Home_with_Menu_Update();
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
316
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
317 return EXIT_TO_HOME;
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
318 }
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
319
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
320
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
321 static uint8_t OnAction_CompassHeadingReset(uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action)
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
322 {
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
323 stateUsedWrite->diveSettings.compassHeading = settingsGetPointer()->compassBearing;
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
324
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
325 exitMenuEdit_to_Home_with_Menu_Update();
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
326
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
327 return EXIT_TO_HOME;
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
328 }
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
329
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
330
776
45b8f3c2acce Add support for a configurable compass declination in a range of -99 to 99 degrees.
heinrichsweikamp
parents: 774
diff changeset
331 static void drawCompassHeadingMenu(bool isRefresh)
774
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
332 {
776
45b8f3c2acce Add support for a configurable compass declination in a range of -99 to 99 degrees.
heinrichsweikamp
parents: 774
diff changeset
333 SSettings *settings = settingsGetPointer();
45b8f3c2acce Add support for a configurable compass declination in a range of -99 to 99 degrees.
heinrichsweikamp
parents: 774
diff changeset
334
774
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
335 char text[32];
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
336 snprintf(text, 32, "\001%c%c", TXT_2BYTE, TXT2BYTE_CompassHeading);
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
337 write_topline(text);
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
338
776
45b8f3c2acce Add support for a configurable compass declination in a range of -99 to 99 degrees.
heinrichsweikamp
parents: 774
diff changeset
339 uint16_t heading;
45b8f3c2acce Add support for a configurable compass declination in a range of -99 to 99 degrees.
heinrichsweikamp
parents: 774
diff changeset
340 if (settings->compassInertia) {
45b8f3c2acce Add support for a configurable compass declination in a range of -99 to 99 degrees.
heinrichsweikamp
parents: 774
diff changeset
341 heading = (uint16_t)compass_getCompensated();
45b8f3c2acce Add support for a configurable compass declination in a range of -99 to 99 degrees.
heinrichsweikamp
parents: 774
diff changeset
342 } else {
45b8f3c2acce Add support for a configurable compass declination in a range of -99 to 99 degrees.
heinrichsweikamp
parents: 774
diff changeset
343 heading = (uint16_t)stateUsed->lifeData.compass_heading;
45b8f3c2acce Add support for a configurable compass declination in a range of -99 to 99 degrees.
heinrichsweikamp
parents: 774
diff changeset
344 }
774
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
345 snprintf(text,32,"\001%03i`",heading);
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
346 write_label_var(0, 800, ME_Y_LINE1, &FontT54, text);
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
347
776
45b8f3c2acce Add support for a configurable compass declination in a range of -99 to 99 degrees.
heinrichsweikamp
parents: 774
diff changeset
348 if (!isRefresh) {
774
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
349 snprintf(text, 32, "%c%c", TXT_2BYTE, TXT2BYTE_Set);
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
350 write_field_button(StMXTRA_CompassHeading, 20, 800, ME_Y_LINE2, &FontT48, text);
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
351 } else {
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
352 tMenuEdit_refresh_field(StMXTRA_CompassHeading);
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
353 }
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
354
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
355 bool headingIsSet = stateUsed->diveSettings.compassHeading;
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
356 snprintf(text, 32, "%s%c%c", makeGrey(!headingIsSet), TXT_2BYTE, TXT2BYTE_Clear);
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
357 if (headingIsSet) {
776
45b8f3c2acce Add support for a configurable compass declination in a range of -99 to 99 degrees.
heinrichsweikamp
parents: 774
diff changeset
358 if (!isRefresh) {
774
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
359 write_field_button(StMXTRA_CompassHeadingClear, 20, 800, ME_Y_LINE3, &FontT48, text);
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
360 } else {
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
361 tMenuEdit_refresh_field(StMXTRA_CompassHeadingClear);
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
362 }
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
363 } else {
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
364 write_label_var(20, 800, ME_Y_LINE3, &FontT48, text);
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
365 }
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
366
776
45b8f3c2acce Add support for a configurable compass declination in a range of -99 to 99 degrees.
heinrichsweikamp
parents: 774
diff changeset
367 int16_t compassBearing = settings->compassBearing;
774
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
368 bool canSetBearing = compassBearing && compassBearing != stateUsed->diveSettings.compassHeading;
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
369 snprintf(text, 32, "%s%c%c (%03u`)", makeGrey(!canSetBearing), TXT_2BYTE, TXT2BYTE_Reset, compassBearing);
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
370 if (canSetBearing) {
776
45b8f3c2acce Add support for a configurable compass declination in a range of -99 to 99 degrees.
heinrichsweikamp
parents: 774
diff changeset
371 if (!isRefresh) {
774
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
372 write_field_button(StMXTRA_CompassHeadingReset, 20, 800, ME_Y_LINE4, &FontT48, text);
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
373 } else {
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
374 tMenuEdit_refresh_field(StMXTRA_CompassHeadingReset);
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
375 }
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
376 } else {
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
377 write_label_var(20, 800, ME_Y_LINE4, &FontT48, text);
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
378 }
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
379
776
45b8f3c2acce Add support for a configurable compass declination in a range of -99 to 99 degrees.
heinrichsweikamp
parents: 774
diff changeset
380 if (!isRefresh) {
774
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
381 setEvent(StMXTRA_CompassHeading, (uint32_t)OnAction_CompassHeading);
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
382 setEvent(StMXTRA_CompassHeadingClear, (uint32_t)OnAction_CompassHeadingClear);
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
383 setEvent(StMXTRA_CompassHeadingReset, (uint32_t)OnAction_CompassHeadingReset);
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
384 }
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
385
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
386 write_buttonTextline(TXT2BYTE_ButtonBack, TXT2BYTE_ButtonEnter, TXT2BYTE_ButtonNext);
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
387 }
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
388
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
389
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
390 void refresh_CompassHeading(void)
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
391 {
776
45b8f3c2acce Add support for a configurable compass declination in a range of -99 to 99 degrees.
heinrichsweikamp
parents: 774
diff changeset
392 drawCompassHeadingMenu(true);
774
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
393 }
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
394
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
395
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
396 void openEdit_CompassHeading(void)
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
397 {
776
45b8f3c2acce Add support for a configurable compass declination in a range of -99 to 99 degrees.
heinrichsweikamp
parents: 774
diff changeset
398 drawCompassHeadingMenu(false);
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
399 }
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
400
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
401
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
402 uint8_t OnAction_CompassHeading (uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action)
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
403 {
774
6169309d6eb9 more menu items for the compass menu: Delete bearing, and reset to land based bearing. I have also re-enabled the real time bearing display in the menu - makes it easier to set the correct bearing. (mikeller)
heinrichsweikamp
parents: 769
diff changeset
404 setCompassHeading((uint16_t)stateUsed->lifeData.compass_heading);
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
405 exitMenuEdit_to_Home_with_Menu_Update();
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
406 return EXIT_TO_HOME;
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
407 }
654
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
408
710
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
409
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
410 uint8_t OnAction_ScrubberTimerId(uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action)
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
411 {
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
412 char text[32];
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
413 SSettings *pSettings;
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
414 pSettings = settingsGetPointer();
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
415
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
416 if(pSettings->scubberActiveId == 0)
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
417 {
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
418 pSettings->scubberActiveId = 1;
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
419 }
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
420 else
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
421 {
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
422 pSettings->scubberActiveId = 0;
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
423 }
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
424
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
425
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
426 snprintf(&text[0], 32,"%c \002#%d",TXT_ScrubTime,pSettings->scubberActiveId);
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
427 tMenuEdit_newButtonText(StMXTRA_ScrubTimer, text);
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
428
758
b6d8a6fbf4fd - Colours for scrubber display when time remaining falls below a threshold value
heinrichsweikamp
parents: 748
diff changeset
429 printScrubberResetText(text, pSettings);
710
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
430 tMenuEdit_newButtonText(StMXTRA_ScrubTimer_Reset, text);
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
431
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
432 tMenuEdit_newInput(StMXTRA_ScrubTimer_Max, pSettings->scrubberData[pSettings->scubberActiveId].TimerMax, 0, 0, 0);
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
433
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
434 if(pSettings->scrubberData[pSettings->scubberActiveId].lastDive.WeekDay != 0)
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
435 {
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
436 snprintf(&text[0], 32,"%c%c\002 %02d.%02d.%02d", TXT_2BYTE, TXT2BYTE_SimDiveTime, pSettings->scrubberData[pSettings->scubberActiveId].lastDive.Date,
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
437 pSettings->scrubberData[pSettings->scubberActiveId].lastDive.Month,
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
438 pSettings->scrubberData[pSettings->scubberActiveId].lastDive.Year);
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
439 }
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
440 else
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
441 {
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
442 snprintf(&text[0], 32,"%c%c\002 --.--.--", TXT_2BYTE, TXT2BYTE_SimDiveTime);
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
443 }
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
444 clean_content( 20, 780, ME_Y_LINE4, &FontT48);
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
445 write_label_var( 20, 780, ME_Y_LINE4, &FontT48, text);
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
446
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
447 return UNSPECIFIC_RETURN;
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
448 }
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
449
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
450 static uint8_t OnAction_ScrubberTimerMax(uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action)
654
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
451 {
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
452 SSettings *pSettings;
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
453 uint8_t digitContentNew = EXIT_TO_MENU;
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
454 uint32_t newScrubberTime;
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
455
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
456 if(action == ACTION_BUTTON_ENTER)
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
457 {
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
458 return digitContent;
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
459 }
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
460 if(action == ACTION_BUTTON_ENTER_FINAL)
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
461 {
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
462 evaluateNewString(editId, &newScrubberTime, 0, 0, 0);
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
463
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
464 if(newScrubberTime > MAX_SCRUBBER_TIME)
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
465 newScrubberTime = MAX_SCRUBBER_TIME;
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
466
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
467 pSettings = settingsGetPointer();
710
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
468 pSettings->scrubberData[pSettings->scubberActiveId].TimerMax = newScrubberTime;
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
469 if(pSettings->scrubberData[pSettings->scubberActiveId].TimerCur > newScrubberTime)
654
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
470 {
710
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
471 pSettings->scrubberData[pSettings->scubberActiveId].TimerCur = newScrubberTime;
654
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
472 }
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
473
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
474 tMenuEdit_newInput(editId, newScrubberTime, 0, 0, 0);
707
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
475 digitContentNew = UNSPECIFIC_RETURN;
654
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
476 }
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
477 if(action == ACTION_BUTTON_NEXT)
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
478 {
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
479 digitContentNew = digitContent + 1;
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
480 if(digitContentNew > '9')
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
481 digitContentNew = '0';
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
482 }
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
483 if(action == ACTION_BUTTON_BACK)
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
484 {
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
485 digitContentNew = digitContent - 1;
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
486 if(digitContentNew < '0')
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
487 digitContentNew = '9';
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
488 }
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
489 return digitContentNew;
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
490 }
707
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
491
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
492 uint8_t OnAction_ScrubberReset(uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action)
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
493 {
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
494 char text[32];
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
495 SSettings *pSettings;
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
496 pSettings = settingsGetPointer();
710
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
497 pSettings->scrubberData[pSettings->scubberActiveId].TimerCur = pSettings->scrubberData[pSettings->scubberActiveId].TimerMax;
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
498 pSettings->scrubberData[pSettings->scubberActiveId].lastDive.WeekDay = 0; /* invalidate date */
707
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
499
758
b6d8a6fbf4fd - Colours for scrubber display when time remaining falls below a threshold value
heinrichsweikamp
parents: 748
diff changeset
500 printScrubberResetText(text, pSettings);
710
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
501 tMenuEdit_newButtonText(StMXTRA_ScrubTimer_Reset, text);
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
502
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
503 snprintf(&text[0], 32,"%c%c\002 --.--.--", TXT_2BYTE, TXT2BYTE_SimDiveTime);
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
504 clean_content( 20, 780, ME_Y_LINE4, &FontT48);
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
505 write_label_var( 20, 780, ME_Y_LINE4, &FontT48, text);
8adf9b8fc7fa Extension scrubber time:
Ideenmodellierer
parents: 707
diff changeset
506
707
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
507
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
508 return UNSPECIFIC_RETURN;
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
509 }
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
510
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
511 uint8_t OnAction_ScrubberMode(uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action)
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
512 {
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
513 char text[32];
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
514 uint8_t newMode;
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
515 SSettings *pSettings;
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
516 pSettings = settingsGetPointer();
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
517 newMode = pSettings->scrubTimerMode + 1;
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
518 if(newMode >= SCRUB_TIMER_END)
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
519 {
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
520 newMode = SCRUB_TIMER_OFF;
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
521 }
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
522 pSettings->scrubTimerMode = newMode;
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
523
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
524 switch(pSettings->scrubTimerMode)
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
525 {
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
526 case SCRUB_TIMER_OFF:
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
527 default: snprintf(&text[0], 32,"%c\002%c%c",TXT_ScrubTimeMode, TXT_2BYTE, TXT2BYTE_MoCtrlNone );
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
528 break;
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
529 case SCRUB_TIMER_MINUTES: snprintf(&text[0], 32,"%c\002%c",TXT_ScrubTimeMode, TXT_Minutes );
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
530 break;
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
531 case SCRUB_TIMER_PERCENT: snprintf(&text[0], 32,"%c\002%c",TXT_ScrubTimeMode, TXT_Percent );
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
532 break;
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
533 }
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
534 tMenuEdit_newButtonText(StMXTRA_ScrubTimer_OP_Mode, text);
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
535
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
536 return UNSPECIFIC_RETURN;
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
537 }
e81afd727993 Menu cleanup rebreather specific settings:
Ideenmodellierer
parents: 662
diff changeset
538
662
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
539 #ifdef ENABLE_PSCR_MODE
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
540 static uint8_t OnAction_PSCRO2Drop(uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action)
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
541 {
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
542 SSettings *pSettings;
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
543 uint8_t digitContentNew = EXIT_TO_MENU;
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
544 uint32_t newO2Drop;
654
890440ab993a Introduced new menu tab for addition CCR options:
Ideenmodellierer
parents: 648
diff changeset
545
662
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
546 if(action == ACTION_BUTTON_ENTER)
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
547 {
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
548 return digitContent;
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
549 }
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
550 if(action == ACTION_BUTTON_ENTER_FINAL)
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
551 {
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
552 evaluateNewString(editId, &newO2Drop, 0, 0, 0);
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
553
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
554 if(newO2Drop > PSCR_MAX_O2_DROP)
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
555 newO2Drop = PSCR_MAX_O2_DROP;
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
556
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
557 pSettings = settingsGetPointer();
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
558 pSettings->pscr_o2_drop = newO2Drop;
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
559
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
560 tMenuEdit_newInput(editId, newO2Drop, 0, 0, 0);
793
9da81033ad44 Bugfix PSCR Settings in Simulator Mode:
Ideenmodellierer
parents: 776
diff changeset
561 digitContentNew = UPDATE_DIVESETTINGS;
662
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
562 }
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
563 if(action == ACTION_BUTTON_NEXT)
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
564 {
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
565 digitContentNew = digitContent + 1;
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
566 if(digitContentNew > '9')
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
567 digitContentNew = '0';
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
568 }
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
569 if(action == ACTION_BUTTON_BACK)
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
570 {
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
571 digitContentNew = digitContent - 1;
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
572 if(digitContentNew < '0')
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
573 digitContentNew = '9';
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
574 }
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
575 return digitContentNew;
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
576 }
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
577
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
578 static uint8_t OnAction_PSCRLungRation(uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action)
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
579 {
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
580 SSettings *pSettings;
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
581 uint8_t digitContentNew = EXIT_TO_MENU;
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
582 uint32_t newLungRatio;
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
583
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
584 if(action == ACTION_BUTTON_ENTER)
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
585 {
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
586 return digitContent;
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
587 }
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
588 if(action == ACTION_BUTTON_ENTER_FINAL)
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
589 {
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
590 evaluateNewString(editId, &newLungRatio, 0, 0, 0);
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
591
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
592 if(newLungRatio > PSCR_MAX_LUNG_RATIO)
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
593 newLungRatio = PSCR_MAX_LUNG_RATIO;
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
594
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
595 if(newLungRatio < PSCR_MIN_LUNG_RATIO)
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
596 newLungRatio = PSCR_MIN_LUNG_RATIO;
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
597
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
598 pSettings = settingsGetPointer();
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
599 pSettings->pscr_lung_ratio = newLungRatio;
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
600
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
601 tMenuEdit_newInput(editId, newLungRatio, 0, 0, 0);
793
9da81033ad44 Bugfix PSCR Settings in Simulator Mode:
Ideenmodellierer
parents: 776
diff changeset
602 digitContentNew = UPDATE_DIVESETTINGS;
662
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
603 }
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
604 if(action == ACTION_BUTTON_NEXT)
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
605 {
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
606 digitContentNew = digitContent + 1;
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
607 if(digitContentNew > '9')
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
608 digitContentNew = '0';
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
609 }
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
610 if(action == ACTION_BUTTON_BACK)
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
611 {
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
612 digitContentNew = digitContent - 1;
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
613 if(digitContentNew < '0')
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
614 digitContentNew = '9';
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
615 }
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
616 return digitContentNew;
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
617 }
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
618 #endif
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
619
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 654
diff changeset
620