Mercurial > public > ostc4

annotate Discovery/Src/tMenuEditHardware.c @ 1081:1b38d7b8da35 Icon_Integration

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Send sensor data cyclic: In the previous version the sensor data which had been updated at last was send to the main CPU. With the introduction of the hud a second device is sending sensor data information => in case of fast sensor data updated it could happen that a sensor data record was never transmitted. To avoid this the sensor data of all sensor slots is now transmitted on a cyclic basis.
author Ideenmodellierer
date Sun, 15 Mar 2026 21:28:53 +0100
parents 082825daccb5
children 1aa45000f92c
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/tMenuEditHardware.c
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
5 /// \brief BUTTONS
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 15-Sept-2016
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 ------------------------------------------------------------------*/
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
30 #include "tMenuEditHardware.h"
783
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
31 #include "tMenuEdit.h"
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
32
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
33 #include "externCPU2bootloader.h"
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 "ostc.h"
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
36 #include "tCCR.h"
999
ac25c35a3c97 New Tab for dynamic configuration:
Ideenmodellierer
parents: 993
diff changeset
37 #include "tMenuEdit.h"
ac25c35a3c97 New Tab for dynamic configuration:
Ideenmodellierer
parents: 993
diff changeset
38 #include "tHome.h"
ac25c35a3c97 New Tab for dynamic configuration:
Ideenmodellierer
parents: 993
diff changeset
39 #include "tInfo.h"
ac25c35a3c97 New Tab for dynamic configuration:
Ideenmodellierer
parents: 993
diff changeset
40 #include "tInfoLog.h"
ac25c35a3c97 New Tab for dynamic configuration:
Ideenmodellierer
parents: 993
diff changeset
41 #include "tInfoSensor.h"
394
717f335cc5c9 Added start of module configuration after eache modul power on
ideenmodellierer
parents: 314
diff changeset
42 #include "tComm.h"
562
ec76fa85009e Added ADC sensor interface to O2 sensore menu structure:
Ideenmodellierer
parents: 539
diff changeset
43 #include "data_exchange_main.h"
1073
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
44 #include "tMenuCvOptionText.h"
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
45
748
be25ab2d902c Added display of co2 ppm values:
Ideenmodellierer
parents: 746
diff changeset
46
1005
85f7e19c6688 Switch menu position of Buzzer and flipdisplay option:
Ideenmodellierer
parents: 1001
diff changeset
47 //extern void tM_build_pages(void);
999
ac25c35a3c97 New Tab for dynamic configuration:
Ideenmodellierer
parents: 993
diff changeset
48
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
49 /* Private function prototypes -----------------------------------------------*/
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
50 void openEdit_Bluetooth(void);
1073
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
51 void openEdit_Sensors(uint8_t filter);
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
52 void openEdit_Brightness(void);
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
53 //void openEdit_Luftintegration(void);
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
54 void openEdit_ButtonSens(void);
1005
85f7e19c6688 Switch menu position of Buzzer and flipdisplay option:
Ideenmodellierer
parents: 1001
diff changeset
55 void openEdit_WarningBuz(void);
85f7e19c6688 Switch menu position of Buzzer and flipdisplay option:
Ideenmodellierer
parents: 1001
diff changeset
56
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
57
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
58 /* Announced function prototypes -----------------------------------------------*/
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
59 uint8_t OnAction_Sensor1 (uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action);
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
60 uint8_t OnAction_Sensor2 (uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action);
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
61 uint8_t OnAction_Sensor3 (uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action);
562
ec76fa85009e Added ADC sensor interface to O2 sensore menu structure:
Ideenmodellierer
parents: 539
diff changeset
62 uint8_t OnAction_O2_Calibrate (uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action);
1073
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
63 uint8_t OnAction_CO2_Calibrate (uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action);
718
b9f699d2e3d0 Updated menu structure to support new sensor information page:
Ideenmodellierer
parents: 709
diff changeset
64 uint8_t OnAction_Sensor_Info (uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action);
730
9c65d226f4f6 Update sensor menu support for automatic sensor detection:
Ideenmodellierer
parents: 724
diff changeset
65 uint8_t OnAction_Sensor_Detect (uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action);
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
66 uint8_t OnAction_Button (uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action);
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
67 uint8_t OnAction_ButtonBalance (uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action);
740
5078da3845c0 Added button lock after wakeup in surface mode:
Ideenmodellierer
parents: 734
diff changeset
68 uint8_t OnAction_ButtonLock (uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action);
1078
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
69 uint8_t OnAction_LedSequence (uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action);
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
70 uint8_t OnAction_LedBrightness (uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action);
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
71 /* Exported functions --------------------------------------------------------*/
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
72
562
ec76fa85009e Added ADC sensor interface to O2 sensore menu structure:
Ideenmodellierer
parents: 539
diff changeset
73
ec76fa85009e Added ADC sensor interface to O2 sensore menu structure:
Ideenmodellierer
parents: 539
diff changeset
74 #define O2_CALIB_FRACTION_AIR (0.209F)
605
1f665e31aca2 change O2_CALIB_FRACTION_O2 to 0.98
heinrichsweikamp
parents: 584
diff changeset
75 #define O2_CALIB_FRACTION_O2 (0.98F)
562
ec76fa85009e Added ADC sensor interface to O2 sensore menu structure:
Ideenmodellierer
parents: 539
diff changeset
76
584
830de438e0b0 Added option for 100% o2 calibration:
Ideenmodellierer
parents: 562
diff changeset
77 static uint8_t O2_calib_gas = 21;
562
ec76fa85009e Added ADC sensor interface to O2 sensore menu structure:
Ideenmodellierer
parents: 539
diff changeset
78
1073
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
79 static externalInterfaceSensorType sensorFilter = SENSOR_NONE; /* used to have only a specific type of sensor in the sensor list view */
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
80 static externalInterfaceSensorType localSensorMap[3]; /* reduce the complete external sensor map to the three entries which are displayed by the menu */
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
81
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
82 void openEdit_Hardware(uint8_t line)
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
83 {
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
84 set_globalState_Menu_Line(line);
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
85
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
86 switch(line)
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
87 {
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
88 case 1:
1005
85f7e19c6688 Switch menu position of Buzzer and flipdisplay option:
Ideenmodellierer
parents: 1001
diff changeset
89 default: openEdit_Bluetooth();
85f7e19c6688 Switch menu position of Buzzer and flipdisplay option:
Ideenmodellierer
parents: 1001
diff changeset
90 break;
1073
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
91 case 2: openEdit_Sensors(SENSOR_NONE);
1005
85f7e19c6688 Switch menu position of Buzzer and flipdisplay option:
Ideenmodellierer
parents: 1001
diff changeset
92 break;
85f7e19c6688 Switch menu position of Buzzer and flipdisplay option:
Ideenmodellierer
parents: 1001
diff changeset
93 case 3: openEdit_Brightness();
85f7e19c6688 Switch menu position of Buzzer and flipdisplay option:
Ideenmodellierer
parents: 1001
diff changeset
94 break;
85f7e19c6688 Switch menu position of Buzzer and flipdisplay option:
Ideenmodellierer
parents: 1001
diff changeset
95 case 4: resetMenuEdit(CLUT_MenuPageHardware);
85f7e19c6688 Switch menu position of Buzzer and flipdisplay option:
Ideenmodellierer
parents: 1001
diff changeset
96 openEdit_ButtonSens();
85f7e19c6688 Switch menu position of Buzzer and flipdisplay option:
Ideenmodellierer
parents: 1001
diff changeset
97 break;
85f7e19c6688 Switch menu position of Buzzer and flipdisplay option:
Ideenmodellierer
parents: 1001
diff changeset
98 case 5: if(isNewDisplay())
85f7e19c6688 Switch menu position of Buzzer and flipdisplay option:
Ideenmodellierer
parents: 1001
diff changeset
99 {
85f7e19c6688 Switch menu position of Buzzer and flipdisplay option:
Ideenmodellierer
parents: 1001
diff changeset
100 openEdit_WarningBuz();
85f7e19c6688 Switch menu position of Buzzer and flipdisplay option:
Ideenmodellierer
parents: 1001
diff changeset
101 }
85f7e19c6688 Switch menu position of Buzzer and flipdisplay option:
Ideenmodellierer
parents: 1001
diff changeset
102 break;
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
103 }
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
104 }
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
105
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
106 /* Private functions ---------------------------------------------------------*/
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
107 void openEdit_Bluetooth(void)
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
108 {
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
109 /* does not work like this resetEnterPressedToStateBeforeButtonAction(); */
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
110
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
111 SSettings *pSettings = settingsGetPointer();
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
112
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
113 if(pSettings->bluetoothActive == 0)
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
114 {
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
115 pSettings->bluetoothActive = 1;
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
116 MX_Bluetooth_PowerOn();
394
717f335cc5c9 Added start of module configuration after eache modul power on
ideenmodellierer
parents: 314
diff changeset
117 tComm_StartBlueModConfig();
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
118 }
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
119 else
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
120 {
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
121 pSettings->bluetoothActive = 0;
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
122 MX_Bluetooth_PowerOff();
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
123 }
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
124 exitMenuEdit_to_Menu_with_Menu_Update_do_not_write_settings_for_this_only();
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
125 }
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
126
1005
85f7e19c6688 Switch menu position of Buzzer and flipdisplay option:
Ideenmodellierer
parents: 1001
diff changeset
127 void openEdit_WarningBuz(void)
110
cc8e24374b83 Added option to handled mirrored display to existing functions
Ideenmodellierer
parents: 38
diff changeset
128 {
1005
85f7e19c6688 Switch menu position of Buzzer and flipdisplay option:
Ideenmodellierer
parents: 1001
diff changeset
129 SSettings *pSettings = settingsGetPointer();
110
cc8e24374b83 Added option to handled mirrored display to existing functions
Ideenmodellierer
parents: 38
diff changeset
130
1005
85f7e19c6688 Switch menu position of Buzzer and flipdisplay option:
Ideenmodellierer
parents: 1001
diff changeset
131 if(pSettings->warningBuzzer == 0)
85f7e19c6688 Switch menu position of Buzzer and flipdisplay option:
Ideenmodellierer
parents: 1001
diff changeset
132 {
85f7e19c6688 Switch menu position of Buzzer and flipdisplay option:
Ideenmodellierer
parents: 1001
diff changeset
133 pSettings->warningBuzzer = 1;
85f7e19c6688 Switch menu position of Buzzer and flipdisplay option:
Ideenmodellierer
parents: 1001
diff changeset
134 requestBuzzerActivation(REQUEST_BUZZER_ONCE);
85f7e19c6688 Switch menu position of Buzzer and flipdisplay option:
Ideenmodellierer
parents: 1001
diff changeset
135 }
85f7e19c6688 Switch menu position of Buzzer and flipdisplay option:
Ideenmodellierer
parents: 1001
diff changeset
136 else
85f7e19c6688 Switch menu position of Buzzer and flipdisplay option:
Ideenmodellierer
parents: 1001
diff changeset
137 {
85f7e19c6688 Switch menu position of Buzzer and flipdisplay option:
Ideenmodellierer
parents: 1001
diff changeset
138 pSettings->warningBuzzer = 0;
85f7e19c6688 Switch menu position of Buzzer and flipdisplay option:
Ideenmodellierer
parents: 1001
diff changeset
139 deactivateBuzzer();
85f7e19c6688 Switch menu position of Buzzer and flipdisplay option:
Ideenmodellierer
parents: 1001
diff changeset
140 }
85f7e19c6688 Switch menu position of Buzzer and flipdisplay option:
Ideenmodellierer
parents: 1001
diff changeset
141 exitMenuEdit_to_Menu_with_Menu_Update_do_not_write_settings_for_this_only();
85f7e19c6688 Switch menu position of Buzzer and flipdisplay option:
Ideenmodellierer
parents: 1001
diff changeset
142 }
110
cc8e24374b83 Added option to handled mirrored display to existing functions
Ideenmodellierer
parents: 38
diff changeset
143
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
144
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
145 void refresh_O2Sensors(void)
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
146 {
1078
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
147 static uint8_t HUD_cmdUpdateCnt = 20;
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
148
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
149 char strSensorId[20];
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
150 char strSensorValue[30];
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
151 uint16_t y_line;
730
9c65d226f4f6 Update sensor menu support for automatic sensor detection:
Ideenmodellierer
parents: 724
diff changeset
152 uint8_t index = 0;
1078
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
153 uint8_t uartSensorCnt = 0;
1073
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
154
562
ec76fa85009e Added ADC sensor interface to O2 sensore menu structure:
Ideenmodellierer
parents: 539
diff changeset
155 const SDiveState *pStateReal = stateRealGetPointer();
730
9c65d226f4f6 Update sensor menu support for automatic sensor detection:
Ideenmodellierer
parents: 724
diff changeset
156 SSettings *pSettings = settingsGetPointer();
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
157
1073
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
158 if((memcmp(pSettings->ext_sensor_map, pStateReal->lifeData.extIf_sensor_map, EXT_INTERFACE_SENSOR_CNT) != 0) && (sensorFilter == SENSOR_NONE))
734
190e5814b2f5 Removed interface selection from sensor menu:
Ideenmodellierer
parents: 730
diff changeset
159 {
797
acf6614dc396 Use mirror sensortype for visualization:
Ideenmodellierer
parents: 783
diff changeset
160 memcpy(pSettings->ext_sensor_map, pStateReal->lifeData.extIf_sensor_map, EXT_INTERFACE_SENSOR_CNT);
734
190e5814b2f5 Removed interface selection from sensor menu:
Ideenmodellierer
parents: 730
diff changeset
161 pSettings->ppo2sensors_deactivated = 0x0; /* deactivation will be done by openEditO2Sensor if need */
827
ffb1036c27c2 Moved CO2 Menu from Xtra to Hardware:
Ideenmodellierer
parents: 814
diff changeset
162 pSettings->co2_sensor_active = 0;
734
190e5814b2f5 Removed interface selection from sensor menu:
Ideenmodellierer
parents: 730
diff changeset
163 pSettings->ppo2sensors_source = O2_SENSOR_SOURCE_OPTIC;
827
ffb1036c27c2 Moved CO2 Menu from Xtra to Hardware:
Ideenmodellierer
parents: 814
diff changeset
164 for(index = 0; index < EXT_INTERFACE_SENSOR_CNT - 1; index++)
730
9c65d226f4f6 Update sensor menu support for automatic sensor detection:
Ideenmodellierer
parents: 724
diff changeset
165 {
734
190e5814b2f5 Removed interface selection from sensor menu:
Ideenmodellierer
parents: 730
diff changeset
166 switch(pSettings->ext_sensor_map[index])
190e5814b2f5 Removed interface selection from sensor menu:
Ideenmodellierer
parents: 730
diff changeset
167 {
190e5814b2f5 Removed interface selection from sensor menu:
Ideenmodellierer
parents: 730
diff changeset
168 case SENSOR_OPTIC: pSettings->ppo2sensors_source = O2_SENSOR_SOURCE_OPTIC;
190e5814b2f5 Removed interface selection from sensor menu:
Ideenmodellierer
parents: 730
diff changeset
169 break;
190e5814b2f5 Removed interface selection from sensor menu:
Ideenmodellierer
parents: 730
diff changeset
170 case SENSOR_ANALOG: if(pSettings->ppo2sensors_source == O2_SENSOR_SOURCE_DIGITAL)
190e5814b2f5 Removed interface selection from sensor menu:
Ideenmodellierer
parents: 730
diff changeset
171 {
190e5814b2f5 Removed interface selection from sensor menu:
Ideenmodellierer
parents: 730
diff changeset
172 pSettings->ppo2sensors_source = O2_SENSOR_SOURCE_ANADIG;
190e5814b2f5 Removed interface selection from sensor menu:
Ideenmodellierer
parents: 730
diff changeset
173 }
190e5814b2f5 Removed interface selection from sensor menu:
Ideenmodellierer
parents: 730
diff changeset
174 if(pSettings->ppo2sensors_source != O2_SENSOR_SOURCE_ANADIG)
190e5814b2f5 Removed interface selection from sensor menu:
Ideenmodellierer
parents: 730
diff changeset
175 {
190e5814b2f5 Removed interface selection from sensor menu:
Ideenmodellierer
parents: 730
diff changeset
176 pSettings->ppo2sensors_source = O2_SENSOR_SOURCE_ANALOG;
190e5814b2f5 Removed interface selection from sensor menu:
Ideenmodellierer
parents: 730
diff changeset
177 }
190e5814b2f5 Removed interface selection from sensor menu:
Ideenmodellierer
parents: 730
diff changeset
178 break;
797
acf6614dc396 Use mirror sensortype for visualization:
Ideenmodellierer
parents: 783
diff changeset
179 case SENSOR_DIGO2M: if(pSettings->ppo2sensors_source == O2_SENSOR_SOURCE_ANALOG)
734
190e5814b2f5 Removed interface selection from sensor menu:
Ideenmodellierer
parents: 730
diff changeset
180 {
190e5814b2f5 Removed interface selection from sensor menu:
Ideenmodellierer
parents: 730
diff changeset
181 pSettings->ppo2sensors_source = O2_SENSOR_SOURCE_ANADIG;
190e5814b2f5 Removed interface selection from sensor menu:
Ideenmodellierer
parents: 730
diff changeset
182 }
190e5814b2f5 Removed interface selection from sensor menu:
Ideenmodellierer
parents: 730
diff changeset
183 if(pSettings->ppo2sensors_source != O2_SENSOR_SOURCE_ANADIG)
190e5814b2f5 Removed interface selection from sensor menu:
Ideenmodellierer
parents: 730
diff changeset
184 {
190e5814b2f5 Removed interface selection from sensor menu:
Ideenmodellierer
parents: 730
diff changeset
185 pSettings->ppo2sensors_source = O2_SENSOR_SOURCE_DIGITAL;
190e5814b2f5 Removed interface selection from sensor menu:
Ideenmodellierer
parents: 730
diff changeset
186 }
190e5814b2f5 Removed interface selection from sensor menu:
Ideenmodellierer
parents: 730
diff changeset
187 break;
827
ffb1036c27c2 Moved CO2 Menu from Xtra to Hardware:
Ideenmodellierer
parents: 814
diff changeset
188 case SENSOR_CO2:
ffb1036c27c2 Moved CO2 Menu from Xtra to Hardware:
Ideenmodellierer
parents: 814
diff changeset
189 case SENSOR_CO2M: pSettings->co2_sensor_active = 1;
ffb1036c27c2 Moved CO2 Menu from Xtra to Hardware:
Ideenmodellierer
parents: 814
diff changeset
190 break;
746
7e84ae1513b6 Code cleanup sensors under development:
Ideenmodellierer
parents: 745
diff changeset
191 #ifdef ENABLE_SENTINEL_MODE
842
c3dd461ca3f9 Migrated Sentinel protocol to new UART structure:
Ideenmodellierer
parents: 827
diff changeset
192 case SENSOR_SENTINEL:
c3dd461ca3f9 Migrated Sentinel protocol to new UART structure:
Ideenmodellierer
parents: 827
diff changeset
193 case SENSOR_SENTINELM: pSettings->ppo2sensors_source = O2_SENSOR_SOURCE_SENTINEL;
745
b392524753fb Update Sentinel protocol:
Ideenmodellierer
parents: 740
diff changeset
194 break;
746
7e84ae1513b6 Code cleanup sensors under development:
Ideenmodellierer
parents: 745
diff changeset
195 #endif
734
190e5814b2f5 Removed interface selection from sensor menu:
Ideenmodellierer
parents: 730
diff changeset
196 default:
190e5814b2f5 Removed interface selection from sensor menu:
Ideenmodellierer
parents: 730
diff changeset
197 break;
190e5814b2f5 Removed interface selection from sensor menu:
Ideenmodellierer
parents: 730
diff changeset
198 }
730
9c65d226f4f6 Update sensor menu support for automatic sensor detection:
Ideenmodellierer
parents: 724
diff changeset
199 }
1073
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
200 if(pSettings->ext_sensor_map[0] != SENSOR_SEARCH)
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
201 {
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
202 index = tMCvOptText_BuildDynamicContentList();
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
203 tM_setLinesForPage(StMOption, index);
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
204 openEdit_Sensors(SENSOR_NONE);
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
205 }
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
206 else
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
207 {
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
208 openEdit_Sensors(SENSOR_SEARCH);
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
209 }
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
210
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
211
734
190e5814b2f5 Removed interface selection from sensor menu:
Ideenmodellierer
parents: 730
diff changeset
212 }
190e5814b2f5 Removed interface selection from sensor menu:
Ideenmodellierer
parents: 730
diff changeset
213
783
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
214 strSensorId[0] = '\001';
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
215 strSensorId[1] = TXT_o2Sensors;
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
216 strSensorId[2] = 0;
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
217 write_topline(strSensorId);
718
b9f699d2e3d0 Updated menu structure to support new sensor information page:
Ideenmodellierer
parents: 709
diff changeset
218
1078
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
219 memset(strSensorId,0,20);
783
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
220 strSensorId[0] = TXT_2BYTE;
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
221 strSensorId[1] = TXT2BYTE_Sensor;
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
222 strSensorId[2] = ' ';
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
223 strSensorId[3] = TXT_2BYTE;
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
224 strSensorId[4] = 'X';
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
225 strSensorId[5] = '1';
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
226 strSensorId[6] = 0;
718
b9f699d2e3d0 Updated menu structure to support new sensor information page:
Ideenmodellierer
parents: 709
diff changeset
227
783
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
228 for(index = 0; index < 3; index++)
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
229 {
799
1e3c12d772eb Added CO2 mirrow instance:
Ideenmodellierer
parents: 797
diff changeset
230 strSensorId[3] = TXT_2BYTE;
734
190e5814b2f5 Removed interface selection from sensor menu:
Ideenmodellierer
parents: 730
diff changeset
231 strSensorId[4] = 'X';
783
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
232 strSensorId[5] = '1' + index;
718
b9f699d2e3d0 Updated menu structure to support new sensor information page:
Ideenmodellierer
parents: 709
diff changeset
233
1073
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
234 switch(localSensorMap[index])
730
9c65d226f4f6 Update sensor menu support for automatic sensor detection:
Ideenmodellierer
parents: 724
diff changeset
235 {
748
be25ab2d902c Added display of co2 ppm values:
Ideenmodellierer
parents: 746
diff changeset
236 case SENSOR_SEARCH: strSensorId[1] = TXT2BYTE_SensorDetect;
be25ab2d902c Added display of co2 ppm values:
Ideenmodellierer
parents: 746
diff changeset
237 strSensorId[2] = 0;
be25ab2d902c Added display of co2 ppm values:
Ideenmodellierer
parents: 746
diff changeset
238 strSensorId[4] = 0;
745
b392524753fb Update Sentinel protocol:
Ideenmodellierer
parents: 740
diff changeset
239 break;
734
190e5814b2f5 Removed interface selection from sensor menu:
Ideenmodellierer
parents: 730
diff changeset
240 case SENSOR_OPTIC: strSensorId[4] = TXT2BYTE_O2IFOptic;
190e5814b2f5 Removed interface selection from sensor menu:
Ideenmodellierer
parents: 730
diff changeset
241 break;
190e5814b2f5 Removed interface selection from sensor menu:
Ideenmodellierer
parents: 730
diff changeset
242 case SENSOR_ANALOG: strSensorId[4] = TXT2BYTE_O2IFAnalog;
190e5814b2f5 Removed interface selection from sensor menu:
Ideenmodellierer
parents: 730
diff changeset
243 break;
797
acf6614dc396 Use mirror sensortype for visualization:
Ideenmodellierer
parents: 783
diff changeset
244 case SENSOR_DIGO2:
acf6614dc396 Use mirror sensortype for visualization:
Ideenmodellierer
parents: 783
diff changeset
245 case SENSOR_DIGO2M: strSensorId[4] = TXT2BYTE_O2IFDigital;
734
190e5814b2f5 Removed interface selection from sensor menu:
Ideenmodellierer
parents: 730
diff changeset
246 break;
799
1e3c12d772eb Added CO2 mirrow instance:
Ideenmodellierer
parents: 797
diff changeset
247 case SENSOR_CO2:
1073
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
248 case SENSOR_CO2M: strSensorId[3] = 'C';
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
249 strSensorId[4] = 'O';
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
250 strSensorId[5] = '2';
734
190e5814b2f5 Removed interface selection from sensor menu:
Ideenmodellierer
parents: 730
diff changeset
251 break;
842
c3dd461ca3f9 Migrated Sentinel protocol to new UART structure:
Ideenmodellierer
parents: 827
diff changeset
252 case SENSOR_SENTINEL:
1073
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
253 case SENSOR_SENTINELM: strSensorId[3] = 'S';
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
254 strSensorId[4] = 'e';
745
b392524753fb Update Sentinel protocol:
Ideenmodellierer
parents: 740
diff changeset
255 break;
920
c4c9850a2039 Added view for position data:
Ideenmodellierer
parents: 884
diff changeset
256 case SENSOR_GNSS:
c4c9850a2039 Added view for position data:
Ideenmodellierer
parents: 884
diff changeset
257 case SENSOR_GNSSM: strSensorId[3] = 'G';
c4c9850a2039 Added view for position data:
Ideenmodellierer
parents: 884
diff changeset
258 strSensorId[4] = 'N';
c4c9850a2039 Added view for position data:
Ideenmodellierer
parents: 884
diff changeset
259 break;
1078
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
260 case SENSOR_HUD: strSensorId[3] = 'H';
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
261 strSensorId[4] = 'U';
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
262 strSensorId[5] = 'D';
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
263 break;
734
190e5814b2f5 Removed interface selection from sensor menu:
Ideenmodellierer
parents: 730
diff changeset
264 default:
748
be25ab2d902c Added display of co2 ppm values:
Ideenmodellierer
parents: 746
diff changeset
265 strSensorId[5] = 0;
734
190e5814b2f5 Removed interface selection from sensor menu:
Ideenmodellierer
parents: 730
diff changeset
266 break;
783
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
267 }
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
268 if(strSensorId[4] != 'X')
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
269 {
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
270 write_label_var( 96, 340, ME_Y_LINE1 + (index * ME_Y_LINE_STEP), &FontT48, strSensorId);
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
271 }
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
272 strSensorValue[0] = 0;
1073
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
273 if((localSensorMap[index] >= SENSOR_OPTIC) && (localSensorMap[index] < SENSOR_TYPE_O2_END))
783
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
274 {
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
275 snprintf(strSensorValue, 20,"%01.2f, %01.1f mV", pStateReal->lifeData.ppO2Sensor_bar[index], pStateReal->lifeData.sensorVoltage_mV[index]);
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
276 }
1073
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
277 else if(localSensorMap[index] == SENSOR_CO2M)
783
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
278 {
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
279 snprintf(strSensorValue, 20,"%ld ppm", pStateReal->lifeData.CO2_data.CO2_ppm);
730
9c65d226f4f6 Update sensor menu support for automatic sensor detection:
Ideenmodellierer
parents: 724
diff changeset
280 }
1078
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
281 else if(localSensorMap[index] == SENSOR_HUD)
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
282 {
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
283 write_label_var( 30, 340, ME_Y_LINE2, &FontT48, "LED Sequence:");
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
284 tMenuEdit_newInput(StMHARD3_O2_Sensor2, pStateReal->lifeData.HUD_led_sequence[0] - pStateReal->lifeData.HUD_led_sequence[1],
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
285 pStateReal->lifeData.HUD_led_sequence[2] - pStateReal->lifeData.HUD_led_sequence[3],
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
286 pStateReal->lifeData.HUD_led_sequence[4] - pStateReal->lifeData.HUD_led_sequence[5],
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
287 pStateReal->lifeData.HUD_led_sequence[6]);
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
288 snprintf(strSensorValue, 30,"LED Brightness: %d",pStateReal->lifeData.HUD_led_brightness);
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
289 write_label_var( 30, 340, ME_Y_LINE3, &FontT48, strSensorValue);
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
290 snprintf(strSensorValue, 20,"o o o \023o");
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
291 }
783
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
292 y_line = ME_Y_LINE1 + (index * ME_Y_LINE_STEP);
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
293 if(strSensorValue[0] != 0)
718
b9f699d2e3d0 Updated menu structure to support new sensor information page:
Ideenmodellierer
parents: 709
diff changeset
294 {
783
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
295 write_label_var( 480, 800, y_line, &FontT48, strSensorValue);
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
296 }
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
297 }
562
ec76fa85009e Added ADC sensor interface to O2 sensore menu structure:
Ideenmodellierer
parents: 539
diff changeset
298
1073
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
299 if(localSensorMap[0] == SENSOR_OPTIC)
783
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
300 {
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
301 strSensorId[0] = TXT_2BYTE;
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
302 strSensorId[1] = TXT2BYTE_HUDbattery;
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
303 strSensorId[2] = 0;
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
304 write_label_var( 30, 340, ME_Y_LINE4, &FontT48, strSensorId);
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
305
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
306 snprintf(strSensorId, 20,"%01.3fV", get_HUD_battery_voltage_V());
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
307 write_label_var( 480, 800, ME_Y_LINE4, &FontT48, strSensorId);
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
308 }
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
309 else
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
310 {
1073
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
311 if(((pSettings->ppo2sensors_source == O2_SENSOR_SOURCE_ANALOG) || (pSettings->ppo2sensors_source == O2_SENSOR_SOURCE_ANADIG)
754
ec7b62983a8c Only show autodetection in sensor menu if external interface is present:
Ideenmodellierer
parents: 748
diff changeset
312 #ifdef ENABLE_SENTINEL_MODE
746
7e84ae1513b6 Code cleanup sensors under development:
Ideenmodellierer
parents: 745
diff changeset
313 || (pSettings->ppo2sensors_source == O2_SENSOR_SOURCE_SENTINEL)
7e84ae1513b6 Code cleanup sensors under development:
Ideenmodellierer
parents: 745
diff changeset
314 #endif
1073
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
315 ) && ((sensorFilter == SENSOR_NONE) || (sensorFilter == SENSOR_DIGO2)))
783
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
316 {
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
317 strSensorId[0] = TXT_2BYTE;
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
318 strSensorId[1] = TXT2BYTE_O2Calib;
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
319 strSensorId[2] = 0;
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
320 write_label_var( 30, 340, ME_Y_LINE4, &FontT48, strSensorId);
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
321 snprintf(strSensorId, 20,"%d%%", O2_calib_gas);
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
322 write_label_var( 480, 800, ME_Y_LINE4, &FontT48, strSensorId);
562
ec76fa85009e Added ADC sensor interface to O2 sensore menu structure:
Ideenmodellierer
parents: 539
diff changeset
323 }
1073
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
324 else if(sensorFilter == SENSOR_CO2)
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
325 {
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
326 strSensorId[0] = TXT_2BYTE;
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
327 strSensorId[1] = TXT2BYTE_O2Calib;
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
328 strSensorId[2] = 0;
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
329 write_label_var( 30, 340, ME_Y_LINE4, &FontT48, strSensorId);
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
330 }
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
331
783
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
332 }
1078
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
333 if(sensorFilter == SENSOR_NONE)
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
334 {
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
335 for(index = EXT_INTERFACE_MUX_OFFSET; index < EXT_INTERFACE_SENSOR_CNT; index++)
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
336 {
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
337 if(pSettings->ext_sensor_map[index] != SENSOR_NONE)
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
338 {
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
339 uartSensorCnt++;
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
340 }
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
341 }
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
342 if(uartSensorCnt != 0)
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
343 {
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
344 snprintf(strSensorId, 20,"%c: %d", TXT_o2Sensors, uartSensorCnt);
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
345 write_label_var( 30, 340, ME_Y_LINE5, &FontT48, strSensorId);
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
346 }
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
347 }
1073
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
348 if((DataEX_external_ADC_Present()) && (sensorFilter == SENSOR_NONE))
783
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
349 {
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
350 strSensorId[0] = TXT_2BYTE;
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
351 strSensorId[1] = TXT2BYTE_SensorDetect;
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
352 strSensorId[2] = 0;
734
190e5814b2f5 Removed interface selection from sensor menu:
Ideenmodellierer
parents: 730
diff changeset
353
783
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
354 write_label_var( 30, 340, ME_Y_LINE6, &FontT48, strSensorId);
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
355 }
734
190e5814b2f5 Removed interface selection from sensor menu:
Ideenmodellierer
parents: 730
diff changeset
356
1073
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
357 if((localSensorMap[0] >= SENSOR_OPTIC) && (localSensorMap[0] < SENSOR_MUX))
783
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
358 {
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
359 tMenuEdit_refresh_field(StMHARD3_O2_Sensor1);
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
360 }
1073
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
361 if((localSensorMap[1] >= SENSOR_OPTIC) && (localSensorMap[1] < SENSOR_MUX))
783
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
362 {
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
363 tMenuEdit_refresh_field(StMHARD3_O2_Sensor2);
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
364 }
1073
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
365 if((localSensorMap[2] >= SENSOR_OPTIC) && (localSensorMap[2] < SENSOR_MUX))
783
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
366 {
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
367 tMenuEdit_refresh_field(StMHARD3_O2_Sensor3);
718
b9f699d2e3d0 Updated menu structure to support new sensor information page:
Ideenmodellierer
parents: 709
diff changeset
368 }
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
369
584
830de438e0b0 Added option for 100% o2 calibration:
Ideenmodellierer
parents: 562
diff changeset
370 if(get_globalState() == StMHARD3_O2_Calibrate)
830de438e0b0 Added option for 100% o2 calibration:
Ideenmodellierer
parents: 562
diff changeset
371 {
830de438e0b0 Added option for 100% o2 calibration:
Ideenmodellierer
parents: 562
diff changeset
372 write_buttonTextline(TXT2BYTE_ButtonBack,TXT2BYTE_O2Calib,TXT2BYTE_ButtonPlus);
830de438e0b0 Added option for 100% o2 calibration:
Ideenmodellierer
parents: 562
diff changeset
373 }
830de438e0b0 Added option for 100% o2 calibration:
Ideenmodellierer
parents: 562
diff changeset
374 else
830de438e0b0 Added option for 100% o2 calibration:
Ideenmodellierer
parents: 562
diff changeset
375 {
830de438e0b0 Added option for 100% o2 calibration:
Ideenmodellierer
parents: 562
diff changeset
376 write_buttonTextline(TXT2BYTE_ButtonBack,TXT2BYTE_ButtonEnter,TXT2BYTE_ButtonNext);
830de438e0b0 Added option for 100% o2 calibration:
Ideenmodellierer
parents: 562
diff changeset
377 }
1078
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
378
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
379 if(localSensorMap[0] == SENSOR_HUD)
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
380 {
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
381 HUD_cmdUpdateCnt--;
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
382 if(HUD_cmdUpdateCnt == 0)
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
383 {
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
384 HUD_cmdUpdateCnt = 20;
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
385 for(index = EXT_INTERFACE_MUX_OFFSET; index < EXT_INTERFACE_SENSOR_CNT; index++)
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
386 {
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
387 if(pSettings->ext_sensor_map[index] == SENSOR_HUD)
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
388 {
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
389 DataEX_setExtInterface_Cmd(EXT_INTERFACE_HUD_UPDATE, index);
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
390 break;
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
391 }
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
392 }
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
393
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
394 }
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
395 }
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
396 }
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
397
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
398
1073
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
399 void openEdit_Sensors(uint8_t filter)
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
400 {
1073
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
401 static externalInterfaceSensorType lastFilter;
730
9c65d226f4f6 Update sensor menu support for automatic sensor detection:
Ideenmodellierer
parents: 724
diff changeset
402 SSettings *pSettings = settingsGetPointer();
1078
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
403 const SDiveState* pRealState = stateRealGetPointer();
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
404 uint8_t sensorActive[3];
783
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
405 uint8_t index = 0;
746
7e84ae1513b6 Code cleanup sensors under development:
Ideenmodellierer
parents: 745
diff changeset
406 char text[3];
926
875933272056 Bugfix sensor de-/activation handling:
Ideenmodellierer
parents: 920
diff changeset
407 uint32_t firstSensorId = 0;
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
408
718
b9f699d2e3d0 Updated menu structure to support new sensor information page:
Ideenmodellierer
parents: 709
diff changeset
409 set_globalState(StMHARD3_Sensors);
b9f699d2e3d0 Updated menu structure to support new sensor information page:
Ideenmodellierer
parents: 709
diff changeset
410 resetMenuEdit(CLUT_MenuPageHardware);
b9f699d2e3d0 Updated menu structure to support new sensor information page:
Ideenmodellierer
parents: 709
diff changeset
411
1073
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
412 if(filter == SENSOR_SEARCH)
783
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
413 {
1073
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
414 for(index = 0; index < 3; index++ )
926
875933272056 Bugfix sensor de-/activation handling:
Ideenmodellierer
parents: 920
diff changeset
415 {
1073
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
416 localSensorMap[index] = SENSOR_SEARCH;
930
25948e805406 DevBugfix Co2 sensor details:
Ideenmodellierer
parents: 926
diff changeset
417 }
730
9c65d226f4f6 Update sensor menu support for automatic sensor detection:
Ideenmodellierer
parents: 724
diff changeset
418 }
9c65d226f4f6 Update sensor menu support for automatic sensor detection:
Ideenmodellierer
parents: 724
diff changeset
419 else
9c65d226f4f6 Update sensor menu support for automatic sensor detection:
Ideenmodellierer
parents: 724
diff changeset
420 {
1073
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
421 if(filter == SENSOR_END) /* use last filter settings. e.g. for return from submenu */
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
422 {
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
423 sensorFilter = lastFilter;
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
424 }
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
425 else
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
426 {
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
427 sensorFilter = filter;
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
428 }
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
429 lastFilter = sensorFilter;
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
430
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
431 for(index = 0; index < 3; index++ )
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
432 {
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
433 localSensorMap[index] = SENSOR_NONE;
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
434 if(pSettings->ppo2sensors_deactivated & (0x01 << index))
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
435 {
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
436 sensorActive[index] = 0;
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
437 }
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
438 else
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
439 {
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
440 sensorActive[index] = 1;
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
441 }
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
442 }
1078
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
443 if((sensorFilter == SENSOR_NONE) || (sensorFilter == SENSOR_DIGO2))
1073
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
444 {
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
445 if(((pSettings->ext_sensor_map[0] < SENSOR_OPTIC) || (pSettings->ext_sensor_map[0] >= SENSOR_TYPE_O2_END)))
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
446 {
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
447 pSettings->ppo2sensors_deactivated |= 1;
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
448 if((pSettings->ext_sensor_map[0] == SENSOR_CO2M) && (sensorFilter == SENSOR_NONE))
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
449 {
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
450 write_field_on_off(StMHARD3_O2_Sensor1, 30, 95, ME_Y_LINE1, &FontT48, "", pSettings->co2_sensor_active);
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
451 }
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
452 }
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
453 else
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
454 {
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
455 write_field_on_off(StMHARD3_O2_Sensor1, 30, 95, ME_Y_LINE1, &FontT48, "", sensorActive[0]);
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
456 if(firstSensorId == 0)
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
457 {
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
458 firstSensorId = StMHARD3_O2_Sensor1;
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
459 }
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
460 }
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
461 if(((pSettings->ext_sensor_map[1] < SENSOR_OPTIC) || (pSettings->ext_sensor_map[1] >= SENSOR_TYPE_O2_END)))
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
462 {
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
463 pSettings->ppo2sensors_deactivated |= 2;
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
464 if((pSettings->ext_sensor_map[1] == SENSOR_CO2M) && (sensorFilter == SENSOR_NONE))
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
465 {
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
466 write_field_on_off(StMHARD3_O2_Sensor2, 30, 95, ME_Y_LINE2, &FontT48, "", pSettings->co2_sensor_active);
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
467 }
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
468 }
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
469 else
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
470 {
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
471 write_field_on_off(StMHARD3_O2_Sensor2, 30, 95, ME_Y_LINE2, &FontT48, "", sensorActive[1]);
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
472 if(firstSensorId == 0)
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
473 {
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
474 firstSensorId = StMHARD3_O2_Sensor2;
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
475 }
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
476 }
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
477 if(((pSettings->ext_sensor_map[2] < SENSOR_OPTIC) || (pSettings->ext_sensor_map[2] >= SENSOR_TYPE_O2_END)))
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
478 {
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
479 pSettings->ppo2sensors_deactivated |= 4;
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
480 if((pSettings->ext_sensor_map[2] == SENSOR_CO2M) && (sensorFilter == SENSOR_NONE))
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
481 {
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
482 write_field_on_off(StMHARD3_O2_Sensor3, 30, 95, ME_Y_LINE3, &FontT48, "", pSettings->co2_sensor_active);
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
483 }
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
484 }
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
485 else
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
486 {
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
487 write_field_on_off(StMHARD3_O2_Sensor3, 30, 95, ME_Y_LINE3, &FontT48, "", sensorActive[2]);
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
488 if(firstSensorId == 0)
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
489 {
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
490 firstSensorId = StMHARD3_O2_Sensor3;
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
491 }
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
492 }
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
493 }
1078
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
494 else /* single, none O2 sensors */
1073
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
495 {
1078
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
496 switch(sensorFilter)
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
497 {
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
498 case SENSOR_CO2: write_field_on_off(StMHARD3_O2_Sensor1, 30, 95, ME_Y_LINE1, &FontT48, "", pSettings->co2_sensor_active); /* only one CO2 supporterd => show at first line */
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
499 break;
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
500 default: write_field_button(StMHARD3_O2_Sensor1, 30, 95, ME_Y_LINE1, &FontT48, "");
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
501 break;
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
502 }
1073
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
503 firstSensorId = StMHARD3_O2_Sensor1;
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
504 }
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
505 stateRealGetPointerWrite()->diveSettings.ppo2sensors_deactivated = pSettings->ppo2sensors_deactivated;
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
506
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
507 if(settingsGetPointer()->ppo2sensors_deactivated & 1)
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
508 sensorActive[0] = 0;
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
509 if(settingsGetPointer()->ppo2sensors_deactivated & 2)
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
510 sensorActive[1] = 0;
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
511 if(settingsGetPointer()->ppo2sensors_deactivated & 4)
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
512 sensorActive[2] = 0;
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
513
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
514 if (sensorFilter == SENSOR_CO2)
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
515 {
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
516 write_field_button(StMHARD3_O2_Calibrate, 30, 800, ME_Y_LINE4, &FontT48, "");
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
517 }
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
518 else
926
875933272056 Bugfix sensor de-/activation handling:
Ideenmodellierer
parents: 920
diff changeset
519 {
1073
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
520 if(((pSettings->ppo2sensors_source == O2_SENSOR_SOURCE_ANALOG) || (pSettings->ppo2sensors_source == O2_SENSOR_SOURCE_ANADIG)
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
521 #ifdef ENABLE_SENTINEL_MODE
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
522 || (settingsGetPointer()->ppo2sensors_source == O2_SENSOR_SOURCE_SENTINEL)
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
523 #endif
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
524 ) && ((sensorFilter == SENSOR_NONE) || (sensorFilter == SENSOR_DIGO2)))
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
525 {
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
526 write_label_fix( 30, 800, ME_Y_LINE4, &FontT48, TXT2BYTE_O2Calib);
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
527 write_label_var( 400, 800, ME_Y_LINE4, &FontT48, "\016\016 %\017");
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
528
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
529 write_field_toggle(StMHARD3_O2_Calibrate, 400, 800, ME_Y_LINE4, &FontT48, "", 21, 98);
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
530 }
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
531 }
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
532 if((DataEX_external_ADC_Present()) && (sensorFilter == SENSOR_NONE))
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
533 {
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
534 text[0] = TXT_2BYTE;
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
535 text[1] = TXT2BYTE_SensorDetect;
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
536 text[2] = 0;
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
537
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
538 write_label_var( 30, 340, ME_Y_LINE6, &FontT48, text);
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
539
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
540 write_field_button(StMHARD3_Sensor_Detect, 30, 800, ME_Y_LINE6, &FontT48, text);
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
541 }
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
542
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
543 switch(sensorFilter)
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
544 {
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
545 case SENSOR_NONE:
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
546 default: if((pSettings->ext_sensor_map[0] >= SENSOR_OPTIC) && (pSettings->ext_sensor_map[0] < SENSOR_MUX))
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
547 {
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
548 setEvent(StMHARD3_O2_Sensor1, (uint32_t)OnAction_Sensor1);
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
549 localSensorMap[0] =pSettings->ext_sensor_map[0];
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
550 }
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
551 if((pSettings->ext_sensor_map[1] >= SENSOR_OPTIC) && (pSettings->ext_sensor_map[1] < SENSOR_MUX))
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
552 {
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
553 setEvent(StMHARD3_O2_Sensor2, (uint32_t)OnAction_Sensor2);
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
554 localSensorMap[1] =pSettings->ext_sensor_map[1];
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
555 }
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
556 if((pSettings->ext_sensor_map[2] >= SENSOR_OPTIC) && (pSettings->ext_sensor_map[2] < SENSOR_MUX))
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
557 {
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
558 setEvent(StMHARD3_O2_Sensor3, (uint32_t)OnAction_Sensor3);
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
559 localSensorMap[2] =pSettings->ext_sensor_map[2];
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
560 }
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
561 break;
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
562 case SENSOR_DIGO2: if((pSettings->ext_sensor_map[0] >= SENSOR_OPTIC) && (pSettings->ext_sensor_map[0] < SENSOR_TYPE_O2_END))
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
563 {
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
564 setEvent(StMHARD3_O2_Sensor1, (uint32_t)OnAction_Sensor1);
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
565 localSensorMap[0] = pSettings->ext_sensor_map[0];
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
566 }
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
567 if((pSettings->ext_sensor_map[1] >= SENSOR_OPTIC) && (pSettings->ext_sensor_map[1] < SENSOR_TYPE_O2_END))
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
568 {
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
569 setEvent(StMHARD3_O2_Sensor2, (uint32_t)OnAction_Sensor2);
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
570 localSensorMap[1] = pSettings->ext_sensor_map[1];
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
571 }
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
572 if((pSettings->ext_sensor_map[2] >= SENSOR_OPTIC) && (pSettings->ext_sensor_map[2] < SENSOR_TYPE_O2_END))
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
573 {
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
574 setEvent(StMHARD3_O2_Sensor3, (uint32_t)OnAction_Sensor3);
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
575 localSensorMap[2] = pSettings->ext_sensor_map[2];
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
576 }
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
577 break;
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
578 case SENSOR_CO2: setEvent(StMHARD3_O2_Sensor1, (uint32_t)OnAction_Sensor1);
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
579 localSensorMap[0] = SENSOR_CO2M;
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
580 break;
1078
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
581 case SENSOR_HUD: write_label_var( 30, 340, ME_Y_LINE2, &FontT48, "LED Sequence:");
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
582 write_field_sdigit(StMHARD3_O2_Sensor2, 400, 800, ME_Y_LINE2, &FontT48, "### ### ### ###",
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
583 pRealState->lifeData.HUD_led_sequence[0] - pRealState->lifeData.HUD_led_sequence[1],
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
584 pRealState->lifeData.HUD_led_sequence[2] - pRealState->lifeData.HUD_led_sequence[3],
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
585 pRealState->lifeData.HUD_led_sequence[4] - pRealState->lifeData.HUD_led_sequence[5],
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
586 pRealState->lifeData.HUD_led_sequence[6]);
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
587
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
588 write_field_button(StMHARD3_O2_Sensor3, 400, 800, ME_Y_LINE3, &FontT48, "");
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
589
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
590 setEvent(StMHARD3_O2_Sensor1, (uint32_t)OnAction_Sensor1);
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
591 setEvent(StMHARD3_O2_Sensor2, (uint32_t)OnAction_LedSequence);
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
592 setEvent(StMHARD3_O2_Sensor3, (uint32_t)OnAction_LedBrightness);
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
593
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
594 localSensorMap[0] = SENSOR_HUD;
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
595 break;
1073
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
596 }
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
597
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
598 if (sensorFilter == SENSOR_CO2)
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
599 {
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
600 setEvent(StMHARD3_O2_Calibrate, (uint32_t)OnAction_CO2_Calibrate);
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
601 }
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
602 else
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
603 {
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
604 if((((settingsGetPointer()->ppo2sensors_source == O2_SENSOR_SOURCE_ANALOG) || (settingsGetPointer()->ppo2sensors_source == O2_SENSOR_SOURCE_ANADIG))
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
605 && ((sensorFilter == SENSOR_NONE) || (sensorFilter == SENSOR_DIGO2)))
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
606 #ifdef ENABLE_SENTINEL_MODE
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
607 || (settingsGetPointer()->ppo2sensors_source == O2_SENSOR_SOURCE_SENTINEL)
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
608 #endif
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
609 )
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
610 {
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
611 setEvent(StMHARD3_O2_Calibrate, (uint32_t)OnAction_O2_Calibrate);
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
612 }
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
613 }
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
614 if((DataEX_external_ADC_Present()) && (sensorFilter == SENSOR_NONE))
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
615 {
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
616 setEvent(StMHARD3_Sensor_Detect, (uint32_t)OnAction_Sensor_Detect);
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
617 }
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
618 write_buttonTextline(TXT2BYTE_ButtonBack,TXT2BYTE_ButtonEnter,TXT2BYTE_ButtonNext);
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
619
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
620 switch(firstSensorId)
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
621 {
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
622 case StMHARD3_O2_Sensor2: tMenuEdit_select(StMHARD3_O2_Sensor2);
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
623 break;
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
624 case StMHARD3_O2_Sensor3: tMenuEdit_select(StMHARD3_O2_Sensor3);
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
625 break;
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
626 default: break;
926
875933272056 Bugfix sensor de-/activation handling:
Ideenmodellierer
parents: 920
diff changeset
627 }
730
9c65d226f4f6 Update sensor menu support for automatic sensor detection:
Ideenmodellierer
parents: 724
diff changeset
628 }
1073
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
629 }
745
b392524753fb Update Sentinel protocol:
Ideenmodellierer
parents: 740
diff changeset
630
1073
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
631 void openEdit_SensorsO2()
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
632 {
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
633 openEdit_Sensors(SENSOR_DIGO2); /* used for o2 sensors in general */
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
634 }
730
9c65d226f4f6 Update sensor menu support for automatic sensor detection:
Ideenmodellierer
parents: 724
diff changeset
635
1073
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
636 void openEdit_SensorsCO2()
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
637 {
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
638 openEdit_Sensors(SENSOR_CO2);
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
639 }
1078
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
640 void openEdit_SensorsHUD()
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
641 {
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
642 openEdit_Sensors(SENSOR_HUD);
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
643 }
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
644
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
645 uint8_t OnAction_Sensor1(uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action)
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
646 {
1078
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
647 if((localSensorMap[0] == SENSOR_DIGO2M) || (localSensorMap[0] == SENSOR_CO2M) || (localSensorMap[0] == SENSOR_CO2M) || (localSensorMap[0] == SENSOR_HUD))
783
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
648 {
1073
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
649 openInfo_SetSensorType(localSensorMap[0]);
783
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
650 return EXIT_TO_INFO_SENSOR;
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
651 }
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
652 else
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
653 {
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
654 if(settingsGetPointer()->ppo2sensors_deactivated & 1)
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
655 {
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
656 settingsGetPointer()->ppo2sensors_deactivated &= 4+2;
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
657 tMenuEdit_set_on_off(editId, 1);
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
658 }
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
659 else
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
660 {
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
661 settingsGetPointer()->ppo2sensors_deactivated |= 1;
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
662 tMenuEdit_set_on_off(editId, 0);
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
663 }
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
664 }
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
665
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
666 return UPDATE_DIVESETTINGS;
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
667 }
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
668
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
669
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
670 uint8_t OnAction_Sensor2(uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action)
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
671 {
1073
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
672 if((localSensorMap[1] == SENSOR_DIGO2M) || (localSensorMap[1] == SENSOR_CO2M))
783
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
673 {
1073
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
674 openInfo_SetSensorType(localSensorMap[1]);
783
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
675 return EXIT_TO_INFO_SENSOR;
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
676 }
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
677 else
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
678 {
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
679 if(settingsGetPointer()->ppo2sensors_deactivated & 2)
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
680 {
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
681 settingsGetPointer()->ppo2sensors_deactivated &= 4+1;
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
682 tMenuEdit_set_on_off(editId, 1);
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
683 }
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
684 else
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
685 {
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
686 settingsGetPointer()->ppo2sensors_deactivated |= 2;
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
687 tMenuEdit_set_on_off(editId, 0);
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
688 }
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
689 }
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
690 return UPDATE_DIVESETTINGS;
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
691 }
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
692
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
693
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
694 uint8_t OnAction_Sensor3(uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action)
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
695 {
1073
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
696 if((localSensorMap[2] == SENSOR_DIGO2M) || (localSensorMap[2] == SENSOR_CO2M))
783
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
697 {
1073
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
698 openInfo_SetSensorType(localSensorMap[2]);
783
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
699 return EXIT_TO_INFO_SENSOR;
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
700 }
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
701 else
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
702 {
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
703
783
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
704 if(settingsGetPointer()->ppo2sensors_deactivated & 4)
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
705 {
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
706 settingsGetPointer()->ppo2sensors_deactivated &= 2+1;
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
707 tMenuEdit_set_on_off(editId, 1);
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
708 }
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
709 else
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
710 {
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
711 settingsGetPointer()->ppo2sensors_deactivated |= 4;
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
712 tMenuEdit_set_on_off(editId, 0);
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
713 }
c31237d20491 Update digital O2 sensor information:
Ideenmodellierer
parents: 776
diff changeset
714 }
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
715 return UPDATE_DIVESETTINGS;
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
716 }
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
717
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
718
1073
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
719 uint8_t OnAction_CO2_Calibrate(uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action)
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
720 {
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
721 SSettings* pSettings = settingsGetPointer();
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
722 uint8_t index = 0;
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
723
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
724 for (index = EXT_INTERFACE_MUX_OFFSET; index < EXT_INTERFACE_SENSOR_CNT; index++)
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
725 {
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
726 if(pSettings->ext_sensor_map[index] == SENSOR_CO2) break;
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
727 }
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
728
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
729 if(index != EXT_INTERFACE_SENSOR_CNT)
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
730 {
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
731 DataEX_setExtInterface_Cmd(EXT_INTERFACE_CO2_CALIB, index);
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
732 }
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
733 return UNSPECIFIC_RETURN;
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
734 }
734f84b72b30 CV Option Menu added sub menus for O2 and CO2 sensors:
Ideenmodellierer
parents: 1005
diff changeset
735
562
ec76fa85009e Added ADC sensor interface to O2 sensore menu structure:
Ideenmodellierer
parents: 539
diff changeset
736 uint8_t OnAction_O2_Calibrate (uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action)
ec76fa85009e Added ADC sensor interface to O2 sensore menu structure:
Ideenmodellierer
parents: 539
diff changeset
737 {
ec76fa85009e Added ADC sensor interface to O2 sensore menu structure:
Ideenmodellierer
parents: 539
diff changeset
738 uint8_t loop;
ec76fa85009e Added ADC sensor interface to O2 sensore menu structure:
Ideenmodellierer
parents: 539
diff changeset
739 const SDiveState *pStateReal = stateRealGetPointer();
ec76fa85009e Added ADC sensor interface to O2 sensore menu structure:
Ideenmodellierer
parents: 539
diff changeset
740 SSettings* pSettings = settingsGetPointer();
584
830de438e0b0 Added option for 100% o2 calibration:
Ideenmodellierer
parents: 562
diff changeset
741 uint8_t retVal = UNSPECIFIC_RETURN;
830de438e0b0 Added option for 100% o2 calibration:
Ideenmodellierer
parents: 562
diff changeset
742 float compensatedRef;
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
743
584
830de438e0b0 Added option for 100% o2 calibration:
Ideenmodellierer
parents: 562
diff changeset
744 if(action == ACTION_BUTTON_ENTER_FINAL)
830de438e0b0 Added option for 100% o2 calibration:
Ideenmodellierer
parents: 562
diff changeset
745 {
830de438e0b0 Added option for 100% o2 calibration:
Ideenmodellierer
parents: 562
diff changeset
746 if(O2_calib_gas == 21)
830de438e0b0 Added option for 100% o2 calibration:
Ideenmodellierer
parents: 562
diff changeset
747 {
830de438e0b0 Added option for 100% o2 calibration:
Ideenmodellierer
parents: 562
diff changeset
748 compensatedRef = O2_CALIB_FRACTION_AIR * pStateReal->lifeData.pressure_ambient_bar / 1.0;
830de438e0b0 Added option for 100% o2 calibration:
Ideenmodellierer
parents: 562
diff changeset
749 }
830de438e0b0 Added option for 100% o2 calibration:
Ideenmodellierer
parents: 562
diff changeset
750 else
830de438e0b0 Added option for 100% o2 calibration:
Ideenmodellierer
parents: 562
diff changeset
751 {
605
1f665e31aca2 change O2_CALIB_FRACTION_O2 to 0.98
heinrichsweikamp
parents: 584
diff changeset
752 compensatedRef = O2_CALIB_FRACTION_O2 * pStateReal->lifeData.pressure_ambient_bar / 1.0;
584
830de438e0b0 Added option for 100% o2 calibration:
Ideenmodellierer
parents: 562
diff changeset
753 }
830de438e0b0 Added option for 100% o2 calibration:
Ideenmodellierer
parents: 562
diff changeset
754 for(loop=0;loop<3;loop++)
562
ec76fa85009e Added ADC sensor interface to O2 sensore menu structure:
Ideenmodellierer
parents: 539
diff changeset
755 {
584
830de438e0b0 Added option for 100% o2 calibration:
Ideenmodellierer
parents: 562
diff changeset
756 if((pSettings->ppo2sensors_deactivated & (0x1 << loop)) == 0)
830de438e0b0 Added option for 100% o2 calibration:
Ideenmodellierer
parents: 562
diff changeset
757 {
830de438e0b0 Added option for 100% o2 calibration:
Ideenmodellierer
parents: 562
diff changeset
758 if(pStateReal->lifeData.sensorVoltage_mV[loop] > 0.0001) /* sensor connected ?*/
830de438e0b0 Added option for 100% o2 calibration:
Ideenmodellierer
parents: 562
diff changeset
759 {
724
f285424f04d9 Development feature: external pressure sensor
Ideenmodellierer
parents: 718
diff changeset
760 #ifdef ENABLE_EXTERNAL_PRESSURE
f285424f04d9 Development feature: external pressure sensor
Ideenmodellierer
parents: 718
diff changeset
761 if(loop == 2)
f285424f04d9 Development feature: external pressure sensor
Ideenmodellierer
parents: 718
diff changeset
762 {
f285424f04d9 Development feature: external pressure sensor
Ideenmodellierer
parents: 718
diff changeset
763 compensatedRef = pStateReal->lifeData.pressure_ambient_bar;
f285424f04d9 Development feature: external pressure sensor
Ideenmodellierer
parents: 718
diff changeset
764 }
f285424f04d9 Development feature: external pressure sensor
Ideenmodellierer
parents: 718
diff changeset
765 #endif
f285424f04d9 Development feature: external pressure sensor
Ideenmodellierer
parents: 718
diff changeset
766
584
830de438e0b0 Added option for 100% o2 calibration:
Ideenmodellierer
parents: 562
diff changeset
767 pSettings->ppo2sensors_calibCoeff[loop] = compensatedRef / pStateReal->lifeData.sensorVoltage_mV[loop];
830de438e0b0 Added option for 100% o2 calibration:
Ideenmodellierer
parents: 562
diff changeset
768 }
830de438e0b0 Added option for 100% o2 calibration:
Ideenmodellierer
parents: 562
diff changeset
769 else
830de438e0b0 Added option for 100% o2 calibration:
Ideenmodellierer
parents: 562
diff changeset
770 {
830de438e0b0 Added option for 100% o2 calibration:
Ideenmodellierer
parents: 562
diff changeset
771 pSettings->ppo2sensors_calibCoeff[loop] = 0.0;
830de438e0b0 Added option for 100% o2 calibration:
Ideenmodellierer
parents: 562
diff changeset
772 settingsGetPointer()->ppo2sensors_deactivated |= 0x1 << loop;
830de438e0b0 Added option for 100% o2 calibration:
Ideenmodellierer
parents: 562
diff changeset
773 }
830de438e0b0 Added option for 100% o2 calibration:
Ideenmodellierer
parents: 562
diff changeset
774 }
562
ec76fa85009e Added ADC sensor interface to O2 sensore menu structure:
Ideenmodellierer
parents: 539
diff changeset
775 }
584
830de438e0b0 Added option for 100% o2 calibration:
Ideenmodellierer
parents: 562
diff changeset
776 tMenuEdit_newInput(editId, O2_calib_gas, 0, 0, 0);
830de438e0b0 Added option for 100% o2 calibration:
Ideenmodellierer
parents: 562
diff changeset
777 retVal = UPDATE_DIVESETTINGS;
830de438e0b0 Added option for 100% o2 calibration:
Ideenmodellierer
parents: 562
diff changeset
778 }
830de438e0b0 Added option for 100% o2 calibration:
Ideenmodellierer
parents: 562
diff changeset
779 if(action == ACTION_BUTTON_NEXT)
830de438e0b0 Added option for 100% o2 calibration:
Ideenmodellierer
parents: 562
diff changeset
780 {
830de438e0b0 Added option for 100% o2 calibration:
Ideenmodellierer
parents: 562
diff changeset
781 if(O2_calib_gas == 21)
830de438e0b0 Added option for 100% o2 calibration:
Ideenmodellierer
parents: 562
diff changeset
782 {
673
d7c5d592076b Show 98% in case of Oxygen as the calibrating gas
heinrichsweikamp
parents: 605
diff changeset
783 O2_calib_gas = 98;
562
ec76fa85009e Added ADC sensor interface to O2 sensore menu structure:
Ideenmodellierer
parents: 539
diff changeset
784 }
584
830de438e0b0 Added option for 100% o2 calibration:
Ideenmodellierer
parents: 562
diff changeset
785 else
830de438e0b0 Added option for 100% o2 calibration:
Ideenmodellierer
parents: 562
diff changeset
786 {
830de438e0b0 Added option for 100% o2 calibration:
Ideenmodellierer
parents: 562
diff changeset
787 O2_calib_gas = 21;
830de438e0b0 Added option for 100% o2 calibration:
Ideenmodellierer
parents: 562
diff changeset
788 }
830de438e0b0 Added option for 100% o2 calibration:
Ideenmodellierer
parents: 562
diff changeset
789 }
830de438e0b0 Added option for 100% o2 calibration:
Ideenmodellierer
parents: 562
diff changeset
790 retVal = O2_calib_gas;
562
ec76fa85009e Added ADC sensor interface to O2 sensore menu structure:
Ideenmodellierer
parents: 539
diff changeset
791
584
830de438e0b0 Added option for 100% o2 calibration:
Ideenmodellierer
parents: 562
diff changeset
792 if(action == ACTION_BUTTON_BACK)
830de438e0b0 Added option for 100% o2 calibration:
Ideenmodellierer
parents: 562
diff changeset
793 {
830de438e0b0 Added option for 100% o2 calibration:
Ideenmodellierer
parents: 562
diff changeset
794 exitMenuEditField();
830de438e0b0 Added option for 100% o2 calibration:
Ideenmodellierer
parents: 562
diff changeset
795 }
830de438e0b0 Added option for 100% o2 calibration:
Ideenmodellierer
parents: 562
diff changeset
796
830de438e0b0 Added option for 100% o2 calibration:
Ideenmodellierer
parents: 562
diff changeset
797 return retVal;
562
ec76fa85009e Added ADC sensor interface to O2 sensore menu structure:
Ideenmodellierer
parents: 539
diff changeset
798 }
ec76fa85009e Added ADC sensor interface to O2 sensore menu structure:
Ideenmodellierer
parents: 539
diff changeset
799
718
b9f699d2e3d0 Updated menu structure to support new sensor information page:
Ideenmodellierer
parents: 709
diff changeset
800 uint8_t OnAction_Sensor_Info(uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action)
b9f699d2e3d0 Updated menu structure to support new sensor information page:
Ideenmodellierer
parents: 709
diff changeset
801 {
b9f699d2e3d0 Updated menu structure to support new sensor information page:
Ideenmodellierer
parents: 709
diff changeset
802 return EXIT_TO_INFO_SENSOR;
b9f699d2e3d0 Updated menu structure to support new sensor information page:
Ideenmodellierer
parents: 709
diff changeset
803 }
b9f699d2e3d0 Updated menu structure to support new sensor information page:
Ideenmodellierer
parents: 709
diff changeset
804
730
9c65d226f4f6 Update sensor menu support for automatic sensor detection:
Ideenmodellierer
parents: 724
diff changeset
805 uint8_t OnAction_Sensor_Detect(uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action)
9c65d226f4f6 Update sensor menu support for automatic sensor detection:
Ideenmodellierer
parents: 724
diff changeset
806 {
957
3420e3ba698d External sensor commands: Add sensor ID to command:
Ideenmodellierer
parents: 949
diff changeset
807 DataEX_setExtInterface_Cmd(EXT_INTERFACE_AUTODETECT, 0);
730
9c65d226f4f6 Update sensor menu support for automatic sensor detection:
Ideenmodellierer
parents: 724
diff changeset
808 return UNSPECIFIC_RETURN;
9c65d226f4f6 Update sensor menu support for automatic sensor detection:
Ideenmodellierer
parents: 724
diff changeset
809 }
718
b9f699d2e3d0 Updated menu structure to support new sensor information page:
Ideenmodellierer
parents: 709
diff changeset
810
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
811 void openEdit_Brightness(void)
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
812 {
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
813 uint8_t actualBrightness;
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
814 SSettings *pSettings = settingsGetPointer();
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
815
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
816 actualBrightness = pSettings->brightness;
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
817 actualBrightness++;
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
818 if(actualBrightness > 4)
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
819 actualBrightness = 0;
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
820 pSettings->brightness = actualBrightness;
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
821 exitEditWithUpdate();
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
822 }
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
823
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
824
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
825 void buttonBalanceText_helper(uint8_t idOfButton, char *textOutput)
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
826 {
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
827 uint8_t txtcount = 0;
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
828
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
829 if(idOfButton < 3)
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
830 {
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
831 textOutput[txtcount++] = '@' + settingsGetPointer()->buttonBalance[idOfButton];
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
832 textOutput[txtcount++] = ' ';
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
833 textOutput[txtcount++] = ' ';
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
834 textOutput[txtcount++] = '(';
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
835
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
836 switch(settingsGetPointer()->buttonBalance[idOfButton])
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
837 {
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
838 case 1:
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
839 textOutput[txtcount++] = '-';
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
840 textOutput[txtcount++] = '2';
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
841 textOutput[txtcount++] = '0';
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
842 break;
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
843 case 2:
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
844 textOutput[txtcount++] = '-';
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
845 textOutput[txtcount++] = '1';
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
846 textOutput[txtcount++] = '0';
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
847 break;
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
848 case 3:
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
849 default:
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
850 textOutput[txtcount++] = '0';
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
851 break;
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
852 case 4:
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
853 textOutput[txtcount++] = '+';
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
854 textOutput[txtcount++] = '1';
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
855 textOutput[txtcount++] = '0';
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
856 break;
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
857 case 5:
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
858 textOutput[txtcount++] = '+';
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
859 textOutput[txtcount++] = '2';
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
860 textOutput[txtcount++] = '0';
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
861 break;
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
862 }
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
863 textOutput[txtcount++] = ')';
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
864 }
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
865 textOutput[txtcount++] = 0;
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
866 }
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
867
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
868 /**#
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
869 ******************************************************************************
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
870 * @brief BUTTONS
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
871 * @author heinrichs weikamp gmbh
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
872 * @version V 01
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
873 * @date 15-Sept-2016
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
874 ******************************************************************************
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
875 * Button 0 is right, Button 1 is middle, Button 2 is left !!!!
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
876 * 2 1 0 (base value 3)
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
877 * Button 3 is used to store the base value, all others are balanced around this one!
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
878 *
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
879 */
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
880
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
881 void openEdit_ButtonSens(void)
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
882 {
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
883 char text[32];
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
884 uint8_t sens;
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
885 const uint32_t eventListButtonBalance[3] = {StMHARD5_ButtonBalance1,StMHARD5_ButtonBalance2,StMHARD5_ButtonBalance3};
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
886
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
887 sens = (uint8_t)settingsGetPointer()->ButtonResponsiveness[3];
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
888 write_field_3digit(StMHARD5_Button1, 360, 780, ME_Y_LINE1, &FontT48, "###", sens, 0, 0, 0);
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
889
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
890 for(int i=2;i>=0;i--)
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
891 {
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
892 buttonBalanceText_helper(i,text);
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
893 write_field_button(eventListButtonBalance[i],360,500,ME_Y_LINE4-(i*ME_Y_LINE_STEP),&FontT48,text);
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
894 }
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
895
740
5078da3845c0 Added button lock after wakeup in surface mode:
Ideenmodellierer
parents: 734
diff changeset
896 snprintf(text,32,"%c",TXT_ButtonLock);
884
940f8e132638 Minor screen cleanup:
Ideenmodellierer
parents: 854
diff changeset
897 write_field_on_off(StMHARD5_ButtonLock, 30, 700, ME_Y_LINE5, &FontT48, text, settingsGetPointer()->buttonLockActive);
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
898
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
899 setEvent(StMHARD5_Button1, (uint32_t)OnAction_Button);
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
900
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
901 for(int i=2;i>=0;i--)
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
902 {
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
903 setEvent(eventListButtonBalance[i], (uint32_t)OnAction_ButtonBalance);
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
904 }
740
5078da3845c0 Added button lock after wakeup in surface mode:
Ideenmodellierer
parents: 734
diff changeset
905 setEvent(StMHARD5_ButtonLock, (uint32_t)OnAction_ButtonLock);
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
906 write_buttonTextline(TXT2BYTE_ButtonBack,TXT2BYTE_ButtonEnter,TXT2BYTE_ButtonNext);
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
907 }
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
908
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
909
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
910 void refresh_ButtonValuesFromPIC(void)
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
911 {
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
912 uint8_t sens[3];
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
913 char text[64];
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
914
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
915 text[0] = '\001';
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
916 text[1] = TXT_2BYTE;
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
917 text[2] = TXT2BYTE_ButtonSensitivity;
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
918 text[3] = 0;
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
919 write_topline(text);
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
920
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
921 write_buttonTextline(TXT2BYTE_ButtonBack,TXT2BYTE_ButtonEnter,TXT2BYTE_ButtonNext);
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
922
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
923 for(int i=0;i<3;i++)
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
924 {
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
925 text[0] = TXT_2BYTE;
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
926 text[1] = TXT2BYTE_ButtonLeft+i;
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
927 text[2] = 0;
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
928 write_label_var( 20, 300, ME_Y_LINE2+(i*ME_Y_LINE_STEP), &FontT48, text);
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
929 }
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
930
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
931 for(int i=0;i<3;i++)
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
932 {
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
933 sens[i] = settingsHelperButtonSens_translate_hwOS_values_to_percentage(stateRealGetPointer()->lifeData.buttonPICdata[i]);
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
934 }
740
5078da3845c0 Added button lock after wakeup in surface mode:
Ideenmodellierer
parents: 734
diff changeset
935 snprintf(text,64,"\020\016\016%c%c \017 (%03u %03u %03u)",TXT_2BYTE,TXT2BYTE_LowerIsLess,sens[2],sens[1],sens[0]);
884
940f8e132638 Minor screen cleanup:
Ideenmodellierer
parents: 854
diff changeset
936 write_label_var( 20, 700, ME_Y_LINE6, &FontT42, text);
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
937
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
938 tMenuEdit_refresh_field(StMHARD5_Button1);
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
939 tMenuEdit_refresh_field(StMHARD5_ButtonBalance1);
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
940 tMenuEdit_refresh_field(StMHARD5_ButtonBalance2);
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
941 tMenuEdit_refresh_field(StMHARD5_ButtonBalance3);
740
5078da3845c0 Added button lock after wakeup in surface mode:
Ideenmodellierer
parents: 734
diff changeset
942 tMenuEdit_refresh_field(StMHARD5_ButtonLock);
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
943 }
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
944
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
945
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
946 uint8_t OnAction_Button(uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action)
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
947 {
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
948 uint8_t digitContentNew, remainder;
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
949 uint32_t newSensitivityGlobal;
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
950
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
951 if(action == ACTION_BUTTON_NEXT)
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
952 {
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
953 digitContentNew = digitContent - '0';
92
be35821a4974 Stable to test. button sensitiveness fix. + global_constants.
Dmitry Romanov <kitt@bk.ru>
parents: 38
diff changeset
954 if(digitContentNew >= MAX_BUTTONRESPONSIVENESS_GUI)
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
955 {
92
be35821a4974 Stable to test. button sensitiveness fix. + global_constants.
Dmitry Romanov <kitt@bk.ru>
parents: 38
diff changeset
956 digitContentNew = MIN_BUTTONRESPONSIVENESS_GUI;
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
957 }
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
958 else
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
959 {
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
960 remainder = digitContentNew%5;
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
961 digitContentNew += 5 - remainder;
92
be35821a4974 Stable to test. button sensitiveness fix. + global_constants.
Dmitry Romanov <kitt@bk.ru>
parents: 38
diff changeset
962 if(digitContentNew >= MAX_BUTTONRESPONSIVENESS_GUI)
be35821a4974 Stable to test. button sensitiveness fix. + global_constants.
Dmitry Romanov <kitt@bk.ru>
parents: 38
diff changeset
963 digitContentNew = MAX_BUTTONRESPONSIVENESS_GUI;
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
964 }
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
965 return '0' + digitContentNew;
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
966 }
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
967
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
968 if(action == ACTION_BUTTON_BACK)
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
969 {
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
970 digitContentNew = digitContent - '0';
92
be35821a4974 Stable to test. button sensitiveness fix. + global_constants.
Dmitry Romanov <kitt@bk.ru>
parents: 38
diff changeset
971 if(digitContentNew <= MIN_BUTTONRESPONSIVENESS_GUI)
be35821a4974 Stable to test. button sensitiveness fix. + global_constants.
Dmitry Romanov <kitt@bk.ru>
parents: 38
diff changeset
972 digitContentNew = MAX_BUTTONRESPONSIVENESS_GUI;
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
973 else
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
974 {
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
975 remainder = digitContentNew%5;
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
976 if(remainder)
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
977 digitContentNew -= remainder;
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
978 else
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
979 digitContentNew -= 5;
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
980 }
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
981 return '0' + digitContentNew;
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
982 }
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
983
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
984 if(action == ACTION_BUTTON_ENTER_FINAL)
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
985 {
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
986 evaluateNewString(editId, &newSensitivityGlobal, 0, 0, 0);
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
987 settingsHelperButtonSens_keepPercentageValues(newSensitivityGlobal, settingsGetPointer()->ButtonResponsiveness);
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
988 setButtonResponsiveness(settingsGetPointer()->ButtonResponsiveness);
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
989 return UNSPECIFIC_RETURN;
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
990 }
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
991 return digitContent;
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
992 }
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
993
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
994
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
995 uint8_t OnAction_ButtonBalance(uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action)
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
996 {
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
997 int8_t idBalance = -1;
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
998 uint8_t *ptrSetting;
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
999 char text[32];
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
1000
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
1001 const uint32_t eventListButtonBalance[3] = {StMHARD5_ButtonBalance1,StMHARD5_ButtonBalance2,StMHARD5_ButtonBalance3};
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
1002
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
1003 idBalance = -1;
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
1004 for(int i=0;i<3;i++)
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
1005 {
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
1006 if(editId == eventListButtonBalance[i])
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
1007 {
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
1008 idBalance = i;
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
1009 break;
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
1010 }
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
1011 }
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
1012
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
1013 if((idBalance >= 0) && (idBalance < 3))
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
1014 {
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
1015 ptrSetting = &settingsGetPointer()->buttonBalance[idBalance];
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
1016
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
1017 *ptrSetting += 1;
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
1018
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
1019 if(*ptrSetting > 5)
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
1020 *ptrSetting = 2;
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
1021
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
1022 buttonBalanceText_helper(idBalance,text);
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
1023 tMenuEdit_newButtonText(eventListButtonBalance[idBalance],text);
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
1024 }
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
1025
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
1026 return UNSPECIFIC_RETURN;
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
1027 }
740
5078da3845c0 Added button lock after wakeup in surface mode:
Ideenmodellierer
parents: 734
diff changeset
1028
5078da3845c0 Added button lock after wakeup in surface mode:
Ideenmodellierer
parents: 734
diff changeset
1029 uint8_t OnAction_ButtonLock(uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action)
5078da3845c0 Added button lock after wakeup in surface mode:
Ideenmodellierer
parents: 734
diff changeset
1030 {
5078da3845c0 Added button lock after wakeup in surface mode:
Ideenmodellierer
parents: 734
diff changeset
1031 SSettings *pSettings = settingsGetPointer();
5078da3845c0 Added button lock after wakeup in surface mode:
Ideenmodellierer
parents: 734
diff changeset
1032
5078da3845c0 Added button lock after wakeup in surface mode:
Ideenmodellierer
parents: 734
diff changeset
1033 if(pSettings->buttonLockActive)
5078da3845c0 Added button lock after wakeup in surface mode:
Ideenmodellierer
parents: 734
diff changeset
1034 {
5078da3845c0 Added button lock after wakeup in surface mode:
Ideenmodellierer
parents: 734
diff changeset
1035 pSettings->buttonLockActive = 0;
5078da3845c0 Added button lock after wakeup in surface mode:
Ideenmodellierer
parents: 734
diff changeset
1036 tMenuEdit_set_on_off(editId, 0);
5078da3845c0 Added button lock after wakeup in surface mode:
Ideenmodellierer
parents: 734
diff changeset
1037 }
5078da3845c0 Added button lock after wakeup in surface mode:
Ideenmodellierer
parents: 734
diff changeset
1038 else
5078da3845c0 Added button lock after wakeup in surface mode:
Ideenmodellierer
parents: 734
diff changeset
1039 {
5078da3845c0 Added button lock after wakeup in surface mode:
Ideenmodellierer
parents: 734
diff changeset
1040 pSettings->buttonLockActive = 1;
5078da3845c0 Added button lock after wakeup in surface mode:
Ideenmodellierer
parents: 734
diff changeset
1041 tMenuEdit_set_on_off(editId, 1);
5078da3845c0 Added button lock after wakeup in surface mode:
Ideenmodellierer
parents: 734
diff changeset
1042 }
5078da3845c0 Added button lock after wakeup in surface mode:
Ideenmodellierer
parents: 734
diff changeset
1043
5078da3845c0 Added button lock after wakeup in surface mode:
Ideenmodellierer
parents: 734
diff changeset
1044 return UNSPECIFIC_RETURN;
5078da3845c0 Added button lock after wakeup in surface mode:
Ideenmodellierer
parents: 734
diff changeset
1045 }
1078
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1046
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1047
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1048 uint8_t OnAction_LedBrightness(uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action)
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1049 {
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1050 SDiveState * pStateReal = stateRealGetPointerWrite();
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1051
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1052 if(pStateReal->lifeData.HUD_led_brightness == 0)
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1053 {
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1054 pStateReal->lifeData.HUD_led_brightness = 0xFF;
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1055 }
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1056 else
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1057 {
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1058 pStateReal->lifeData.HUD_led_brightness = 0;
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1059 }
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1060
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1061 return UNSPECIFIC_RETURN;
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1062 }
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1063
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1064 uint8_t OnAction_LedSequence(uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action)
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1065 {
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1066 SDiveState * pStateReal = stateRealGetPointerWrite();
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1067 int32_t ledSeq[4];
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1068 uint8_t digitContentNew;
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1069 uint8_t index = 0;
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1070
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1071
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1072 switch (action) {
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1073 case ACTION_BUTTON_ENTER:
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1074
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1075 return digitContent;
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1076 case ACTION_BUTTON_ENTER_FINAL:
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1077 {
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1078 evaluateNewString(editId, (uint32_t*) &ledSeq[0], (uint32_t*)&ledSeq[1], (uint32_t*)&ledSeq[2], (uint32_t*)&ledSeq[3]);
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1079
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1080 for(index = 0; index < 3; index++)
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1081 {
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1082 if (ledSeq[index] > 16)
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1083 {
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1084 ledSeq[index] = 16;
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1085 } else if (ledSeq[index] < -16)
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1086 {
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1087 ledSeq[index] = -16;
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1088 }
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1089 pStateReal->lifeData.HUD_led_sequence[(index*2)] = 0; /* every value handles 2 LEDs depending on +/- sign */
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1090 pStateReal->lifeData.HUD_led_sequence[(index*2)+1] = 0;
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1091 if(ledSeq[index] > 0)
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1092 {
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1093 pStateReal->lifeData.HUD_led_sequence[(index*2)] = ledSeq[index];
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1094 }
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1095 else
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1096 {
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1097 pStateReal->lifeData.HUD_led_sequence[(index*2 + 1)] = ledSeq[index] * -1;
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1098 }
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1099 }
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1100 pStateReal->lifeData.HUD_led_sequence[6] = ledSeq[3];
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1101 tMenuEdit_newInput(editId, ledSeq[0], ledSeq[1], ledSeq[2], ledSeq[3]);
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1102 }
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1103
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1104 break;
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1105 case ACTION_BUTTON_NEXT:
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1106 if ((blockNumber < 3) && (digitNumber == 0))
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1107 {
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1108 digitContentNew = togglePlusMinus(digitContent);
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1109 } else if (digitNumber == 1)
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1110 {
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1111 digitContentNew = digitContent + 1;
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1112 if (digitContentNew > '1') {
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1113 digitContentNew = '0';
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1114 }
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1115 } else
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1116 {
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1117 digitContentNew = digitContent + 1;
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1118 if (digitContentNew > '9') {
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1119 digitContentNew = '0';
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1120 }
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1121 }
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1122
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1123 return digitContentNew;
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1124 case ACTION_BUTTON_BACK:
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1125 if ((blockNumber < 3) && (digitNumber == 0))
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1126 {
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1127 digitContentNew = togglePlusMinus(digitContent);
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1128 } else if (digitNumber == 1)
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1129 {
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1130 digitContentNew = digitContent - 1;
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1131 if (digitContentNew < '0') {
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1132 digitContentNew = '1';
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1133 }
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1134 }else
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1135 {
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1136 digitContentNew = digitContent - 1;
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1137 if (digitContentNew < '0') {
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1138 digitContentNew = '9';
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1139 }
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1140 }
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1141 return digitContentNew;
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1142 }
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1143 return UNSPECIFIC_RETURN;
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1144 }
082825daccb5 Added control views for HUD:
Ideenmodellierer
parents: 1073
diff changeset
1145