Mercurial > public > ostc4
annotate Discovery/Src/tMenuEditHardware.c @ 1001:21142f4fa968 GasConsumption
Cleanup menu structucture afer menu shift:
Compass and timer have been moved to the new menu => some code cleanup was needed.
| author | Ideenmodellierer |
|---|---|
| date | Mon, 28 Apr 2025 22:53:36 +0200 |
| parents | ac25c35a3c97 |
| children | 85f7e19c6688 |
| rev | line source |
|---|---|
| 38 | 1 /////////////////////////////////////////////////////////////////////////////// |
| 2 /// -*- coding: UTF-8 -*- | |
| 3 /// | |
| 4 /// \file Discovery/Src/tMenuEditHardware.c | |
| 5 /// \brief BUTTONS | |
| 6 /// \author heinrichs weikamp gmbh | |
| 7 /// \date 15-Sept-2016 | |
| 8 /// | |
| 9 /// \details | |
| 10 /// | |
| 11 /// $Id$ | |
| 12 /////////////////////////////////////////////////////////////////////////////// | |
| 13 /// \par Copyright (c) 2014-2018 Heinrichs Weikamp gmbh | |
| 14 /// | |
| 15 /// This program is free software: you can redistribute it and/or modify | |
| 16 /// it under the terms of the GNU General Public License as published by | |
| 17 /// the Free Software Foundation, either version 3 of the License, or | |
| 18 /// (at your option) any later version. | |
| 19 /// | |
| 20 /// This program is distributed in the hope that it will be useful, | |
| 21 /// but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 22 /// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 23 /// GNU General Public License for more details. | |
| 24 /// | |
| 25 /// You should have received a copy of the GNU General Public License | |
| 26 /// along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 27 ////////////////////////////////////////////////////////////////////////////// | |
| 28 | |
| 29 /* Includes ------------------------------------------------------------------*/ | |
| 30 #include "tMenuEditHardware.h" | |
| 783 | 31 #include "tMenuEdit.h" |
| 38 | 32 |
| 33 #include "externCPU2bootloader.h" | |
| 34 #include "gfx_fonts.h" | |
| 35 #include "ostc.h" | |
| 36 #include "tCCR.h" | |
| 999 | 37 #include "tMenuEdit.h" |
| 38 #include "tHome.h" | |
| 39 #include "tInfo.h" | |
| 40 #include "tInfoLog.h" | |
| 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" |
| 38 | 44 |
| 748 | 45 |
| 999 | 46 extern void tM_build_pages(void); |
| 47 | |
| 38 | 48 /* Private function prototypes -----------------------------------------------*/ |
| 49 void openEdit_Bluetooth(void); | |
| 50 void openEdit_Compass(void); | |
| 51 void openEdit_O2Sensors(void); | |
| 52 void openEdit_Brightness(void); | |
| 53 //void openEdit_Luftintegration(void); | |
| 54 void openEdit_ButtonSens(void); | |
|
110
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
38
diff
changeset
|
55 void openEdit_FlipDisplay(void); |
| 38 | 56 |
| 57 /* Announced function prototypes -----------------------------------------------*/ | |
| 58 uint8_t OnAction_Sensor1 (uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action); | |
| 59 uint8_t OnAction_Sensor2 (uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action); | |
| 60 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
|
61 uint8_t OnAction_O2_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
|
62 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
|
63 uint8_t OnAction_Sensor_Detect (uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action); |
| 38 | 64 uint8_t OnAction_Button (uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action); |
| 65 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
|
66 uint8_t OnAction_ButtonLock (uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action); |
| 38 | 67 |
| 68 /* Exported functions --------------------------------------------------------*/ | |
| 69 | |
|
562
ec76fa85009e
Added ADC sensor interface to O2 sensore menu structure:
Ideenmodellierer
parents:
539
diff
changeset
|
70 |
|
ec76fa85009e
Added ADC sensor interface to O2 sensore menu structure:
Ideenmodellierer
parents:
539
diff
changeset
|
71 #define O2_CALIB_FRACTION_AIR (0.209F) |
| 605 | 72 #define O2_CALIB_FRACTION_O2 (0.98F) |
|
562
ec76fa85009e
Added ADC sensor interface to O2 sensore menu structure:
Ideenmodellierer
parents:
539
diff
changeset
|
73 |
| 584 | 74 static uint8_t O2_calib_gas = 21; |
|
562
ec76fa85009e
Added ADC sensor interface to O2 sensore menu structure:
Ideenmodellierer
parents:
539
diff
changeset
|
75 |
| 38 | 76 void openEdit_Hardware(uint8_t line) |
| 77 { | |
| 78 set_globalState_Menu_Line(line); | |
| 79 | |
| 80 switch(line) | |
| 81 { | |
| 82 case 1: | |
| 83 default: | |
| 84 openEdit_Bluetooth(); | |
| 85 break; | |
| 86 case 2: | |
|
1001
21142f4fa968
Cleanup menu structucture afer menu shift:
Ideenmodellierer
parents:
999
diff
changeset
|
87 openEdit_O2Sensors(); |
| 38 | 88 break; |
| 89 case 3: | |
|
1001
21142f4fa968
Cleanup menu structucture afer menu shift:
Ideenmodellierer
parents:
999
diff
changeset
|
90 openEdit_Brightness(); |
| 38 | 91 break; |
| 92 case 4: | |
|
708
7e3bf2c0cd40
Menu cleanup rebreather specific settings:
Ideenmodellierer
parents:
703
diff
changeset
|
93 resetMenuEdit(CLUT_MenuPageHardware); |
| 38 | 94 openEdit_ButtonSens(); |
| 95 break; | |
|
1001
21142f4fa968
Cleanup menu structucture afer menu shift:
Ideenmodellierer
parents:
999
diff
changeset
|
96 case 5: |
| 138 | 97 openEdit_FlipDisplay(); |
| 38 | 98 break; |
| 99 } | |
| 100 } | |
| 101 | |
| 102 /* Private functions ---------------------------------------------------------*/ | |
| 103 void openEdit_Bluetooth(void) | |
| 104 { | |
| 105 /* does not work like this resetEnterPressedToStateBeforeButtonAction(); */ | |
| 106 | |
| 107 SSettings *pSettings = settingsGetPointer(); | |
| 108 | |
| 109 if(pSettings->bluetoothActive == 0) | |
| 110 { | |
| 111 pSettings->bluetoothActive = 1; | |
| 112 MX_Bluetooth_PowerOn(); | |
|
394
717f335cc5c9
Added start of module configuration after eache modul power on
ideenmodellierer
parents:
314
diff
changeset
|
113 tComm_StartBlueModConfig(); |
| 38 | 114 } |
| 115 else | |
| 116 { | |
| 117 pSettings->bluetoothActive = 0; | |
| 118 MX_Bluetooth_PowerOff(); | |
| 119 } | |
| 120 exitMenuEdit_to_Menu_with_Menu_Update_do_not_write_settings_for_this_only(); | |
| 121 } | |
| 122 | |
|
110
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
38
diff
changeset
|
123 void openEdit_FlipDisplay(void) |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
38
diff
changeset
|
124 { |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
38
diff
changeset
|
125 /* does not work like this resetEnterPressedToStateBeforeButtonAction(); */ |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
38
diff
changeset
|
126 |
|
993
df052f0347fb
Add settings that have been missing in the bluetooth API:
heinrichsweikamp
parents:
978
diff
changeset
|
127 bool oldValue = settingsGetPointer()->FlipDisplay; |
|
110
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
38
diff
changeset
|
128 |
|
993
df052f0347fb
Add settings that have been missing in the bluetooth API:
heinrichsweikamp
parents:
978
diff
changeset
|
129 setFlipDisplay(!oldValue); |
|
110
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
38
diff
changeset
|
130 |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
38
diff
changeset
|
131 exitEditWithUpdate(); |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
38
diff
changeset
|
132 exitMenuEdit_to_Home(); |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
38
diff
changeset
|
133 } |
| 38 | 134 |
| 135 void refresh_O2Sensors(void) | |
| 136 { | |
|
734
190e5814b2f5
Removed interface selection from sensor menu:
Ideenmodellierer
parents:
730
diff
changeset
|
137 char strSensorId[20]; |
|
190e5814b2f5
Removed interface selection from sensor menu:
Ideenmodellierer
parents:
730
diff
changeset
|
138 char strSensorValue[20]; |
| 38 | 139 uint16_t y_line; |
|
730
9c65d226f4f6
Update sensor menu support for automatic sensor detection:
Ideenmodellierer
parents:
724
diff
changeset
|
140 uint8_t index = 0; |
| 38 | 141 |
|
562
ec76fa85009e
Added ADC sensor interface to O2 sensore menu structure:
Ideenmodellierer
parents:
539
diff
changeset
|
142 const SDiveState *pStateReal = stateRealGetPointer(); |
|
730
9c65d226f4f6
Update sensor menu support for automatic sensor detection:
Ideenmodellierer
parents:
724
diff
changeset
|
143 SSettings *pSettings = settingsGetPointer(); |
| 38 | 144 |
| 797 | 145 if(memcmp(pSettings->ext_sensor_map, pStateReal->lifeData.extIf_sensor_map, EXT_INTERFACE_SENSOR_CNT) != 0) |
|
734
190e5814b2f5
Removed interface selection from sensor menu:
Ideenmodellierer
parents:
730
diff
changeset
|
146 { |
| 797 | 147 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
|
148 pSettings->ppo2sensors_deactivated = 0x0; /* deactivation will be done by openEditO2Sensor if need */ |
| 827 | 149 pSettings->co2_sensor_active = 0; |
|
734
190e5814b2f5
Removed interface selection from sensor menu:
Ideenmodellierer
parents:
730
diff
changeset
|
150 pSettings->ppo2sensors_source = O2_SENSOR_SOURCE_OPTIC; |
| 827 | 151 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
|
152 { |
|
734
190e5814b2f5
Removed interface selection from sensor menu:
Ideenmodellierer
parents:
730
diff
changeset
|
153 switch(pSettings->ext_sensor_map[index]) |
|
190e5814b2f5
Removed interface selection from sensor menu:
Ideenmodellierer
parents:
730
diff
changeset
|
154 { |
|
190e5814b2f5
Removed interface selection from sensor menu:
Ideenmodellierer
parents:
730
diff
changeset
|
155 case SENSOR_OPTIC: pSettings->ppo2sensors_source = O2_SENSOR_SOURCE_OPTIC; |
|
190e5814b2f5
Removed interface selection from sensor menu:
Ideenmodellierer
parents:
730
diff
changeset
|
156 break; |
|
190e5814b2f5
Removed interface selection from sensor menu:
Ideenmodellierer
parents:
730
diff
changeset
|
157 case SENSOR_ANALOG: if(pSettings->ppo2sensors_source == O2_SENSOR_SOURCE_DIGITAL) |
|
190e5814b2f5
Removed interface selection from sensor menu:
Ideenmodellierer
parents:
730
diff
changeset
|
158 { |
|
190e5814b2f5
Removed interface selection from sensor menu:
Ideenmodellierer
parents:
730
diff
changeset
|
159 pSettings->ppo2sensors_source = O2_SENSOR_SOURCE_ANADIG; |
|
190e5814b2f5
Removed interface selection from sensor menu:
Ideenmodellierer
parents:
730
diff
changeset
|
160 } |
|
190e5814b2f5
Removed interface selection from sensor menu:
Ideenmodellierer
parents:
730
diff
changeset
|
161 if(pSettings->ppo2sensors_source != O2_SENSOR_SOURCE_ANADIG) |
|
190e5814b2f5
Removed interface selection from sensor menu:
Ideenmodellierer
parents:
730
diff
changeset
|
162 { |
|
190e5814b2f5
Removed interface selection from sensor menu:
Ideenmodellierer
parents:
730
diff
changeset
|
163 pSettings->ppo2sensors_source = O2_SENSOR_SOURCE_ANALOG; |
|
190e5814b2f5
Removed interface selection from sensor menu:
Ideenmodellierer
parents:
730
diff
changeset
|
164 } |
|
190e5814b2f5
Removed interface selection from sensor menu:
Ideenmodellierer
parents:
730
diff
changeset
|
165 break; |
| 797 | 166 case SENSOR_DIGO2M: if(pSettings->ppo2sensors_source == O2_SENSOR_SOURCE_ANALOG) |
|
734
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 pSettings->ppo2sensors_source = O2_SENSOR_SOURCE_ANADIG; |
|
190e5814b2f5
Removed interface selection from sensor menu:
Ideenmodellierer
parents:
730
diff
changeset
|
169 } |
|
190e5814b2f5
Removed interface selection from sensor menu:
Ideenmodellierer
parents:
730
diff
changeset
|
170 if(pSettings->ppo2sensors_source != O2_SENSOR_SOURCE_ANADIG) |
|
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_DIGITAL; |
|
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 break; |
| 827 | 175 case SENSOR_CO2: |
| 176 case SENSOR_CO2M: pSettings->co2_sensor_active = 1; | |
| 177 break; | |
| 746 | 178 #ifdef ENABLE_SENTINEL_MODE |
|
842
c3dd461ca3f9
Migrated Sentinel protocol to new UART structure:
Ideenmodellierer
parents:
827
diff
changeset
|
179 case SENSOR_SENTINEL: |
|
c3dd461ca3f9
Migrated Sentinel protocol to new UART structure:
Ideenmodellierer
parents:
827
diff
changeset
|
180 case SENSOR_SENTINELM: pSettings->ppo2sensors_source = O2_SENSOR_SOURCE_SENTINEL; |
| 745 | 181 break; |
| 746 | 182 #endif |
|
734
190e5814b2f5
Removed interface selection from sensor menu:
Ideenmodellierer
parents:
730
diff
changeset
|
183 default: |
|
190e5814b2f5
Removed interface selection from sensor menu:
Ideenmodellierer
parents:
730
diff
changeset
|
184 break; |
|
190e5814b2f5
Removed interface selection from sensor menu:
Ideenmodellierer
parents:
730
diff
changeset
|
185 } |
|
730
9c65d226f4f6
Update sensor menu support for automatic sensor detection:
Ideenmodellierer
parents:
724
diff
changeset
|
186 } |
|
734
190e5814b2f5
Removed interface selection from sensor menu:
Ideenmodellierer
parents:
730
diff
changeset
|
187 openEdit_O2Sensors(); |
|
190e5814b2f5
Removed interface selection from sensor menu:
Ideenmodellierer
parents:
730
diff
changeset
|
188 } |
|
190e5814b2f5
Removed interface selection from sensor menu:
Ideenmodellierer
parents:
730
diff
changeset
|
189 |
| 783 | 190 strSensorId[0] = '\001'; |
| 191 strSensorId[1] = TXT_o2Sensors; | |
| 192 strSensorId[2] = 0; | |
| 193 write_topline(strSensorId); | |
|
718
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
709
diff
changeset
|
194 |
| 783 | 195 strSensorId[0] = TXT_2BYTE; |
| 196 strSensorId[1] = TXT2BYTE_Sensor; | |
| 197 strSensorId[2] = ' '; | |
| 198 strSensorId[3] = TXT_2BYTE; | |
| 199 strSensorId[4] = 'X'; | |
| 200 strSensorId[5] = '1'; | |
| 201 strSensorId[6] = 0; | |
|
718
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
709
diff
changeset
|
202 |
| 783 | 203 for(index = 0; index < 3; index++) |
| 204 { | |
| 799 | 205 strSensorId[3] = TXT_2BYTE; |
|
734
190e5814b2f5
Removed interface selection from sensor menu:
Ideenmodellierer
parents:
730
diff
changeset
|
206 strSensorId[4] = 'X'; |
| 783 | 207 strSensorId[5] = '1' + index; |
|
718
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
709
diff
changeset
|
208 |
| 783 | 209 switch(pSettings->ext_sensor_map[index]) |
|
730
9c65d226f4f6
Update sensor menu support for automatic sensor detection:
Ideenmodellierer
parents:
724
diff
changeset
|
210 { |
| 748 | 211 case SENSOR_SEARCH: strSensorId[1] = TXT2BYTE_SensorDetect; |
| 212 strSensorId[2] = 0; | |
| 213 strSensorId[4] = 0; | |
| 745 | 214 break; |
|
734
190e5814b2f5
Removed interface selection from sensor menu:
Ideenmodellierer
parents:
730
diff
changeset
|
215 case SENSOR_OPTIC: strSensorId[4] = TXT2BYTE_O2IFOptic; |
|
190e5814b2f5
Removed interface selection from sensor menu:
Ideenmodellierer
parents:
730
diff
changeset
|
216 break; |
|
190e5814b2f5
Removed interface selection from sensor menu:
Ideenmodellierer
parents:
730
diff
changeset
|
217 case SENSOR_ANALOG: strSensorId[4] = TXT2BYTE_O2IFAnalog; |
|
190e5814b2f5
Removed interface selection from sensor menu:
Ideenmodellierer
parents:
730
diff
changeset
|
218 break; |
| 797 | 219 case SENSOR_DIGO2: |
| 220 case SENSOR_DIGO2M: strSensorId[4] = TXT2BYTE_O2IFDigital; | |
|
734
190e5814b2f5
Removed interface selection from sensor menu:
Ideenmodellierer
parents:
730
diff
changeset
|
221 break; |
| 799 | 222 case SENSOR_CO2: |
| 223 case SENSOR_CO2M: strSensorId[3] = 'C'; | |
|
734
190e5814b2f5
Removed interface selection from sensor menu:
Ideenmodellierer
parents:
730
diff
changeset
|
224 strSensorId[4] = 'O'; |
| 978 | 225 strSensorId[5] = '2'; |
|
734
190e5814b2f5
Removed interface selection from sensor menu:
Ideenmodellierer
parents:
730
diff
changeset
|
226 break; |
|
842
c3dd461ca3f9
Migrated Sentinel protocol to new UART structure:
Ideenmodellierer
parents:
827
diff
changeset
|
227 case SENSOR_SENTINEL: |
|
c3dd461ca3f9
Migrated Sentinel protocol to new UART structure:
Ideenmodellierer
parents:
827
diff
changeset
|
228 case SENSOR_SENTINELM: strSensorId[3] = 'S'; |
| 920 | 229 strSensorId[4] = 'e'; |
| 745 | 230 break; |
| 920 | 231 case SENSOR_GNSS: |
| 232 case SENSOR_GNSSM: strSensorId[3] = 'G'; | |
| 233 strSensorId[4] = 'N'; | |
| 234 break; | |
|
734
190e5814b2f5
Removed interface selection from sensor menu:
Ideenmodellierer
parents:
730
diff
changeset
|
235 default: |
| 748 | 236 strSensorId[5] = 0; |
|
734
190e5814b2f5
Removed interface selection from sensor menu:
Ideenmodellierer
parents:
730
diff
changeset
|
237 break; |
| 783 | 238 } |
| 239 if(strSensorId[4] != 'X') | |
| 240 { | |
| 241 write_label_var( 96, 340, ME_Y_LINE1 + (index * ME_Y_LINE_STEP), &FontT48, strSensorId); | |
| 242 } | |
| 243 strSensorValue[0] = 0; | |
| 244 if((pSettings->ext_sensor_map[index] >= SENSOR_OPTIC) && (pSettings->ext_sensor_map[index] < SENSOR_TYPE_O2_END)) | |
| 245 { | |
| 246 snprintf(strSensorValue, 20,"%01.2f, %01.1f mV", pStateReal->lifeData.ppO2Sensor_bar[index], pStateReal->lifeData.sensorVoltage_mV[index]); | |
| 247 } | |
| 799 | 248 else if(pSettings->ext_sensor_map[index] == SENSOR_CO2M) |
| 783 | 249 { |
| 250 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
|
251 } |
| 783 | 252 y_line = ME_Y_LINE1 + (index * ME_Y_LINE_STEP); |
| 253 if(strSensorValue[0] != 0) | |
|
718
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
709
diff
changeset
|
254 { |
| 783 | 255 write_label_var( 480, 800, y_line, &FontT48, strSensorValue); |
| 256 } | |
| 257 } | |
|
562
ec76fa85009e
Added ADC sensor interface to O2 sensore menu structure:
Ideenmodellierer
parents:
539
diff
changeset
|
258 |
| 783 | 259 if(pSettings->ext_sensor_map[0] == SENSOR_OPTIC) |
| 260 { | |
| 261 strSensorId[0] = TXT_2BYTE; | |
| 262 strSensorId[1] = TXT2BYTE_HUDbattery; | |
| 263 strSensorId[2] = 0; | |
| 264 write_label_var( 30, 340, ME_Y_LINE4, &FontT48, strSensorId); | |
| 265 | |
| 266 snprintf(strSensorId, 20,"%01.3fV", get_HUD_battery_voltage_V()); | |
| 267 write_label_var( 480, 800, ME_Y_LINE4, &FontT48, strSensorId); | |
| 268 } | |
| 269 else | |
| 270 { | |
| 271 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
|
272 #ifdef ENABLE_SENTINEL_MODE |
| 746 | 273 || (pSettings->ppo2sensors_source == O2_SENSOR_SOURCE_SENTINEL) |
| 274 #endif | |
| 275 ) | |
| 783 | 276 { |
| 277 strSensorId[0] = TXT_2BYTE; | |
| 278 strSensorId[1] = TXT2BYTE_O2Calib; | |
| 279 strSensorId[2] = 0; | |
| 280 write_label_var( 30, 340, ME_Y_LINE4, &FontT48, strSensorId); | |
| 281 snprintf(strSensorId, 20,"%d%%", O2_calib_gas); | |
| 282 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
|
283 } |
| 783 | 284 } |
| 285 if(DataEX_external_ADC_Present()) | |
| 286 { | |
| 287 strSensorId[0] = TXT_2BYTE; | |
| 288 strSensorId[1] = TXT2BYTE_SensorDetect; | |
| 289 strSensorId[2] = 0; | |
|
734
190e5814b2f5
Removed interface selection from sensor menu:
Ideenmodellierer
parents:
730
diff
changeset
|
290 |
| 783 | 291 write_label_var( 30, 340, ME_Y_LINE6, &FontT48, strSensorId); |
| 292 } | |
|
734
190e5814b2f5
Removed interface selection from sensor menu:
Ideenmodellierer
parents:
730
diff
changeset
|
293 |
| 827 | 294 if((pSettings->ext_sensor_map[0] >= SENSOR_OPTIC) && (pSettings->ext_sensor_map[0] < SENSOR_MUX)) |
| 783 | 295 { |
| 296 tMenuEdit_refresh_field(StMHARD3_O2_Sensor1); | |
| 297 } | |
| 827 | 298 if((pSettings->ext_sensor_map[1] >= SENSOR_OPTIC) && (pSettings->ext_sensor_map[1] < SENSOR_MUX)) |
| 783 | 299 { |
| 300 tMenuEdit_refresh_field(StMHARD3_O2_Sensor2); | |
| 301 } | |
| 827 | 302 if((pSettings->ext_sensor_map[2] >= SENSOR_OPTIC) && (pSettings->ext_sensor_map[2] < SENSOR_MUX)) |
| 783 | 303 { |
| 304 tMenuEdit_refresh_field(StMHARD3_O2_Sensor3); | |
|
718
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
709
diff
changeset
|
305 } |
| 38 | 306 |
| 584 | 307 if(get_globalState() == StMHARD3_O2_Calibrate) |
| 308 { | |
| 309 write_buttonTextline(TXT2BYTE_ButtonBack,TXT2BYTE_O2Calib,TXT2BYTE_ButtonPlus); | |
| 310 } | |
| 311 else | |
| 312 { | |
| 313 write_buttonTextline(TXT2BYTE_ButtonBack,TXT2BYTE_ButtonEnter,TXT2BYTE_ButtonNext); | |
| 314 } | |
| 38 | 315 } |
| 316 | |
| 317 | |
| 318 void openEdit_O2Sensors(void) | |
| 319 { | |
|
730
9c65d226f4f6
Update sensor menu support for automatic sensor detection:
Ideenmodellierer
parents:
724
diff
changeset
|
320 SSettings *pSettings = settingsGetPointer(); |
| 38 | 321 uint8_t sensorActive[3]; |
| 783 | 322 uint8_t index = 0; |
| 746 | 323 char text[3]; |
| 926 | 324 uint32_t firstSensorId = 0; |
| 38 | 325 |
|
718
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
709
diff
changeset
|
326 set_globalState(StMHARD3_Sensors); |
|
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
709
diff
changeset
|
327 resetMenuEdit(CLUT_MenuPageHardware); |
|
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
709
diff
changeset
|
328 |
| 783 | 329 for(index = 0; index < 3; index++ ) |
| 330 { | |
| 331 if(pSettings->ppo2sensors_deactivated & (0x01 << index)) | |
| 332 { | |
| 333 sensorActive[index] = 0; | |
| 334 } | |
| 335 else | |
| 336 { | |
| 337 sensorActive[index] = 1; | |
| 338 } | |
| 339 } | |
|
730
9c65d226f4f6
Update sensor menu support for automatic sensor detection:
Ideenmodellierer
parents:
724
diff
changeset
|
340 |
| 926 | 341 if(((pSettings->ext_sensor_map[0] < SENSOR_OPTIC) || (pSettings->ext_sensor_map[0] >= SENSOR_TYPE_O2_END))) |
|
730
9c65d226f4f6
Update sensor menu support for automatic sensor detection:
Ideenmodellierer
parents:
724
diff
changeset
|
342 { |
|
9c65d226f4f6
Update sensor menu support for automatic sensor detection:
Ideenmodellierer
parents:
724
diff
changeset
|
343 pSettings->ppo2sensors_deactivated |= 1; |
| 930 | 344 if(pSettings->ext_sensor_map[0] == SENSOR_CO2M) |
| 345 { | |
| 346 write_field_on_off(StMHARD3_O2_Sensor1, 30, 95, ME_Y_LINE1, &FontT48, "", pSettings->co2_sensor_active); | |
| 347 } | |
|
730
9c65d226f4f6
Update sensor menu support for automatic sensor detection:
Ideenmodellierer
parents:
724
diff
changeset
|
348 } |
|
9c65d226f4f6
Update sensor menu support for automatic sensor detection:
Ideenmodellierer
parents:
724
diff
changeset
|
349 else |
|
9c65d226f4f6
Update sensor menu support for automatic sensor detection:
Ideenmodellierer
parents:
724
diff
changeset
|
350 { |
|
9c65d226f4f6
Update sensor menu support for automatic sensor detection:
Ideenmodellierer
parents:
724
diff
changeset
|
351 write_field_on_off(StMHARD3_O2_Sensor1, 30, 95, ME_Y_LINE1, &FontT48, "", sensorActive[0]); |
| 926 | 352 if(firstSensorId == 0) |
| 353 { | |
| 354 firstSensorId = StMHARD3_O2_Sensor1; | |
| 355 } | |
|
730
9c65d226f4f6
Update sensor menu support for automatic sensor detection:
Ideenmodellierer
parents:
724
diff
changeset
|
356 } |
| 926 | 357 if(((pSettings->ext_sensor_map[1] < SENSOR_OPTIC) || (pSettings->ext_sensor_map[1] >= SENSOR_TYPE_O2_END))) |
|
730
9c65d226f4f6
Update sensor menu support for automatic sensor detection:
Ideenmodellierer
parents:
724
diff
changeset
|
358 { |
|
9c65d226f4f6
Update sensor menu support for automatic sensor detection:
Ideenmodellierer
parents:
724
diff
changeset
|
359 pSettings->ppo2sensors_deactivated |= 2; |
| 930 | 360 if(pSettings->ext_sensor_map[1] == SENSOR_CO2M) |
| 361 { | |
| 362 write_field_on_off(StMHARD3_O2_Sensor2, 30, 95, ME_Y_LINE2, &FontT48, "", pSettings->co2_sensor_active); | |
| 363 } | |
|
730
9c65d226f4f6
Update sensor menu support for automatic sensor detection:
Ideenmodellierer
parents:
724
diff
changeset
|
364 } |
|
9c65d226f4f6
Update sensor menu support for automatic sensor detection:
Ideenmodellierer
parents:
724
diff
changeset
|
365 else |
|
9c65d226f4f6
Update sensor menu support for automatic sensor detection:
Ideenmodellierer
parents:
724
diff
changeset
|
366 { |
|
9c65d226f4f6
Update sensor menu support for automatic sensor detection:
Ideenmodellierer
parents:
724
diff
changeset
|
367 write_field_on_off(StMHARD3_O2_Sensor2, 30, 95, ME_Y_LINE2, &FontT48, "", sensorActive[1]); |
| 926 | 368 if(firstSensorId == 0) |
| 369 { | |
| 370 firstSensorId = StMHARD3_O2_Sensor2; | |
| 371 } | |
|
730
9c65d226f4f6
Update sensor menu support for automatic sensor detection:
Ideenmodellierer
parents:
724
diff
changeset
|
372 } |
| 926 | 373 if(((pSettings->ext_sensor_map[2] < SENSOR_OPTIC) || (pSettings->ext_sensor_map[2] >= SENSOR_TYPE_O2_END))) |
|
730
9c65d226f4f6
Update sensor menu support for automatic sensor detection:
Ideenmodellierer
parents:
724
diff
changeset
|
374 { |
|
9c65d226f4f6
Update sensor menu support for automatic sensor detection:
Ideenmodellierer
parents:
724
diff
changeset
|
375 pSettings->ppo2sensors_deactivated |= 4; |
| 930 | 376 if(pSettings->ext_sensor_map[2] == SENSOR_CO2M) |
| 377 { | |
| 378 write_field_on_off(StMHARD3_O2_Sensor3, 30, 95, ME_Y_LINE3, &FontT48, "", pSettings->co2_sensor_active); | |
| 379 } | |
|
730
9c65d226f4f6
Update sensor menu support for automatic sensor detection:
Ideenmodellierer
parents:
724
diff
changeset
|
380 } |
|
9c65d226f4f6
Update sensor menu support for automatic sensor detection:
Ideenmodellierer
parents:
724
diff
changeset
|
381 else |
|
9c65d226f4f6
Update sensor menu support for automatic sensor detection:
Ideenmodellierer
parents:
724
diff
changeset
|
382 { |
|
9c65d226f4f6
Update sensor menu support for automatic sensor detection:
Ideenmodellierer
parents:
724
diff
changeset
|
383 write_field_on_off(StMHARD3_O2_Sensor3, 30, 95, ME_Y_LINE3, &FontT48, "", sensorActive[2]); |
| 926 | 384 if(firstSensorId == 0) |
| 385 { | |
| 386 firstSensorId = StMHARD3_O2_Sensor3; | |
| 387 } | |
|
730
9c65d226f4f6
Update sensor menu support for automatic sensor detection:
Ideenmodellierer
parents:
724
diff
changeset
|
388 } |
|
814
26ae9e8f24fd
Dev Bugfix: O2 values of new detected sensors were shown as invalid:
Ideenmodellierer
parents:
799
diff
changeset
|
389 |
|
26ae9e8f24fd
Dev Bugfix: O2 values of new detected sensors were shown as invalid:
Ideenmodellierer
parents:
799
diff
changeset
|
390 stateRealGetPointerWrite()->diveSettings.ppo2sensors_deactivated = pSettings->ppo2sensors_deactivated; |
|
26ae9e8f24fd
Dev Bugfix: O2 values of new detected sensors were shown as invalid:
Ideenmodellierer
parents:
799
diff
changeset
|
391 |
| 38 | 392 if(settingsGetPointer()->ppo2sensors_deactivated & 1) |
| 393 sensorActive[0] = 0; | |
| 394 if(settingsGetPointer()->ppo2sensors_deactivated & 2) | |
| 395 sensorActive[1] = 0; | |
| 396 if(settingsGetPointer()->ppo2sensors_deactivated & 4) | |
| 397 sensorActive[2] = 0; | |
| 398 | |
|
730
9c65d226f4f6
Update sensor menu support for automatic sensor detection:
Ideenmodellierer
parents:
724
diff
changeset
|
399 if((pSettings->ppo2sensors_source == O2_SENSOR_SOURCE_ANALOG) || (pSettings->ppo2sensors_source == O2_SENSOR_SOURCE_ANADIG) |
| 689 | 400 #ifdef ENABLE_SENTINEL_MODE |
| 401 || (settingsGetPointer()->ppo2sensors_source == O2_SENSOR_SOURCE_SENTINEL) | |
| 402 #endif | |
| 403 ) | |
|
562
ec76fa85009e
Added ADC sensor interface to O2 sensore menu structure:
Ideenmodellierer
parents:
539
diff
changeset
|
404 { |
| 584 | 405 write_label_fix( 30, 800, ME_Y_LINE4, &FontT48, TXT2BYTE_O2Calib); |
| 406 write_label_var( 400, 800, ME_Y_LINE4, &FontT48, "\016\016 %\017"); | |
| 407 | |
|
673
d7c5d592076b
Show 98% in case of Oxygen as the calibrating gas
heinrichsweikamp
parents:
605
diff
changeset
|
408 write_field_toggle(StMHARD3_O2_Calibrate, 400, 800, ME_Y_LINE4, &FontT48, "", 21, 98); |
|
562
ec76fa85009e
Added ADC sensor interface to O2 sensore menu structure:
Ideenmodellierer
parents:
539
diff
changeset
|
409 } |
|
ec76fa85009e
Added ADC sensor interface to O2 sensore menu structure:
Ideenmodellierer
parents:
539
diff
changeset
|
410 |
|
754
ec7b62983a8c
Only show autodetection in sensor menu if external interface is present:
Ideenmodellierer
parents:
748
diff
changeset
|
411 if(DataEX_external_ADC_Present()) |
|
ec7b62983a8c
Only show autodetection in sensor menu if external interface is present:
Ideenmodellierer
parents:
748
diff
changeset
|
412 { |
|
ec7b62983a8c
Only show autodetection in sensor menu if external interface is present:
Ideenmodellierer
parents:
748
diff
changeset
|
413 text[0] = TXT_2BYTE; |
|
ec7b62983a8c
Only show autodetection in sensor menu if external interface is present:
Ideenmodellierer
parents:
748
diff
changeset
|
414 text[1] = TXT2BYTE_SensorDetect; |
|
ec7b62983a8c
Only show autodetection in sensor menu if external interface is present:
Ideenmodellierer
parents:
748
diff
changeset
|
415 text[2] = 0; |
|
730
9c65d226f4f6
Update sensor menu support for automatic sensor detection:
Ideenmodellierer
parents:
724
diff
changeset
|
416 |
|
754
ec7b62983a8c
Only show autodetection in sensor menu if external interface is present:
Ideenmodellierer
parents:
748
diff
changeset
|
417 write_label_var( 30, 340, ME_Y_LINE6, &FontT48, text); |
| 745 | 418 |
|
754
ec7b62983a8c
Only show autodetection in sensor menu if external interface is present:
Ideenmodellierer
parents:
748
diff
changeset
|
419 write_field_button(StMHARD3_Sensor_Detect, 30, 800, ME_Y_LINE6, &FontT48, text); |
|
ec7b62983a8c
Only show autodetection in sensor menu if external interface is present:
Ideenmodellierer
parents:
748
diff
changeset
|
420 } |
| 745 | 421 |
| 827 | 422 if((pSettings->ext_sensor_map[0] >= SENSOR_OPTIC) && (pSettings->ext_sensor_map[0] < SENSOR_MUX)) |
|
730
9c65d226f4f6
Update sensor menu support for automatic sensor detection:
Ideenmodellierer
parents:
724
diff
changeset
|
423 { |
|
9c65d226f4f6
Update sensor menu support for automatic sensor detection:
Ideenmodellierer
parents:
724
diff
changeset
|
424 setEvent(StMHARD3_O2_Sensor1, (uint32_t)OnAction_Sensor1); |
|
9c65d226f4f6
Update sensor menu support for automatic sensor detection:
Ideenmodellierer
parents:
724
diff
changeset
|
425 } |
| 827 | 426 if((pSettings->ext_sensor_map[1] >= SENSOR_OPTIC) && (pSettings->ext_sensor_map[1] < SENSOR_MUX)) |
|
730
9c65d226f4f6
Update sensor menu support for automatic sensor detection:
Ideenmodellierer
parents:
724
diff
changeset
|
427 { |
|
9c65d226f4f6
Update sensor menu support for automatic sensor detection:
Ideenmodellierer
parents:
724
diff
changeset
|
428 setEvent(StMHARD3_O2_Sensor2, (uint32_t)OnAction_Sensor2); |
|
9c65d226f4f6
Update sensor menu support for automatic sensor detection:
Ideenmodellierer
parents:
724
diff
changeset
|
429 } |
| 827 | 430 if((pSettings->ext_sensor_map[2] >= SENSOR_OPTIC) && (pSettings->ext_sensor_map[2] < SENSOR_MUX)) |
|
730
9c65d226f4f6
Update sensor menu support for automatic sensor detection:
Ideenmodellierer
parents:
724
diff
changeset
|
431 { |
|
9c65d226f4f6
Update sensor menu support for automatic sensor detection:
Ideenmodellierer
parents:
724
diff
changeset
|
432 setEvent(StMHARD3_O2_Sensor3, (uint32_t)OnAction_Sensor3); |
|
9c65d226f4f6
Update sensor menu support for automatic sensor detection:
Ideenmodellierer
parents:
724
diff
changeset
|
433 } |
|
9c65d226f4f6
Update sensor menu support for automatic sensor detection:
Ideenmodellierer
parents:
724
diff
changeset
|
434 |
|
703
2f457024049b
Added selection of digital o2 sensor source to HW menu:
Ideenmodellierer
parents:
689
diff
changeset
|
435 if((settingsGetPointer()->ppo2sensors_source == O2_SENSOR_SOURCE_ANALOG) || (settingsGetPointer()->ppo2sensors_source == O2_SENSOR_SOURCE_ANADIG) |
| 689 | 436 #ifdef ENABLE_SENTINEL_MODE |
| 437 || (settingsGetPointer()->ppo2sensors_source == O2_SENSOR_SOURCE_SENTINEL) | |
| 438 #endif | |
| 439 ) | |
|
562
ec76fa85009e
Added ADC sensor interface to O2 sensore menu structure:
Ideenmodellierer
parents:
539
diff
changeset
|
440 { |
|
ec76fa85009e
Added ADC sensor interface to O2 sensore menu structure:
Ideenmodellierer
parents:
539
diff
changeset
|
441 setEvent(StMHARD3_O2_Calibrate, (uint32_t)OnAction_O2_Calibrate); |
|
ec76fa85009e
Added ADC sensor interface to O2 sensore menu structure:
Ideenmodellierer
parents:
539
diff
changeset
|
442 } |
|
708
7e3bf2c0cd40
Menu cleanup rebreather specific settings:
Ideenmodellierer
parents:
703
diff
changeset
|
443 |
|
754
ec7b62983a8c
Only show autodetection in sensor menu if external interface is present:
Ideenmodellierer
parents:
748
diff
changeset
|
444 if(DataEX_external_ADC_Present()) |
|
ec7b62983a8c
Only show autodetection in sensor menu if external interface is present:
Ideenmodellierer
parents:
748
diff
changeset
|
445 { |
|
ec7b62983a8c
Only show autodetection in sensor menu if external interface is present:
Ideenmodellierer
parents:
748
diff
changeset
|
446 setEvent(StMHARD3_Sensor_Detect, (uint32_t)OnAction_Sensor_Detect); |
|
ec7b62983a8c
Only show autodetection in sensor menu if external interface is present:
Ideenmodellierer
parents:
748
diff
changeset
|
447 } |
| 38 | 448 write_buttonTextline(TXT2BYTE_ButtonBack,TXT2BYTE_ButtonEnter,TXT2BYTE_ButtonNext); |
| 926 | 449 |
| 450 switch(firstSensorId) | |
| 451 { | |
| 452 case StMHARD3_O2_Sensor2: tMenuEdit_select(StMHARD3_O2_Sensor2); | |
| 453 break; | |
| 454 case StMHARD3_O2_Sensor3: tMenuEdit_select(StMHARD3_O2_Sensor3); | |
| 455 break; | |
| 456 default: break; | |
| 457 } | |
| 38 | 458 } |
| 459 | |
| 460 | |
| 461 uint8_t OnAction_Sensor1(uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action) | |
| 462 { | |
| 783 | 463 const SDiveState *pStateReal = stateRealGetPointer(); |
| 464 | |
| 827 | 465 if((pStateReal->lifeData.extIf_sensor_map[0] == SENSOR_DIGO2M) || (pStateReal->lifeData.extIf_sensor_map[0] == SENSOR_CO2M)) |
| 783 | 466 { |
| 467 return EXIT_TO_INFO_SENSOR; | |
| 468 } | |
| 469 else | |
| 470 { | |
| 471 if(settingsGetPointer()->ppo2sensors_deactivated & 1) | |
| 472 { | |
| 473 settingsGetPointer()->ppo2sensors_deactivated &= 4+2; | |
| 474 tMenuEdit_set_on_off(editId, 1); | |
| 475 } | |
| 476 else | |
| 477 { | |
| 478 settingsGetPointer()->ppo2sensors_deactivated |= 1; | |
| 479 tMenuEdit_set_on_off(editId, 0); | |
| 480 } | |
| 481 } | |
| 38 | 482 |
| 483 return UPDATE_DIVESETTINGS; | |
| 484 } | |
| 485 | |
| 486 | |
| 487 uint8_t OnAction_Sensor2(uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action) | |
| 488 { | |
| 783 | 489 const SDiveState *pStateReal = stateRealGetPointer(); |
| 38 | 490 |
| 827 | 491 if((pStateReal->lifeData.extIf_sensor_map[1] == SENSOR_DIGO2M) || (pStateReal->lifeData.extIf_sensor_map[1] == SENSOR_CO2M)) |
| 783 | 492 { |
| 493 return EXIT_TO_INFO_SENSOR; | |
| 494 } | |
| 495 else | |
| 496 { | |
| 497 if(settingsGetPointer()->ppo2sensors_deactivated & 2) | |
| 498 { | |
| 499 settingsGetPointer()->ppo2sensors_deactivated &= 4+1; | |
| 500 tMenuEdit_set_on_off(editId, 1); | |
| 501 } | |
| 502 else | |
| 503 { | |
| 504 settingsGetPointer()->ppo2sensors_deactivated |= 2; | |
| 505 tMenuEdit_set_on_off(editId, 0); | |
| 506 } | |
| 507 } | |
| 38 | 508 return UPDATE_DIVESETTINGS; |
| 509 } | |
| 510 | |
| 511 | |
| 512 uint8_t OnAction_Sensor3(uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action) | |
| 513 { | |
| 783 | 514 const SDiveState *pStateReal = stateRealGetPointer(); |
| 515 | |
| 827 | 516 if((pStateReal->lifeData.extIf_sensor_map[2] == SENSOR_DIGO2M) || (pStateReal->lifeData.extIf_sensor_map[2] == SENSOR_CO2M)) |
| 783 | 517 { |
| 518 return EXIT_TO_INFO_SENSOR; | |
| 519 } | |
| 520 else | |
| 521 { | |
| 38 | 522 |
| 783 | 523 if(settingsGetPointer()->ppo2sensors_deactivated & 4) |
| 524 { | |
| 525 settingsGetPointer()->ppo2sensors_deactivated &= 2+1; | |
| 526 tMenuEdit_set_on_off(editId, 1); | |
| 527 } | |
| 528 else | |
| 529 { | |
| 530 settingsGetPointer()->ppo2sensors_deactivated |= 4; | |
| 531 tMenuEdit_set_on_off(editId, 0); | |
| 532 } | |
| 533 } | |
| 38 | 534 return UPDATE_DIVESETTINGS; |
| 535 } | |
| 536 | |
| 537 | |
|
562
ec76fa85009e
Added ADC sensor interface to O2 sensore menu structure:
Ideenmodellierer
parents:
539
diff
changeset
|
538 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
|
539 { |
|
ec76fa85009e
Added ADC sensor interface to O2 sensore menu structure:
Ideenmodellierer
parents:
539
diff
changeset
|
540 uint8_t loop; |
|
ec76fa85009e
Added ADC sensor interface to O2 sensore menu structure:
Ideenmodellierer
parents:
539
diff
changeset
|
541 const SDiveState *pStateReal = stateRealGetPointer(); |
|
ec76fa85009e
Added ADC sensor interface to O2 sensore menu structure:
Ideenmodellierer
parents:
539
diff
changeset
|
542 SSettings* pSettings = settingsGetPointer(); |
| 584 | 543 uint8_t retVal = UNSPECIFIC_RETURN; |
| 544 float compensatedRef; | |
| 38 | 545 |
| 584 | 546 if(action == ACTION_BUTTON_ENTER_FINAL) |
| 547 { | |
| 548 if(O2_calib_gas == 21) | |
| 549 { | |
| 550 compensatedRef = O2_CALIB_FRACTION_AIR * pStateReal->lifeData.pressure_ambient_bar / 1.0; | |
| 551 } | |
| 552 else | |
| 553 { | |
| 605 | 554 compensatedRef = O2_CALIB_FRACTION_O2 * pStateReal->lifeData.pressure_ambient_bar / 1.0; |
| 584 | 555 } |
| 556 for(loop=0;loop<3;loop++) | |
|
562
ec76fa85009e
Added ADC sensor interface to O2 sensore menu structure:
Ideenmodellierer
parents:
539
diff
changeset
|
557 { |
| 584 | 558 if((pSettings->ppo2sensors_deactivated & (0x1 << loop)) == 0) |
| 559 { | |
| 560 if(pStateReal->lifeData.sensorVoltage_mV[loop] > 0.0001) /* sensor connected ?*/ | |
| 561 { | |
|
724
f285424f04d9
Development feature: external pressure sensor
Ideenmodellierer
parents:
718
diff
changeset
|
562 #ifdef ENABLE_EXTERNAL_PRESSURE |
|
f285424f04d9
Development feature: external pressure sensor
Ideenmodellierer
parents:
718
diff
changeset
|
563 if(loop == 2) |
|
f285424f04d9
Development feature: external pressure sensor
Ideenmodellierer
parents:
718
diff
changeset
|
564 { |
|
f285424f04d9
Development feature: external pressure sensor
Ideenmodellierer
parents:
718
diff
changeset
|
565 compensatedRef = pStateReal->lifeData.pressure_ambient_bar; |
|
f285424f04d9
Development feature: external pressure sensor
Ideenmodellierer
parents:
718
diff
changeset
|
566 } |
|
f285424f04d9
Development feature: external pressure sensor
Ideenmodellierer
parents:
718
diff
changeset
|
567 #endif |
|
f285424f04d9
Development feature: external pressure sensor
Ideenmodellierer
parents:
718
diff
changeset
|
568 |
| 584 | 569 pSettings->ppo2sensors_calibCoeff[loop] = compensatedRef / pStateReal->lifeData.sensorVoltage_mV[loop]; |
| 570 } | |
| 571 else | |
| 572 { | |
| 573 pSettings->ppo2sensors_calibCoeff[loop] = 0.0; | |
| 574 settingsGetPointer()->ppo2sensors_deactivated |= 0x1 << loop; | |
| 575 } | |
| 576 } | |
|
562
ec76fa85009e
Added ADC sensor interface to O2 sensore menu structure:
Ideenmodellierer
parents:
539
diff
changeset
|
577 } |
| 584 | 578 tMenuEdit_newInput(editId, O2_calib_gas, 0, 0, 0); |
| 579 retVal = UPDATE_DIVESETTINGS; | |
| 580 } | |
| 581 if(action == ACTION_BUTTON_NEXT) | |
| 582 { | |
| 583 if(O2_calib_gas == 21) | |
| 584 { | |
|
673
d7c5d592076b
Show 98% in case of Oxygen as the calibrating gas
heinrichsweikamp
parents:
605
diff
changeset
|
585 O2_calib_gas = 98; |
|
562
ec76fa85009e
Added ADC sensor interface to O2 sensore menu structure:
Ideenmodellierer
parents:
539
diff
changeset
|
586 } |
| 584 | 587 else |
| 588 { | |
| 589 O2_calib_gas = 21; | |
| 590 } | |
| 591 } | |
| 592 retVal = O2_calib_gas; | |
|
562
ec76fa85009e
Added ADC sensor interface to O2 sensore menu structure:
Ideenmodellierer
parents:
539
diff
changeset
|
593 |
| 584 | 594 if(action == ACTION_BUTTON_BACK) |
| 595 { | |
| 596 exitMenuEditField(); | |
| 597 } | |
| 598 | |
| 599 return retVal; | |
|
562
ec76fa85009e
Added ADC sensor interface to O2 sensore menu structure:
Ideenmodellierer
parents:
539
diff
changeset
|
600 } |
|
ec76fa85009e
Added ADC sensor interface to O2 sensore menu structure:
Ideenmodellierer
parents:
539
diff
changeset
|
601 |
|
718
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
709
diff
changeset
|
602 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
|
603 { |
|
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
709
diff
changeset
|
604 return EXIT_TO_INFO_SENSOR; |
|
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
709
diff
changeset
|
605 } |
|
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
709
diff
changeset
|
606 |
|
730
9c65d226f4f6
Update sensor menu support for automatic sensor detection:
Ideenmodellierer
parents:
724
diff
changeset
|
607 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
|
608 { |
|
957
3420e3ba698d
External sensor commands: Add sensor ID to command:
Ideenmodellierer
parents:
949
diff
changeset
|
609 DataEX_setExtInterface_Cmd(EXT_INTERFACE_AUTODETECT, 0); |
|
730
9c65d226f4f6
Update sensor menu support for automatic sensor detection:
Ideenmodellierer
parents:
724
diff
changeset
|
610 return UNSPECIFIC_RETURN; |
|
9c65d226f4f6
Update sensor menu support for automatic sensor detection:
Ideenmodellierer
parents:
724
diff
changeset
|
611 } |
|
718
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
709
diff
changeset
|
612 |
| 38 | 613 void openEdit_Brightness(void) |
| 614 { | |
| 615 uint8_t actualBrightness; | |
| 616 SSettings *pSettings = settingsGetPointer(); | |
| 617 | |
| 618 actualBrightness = pSettings->brightness; | |
| 619 actualBrightness++; | |
| 620 if(actualBrightness > 4) | |
| 621 actualBrightness = 0; | |
| 622 pSettings->brightness = actualBrightness; | |
| 623 exitEditWithUpdate(); | |
| 624 } | |
| 625 | |
| 626 | |
| 627 void buttonBalanceText_helper(uint8_t idOfButton, char *textOutput) | |
| 628 { | |
| 629 uint8_t txtcount = 0; | |
| 630 | |
| 631 if(idOfButton < 3) | |
| 632 { | |
| 633 textOutput[txtcount++] = '@' + settingsGetPointer()->buttonBalance[idOfButton]; | |
| 634 textOutput[txtcount++] = ' '; | |
| 635 textOutput[txtcount++] = ' '; | |
| 636 textOutput[txtcount++] = '('; | |
| 637 | |
| 638 switch(settingsGetPointer()->buttonBalance[idOfButton]) | |
| 639 { | |
| 640 case 1: | |
| 641 textOutput[txtcount++] = '-'; | |
| 642 textOutput[txtcount++] = '2'; | |
| 643 textOutput[txtcount++] = '0'; | |
| 644 break; | |
| 645 case 2: | |
| 646 textOutput[txtcount++] = '-'; | |
| 647 textOutput[txtcount++] = '1'; | |
| 648 textOutput[txtcount++] = '0'; | |
| 649 break; | |
| 650 case 3: | |
| 651 default: | |
| 652 textOutput[txtcount++] = '0'; | |
| 653 break; | |
| 654 case 4: | |
| 655 textOutput[txtcount++] = '+'; | |
| 656 textOutput[txtcount++] = '1'; | |
| 657 textOutput[txtcount++] = '0'; | |
| 658 break; | |
| 659 case 5: | |
| 660 textOutput[txtcount++] = '+'; | |
| 661 textOutput[txtcount++] = '2'; | |
| 662 textOutput[txtcount++] = '0'; | |
| 663 break; | |
| 664 } | |
| 665 textOutput[txtcount++] = ')'; | |
| 666 } | |
| 667 textOutput[txtcount++] = 0; | |
| 668 } | |
| 669 | |
| 670 /**# | |
| 671 ****************************************************************************** | |
| 672 * @brief BUTTONS | |
| 673 * @author heinrichs weikamp gmbh | |
| 674 * @version V 01 | |
| 675 * @date 15-Sept-2016 | |
| 676 ****************************************************************************** | |
| 677 * Button 0 is right, Button 1 is middle, Button 2 is left !!!! | |
| 678 * 2 1 0 (base value 3) | |
| 679 * Button 3 is used to store the base value, all others are balanced around this one! | |
| 680 * | |
| 681 */ | |
| 682 | |
| 683 void openEdit_ButtonSens(void) | |
| 684 { | |
| 685 char text[32]; | |
| 686 uint8_t sens; | |
| 687 const uint32_t eventListButtonBalance[3] = {StMHARD5_ButtonBalance1,StMHARD5_ButtonBalance2,StMHARD5_ButtonBalance3}; | |
| 688 | |
| 689 sens = (uint8_t)settingsGetPointer()->ButtonResponsiveness[3]; | |
| 690 write_field_3digit(StMHARD5_Button1, 360, 780, ME_Y_LINE1, &FontT48, "###", sens, 0, 0, 0); | |
| 691 | |
| 692 for(int i=2;i>=0;i--) | |
| 693 { | |
| 694 buttonBalanceText_helper(i,text); | |
| 695 write_field_button(eventListButtonBalance[i],360,500,ME_Y_LINE4-(i*ME_Y_LINE_STEP),&FontT48,text); | |
| 696 } | |
| 697 | |
|
740
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
734
diff
changeset
|
698 snprintf(text,32,"%c",TXT_ButtonLock); |
| 884 | 699 write_field_on_off(StMHARD5_ButtonLock, 30, 700, ME_Y_LINE5, &FontT48, text, settingsGetPointer()->buttonLockActive); |
| 38 | 700 |
| 701 setEvent(StMHARD5_Button1, (uint32_t)OnAction_Button); | |
| 702 | |
| 703 for(int i=2;i>=0;i--) | |
| 704 { | |
| 705 setEvent(eventListButtonBalance[i], (uint32_t)OnAction_ButtonBalance); | |
| 706 } | |
|
740
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
734
diff
changeset
|
707 setEvent(StMHARD5_ButtonLock, (uint32_t)OnAction_ButtonLock); |
| 38 | 708 write_buttonTextline(TXT2BYTE_ButtonBack,TXT2BYTE_ButtonEnter,TXT2BYTE_ButtonNext); |
| 709 } | |
| 710 | |
| 711 | |
| 712 void refresh_ButtonValuesFromPIC(void) | |
| 713 { | |
| 714 uint8_t sens[3]; | |
| 715 char text[64]; | |
| 716 | |
| 717 text[0] = '\001'; | |
| 718 text[1] = TXT_2BYTE; | |
| 719 text[2] = TXT2BYTE_ButtonSensitivity; | |
| 720 text[3] = 0; | |
| 721 write_topline(text); | |
| 722 | |
| 723 write_buttonTextline(TXT2BYTE_ButtonBack,TXT2BYTE_ButtonEnter,TXT2BYTE_ButtonNext); | |
| 724 | |
| 725 for(int i=0;i<3;i++) | |
| 726 { | |
| 727 text[0] = TXT_2BYTE; | |
| 728 text[1] = TXT2BYTE_ButtonLeft+i; | |
| 729 text[2] = 0; | |
| 730 write_label_var( 20, 300, ME_Y_LINE2+(i*ME_Y_LINE_STEP), &FontT48, text); | |
| 731 } | |
| 732 | |
| 733 for(int i=0;i<3;i++) | |
| 734 { | |
| 735 sens[i] = settingsHelperButtonSens_translate_hwOS_values_to_percentage(stateRealGetPointer()->lifeData.buttonPICdata[i]); | |
| 736 } | |
|
740
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
734
diff
changeset
|
737 snprintf(text,64,"\020\016\016%c%c \017 (%03u %03u %03u)",TXT_2BYTE,TXT2BYTE_LowerIsLess,sens[2],sens[1],sens[0]); |
| 884 | 738 write_label_var( 20, 700, ME_Y_LINE6, &FontT42, text); |
| 38 | 739 |
| 740 tMenuEdit_refresh_field(StMHARD5_Button1); | |
| 741 tMenuEdit_refresh_field(StMHARD5_ButtonBalance1); | |
| 742 tMenuEdit_refresh_field(StMHARD5_ButtonBalance2); | |
| 743 tMenuEdit_refresh_field(StMHARD5_ButtonBalance3); | |
|
740
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
734
diff
changeset
|
744 tMenuEdit_refresh_field(StMHARD5_ButtonLock); |
| 38 | 745 } |
| 746 | |
| 747 | |
| 748 uint8_t OnAction_Button(uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action) | |
| 749 { | |
| 750 uint8_t digitContentNew, remainder; | |
| 751 uint32_t newSensitivityGlobal; | |
| 752 | |
| 753 if(action == ACTION_BUTTON_NEXT) | |
| 754 { | |
| 755 digitContentNew = digitContent - '0'; | |
|
92
be35821a4974
Stable to test. button sensitiveness fix. + global_constants.
Dmitry Romanov <kitt@bk.ru>
parents:
38
diff
changeset
|
756 if(digitContentNew >= MAX_BUTTONRESPONSIVENESS_GUI) |
| 38 | 757 { |
|
92
be35821a4974
Stable to test. button sensitiveness fix. + global_constants.
Dmitry Romanov <kitt@bk.ru>
parents:
38
diff
changeset
|
758 digitContentNew = MIN_BUTTONRESPONSIVENESS_GUI; |
| 38 | 759 } |
| 760 else | |
| 761 { | |
| 762 remainder = digitContentNew%5; | |
| 763 digitContentNew += 5 - remainder; | |
|
92
be35821a4974
Stable to test. button sensitiveness fix. + global_constants.
Dmitry Romanov <kitt@bk.ru>
parents:
38
diff
changeset
|
764 if(digitContentNew >= MAX_BUTTONRESPONSIVENESS_GUI) |
|
be35821a4974
Stable to test. button sensitiveness fix. + global_constants.
Dmitry Romanov <kitt@bk.ru>
parents:
38
diff
changeset
|
765 digitContentNew = MAX_BUTTONRESPONSIVENESS_GUI; |
| 38 | 766 } |
| 767 return '0' + digitContentNew; | |
| 768 } | |
| 769 | |
| 770 if(action == ACTION_BUTTON_BACK) | |
| 771 { | |
| 772 digitContentNew = digitContent - '0'; | |
|
92
be35821a4974
Stable to test. button sensitiveness fix. + global_constants.
Dmitry Romanov <kitt@bk.ru>
parents:
38
diff
changeset
|
773 if(digitContentNew <= MIN_BUTTONRESPONSIVENESS_GUI) |
|
be35821a4974
Stable to test. button sensitiveness fix. + global_constants.
Dmitry Romanov <kitt@bk.ru>
parents:
38
diff
changeset
|
774 digitContentNew = MAX_BUTTONRESPONSIVENESS_GUI; |
| 38 | 775 else |
| 776 { | |
| 777 remainder = digitContentNew%5; | |
| 778 if(remainder) | |
| 779 digitContentNew -= remainder; | |
| 780 else | |
| 781 digitContentNew -= 5; | |
| 782 } | |
| 783 return '0' + digitContentNew; | |
| 784 } | |
| 785 | |
| 786 if(action == ACTION_BUTTON_ENTER_FINAL) | |
| 787 { | |
| 788 evaluateNewString(editId, &newSensitivityGlobal, 0, 0, 0); | |
| 789 settingsHelperButtonSens_keepPercentageValues(newSensitivityGlobal, settingsGetPointer()->ButtonResponsiveness); | |
| 790 setButtonResponsiveness(settingsGetPointer()->ButtonResponsiveness); | |
| 791 return UNSPECIFIC_RETURN; | |
| 792 } | |
| 793 return digitContent; | |
| 794 } | |
| 795 | |
| 796 | |
| 797 uint8_t OnAction_ButtonBalance(uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action) | |
| 798 { | |
| 799 int8_t idBalance = -1; | |
| 800 uint8_t *ptrSetting; | |
| 801 char text[32]; | |
| 802 | |
| 803 const uint32_t eventListButtonBalance[3] = {StMHARD5_ButtonBalance1,StMHARD5_ButtonBalance2,StMHARD5_ButtonBalance3}; | |
| 804 | |
| 805 idBalance = -1; | |
| 806 for(int i=0;i<3;i++) | |
| 807 { | |
| 808 if(editId == eventListButtonBalance[i]) | |
| 809 { | |
| 810 idBalance = i; | |
| 811 break; | |
| 812 } | |
| 813 } | |
| 814 | |
| 815 if((idBalance >= 0) && (idBalance < 3)) | |
| 816 { | |
| 817 ptrSetting = &settingsGetPointer()->buttonBalance[idBalance]; | |
| 818 | |
| 819 *ptrSetting += 1; | |
| 820 | |
| 821 if(*ptrSetting > 5) | |
| 822 *ptrSetting = 2; | |
| 823 | |
| 824 buttonBalanceText_helper(idBalance,text); | |
| 825 tMenuEdit_newButtonText(eventListButtonBalance[idBalance],text); | |
| 826 } | |
| 827 | |
| 828 return UNSPECIFIC_RETURN; | |
| 829 } | |
|
740
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
734
diff
changeset
|
830 |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
734
diff
changeset
|
831 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
|
832 { |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
734
diff
changeset
|
833 SSettings *pSettings = settingsGetPointer(); |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
734
diff
changeset
|
834 |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
734
diff
changeset
|
835 if(pSettings->buttonLockActive) |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
734
diff
changeset
|
836 { |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
734
diff
changeset
|
837 pSettings->buttonLockActive = 0; |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
734
diff
changeset
|
838 tMenuEdit_set_on_off(editId, 0); |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
734
diff
changeset
|
839 } |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
734
diff
changeset
|
840 else |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
734
diff
changeset
|
841 { |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
734
diff
changeset
|
842 pSettings->buttonLockActive = 1; |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
734
diff
changeset
|
843 tMenuEdit_set_on_off(editId, 1); |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
734
diff
changeset
|
844 } |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
734
diff
changeset
|
845 |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
734
diff
changeset
|
846 return UNSPECIFIC_RETURN; |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
734
diff
changeset
|
847 } |