Mercurial > public > ostc4
annotate Discovery/Src/tMenuHardware.c @ 901:e4e9acfde839 Evo_2_23
Bugfix simulator/planer:
For deco calculation two structures are used. The calculation structure and the input structure. During simulation fast forward (+5min) the input structure is manipulated. Especially for vpm calculation it could happen that the input structure was manipulated and then overwritten by the calculation structure => deco and tts may have wrong values. To avoid this thedeco calculation status is now checked before doing the FF manupulation. Based an calculation state deco or input structures are manipulated.
Surface time stamp in planer view:
The planer used its own (buggy) implementation for calculation of tts. The timestamp for the surface arrival did not match the bottom time + TTS. The new implementation uses the tts calculated by the deco loop for generation of surface time stamp.
| author | Ideenmodellierer |
|---|---|
| date | Wed, 02 Oct 2024 22:07:13 +0200 |
| parents | ffb1036c27c2 |
| children |
| rev | line source |
|---|---|
| 38 | 1 /////////////////////////////////////////////////////////////////////////////// |
| 2 /// -*- coding: UTF-8 -*- | |
| 3 /// | |
| 4 /// \file Discovery/Src/tMenuHardware.c | |
| 5 /// \brief Main Template file for Menu Page Hardware | |
| 6 /// \author heinrichs weikamp gmbh | |
| 7 /// \date 05-Aug-2014 | |
| 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 "tMenu.h" | |
| 31 #include "tMenuHardware.h" | |
| 32 | |
| 33 //#define NEXTLINE(text, textPointer) {text[(textPointer)++] = '\n'; text[textPointer++] = '\r'; text[textPointer] = 0;} | |
| 34 // NEXTLINE(text,textPointer); | |
| 35 | |
| 36 | |
| 37 //\ text[(*textPointer)++] = '\r'; text[*textPointer] = 0; | |
| 38 | |
| 39 /* Exported functions --------------------------------------------------------*/ | |
| 40 | |
| 41 uint32_t tMHardware_refresh(uint8_t line, char *text, uint16_t *tab, char *subtext) | |
| 42 { | |
| 43 | |
| 44 SSettings *data; | |
| 45 uint8_t textPointer, actualBrightness; | |
| 46 char sensorStatusColor[3]; | |
| 47 int32_t button[4]; | |
| 48 data = settingsGetPointer(); | |
| 49 textPointer = 0; | |
| 50 *tab = 450; | |
| 51 *subtext = 0; | |
| 52 /* | |
| 53 const char content[6] = | |
| 54 { TXT_Compass, | |
| 55 TXT_o2Sensors, | |
| 56 TXT_Brightness, | |
| 57 TXT_FirmwareUpdate,//TXT_Luftintegration, | |
| 58 0,//TXT_FirmwareUpdate, | |
| 59 0 | |
| 60 }; | |
| 61 tM_refresh(text,&textPointer,line,content); | |
| 62 */ | |
| 63 if((line == 0) || (line == 1)) | |
| 64 { | |
| 65 text[textPointer++] = TXT_2BYTE; | |
| 66 text[textPointer++] = TXT2BYTE_Bluetooth; | |
| 67 text[textPointer++] = '\t'; | |
| 68 if(settingsGetPointer()->bluetoothActive) | |
| 69 text[textPointer++] = '\005'; | |
| 70 else | |
| 71 text[textPointer++] = '\006'; | |
| 72 text[textPointer] = 0; | |
| 73 } | |
| 74 nextline(text,&textPointer); | |
| 75 | |
| 76 if((line == 0) || (line == 2)) | |
| 77 { | |
| 78 text[textPointer++] = TXT_2BYTE; | |
| 79 text[textPointer++] = TXT2BYTE_Compass; | |
| 80 text[textPointer++] = '\t'; | |
| 81 | |
| 82 if(settingsGetPointer()->compassBearing != 0) | |
| 83 { | |
| 759 | 84 textPointer += snprintf(&text[textPointer], 20, "(%03u`)", settingsGetPointer()->compassBearing % 360); |
| 38 | 85 } |
| 86 text[textPointer] = 0; | |
| 87 /* | |
| 88 textPointer += snprintf(&text[textPointer],20,"%i %i %i" | |
| 89 ,stateUsed->lifeData.compass_DX_f | |
| 90 ,stateUsed->lifeData.compass_DY_f | |
| 91 ,stateUsed->lifeData.compass_DZ_f); | |
| 92 */ | |
| 93 } | |
| 94 nextline(text,&textPointer); | |
| 95 | |
| 96 if((line == 0) || (line == 3)) | |
| 97 { | |
| 98 text[textPointer++] = TXT_o2Sensors; | |
| 99 if((stateUsed->lifeData.ppO2Sensor_bar[0] != 0) || (stateUsed->lifeData.ppO2Sensor_bar[1] != 0) || (stateUsed->lifeData.ppO2Sensor_bar[2] != 0)) | |
| 100 { | |
| 101 text[textPointer++] = '\t'; | |
| 102 sensorStatusColor[0] = '\020'; | |
| 103 sensorStatusColor[1] = '\020'; | |
| 104 sensorStatusColor[2] = '\020'; | |
| 827 | 105 |
| 106 if((stateUsed->diveSettings.ppo2sensors_deactivated & 1) || (data->ext_sensor_map[0] > SENSOR_DIGO2M)) | |
|
525
1f557e5f4b5a
Change color ID used in strings for light grey:
Ideenmodellierer
parents:
317
diff
changeset
|
107 sensorStatusColor[0] = '\031'; |
| 827 | 108 if((stateUsed->diveSettings.ppo2sensors_deactivated & 2) || (data->ext_sensor_map[1] > SENSOR_DIGO2M)) |
|
525
1f557e5f4b5a
Change color ID used in strings for light grey:
Ideenmodellierer
parents:
317
diff
changeset
|
109 sensorStatusColor[1] = '\031'; |
| 827 | 110 if((stateUsed->diveSettings.ppo2sensors_deactivated & 4) || (data->ext_sensor_map[1] > SENSOR_DIGO2M)) |
|
525
1f557e5f4b5a
Change color ID used in strings for light grey:
Ideenmodellierer
parents:
317
diff
changeset
|
111 sensorStatusColor[2] = '\031'; |
| 827 | 112 |
| 38 | 113 textPointer += snprintf(&text[textPointer],20,"%c%01.1f %c%01.1f %c%01.1f\020" |
| 114 ,sensorStatusColor[0], stateUsed->lifeData.ppO2Sensor_bar[0] | |
| 115 ,sensorStatusColor[1], stateUsed->lifeData.ppO2Sensor_bar[1] | |
| 116 ,sensorStatusColor[2], stateUsed->lifeData.ppO2Sensor_bar[2]); | |
| 117 } | |
| 118 } | |
| 119 nextline(text,&textPointer); | |
| 120 | |
| 121 if((line == 0) || (line == 4)) | |
| 122 { | |
| 123 text[textPointer++] = TXT_Brightness; | |
| 124 text[textPointer++] = '\t'; | |
| 125 | |
| 126 actualBrightness = data->brightness; | |
| 127 | |
| 128 if(actualBrightness == 0) | |
| 129 text[textPointer++] = TXT_Cave; | |
| 130 else if(actualBrightness == 1) | |
| 131 text[textPointer++] = TXT_Eco; | |
| 132 else if(actualBrightness == 2) | |
| 133 text[textPointer++] = TXT_Normal; | |
| 134 else if(actualBrightness == 3) | |
| 135 text[textPointer++] = TXT_Bright; | |
| 136 else if(actualBrightness == 4) | |
| 137 text[textPointer++] = TXT_Ultrabright; | |
| 138 else | |
| 139 text[textPointer++] = '+'; | |
| 140 } | |
| 141 nextline(text,&textPointer); | |
| 142 | |
| 143 if((line == 0) || (line == 5)) | |
| 144 { | |
| 145 text[textPointer++] = TXT_2BYTE; | |
| 146 text[textPointer++] = TXT2BYTE_ButtonSensitivity; | |
| 147 text[textPointer++] = '\t'; | |
| 148 | |
| 149 for(int i=0;i<=3;i++) | |
| 150 { | |
| 151 button[i] = (uint8_t)settingsGetPointer()->ButtonResponsiveness[i]; | |
| 152 } | |
| 153 // textPointer += snprintf(&text[textPointer],25,"%i %i %i",button[0],button[1],button[2]); | |
| 154 textPointer += snprintf(&text[textPointer],25, | |
| 317 | 155 "%li" |
| 38 | 156 "\016\016" |
| 157 " %%" | |
| 158 "\017", | |
| 159 button[3]); | |
| 160 } | |
| 161 nextline(text,&textPointer); | |
| 162 | |
|
110
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
38
diff
changeset
|
163 if((line == 0) || (line == 6)) |
| 38 | 164 { |
|
110
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
38
diff
changeset
|
165 text[textPointer++] = TXT_2BYTE; |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
38
diff
changeset
|
166 text[textPointer++] = TXT2BYTE_FLIPDISPLAY; |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
38
diff
changeset
|
167 text[textPointer++] = '\t'; |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
38
diff
changeset
|
168 if(settingsGetPointer()->FlipDisplay) |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
38
diff
changeset
|
169 text[textPointer++] = '\005'; |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
38
diff
changeset
|
170 else |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
38
diff
changeset
|
171 text[textPointer++] = '\006'; |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
38
diff
changeset
|
172 text[textPointer] = 0; |
|
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
38
diff
changeset
|
173 nextline(text,&textPointer); |
| 38 | 174 } |
|
110
cc8e24374b83
Added option to handled mirrored display to existing functions
Ideenmodellierer
parents:
38
diff
changeset
|
175 |
| 38 | 176 return StMHARD; |
| 177 } |