Mercurial > public > ostc4
annotate Discovery/Src/base.c @ 736:8a2337c7af52
Fixed logbook download after switch from CCR to extra (OC) gas if the extra gas
was the same as the active diluent
Bugfix from mikeller
author | heinrichsweikamp |
---|---|
date | Fri, 03 Mar 2023 10:41:44 +0100 |
parents | b9f699d2e3d0 |
children | 5078da3845c0 |
rev | line source |
---|---|
38 | 1 /////////////////////////////////////////////////////////////////////////////// |
2 /// -*- coding: UTF-8 -*- | |
3 /// | |
4 /// \file Discovery/Src/base.c | |
5 /// \brief main(): init hardware, IRQs and start sub-systems | |
6 /// \author heinrichs weikamp gmbh | |
7 /// \date 26-February-2014 | |
8 /// | |
9 /// $Id$ | |
10 /////////////////////////////////////////////////////////////////////////////// | |
11 /// \par Copyright (c) 2014-2018 Heinrichs Weikamp gmbh | |
12 /// | |
13 /// This program is free software: you can redistribute it and/or modify | |
14 /// it under the terms of the GNU General Public License as published by | |
15 /// the Free Software Foundation, either version 3 of the License, or | |
16 /// (at your option) any later version. | |
17 /// | |
18 /// This program is distributed in the hope that it will be useful, | |
19 /// but WITHOUT ANY WARRANTY; without even the implied warranty of | |
20 /// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
21 /// GNU General Public License for more details. | |
22 /// | |
23 /// You should have received a copy of the GNU General Public License | |
24 /// along with this program. If not, see <http://www.gnu.org/licenses/>. | |
25 ////////////////////////////////////////////////////////////////////////////// | |
26 | |
27 /** | |
28 @verbatim | |
29 ============================================================================== | |
30 ##### Firmware Info ##### | |
31 ============================================================================== | |
32 [..] In settings.c including text and magic stuff | |
33 ============================================================================== | |
34 ##### IRQs ##### | |
35 ============================================================================== | |
36 [..] The IRQs are very important and most functions should only run there. | |
37 | |
38 PreemptPriority are as follows | |
39 (#) 2 (low) sprintf _only_ here. Don't use in maintask or anywhere else. | |
40 Called by Buttons und Timer3 | |
41 Timer3 is 1/10 second | |
42 (#) 1 (mid) anything that should work while in IRQ2 like HalDelay(), VSYNC | |
43 and DMA2D Transfer Complete for housekeepingFrame(); | |
44 (#) 0 (high) _very very short_ interrupts like The HAL hardware part for | |
45 spi, uart, i2c. | |
46 | |
47 SubPriority within PreemptPriority give the order to execute. | |
48 Introduced 30.Oct.14 as it used by several HAL examples. | |
49 Three levelAmbients are available (2 low,1 mid,0 high) | |
50 | |
51 The STM32F4 has 4bits for IRQ levelAmbients, divided 2/2 in this code | |
52 with the NVIC_PRIORITYGROUP_2 setting. | |
53 | |
54 ============================================================================== | |
55 ##### MainTask ##### | |
56 ============================================================================== | |
57 [..] For everthing slow without importance to be 'in time'. | |
58 Like VPM and Buehlmann. | |
59 No sprintf and probably no GFX_SetFramesTopBottom() stuff neither. | |
60 If sprintf is called while sprintf is executed it blows up everything. | |
61 | |
62 ============================================================================== | |
63 ##### Frames / the external SDRAM ##### | |
64 ============================================================================== | |
65 [..] The SDRAM is handled by getFrame() and releaseFrame(). | |
66 Each frame with 800*480*2 Bytes. | |
67 Be carefull to release every frame | |
68 otherwise there will be a memory leakage over time. | |
69 housekeepingFrame() in the MainTask takes care of cleaning the frames. | |
70 All frames are filled with 0x00. This will be transparent with color of | |
71 CLUT_Font020 (is CLUT 0) if the alpha is set for a 16bit pair. | |
72 housekeepingFrame() delays the cleaning of frames still used as screen | |
73 buffer to prevent flickering. | |
74 | |
75 [..] use global variable frameCounter[] in gfxengine.c to control memory | |
76 all but the last three are identical to caller_id | |
77 for example 0x05 are the menu frames | |
78 the last but one is a sum for higher numbers (shouldn't be any) | |
79 the last but one are those in status RELEASED | |
80 the last are those CLEAR (as of 151202 down to 4 in logbook mode) | |
81 | |
82 [..] 4 pages are used for two double memories for screenshots (since Nov. 15) | |
83 | |
84 ============================================================================== | |
85 ##### Display ##### | |
86 ============================================================================== | |
87 [..] There is a Top layer, Bottom layer and background color. | |
88 All are perfectly alpha-blended by hardware. | |
89 | |
90 (#) top layer has 800x480 option function calls only | |
91 as it is not used for cursors here | |
92 (#) bottom layer has free size and start option to be used | |
93 for cursors (or sprites in the future ;-) | |
94 (#) background only black in the moment. | |
95 ToDo: Could be anything else for warnings etc. | |
96 if needed | |
97 | |
98 [..] Frame updates, switching and cursors is done with | |
99 | |
100 (#) GFX_SetFramesTopBottom() and the subset | |
101 GFX_SetFrameTop() + GFX_SetFrameBottom() | |
102 Those do not change anything on the display but give commands to.. | |
103 (#) GFX_change_LTDC() The only place that changes the pointer. | |
104 This prevents erratic behaviour if several changes | |
105 are made within one refresh rate of the screen. | |
106 Is called in IRQ by PD4 and HAL_GPIO_EXTI_IRQHandler | |
107 from VSYNC signal. | |
108 | |
109 [..] Content | |
110 | |
111 (#) Colors by LookupTable only. This could be modified by | |
112 system settings in the future. (gfx_color.h/.c) | |
113 | |
114 (#) Text by text_multilinguage.h/.c with one char | |
115 necessary only starting from '\x80' | |
116 with automatic language switch by | |
117 selected_language in SSettings | |
118 see openEdit_Language() in tMenuEditSystem.c | |
119 Therefore there are differnent functions | |
120 for example: | |
121 write_label_fix() for single char multilanguage | |
122 write_label_var() for strings that could include | |
123 multilanguage as well | |
124 see GFX_write_string() to get an overview of the controls | |
125 as well as the command list in gfx_engine.h | |
126 There is no clear before writing, text overlay is always on. | |
127 Many options to have LargeFont.SmallFont for numbers etc. | |
128 | |
129 ============================================================================== | |
130 ##### Update, DualBoot and build-in FLASH memory usage ##### | |
131 ============================================================================== | |
132 [..] Boot0 pin, Boot1/PB2 pin and BFB2 software bit control the behaviour. | |
133 PB2 should be tied to GND. | |
134 Boot0 == VDD -> bootloader on start, otherwise boot from Bank1 or Bank2 | |
135 depending on BFB2. | |
136 Bank2 contains the Fonts and should contain a proper test code in future | |
137 Bank1 is the main code (Bank1 is 1 MB too, usage as of Oct. 14 is 200 KB) | |
138 [..] Bootloader should be either UART or USB (on FS pins _only_) | |
139 USB HS to FS like on the Eval board does not work. | |
140 [..] Bootloader for the smaller CPU2 is implemented via the SPI used for DMA copy. | |
141 | |
142 ============================================================================== | |
143 ##### Connection to CPU2 (STM32F411 as of Oct.14 ##### | |
144 ============================================================================== | |
145 [..] Connected via SPI and DMA for every purpose. | |
146 two entire arrays are transfered for data security reasons | |
147 with respect to master (STM32F429) might interrupt internal | |
148 data copy in CPU2 (like hi byte, low byte, etc.). | |
149 [..] The entire life data is calculated in CPU2. Like tissues, CNS,... | |
150 Therefore the main unit is _not_ necessarily a Real Time system. | |
151 Simulation on the main unit can be executed without disrupting life data. | |
152 [..] SPI is triggered and timed by calling DataEX_call() in data_exchange_main.c | |
153 DataEX_copy_to_LifeData() does the transfer from buffer to variables used. | |
154 | |
155 ============================================================================== | |
156 ##### Menu, MenuEdit, Info ##### | |
157 ============================================================================== | |
158 [..] tMenu.c, tMenuEdit.c and tInfo.c is the system used. | |
159 logbook is part of Info not Menu. | |
160 The Info Menu is accessed by button 'Back' | |
161 The regular Menu is accessed by button 'Enter' | |
162 [..] Menu content is kept in frame memory for fast access. | |
163 There is no need to build pages if the 'Enter' button is pressed. | |
164 This is in contrast to MenuEdit pages. | |
165 [..] Button control for new pages (and pages in general) have to implemented | |
166 in tMenu.c, tMenuEdit.c or tInfo.c | |
167 | |
168 [..] ToDo (Oct. 14) Timeout for menus via Timer3 / IRQ 2 | |
169 | |
170 ============================================================================== | |
171 ##### settings ##### | |
172 ============================================================================== | |
173 [..] files: settings.c, settings.h | |
174 1. adjust struct SSettings in settings.h | |
175 2. adjust const SSettings SettingsStandard in settings.c | |
176 3. adjust set_new_settings_missing_in_ext_flash() | |
177 4. adjust check_and_correct_settings() IMPORTANT as it changes values! | |
178 | |
179 ============================================================================== | |
180 ##### specials ##### | |
181 ============================================================================== | |
182 [..] There was code for vector graphics from great demos | |
183 (peridiummmm and jupiter) that can be fitted again | |
184 | |
185 ============================================================================== | |
186 ##### ppO2 sensors ##### | |
187 ============================================================================== | |
188 [..] in tCCR.c is function get_ppO2SensorWeightedResult_cbar(); | |
189 | |
190 @endverbatim | |
191 ****************************************************************************** | |
192 * @attention | |
193 * | |
194 * <h2><center>© COPYRIGHT(c) 2014 heinrichs weikamp</center></h2> | |
195 * | |
196 ****************************************************************************** | |
197 */ | |
198 | |
199 /* Includes ------------------------------------------------------------------*/ | |
200 #include "stdio.h" | |
201 #include <string.h> // for memcopy | |
549
469e93f8633e
Only execute motion detection functions if features is enabled:
Ideenmodellierer
parents:
540
diff
changeset
|
202 #include <math.h> |
446
f1257a32f2d4
Introduced configuration header for variant managment:
ideenmodellierer
parents:
427
diff
changeset
|
203 #include "configuration.h" |
38 | 204 |
205 #include "stm32f4xx_hal.h" | |
206 #include "ostc.h" | |
207 #include "base.h" | |
208 #include "display.h" | |
209 #include "gfx_engine.h" | |
210 #include "show_logbook.h" | |
211 #include "text_multilanguage.h" | |
212 #include "tHome.h" | |
213 #include "tInfo.h" | |
214 #include "tInfoLog.h" | |
718
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
697
diff
changeset
|
215 #include "tInfoSensor.h" |
38 | 216 #include "tMenu.h" |
217 #include "tMenuEdit.h" | |
218 #include "tMenuEditGasOC.h" | |
219 #include "tStructure.h" | |
220 #include "externLogbookFlash.h" | |
221 #include "tComm.h" | |
222 #include "tCCR.h" | |
223 #include "data_exchange.h" | |
224 #include "data_exchange_main.h" | |
225 #include "vpm.h" | |
226 #include "buehlmann.h" | |
227 #include "logbook.h" | |
228 #include "check_warning.h" | |
229 #include "simulation.h" | |
230 #include "decom.h" | |
231 #include "timer.h" | |
232 #include "logbook_miniLive.h" | |
233 #include "test_vpm.h" | |
234 #include "tDebug.h" | |
360
fc5e9fdcb156
Added trigger of middle button action in case of a detected shake
ideenmodellierer
parents:
272
diff
changeset
|
235 #include "motion.h" |
586
bb5ce239741f
Motion control: Jump back to primary view if focus is lost:
Ideenmodellierer
parents:
561
diff
changeset
|
236 #include "t7.h" |
bb5ce239741f
Motion control: Jump back to primary view if focus is lost:
Ideenmodellierer
parents:
561
diff
changeset
|
237 #include "t3.h" |
651 | 238 #include "tMenuEditSetpoint.h" |
38 | 239 |
240 #ifdef DEMOMODE | |
241 #include "demo.h" | |
242 static void TIM_DEMO_init(void); | |
243 #endif | |
244 | |
361
b111fc4250e9
Pass action to customer vie update function.
Ideenmodellierer
parents:
360
diff
changeset
|
245 |
38 | 246 //#include "lodepng.h" |
247 //#include <stdlib.h> // for malloc and free | |
248 | |
249 /** @addtogroup OSTC 4 | |
250 * @{ | |
251 */ | |
252 | |
253 /* Private typedef -----------------------------------------------------------*/ | |
254 | |
255 //#define NO_TIMEOUT | |
256 //#define QUICK_SLEEP | |
257 | |
258 /* Private define ------------------------------------------------------------*/ | |
259 #define REFRESH_COUNT ((uint32_t)0x0569) /**< for SDRAM refresh counter (90Mhz SD clock) */ | |
152
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
260 #define INVALID_BUTTON ((uint8_t) 0xFF) |
38 | 261 /* Private macro -------------------------------------------------------------*/ |
262 /* Private variables ---------------------------------------------------------*/ | |
263 | |
300
5ca177d2df5d
cleanup: remove commented/unused code, make static
Jan Mulder <jlmulder@xs4all.nl>
parents:
272
diff
changeset
|
264 static RTC_HandleTypeDef RtcHandle; /* used to change time and date, no RTC is running on this MCU */ |
38 | 265 TIM_HandleTypeDef TimHandle; /* used in stm32f4xx_it.c too */ |
300
5ca177d2df5d
cleanup: remove commented/unused code, make static
Jan Mulder <jlmulder@xs4all.nl>
parents:
272
diff
changeset
|
266 static TIM_HandleTypeDef TimBacklightHandle; |
225
2bb1db22b5f5
cleanup: random set of cleanups
Jan Mulder <jlmulder@xs4all.nl>
parents:
223
diff
changeset
|
267 #ifdef DEMOMODE |
38 | 268 TIM_HandleTypeDef TimDemoHandle; /* used in stm32f4xx_it.c too */ |
225
2bb1db22b5f5
cleanup: random set of cleanups
Jan Mulder <jlmulder@xs4all.nl>
parents:
223
diff
changeset
|
269 #endif |
38 | 270 |
549
469e93f8633e
Only execute motion detection functions if features is enabled:
Ideenmodellierer
parents:
540
diff
changeset
|
271 |
469e93f8633e
Only execute motion detection functions if features is enabled:
Ideenmodellierer
parents:
540
diff
changeset
|
272 static uint8_t blBoost = 0; |
422
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
273 static uint8_t RequestModeChange = 0; |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
274 |
697 | 275 static uint8_t LastButtonPressed = INVALID_BUTTON; |
276 static uint32_t LastButtonPressedTick = 0; | |
300
5ca177d2df5d
cleanup: remove commented/unused code, make static
Jan Mulder <jlmulder@xs4all.nl>
parents:
272
diff
changeset
|
277 static uint32_t BaseTick100ms; /* Tick at last 100ms cycle */ |
38 | 278 |
279 /* SDRAM handler declaration */ | |
300
5ca177d2df5d
cleanup: remove commented/unused code, make static
Jan Mulder <jlmulder@xs4all.nl>
parents:
272
diff
changeset
|
280 static SDRAM_HandleTypeDef hsdram; |
5ca177d2df5d
cleanup: remove commented/unused code, make static
Jan Mulder <jlmulder@xs4all.nl>
parents:
272
diff
changeset
|
281 static FMC_SDRAM_TimingTypeDef SDRAM_Timing; |
5ca177d2df5d
cleanup: remove commented/unused code, make static
Jan Mulder <jlmulder@xs4all.nl>
parents:
272
diff
changeset
|
282 static FMC_SDRAM_CommandTypeDef command; |
38 | 283 |
284 /* This was used for Dual Boot */ | |
285 //FLASH_OBProgramInitTypeDef OBInit; | |
286 //FLASH_AdvOBProgramInitTypeDef AdvOBInit; | |
287 | |
288 /* Private variables with external access ------------------------------------*/ | |
289 | |
300
5ca177d2df5d
cleanup: remove commented/unused code, make static
Jan Mulder <jlmulder@xs4all.nl>
parents:
272
diff
changeset
|
290 static uint32_t globalStateID = 0; |
5ca177d2df5d
cleanup: remove commented/unused code, make static
Jan Mulder <jlmulder@xs4all.nl>
parents:
272
diff
changeset
|
291 static uint32_t time_without_button_pressed_deciseconds = 0; /**< langbeschreibung (eigenes Feld) warum diese variable verwendet wird um den sleepmode zu aktivieren */ |
38 | 292 uint8_t bootToBootloader = 0; ///< set in tComm.c to install firmware updates, calls resetToFirmwareUpdate() |
300
5ca177d2df5d
cleanup: remove commented/unused code, make static
Jan Mulder <jlmulder@xs4all.nl>
parents:
272
diff
changeset
|
293 static uint8_t returnFromCommCleanUpRequest = 0; ///< use this to exit bluetooth mode and call tComm_exit() |
38 | 294 uint32_t base_tempLightLevel = 0; |
300
5ca177d2df5d
cleanup: remove commented/unused code, make static
Jan Mulder <jlmulder@xs4all.nl>
parents:
272
diff
changeset
|
295 static uint8_t wasFirmwareUpdateCheckBattery = 0; |
229
2c0b502b0a72
cleanup: fix recent extra compiler warnings
Jan Mulder <jlmulder@xs4all.nl>
parents:
225
diff
changeset
|
296 static uint8_t DoDisplayRefresh = 0; /* trigger to refresh display data */ |
623 | 297 static uint8_t DoHousekeeping = 0; /* trigger to cleanup the frame buffers */ |
217
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
298 |
38 | 299 /* Private function prototypes -----------------------------------------------*/ |
300 static void SystemClock_Config(void); | |
301 static void Error_Handler(void); | |
302 static void SDRAM_Initialization_Sequence(SDRAM_HandleTypeDef *hsdram, FMC_SDRAM_CommandTypeDef *Command); | |
303 static void SDRAM_Config(void); | |
304 static void EXTILine_Buttons_Config(void); | |
305 static void TIM_init(void); | |
306 static void TIM_BACKLIGHT_init(void); | |
307 static uint32_t TIM_BACKLIGHT_adjust(void); | |
308 static void gotoSleep(void); | |
309 static void deco_loop(void); | |
310 static void resetToFirmwareUpdate(void); | |
217
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
311 static void TriggerButtonAction(void); |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
312 static void EvaluateButton(void); |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
313 static void RefreshDisplay(void); |
422
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
314 static void TimeoutControlRequestModechange(void); |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
315 static void TimeoutControl(void); |
38 | 316 |
317 /* ITM Trace-------- ---------------------------------------------------------*/ | |
318 /* | |
319 #define ITM_Port8(n) (*((volatile unsigned char *)(0xE0000000+4*n))) | |
320 #define ITM_Port16(n) (*((volatile unsigned short*)(0xE0000000+4*n))) | |
321 #define ITM_Port32(n) (*((volatile unsigned long *)(0xE0000000+4*n))) | |
322 | |
323 #define DEMCR (*((volatile unsigned long *)(0xE000EDFC))) | |
324 #define TRCENA 0x01000000 | |
325 | |
326 struct __FILE { int handle; }; | |
327 FILE __stdout; | |
328 FILE __stdin; | |
329 | |
330 int fputc(int ch, FILE *f) { | |
331 if (DEMCR & TRCENA) { | |
332 while (ITM_Port32(0) == 0); | |
333 ITM_Port8(0) = ch; | |
334 } | |
335 return(ch); | |
336 } | |
337 */ | |
360
fc5e9fdcb156
Added trigger of middle button action in case of a detected shake
ideenmodellierer
parents:
272
diff
changeset
|
338 static uint8_t ButtonAction = ACTION_END; |
fc5e9fdcb156
Added trigger of middle button action in case of a detected shake
ideenmodellierer
parents:
272
diff
changeset
|
339 |
611
916998f90e39
Suspend MotionDetection events while diver is operationg the OSTC:
Ideenmodellierer
parents:
597
diff
changeset
|
340 void StoreButtonAction(uint8_t action) |
360
fc5e9fdcb156
Added trigger of middle button action in case of a detected shake
ideenmodellierer
parents:
272
diff
changeset
|
341 { |
fc5e9fdcb156
Added trigger of middle button action in case of a detected shake
ideenmodellierer
parents:
272
diff
changeset
|
342 ButtonAction = action; |
fc5e9fdcb156
Added trigger of middle button action in case of a detected shake
ideenmodellierer
parents:
272
diff
changeset
|
343 } |
fc5e9fdcb156
Added trigger of middle button action in case of a detected shake
ideenmodellierer
parents:
272
diff
changeset
|
344 |
38 | 345 // =============================================================================== |
346 // main | |
347 /// @brief This function makes initializations and has the nonIRQ endless loop | |
348 /// for bluetooth and deco calculations | |
349 /// | |
350 // =============================================================================== | |
351 int main(void) | |
352 { | |
353 uint32_t pLayerInvisible; | |
354 uint16_t totalDiveCounterFound; | |
116 | 355 |
407
b11e50415982
Bugfix parallel call of external flash functions:
ideenmodellierer
parents:
395
diff
changeset
|
356 SStateList status; |
611
916998f90e39
Suspend MotionDetection events while diver is operationg the OSTC:
Ideenmodellierer
parents:
597
diff
changeset
|
357 |
38 | 358 set_globalState( StBoot0 ); |
152
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
359 LastButtonPressed = 0; |
38 | 360 |
361 HAL_Init(); | |
362 HAL_NVIC_SetPriorityGrouping( NVIC_PRIORITYGROUP_2 ); | |
363 | |
364 SystemClock_Config(); | |
365 | |
366 MX_GPIO_Init(); | |
367 // MX_SmallCPU_NO_Reset_Helper(); //161116 hw | |
395
eb7696e0510f
Added start of module configuration after eache modul power on
ideenmodellierer
parents:
384
diff
changeset
|
368 MX_Bluetooth_PowerOff(); /* disable module, needed in case of e.g. a reset event to make sure module is configured from scratch */ |
38 | 369 MX_SPI_Init(); |
370 MX_UART_Init(); | |
371 SDRAM_Config(); | |
372 HAL_Delay( 100 ); | |
116 | 373 |
374 stateRealGetPointerWrite()->lastKnownBatteryPercentage = 0; // damit das nicht in settings kopiert wird. | |
375 set_settings_to_Standard(); | |
376 mod_settings_for_first_start_with_empty_ext_flash(); | |
377 ext_flash_read_settings(); | |
378 if( newFirmwareVersionCheckViaSettings() ) // test for old firmware version in loaded settings | |
379 { | |
380 wasFirmwareUpdateCheckBattery = 1; | |
381 set_settings_button_to_standard_with_individual_buttonBalance(); // will adapt individual values | |
382 } | |
383 //settingsGetPointer()->bluetoothActive = 0; /* MX_Bluetooth_PowerOff(); unnecessary as part of MX_GPIO_Init() */ | |
384 //settingsGetPointer()->compassBearing = 0; | |
300
5ca177d2df5d
cleanup: remove commented/unused code, make static
Jan Mulder <jlmulder@xs4all.nl>
parents:
272
diff
changeset
|
385 set_new_settings_missing_in_ext_flash(); // includes update of firmware version 161121 |
116 | 386 |
38 | 387 GFX_init( &pLayerInvisible ); |
388 TIM_BACKLIGHT_init(); | |
389 | |
390 // new 170508: bluetooth on at start | |
391 settingsGetPointer()->bluetoothActive = 1; | |
392 MX_Bluetooth_PowerOn(); | |
395
eb7696e0510f
Added start of module configuration after eache modul power on
ideenmodellierer
parents:
384
diff
changeset
|
393 tComm_StartBlueModConfig(); |
38 | 394 |
395 /* | |
396 if( (hardwareDataGetPointer()->primarySerial == 20+18) | |
397 || (hardwareDataGetPointer()->primarySerial == 20+25) | |
398 || (hardwareDataGetPointer()->primarySerial == 20+27)) | |
399 { | |
400 MX_Bluetooth_PowerOn(); | |
401 tComm_Set_Bluetooth_Name(1); | |
402 } | |
403 */ | |
404 errorsInSettings = check_and_correct_settings(); | |
405 createDiveSettings(); | |
406 | |
407 #ifdef QUICK_SLEEP | |
408 settingsGetPointer()->timeoutSurfacemode = 20; | |
409 #else | |
410 settingsGetPointer()->timeoutSurfacemode = 120; | |
411 #endif | |
412 | |
413 #ifdef DEMOMODE | |
414 demoConfigureSettings(); | |
415 TIM_DEMO_init(); | |
416 #endif | |
417 | |
418 // ----------------------------- | |
419 | |
420 display_power_on__1_of_2__pre_RGB(); | |
421 GFX_LTDC_Init(); | |
422 GFX_LTDC_LayerDefaultInit( TOP_LAYER, pLayerInvisible ); | |
423 GFX_LTDC_LayerDefaultInit( BACKGRD_LAYER, pLayerInvisible ); | |
424 GFX_SetFramesTopBottom( pLayerInvisible, pLayerInvisible, 480 ); | |
425 HAL_Delay( 20 ); | |
426 display_power_on__2_of_2__post_RGB(); | |
427 GFX_use_colorscheme( settingsGetPointer()->tX_colorscheme ); | |
428 | |
429 tHome_init(); | |
430 tI_init(); | |
431 tM_init(); | |
432 tMenuEdit_init(); | |
433 tInfoLog_init(); | |
434 tComm_init(); | |
435 DataEX_init(); | |
476
19cff811616d
Balance value of button responsitivness were not considered during firmware startup:
ideenmodellierer
parents:
447
diff
changeset
|
436 settingsHelperButtonSens_keepPercentageValues(settingsGetPointer()->ButtonResponsiveness[3], settingsGetPointer()->ButtonResponsiveness); |
38 | 437 setButtonResponsiveness( settingsGetPointer()->ButtonResponsiveness ); |
438 set_globalState_tHome(); | |
439 | |
440 GFX_start_VSYNC_IRQ(); | |
441 tCCR_init(); | |
442 | |
443 GFX_logoAutoOff(); | |
444 EXTILine_Buttons_Config(); | |
445 | |
447
adc4ccbebbb5
Added compile switch var firmware variant which does trust the memory log => does not check the log consistency at startu (used for test purpose)
ideenmodellierer
parents:
446
diff
changeset
|
446 #ifdef TRUST_LOG_CONSISTENCY |
adc4ccbebbb5
Added compile switch var firmware variant which does trust the memory log => does not check the log consistency at startu (used for test purpose)
ideenmodellierer
parents:
446
diff
changeset
|
447 if(!ext_dive_log_consistent()) /* only repair log if an invalid entry was detected */ |
adc4ccbebbb5
Added compile switch var firmware variant which does trust the memory log => does not check the log consistency at startu (used for test purpose)
ideenmodellierer
parents:
446
diff
changeset
|
448 { |
adc4ccbebbb5
Added compile switch var firmware variant which does trust the memory log => does not check the log consistency at startu (used for test purpose)
ideenmodellierer
parents:
446
diff
changeset
|
449 ext_flash_repair_dive_log(); |
adc4ccbebbb5
Added compile switch var firmware variant which does trust the memory log => does not check the log consistency at startu (used for test purpose)
ideenmodellierer
parents:
446
diff
changeset
|
450 } |
adc4ccbebbb5
Added compile switch var firmware variant which does trust the memory log => does not check the log consistency at startu (used for test purpose)
ideenmodellierer
parents:
446
diff
changeset
|
451 |
adc4ccbebbb5
Added compile switch var firmware variant which does trust the memory log => does not check the log consistency at startu (used for test purpose)
ideenmodellierer
parents:
446
diff
changeset
|
452 #else /* always check and repair log */ |
38 | 453 ext_flash_repair_dive_log(); |
454 //ext_flash_repair_SPECIAL_dive_numbers_starting_count_with(1); | |
447
adc4ccbebbb5
Added compile switch var firmware variant which does trust the memory log => does not check the log consistency at startu (used for test purpose)
ideenmodellierer
parents:
446
diff
changeset
|
455 #endif |
38 | 456 totalDiveCounterFound = logbook_lastDive_diveNumber(); |
457 if( settingsGetPointer()->totalDiveCounter < totalDiveCounterFound ) | |
458 settingsGetPointer()->totalDiveCounter = totalDiveCounterFound; | |
459 | |
460 if( settingsGetPointer()->debugModeOnStart ) | |
461 { | |
462 settingsGetPointer()->debugModeOnStart = 0; | |
427 | 463 ext_flash_write_settings(0); |
38 | 464 setDebugMode(); |
465 openInfo( StIDEBUG ); | |
466 } | |
368
50ea68c7a153
Added menu item for motion detection. There are several possibility to use motion detection for user action input. To select of the a new menu entry has been added to the Sys2 =>Custom View Menu (Variables in german)
ideenmodellierer
parents:
367
diff
changeset
|
467 InitMotionDetection(); |
38 | 468 |
263
a6c0375bc950
Forward 100ms time stamp to RTE and handle logbook in main loop
ideenmodellierer
parents:
250
diff
changeset
|
469 TIM_init(); /* start cylic 100ms task */ |
a6c0375bc950
Forward 100ms time stamp to RTE and handle logbook in main loop
ideenmodellierer
parents:
250
diff
changeset
|
470 |
38 | 471 /* @brief main LOOP |
472 * | |
473 * this is executed while no IRQ interrupts it | |
474 * - deco calculation | |
475 * - bluetooth | |
476 * and resetToFirmwareUpdate() | |
477 * because tComm_control() does not exit before disconnection | |
478 */ | |
479 while( 1 ) | |
480 { | |
481 if( bootToBootloader ) | |
482 resetToFirmwareUpdate(); | |
483 | |
484 tCCR_control(); | |
485 if( tComm_control() )// will stop while loop if tComm Mode started until exit from UART | |
486 { | |
487 createDiveSettings(); | |
488 updateMenu(); | |
427 | 489 ext_flash_write_settings(0); |
38 | 490 } |
407
b11e50415982
Bugfix parallel call of external flash functions:
ideenmodellierer
parents:
395
diff
changeset
|
491 |
b11e50415982
Bugfix parallel call of external flash functions:
ideenmodellierer
parents:
395
diff
changeset
|
492 /* check if tasks depending on global state are pending */ |
b11e50415982
Bugfix parallel call of external flash functions:
ideenmodellierer
parents:
395
diff
changeset
|
493 get_globalStateList(&status); |
b11e50415982
Bugfix parallel call of external flash functions:
ideenmodellierer
parents:
395
diff
changeset
|
494 if(status.base == BaseHome) |
b11e50415982
Bugfix parallel call of external flash functions:
ideenmodellierer
parents:
395
diff
changeset
|
495 { |
427 | 496 tMenuEdit_writeSettingsToFlash(); |
407
b11e50415982
Bugfix parallel call of external flash functions:
ideenmodellierer
parents:
395
diff
changeset
|
497 } |
b11e50415982
Bugfix parallel call of external flash functions:
ideenmodellierer
parents:
395
diff
changeset
|
498 |
b11e50415982
Bugfix parallel call of external flash functions:
ideenmodellierer
parents:
395
diff
changeset
|
499 DataEX_merge_devicedata(); /* data is exchanged at startup and every 10 minutes => check if something changed */ |
b11e50415982
Bugfix parallel call of external flash functions:
ideenmodellierer
parents:
395
diff
changeset
|
500 |
38 | 501 deco_loop(); |
217
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
502 TriggerButtonAction(); |
623 | 503 if(DoHousekeeping) |
504 { | |
505 DoHousekeeping = housekeepingFrame(); | |
506 } | |
395
eb7696e0510f
Added start of module configuration after eache modul power on
ideenmodellierer
parents:
384
diff
changeset
|
507 if(DoDisplayRefresh) /* set every 100ms by timer interrupt */ |
217
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
508 { |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
509 DoDisplayRefresh = 0; |
615
556df4a8f418
Moved non critical functions from timer interrupt to main loop:
Ideenmodellierer
parents:
611
diff
changeset
|
510 |
662 | 511 updateSetpointStateUsed(); |
615
556df4a8f418
Moved non critical functions from timer interrupt to main loop:
Ideenmodellierer
parents:
611
diff
changeset
|
512 if(stateUsed == stateSimGetPointer()) |
556df4a8f418
Moved non critical functions from timer interrupt to main loop:
Ideenmodellierer
parents:
611
diff
changeset
|
513 { |
556df4a8f418
Moved non critical functions from timer interrupt to main loop:
Ideenmodellierer
parents:
611
diff
changeset
|
514 simulation_UpdateLifeData(1); |
556df4a8f418
Moved non critical functions from timer interrupt to main loop:
Ideenmodellierer
parents:
611
diff
changeset
|
515 } |
556df4a8f418
Moved non critical functions from timer interrupt to main loop:
Ideenmodellierer
parents:
611
diff
changeset
|
516 check_warning(); |
556df4a8f418
Moved non critical functions from timer interrupt to main loop:
Ideenmodellierer
parents:
611
diff
changeset
|
517 updateMiniLiveLogbook(1); |
556df4a8f418
Moved non critical functions from timer interrupt to main loop:
Ideenmodellierer
parents:
611
diff
changeset
|
518 |
217
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
519 RefreshDisplay(); |
623 | 520 TimeoutControl(); /* exit menus if needed */ |
422
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
521 |
549
469e93f8633e
Only execute motion detection functions if features is enabled:
Ideenmodellierer
parents:
540
diff
changeset
|
522 #ifdef ENABLE_MOTION_CONTROL |
469e93f8633e
Only execute motion detection functions if features is enabled:
Ideenmodellierer
parents:
540
diff
changeset
|
523 if((stateUsed->mode == MODE_DIVE) && (settingsGetPointer()->MotionDetection != MOTION_DETECT_OFF)) /* handle motion events in divemode only */ |
368
50ea68c7a153
Added menu item for motion detection. There are several possibility to use motion detection for user action input. To select of the a new menu entry has been added to the Sys2 =>Custom View Menu (Variables in german)
ideenmodellierer
parents:
367
diff
changeset
|
524 { |
611
916998f90e39
Suspend MotionDetection events while diver is operationg the OSTC:
Ideenmodellierer
parents:
597
diff
changeset
|
525 if(get_globalState() != StD) |
549
469e93f8633e
Only execute motion detection functions if features is enabled:
Ideenmodellierer
parents:
540
diff
changeset
|
526 { |
642
c737cf5d9067
Do not show focus indicator in case motion detection is suspended:
Ideenmodellierer
parents:
625
diff
changeset
|
527 suspendMotionDetection(10); /* do not change custom views while divers is operating the computer */ |
611
916998f90e39
Suspend MotionDetection events while diver is operationg the OSTC:
Ideenmodellierer
parents:
597
diff
changeset
|
528 } |
916998f90e39
Suspend MotionDetection events while diver is operationg the OSTC:
Ideenmodellierer
parents:
597
diff
changeset
|
529 HandleMotionDetection(); |
368
50ea68c7a153
Added menu item for motion detection. There are several possibility to use motion detection for user action input. To select of the a new menu entry has been added to the Sys2 =>Custom View Menu (Variables in german)
ideenmodellierer
parents:
367
diff
changeset
|
530 } |
549
469e93f8633e
Only execute motion detection functions if features is enabled:
Ideenmodellierer
parents:
540
diff
changeset
|
531 #endif |
360
fc5e9fdcb156
Added trigger of middle button action in case of a detected shake
ideenmodellierer
parents:
272
diff
changeset
|
532 |
272
74a8296a2318
cleanup: simplify stateUsed usage
Jan Mulder <jlmulder@xs4all.nl>
parents:
270
diff
changeset
|
533 #ifdef SIM_WRITES_LOGBOOK |
270
2e58a4094770
feature, debug: make simulator write a logbook entry
Jan Mulder <jlmulder@xs4all.nl>
parents:
263
diff
changeset
|
534 if(stateUsed == stateSimGetPointer()) |
2e58a4094770
feature, debug: make simulator write a logbook entry
Jan Mulder <jlmulder@xs4all.nl>
parents:
263
diff
changeset
|
535 logbook_InitAndWrite(stateUsed); |
2e58a4094770
feature, debug: make simulator write a logbook entry
Jan Mulder <jlmulder@xs4all.nl>
parents:
263
diff
changeset
|
536 #endif |
263
a6c0375bc950
Forward 100ms time stamp to RTE and handle logbook in main loop
ideenmodellierer
parents:
250
diff
changeset
|
537 if(stateUsed == stateRealGetPointer()) /* Handle log entries while in dive mode*/ |
270
2e58a4094770
feature, debug: make simulator write a logbook entry
Jan Mulder <jlmulder@xs4all.nl>
parents:
263
diff
changeset
|
538 logbook_InitAndWrite(stateUsed); |
217
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
539 } |
38 | 540 } |
541 } | |
542 | |
360
fc5e9fdcb156
Added trigger of middle button action in case of a detected shake
ideenmodellierer
parents:
272
diff
changeset
|
543 |
fc5e9fdcb156
Added trigger of middle button action in case of a detected shake
ideenmodellierer
parents:
272
diff
changeset
|
544 |
fc5e9fdcb156
Added trigger of middle button action in case of a detected shake
ideenmodellierer
parents:
272
diff
changeset
|
545 |
38 | 546 // =============================================================================== |
547 // timer IRQ | |
548 /// @brief this is called periodically | |
549 /// | |
550 /// - refresh screen (the actual change is done in the VSYNC IRQ) | |
551 /// - start data transfer with RTE / small CPU (DateEX....) | |
552 /// - update logbook | |
553 /// - timeouts | |
554 /// .... | |
555 /// | |
556 /// all this in three steps / switch() routines in a given order | |
557 /// as the previous switch() might influence the next functions | |
558 /// to be called | |
559 /// | |
560 // =============================================================================== | |
348 | 561 |
562 //#define NO_TIMEOUT | |
38 | 563 void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim) |
564 { | |
565 #ifdef DEMOMODE | |
566 if(htim->Instance==TIM7) | |
567 { | |
568 HAL_GPIO_EXTI_Callback(demoGetCommand()); | |
569 return; | |
570 } | |
571 #endif | |
572 SStateList status; | |
422
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
573 _Bool modeChange = 0; |
263
a6c0375bc950
Forward 100ms time stamp to RTE and handle logbook in main loop
ideenmodellierer
parents:
250
diff
changeset
|
574 |
a6c0375bc950
Forward 100ms time stamp to RTE and handle logbook in main loop
ideenmodellierer
parents:
250
diff
changeset
|
575 BaseTick100ms = HAL_GetTick(); /* store start of 100ms cycle */ |
a6c0375bc950
Forward 100ms time stamp to RTE and handle logbook in main loop
ideenmodellierer
parents:
250
diff
changeset
|
576 |
38 | 577 if(returnFromCommCleanUpRequest) |
578 { | |
579 tComm_exit(); | |
580 returnFromCommCleanUpRequest = 0; | |
581 } | |
582 | |
583 get_globalStateList(&status); | |
584 | |
585 switch(status.base) | |
586 { | |
587 case BaseHome: | |
588 case BaseMenu: | |
589 case BaseInfo: | |
590 DateEx_copy_to_dataOut(); | |
591 DataEX_copy_to_LifeData(&modeChange); | |
592 //foto session :-) stateRealGetPointerWrite()->lifeData.battery_charge = 99; | |
593 //foto session :-) stateSimGetPointerWrite()->lifeData.battery_charge = 99; | |
594 DataEX_copy_to_deco(); | |
132
135eae957389
Add compile switch to disable optimization for specific function
Ideenmodellierer
parents:
116
diff
changeset
|
595 DataEX_call(); |
135eae957389
Add compile switch to disable optimization for specific function
Ideenmodellierer
parents:
116
diff
changeset
|
596 |
38 | 597 timer_UpdateSecond(1); |
132
135eae957389
Add compile switch to disable optimization for specific function
Ideenmodellierer
parents:
116
diff
changeset
|
598 base_tempLightLevel = TIM_BACKLIGHT_adjust(); |
38 | 599 tCCR_tick(); |
600 tHome_tick(); | |
601 break; | |
602 case BaseStop: | |
603 DateEx_copy_to_dataOut(); | |
604 DataEX_call(); | |
605 DataEX_control_connection_while_asking_for_sleep(); | |
606 break; | |
607 default: | |
608 case BaseComm: | |
609 if(get_globalState() == StUART_RTECONNECT) | |
610 { | |
611 DateEx_copy_to_dataOut(); | |
612 DataEX_call(); | |
613 DataEX_copy_to_LifeData(0); | |
614 } | |
615 break; | |
616 } | |
617 | |
422
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
618 get_globalStateList(&status); |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
619 if(modeChange) |
38 | 620 { |
422
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
621 TimeoutControlRequestModechange(); |
38 | 622 } |
217
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
623 if(status.base == BaseComm) /* main loop not serviced in com mode */ |
38 | 624 { |
217
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
625 tComm_refresh(); |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
626 } |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
627 else |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
628 { |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
629 DoDisplayRefresh = 1; |
38 | 630 } |
631 } | |
632 | |
633 | |
634 /* button and VSYNC IRQ | |
635 * | |
636 * VSYNC will switch foreground and background picture | |
637 * if demanded. see GFX_change_LTDC() | |
638 * | |
639 */ | |
640 // =============================================================================== | |
641 // HAL_GPIO_EXTI_Callback | |
642 /// @brief button and VSYNC IRQ | |
643 /// | |
644 /// VSYNC will switch foreground and background picture if demanded - | |
645 /// see GFX_change_LTDC() | |
646 /// | |
647 // =============================================================================== | |
95
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
648 void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin) { |
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
649 if (!GPIO_Pin) |
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
650 return; |
38 | 651 |
95
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
652 if (GPIO_Pin == VSYNC_IRQ_PIN) // rechts, unten |
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
653 { |
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
654 GFX_change_LTDC(); |
623 | 655 DoHousekeeping = 1; |
95
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
656 /* |
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
657 #ifdef DEMOMODE |
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
658 static uint8_t countCall = 0; |
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
659 if(countCall++ < 10) |
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
660 return; |
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
661 countCall = 0; |
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
662 uint8_t buttonAction = demoGetCommand(); |
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
663 if(buttonAction) |
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
664 GPIO_Pin = buttonAction; |
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
665 else |
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
666 #endif |
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
667 */ |
697 | 668 |
95
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
669 } |
697 | 670 if((GPIO_Pin == BUTTON_ENTER_PIN) || (GPIO_Pin == BUTTON_NEXT_PIN) || (GPIO_Pin == BUTTON_BACK_PIN)) |
671 { | |
672 LastButtonPressed = GPIO_Pin; | |
673 LastButtonPressedTick = HAL_GetTick(); | |
674 } | |
675 | |
676 EvaluateButton(); | |
38 | 677 |
678 #ifdef DEMOMODE | |
95
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
679 uint8_t demoMachineCall = 0; |
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
680 if(GPIO_Pin & 0x80) |
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
681 { |
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
682 demoMachineCall = 1; |
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
683 GPIO_Pin &= 0x7F; |
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
684 } |
38 | 685 #endif |
152
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
686 } |
38 | 687 |
217
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
688 static void RefreshDisplay() |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
689 { |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
690 SStateList status; |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
691 get_globalStateList(&status); |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
692 switch(status.base) |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
693 { |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
694 case BaseHome: |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
695 tHome_refresh(); |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
696 tM_check_content(); |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
697 break; |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
698 case BaseMenu: |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
699 tM_refresh_live_content(); |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
700 tMenuEdit_refresh_live_content(); |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
701 break; |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
702 case BaseInfo: |
718
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
697
diff
changeset
|
703 tInfo_refresh(); |
217
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
704 break; |
718
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
697
diff
changeset
|
705 case BaseComm: /* refresh already done in time callback */ |
217
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
706 break; |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
707 default: |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
708 if(get_globalState() == StStop) |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
709 tHome_sleepmode_fun(); |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
710 break; |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
711 } |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
712 } |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
713 |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
714 |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
715 static void TriggerButtonAction() |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
716 { |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
717 uint8_t action = ButtonAction; |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
718 SStateList status; |
611
916998f90e39
Suspend MotionDetection events while diver is operationg the OSTC:
Ideenmodellierer
parents:
597
diff
changeset
|
719 SSettings* pSettings; |
916998f90e39
Suspend MotionDetection events while diver is operationg the OSTC:
Ideenmodellierer
parents:
597
diff
changeset
|
720 pSettings = settingsGetPointer(); |
916998f90e39
Suspend MotionDetection events while diver is operationg the OSTC:
Ideenmodellierer
parents:
597
diff
changeset
|
721 |
217
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
722 |
697 | 723 if(action != ACTION_END) |
217
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
724 { |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
725 get_globalStateList(&status); |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
726 |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
727 if (action == ACTION_BUTTON_CUSTOM) { |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
728 GFX_screenshot(); |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
729 } |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
730 |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
731 switch (status.base) { |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
732 case BaseStop: |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
733 if (action == ACTION_BUTTON_BACK) |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
734 resetToFirmwareUpdate(); |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
735 break; |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
736 case BaseComm: /* already handled in tim callback */ |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
737 break; |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
738 case BaseHome: |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
739 if (action == ACTION_BUTTON_NEXT) { |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
740 if (status.page == PageSurface) |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
741 openMenu(1); |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
742 else |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
743 tHomeDiveMenuControl(action); |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
744 } else if (action == ACTION_BUTTON_BACK) { |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
745 if (get_globalState() == StS) |
540 | 746 { |
217
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
747 openInfo(StILOGLIST); |
540 | 748 } |
611
916998f90e39
Suspend MotionDetection events while diver is operationg the OSTC:
Ideenmodellierer
parents:
597
diff
changeset
|
749 else if ((status.page == PageDive) && (pSettings->design < 7)) |
540 | 750 { |
611
916998f90e39
Suspend MotionDetection events while diver is operationg the OSTC:
Ideenmodellierer
parents:
597
diff
changeset
|
751 if(pSettings->design == 3) |
540 | 752 { |
753 if(get_globalState() != StD) /* located in submenu? => return */ | |
754 { | |
755 set_globalState(StD); | |
756 } | |
757 else /* return to t7 view */ | |
758 { | |
611
916998f90e39
Suspend MotionDetection events while diver is operationg the OSTC:
Ideenmodellierer
parents:
597
diff
changeset
|
759 pSettings->design = 7; |
916998f90e39
Suspend MotionDetection events while diver is operationg the OSTC:
Ideenmodellierer
parents:
597
diff
changeset
|
760 if(pSettings->MotionDetection == MOTION_DETECT_SECTOR) |
586
bb5ce239741f
Motion control: Jump back to primary view if focus is lost:
Ideenmodellierer
parents:
561
diff
changeset
|
761 { |
625
028d8f3a9410
Switch Sector / Scroll detection to vector implementation:
Ideenmodellierer
parents:
623
diff
changeset
|
762 DefineSectorCount(CUSTOMER_DEFINED_VIEWS); |
597
132e7e3d13a7
MotionControl-Sector: Map sectors during switch T7 <=> T3:
Ideenmodellierer
parents:
586
diff
changeset
|
763 MapCVToSector(); |
586
bb5ce239741f
Motion control: Jump back to primary view if focus is lost:
Ideenmodellierer
parents:
561
diff
changeset
|
764 } |
540 | 765 } |
766 } | |
767 else | |
768 { | |
611
916998f90e39
Suspend MotionDetection events while diver is operationg the OSTC:
Ideenmodellierer
parents:
597
diff
changeset
|
769 pSettings->design = 7; // auto switch to 9 if necessary |
540 | 770 } |
771 } else if ((status.page == PageDive) && (status.line != 0)) | |
772 { | |
662 | 773 if(get_globalState() == StDMENU) |
384
427ae9f8e28e
Consider number of available t3 views in sector handling:
ideenmodellierer
parents:
382
diff
changeset
|
774 { |
662 | 775 if (pSettings->extraDisplay == EXTRADISPLAY_BIGFONT) |
384
427ae9f8e28e
Consider number of available t3 views in sector handling:
ideenmodellierer
parents:
382
diff
changeset
|
776 { |
662 | 777 pSettings->design = 3; |
778 if(pSettings->MotionDetection == MOTION_DETECT_SECTOR) | |
779 { | |
780 DefineSectorCount(CUSTOMER_DEFINED_VIEWS); | |
781 MapCVToSector(); | |
782 } | |
384
427ae9f8e28e
Consider number of available t3 views in sector handling:
ideenmodellierer
parents:
382
diff
changeset
|
783 } |
662 | 784 else if (pSettings->extraDisplay == EXTRADISPLAY_DECOGAME) |
785 pSettings->design = 4; | |
384
427ae9f8e28e
Consider number of available t3 views in sector handling:
ideenmodellierer
parents:
382
diff
changeset
|
786 } |
217
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
787 set_globalState(StD); |
540 | 788 } |
789 else | |
790 { | |
217
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
791 tHome_change_field_button_pressed(); |
540 | 792 } |
368
50ea68c7a153
Added menu item for motion detection. There are several possibility to use motion detection for user action input. To select of the a new menu entry has been added to the Sys2 =>Custom View Menu (Variables in german)
ideenmodellierer
parents:
367
diff
changeset
|
793 } else if ((action == ACTION_BUTTON_ENTER) || (action == ACTION_PITCH_NEG) || (action == ACTION_PITCH_POS)) |
361
b111fc4250e9
Pass action to customer vie update function.
Ideenmodellierer
parents:
360
diff
changeset
|
794 { |
b111fc4250e9
Pass action to customer vie update function.
Ideenmodellierer
parents:
360
diff
changeset
|
795 |
b111fc4250e9
Pass action to customer vie update function.
Ideenmodellierer
parents:
360
diff
changeset
|
796 if ((status.page == PageDive) && (status.line == 0)) |
368
50ea68c7a153
Added menu item for motion detection. There are several possibility to use motion detection for user action input. To select of the a new menu entry has been added to the Sys2 =>Custom View Menu (Variables in german)
ideenmodellierer
parents:
367
diff
changeset
|
797 { |
642
c737cf5d9067
Do not show focus indicator in case motion detection is suspended:
Ideenmodellierer
parents:
625
diff
changeset
|
798 if(action == ACTION_BUTTON_ENTER) |
611
916998f90e39
Suspend MotionDetection events while diver is operationg the OSTC:
Ideenmodellierer
parents:
597
diff
changeset
|
799 { |
916998f90e39
Suspend MotionDetection events while diver is operationg the OSTC:
Ideenmodellierer
parents:
597
diff
changeset
|
800 suspendMotionDetection(10); |
916998f90e39
Suspend MotionDetection events while diver is operationg the OSTC:
Ideenmodellierer
parents:
597
diff
changeset
|
801 } |
361
b111fc4250e9
Pass action to customer vie update function.
Ideenmodellierer
parents:
360
diff
changeset
|
802 tHome_change_customview_button_pressed(action); |
368
50ea68c7a153
Added menu item for motion detection. There are several possibility to use motion detection for user action input. To select of the a new menu entry has been added to the Sys2 =>Custom View Menu (Variables in german)
ideenmodellierer
parents:
367
diff
changeset
|
803 } |
361
b111fc4250e9
Pass action to customer vie update function.
Ideenmodellierer
parents:
360
diff
changeset
|
804 else if (status.page == PageSurface) |
b111fc4250e9
Pass action to customer vie update function.
Ideenmodellierer
parents:
360
diff
changeset
|
805 tHome_change_customview_button_pressed(action); |
b111fc4250e9
Pass action to customer vie update function.
Ideenmodellierer
parents:
360
diff
changeset
|
806 else |
642
c737cf5d9067
Do not show focus indicator in case motion detection is suspended:
Ideenmodellierer
parents:
625
diff
changeset
|
807 { |
361
b111fc4250e9
Pass action to customer vie update function.
Ideenmodellierer
parents:
360
diff
changeset
|
808 tHomeDiveMenuControl(action); |
642
c737cf5d9067
Do not show focus indicator in case motion detection is suspended:
Ideenmodellierer
parents:
625
diff
changeset
|
809 } |
361
b111fc4250e9
Pass action to customer vie update function.
Ideenmodellierer
parents:
360
diff
changeset
|
810 } |
217
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
811 break; |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
812 |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
813 case BaseMenu: |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
814 if (status.line == 0) |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
815 sendActionToMenu(action); |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
816 else |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
817 sendActionToMenuEdit(action); |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
818 break; |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
819 |
718
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
697
diff
changeset
|
820 case BaseInfo: switch(status.page) |
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
697
diff
changeset
|
821 { |
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
697
diff
changeset
|
822 case InfoPageLogList: sendActionToInfoLogList(action); |
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
697
diff
changeset
|
823 break; |
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
697
diff
changeset
|
824 case InfoPageLogShow: sendActionToInfoLogShow(action); |
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
697
diff
changeset
|
825 break; |
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
697
diff
changeset
|
826 case InfoPageSensor: sendActionToInfoSensor(action); |
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
697
diff
changeset
|
827 break; |
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
697
diff
changeset
|
828 default: sendActionToInfo(action); |
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
697
diff
changeset
|
829 break; |
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
697
diff
changeset
|
830 } |
217
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
831 break; |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
832 |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
833 default: |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
834 break; |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
835 } |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
836 ButtonAction = ACTION_END; |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
837 } |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
838 } |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
839 |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
840 |
300
5ca177d2df5d
cleanup: remove commented/unused code, make static
Jan Mulder <jlmulder@xs4all.nl>
parents:
272
diff
changeset
|
841 static void EvaluateButton() |
152
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
842 { |
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
843 uint8_t action = 0; |
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
844 SStateList status; |
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
845 SSettings* pSettings; |
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
846 pSettings = settingsGetPointer(); |
95
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
847 |
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
848 if (GFX_logoStatus() != 0) |
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
849 return; |
38 | 850 |
697 | 851 if ((LastButtonPressed != INVALID_BUTTON) && (time_elapsed_ms(LastButtonPressedTick, HAL_GetTick()) > 40)) |
152
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
852 { |
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
853 if (LastButtonPressed == BUTTON_BACK_PIN) { // links |
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
854 if (HAL_GPIO_ReadPin(BUTTON_BACK_GPIO_PORT, BUTTON_BACK_PIN) == 1) { |
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
855 action = ACTION_BUTTON_BACK; |
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
856 } |
95
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
857 } |
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
858 |
152
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
859 else if (LastButtonPressed == BUTTON_ENTER_PIN) { // mitte |
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
860 if (HAL_GPIO_ReadPin(BUTTON_ENTER_GPIO_PORT, BUTTON_ENTER_PIN) == 1) { |
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
861 action = ACTION_BUTTON_ENTER; |
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
862 } |
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
863 } |
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
864 |
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
865 else if (LastButtonPressed == BUTTON_NEXT_PIN) { // rechts |
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
866 if (HAL_GPIO_ReadPin(BUTTON_NEXT_GPIO_PORT, BUTTON_NEXT_PIN) == 1) { |
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
867 action = ACTION_BUTTON_NEXT; |
108 | 868 } |
869 } | |
38 | 870 |
152
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
871 if(action != 0) |
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
872 { |
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
873 time_without_button_pressed_deciseconds = 0; |
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
874 if(pSettings->FlipDisplay) /* switch action resulting from pressed button */ |
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
875 { |
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
876 if (action == ACTION_BUTTON_BACK) |
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
877 { |
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
878 action = ACTION_BUTTON_NEXT; |
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
879 } |
158 | 880 else |
152
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
881 { |
158 | 882 if (action == ACTION_BUTTON_NEXT) |
883 { | |
884 action = ACTION_BUTTON_BACK; | |
885 } | |
152
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
886 } |
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
887 } |
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
888 } |
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
889 |
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
890 #ifdef BUTTON_CUSTOM_PIN |
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
891 else |
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
892 if(LastButtonPressed == BUTTON_CUSTOM_PIN) // extra |
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
893 action = ACTION_BUTTON_CUSTOM; |
38 | 894 #endif |
895 | |
152
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
896 #ifdef DEMOMODE // user pressed button ? |
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
897 if((!demoMachineCall) && demoModeActive()) |
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
898 { |
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
899 demoSendCommand(action); |
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
900 return; |
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
901 } |
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
902 #endif |
38 | 903 |
152
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
904 get_globalStateList(&status); |
217
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
905 if(status.base == BaseComm) /* main loop is not serviced in comm mode => react immediately */ |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
906 { |
395
eb7696e0510f
Added start of module configuration after eache modul power on
ideenmodellierer
parents:
384
diff
changeset
|
907 switch(action) |
eb7696e0510f
Added start of module configuration after eache modul power on
ideenmodellierer
parents:
384
diff
changeset
|
908 { |
eb7696e0510f
Added start of module configuration after eache modul power on
ideenmodellierer
parents:
384
diff
changeset
|
909 case ACTION_BUTTON_BACK: tComm_exit(); |
eb7696e0510f
Added start of module configuration after eache modul power on
ideenmodellierer
parents:
384
diff
changeset
|
910 break; |
eb7696e0510f
Added start of module configuration after eache modul power on
ideenmodellierer
parents:
384
diff
changeset
|
911 case ACTION_BUTTON_NEXT: tComm_RequestBluetoothStrength(); |
eb7696e0510f
Added start of module configuration after eache modul power on
ideenmodellierer
parents:
384
diff
changeset
|
912 break; |
eb7696e0510f
Added start of module configuration after eache modul power on
ideenmodellierer
parents:
384
diff
changeset
|
913 default: |
eb7696e0510f
Added start of module configuration after eache modul power on
ideenmodellierer
parents:
384
diff
changeset
|
914 break; |
152
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
915 } |
217
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
916 } |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
917 else |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
918 { |
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
919 StoreButtonAction(action); /* Handle action in main loop */ |
152
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
920 } |
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
921 LastButtonPressed = INVALID_BUTTON; |
95
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
922 } |
38 | 923 } |
924 | |
300
5ca177d2df5d
cleanup: remove commented/unused code, make static
Jan Mulder <jlmulder@xs4all.nl>
parents:
272
diff
changeset
|
925 static void gotoSleep(void) |
38 | 926 { |
927 /* not at the moment of testing */ | |
928 // ext_flash_erase_firmware_if_not_empty(); | |
929 GFX_logoAutoOff(); | |
422
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
930 ext_flash_write_devicedata(true); /* write data at default position */ |
427 | 931 ext_flash_write_settings(true); /* write data at default position */ |
38 | 932 set_globalState(StStop); |
933 } | |
934 | |
935 | |
936 // ----------------------------- | |
937 | |
938 uint32_t get_globalState(void) | |
939 { | |
940 return globalStateID; | |
941 } | |
942 | |
943 | |
944 void get_globalStateList(SStateList *output) | |
945 { | |
946 output->base = (uint8_t)((globalStateID >> 28) & 0x0F); | |
947 output->page = (uint8_t)((globalStateID >> 24) & 0x0F); | |
948 output->line = (uint8_t)((globalStateID >> 16) & 0xFF); | |
949 output->field = (uint8_t)((globalStateID >> 8) & 0xFF); | |
950 output->mode = (uint8_t)((globalStateID ) & 0xFF); | |
951 } | |
952 | |
953 | |
954 void get_idSpecificStateList(uint32_t id, SStateList *output) | |
955 { | |
956 output->base = (uint8_t)((id >> 28) & 0x0F); | |
957 output->page = (uint8_t)((id >> 24) & 0x0F); | |
958 output->line = (uint8_t)((id >> 16) & 0xFF); | |
959 output->field = (uint8_t)((id >> 8) & 0xFF); | |
960 output->mode = (uint8_t)((id ) & 0xFF); | |
961 } | |
962 | |
963 | |
964 void set_globalState_Menu_Page(uint8_t page) | |
965 { | |
966 globalStateID = ((BaseMenu << 28) + (page << 24)); | |
967 } | |
968 | |
969 void set_globalState_Log_Page(uint8_t pageIsLine) | |
970 { | |
971 globalStateID = StILOGLIST + (pageIsLine << 16); | |
972 } | |
973 | |
974 | |
975 void set_globalState_Menu_Line(uint8_t line) | |
976 { | |
977 globalStateID = ((globalStateID & MaskLineFieldDigit) + (line << 16)); | |
978 } | |
979 | |
980 | |
981 void set_globalState(uint32_t newID) | |
982 { | |
983 globalStateID = newID; | |
984 } | |
985 | |
986 void set_returnFromComm(void) | |
987 { | |
988 returnFromCommCleanUpRequest = 1; | |
989 } | |
990 | |
991 uint8_t font_update_required(void) | |
992 { | |
993 uint8_t *fontVersionHigh; | |
994 uint8_t *fontVersionLow; | |
995 | |
996 fontVersionHigh = (uint8_t *)0x08132000; | |
997 fontVersionLow = (uint8_t *)0x08132001; | |
998 | |
999 if(FONTminimum_required_high() < *fontVersionHigh) | |
1000 return 0; | |
1001 | |
1002 if((FONTminimum_required_high() == *fontVersionHigh) && (FONTminimum_required_low() <= *fontVersionLow)) | |
1003 return 0; | |
1004 | |
1005 return 1; | |
1006 } | |
1007 | |
1008 | |
132
135eae957389
Add compile switch to disable optimization for specific function
Ideenmodellierer
parents:
116
diff
changeset
|
1009 __attribute__((optimize("O0"))) void delayMicros(uint32_t micros) |
38 | 1010 { |
1011 micros = micros * (168/4) - 10; | |
1012 while(micros--); | |
1013 } | |
1014 | |
1015 | |
1016 void get_RTC_DateTime(RTC_DateTypeDef * sdatestructureget, RTC_TimeTypeDef * stimestructureget) | |
1017 { | |
1018 /* Get the RTC current Time */ | |
1019 if(sdatestructureget) | |
1020 HAL_RTC_GetTime(&RtcHandle, stimestructureget, FORMAT_BIN); | |
1021 /* Get the RTC current Date */ | |
1022 if(stimestructureget) | |
1023 HAL_RTC_GetDate(&RtcHandle, sdatestructureget, FORMAT_BIN); | |
1024 } | |
1025 | |
1026 | |
1027 void set_RTC_DateTime(RTC_DateTypeDef * sdatestructure, RTC_TimeTypeDef * stimestructure) | |
1028 { | |
1029 if(sdatestructure) | |
1030 if(HAL_RTC_SetDate(&RtcHandle,sdatestructure,FORMAT_BCD) != HAL_OK) | |
1031 { | |
1032 /* Initialization Error */ | |
1033 Error_Handler(); | |
1034 } | |
1035 | |
1036 if(stimestructure) | |
1037 if(HAL_RTC_SetTime(&RtcHandle,stimestructure,FORMAT_BCD) != HAL_OK) | |
1038 { | |
1039 /* Initialization Error */ | |
1040 Error_Handler(); | |
1041 } | |
1042 } | |
1043 | |
1044 static void TIM_init(void) | |
1045 { | |
1046 uint16_t uwPrescalerValue = 0; | |
1047 | |
1048 uwPrescalerValue = (uint32_t) ((SystemCoreClock /2) / 10000) - 1; | |
1049 | |
1050 /* Set TIMx instance */ | |
1051 TimHandle.Instance = TIMx; | |
1052 | |
1053 /* Initialize TIM3 peripheral as follows: | |
1054 + Period = 10000 - 1 | |
1055 + Prescaler = ((SystemCoreClock/2)/10000) - 1 | |
1056 + ClockDivision = 0 | |
1057 + Counter direction = Up | |
1058 */ | |
1059 TimHandle.Init.Period = 1000 - 1; | |
1060 TimHandle.Init.Prescaler = uwPrescalerValue; | |
1061 TimHandle.Init.ClockDivision = 0; | |
1062 TimHandle.Init.CounterMode = TIM_COUNTERMODE_UP; | |
1063 if(HAL_TIM_Base_Init(&TimHandle) != HAL_OK) | |
1064 { | |
1065 /* Initialization Error */ | |
1066 Error_Handler(); | |
1067 } | |
1068 | |
1069 /*##-2- Start the TIM Base generation in interrupt mode ####################*/ | |
1070 /* Start Channel1 */ | |
1071 if(HAL_TIM_Base_Start_IT(&TimHandle) != HAL_OK) | |
1072 { | |
1073 /* Starting Error */ | |
1074 Error_Handler(); | |
1075 } | |
1076 } | |
1077 | |
1078 #ifdef DEMOMODE | |
1079 static void TIM_DEMO_init(void) | |
1080 { | |
1081 uint16_t uwPrescalerValue = 0; | |
1082 | |
1083 uwPrescalerValue = (uint32_t) ((SystemCoreClock /2) / 10000) - 1; | |
1084 | |
1085 /* Set TIMx instance */ | |
1086 TimDemoHandle.Instance = TIM7; | |
1087 | |
1088 /* Initialize TIM3 peripheral as follows: | |
1089 + Period = 10000 - 1 | |
1090 + Prescaler = ((SystemCoreClock/2)/10000) - 1 | |
1091 + ClockDivision = 0 | |
1092 + Counter direction = Up | |
1093 */ | |
1094 TimDemoHandle.Init.Period = 1000 - 1; | |
1095 TimDemoHandle.Init.Prescaler = uwPrescalerValue; | |
1096 TimDemoHandle.Init.ClockDivision = 0; | |
1097 TimHandle.Init.CounterMode = TIM_COUNTERMODE_UP; | |
1098 if(HAL_TIM_Base_Init(&TimDemoHandle) != HAL_OK) | |
1099 { | |
1100 /* Initialization Error */ | |
1101 Error_Handler(); | |
1102 } | |
1103 | |
1104 /*##-2- Start the TIM Base generation in interrupt mode ####################*/ | |
1105 /* Start Channel1 */ | |
1106 if(HAL_TIM_Base_Start_IT(&TimDemoHandle) != HAL_OK) | |
1107 { | |
1108 /* Starting Error */ | |
1109 Error_Handler(); | |
1110 } | |
1111 } | |
1112 #endif | |
1113 | |
1114 | |
1115 | |
1116 #ifndef TIM_BACKLIGHT | |
1117 | |
1118 static uint32_t TIM_BACKLIGHT_adjust(void) | |
1119 { | |
1120 return 0; | |
1121 } | |
1122 | |
1123 static void TIM_BACKLIGHT_init(void) | |
1124 { | |
1125 } | |
1126 #else | |
1127 static uint32_t TIM_BACKLIGHT_adjust(void) | |
1128 { | |
1129 static uint32_t levelActual = 12000; | |
1130 static uint8_t brightnessModeLast = 0; | |
1131 // static _Bool wasLostConnection = 0; | |
1132 | |
1133 uint32_t levelAmbient; | |
1134 uint32_t levelMax; | |
1135 uint32_t levelMin; | |
1136 uint32_t levelUpStep_100ms = 200; | |
1137 uint32_t levelDnStep_100ms = 20; | |
1138 | |
1139 TIM_OC_InitTypeDef sConfig; | |
1140 sConfig.OCMode = TIM_OCMODE_PWM1; | |
1141 sConfig.OCPolarity = TIM_OCPOLARITY_HIGH; | |
1142 sConfig.OCFastMode = TIM_OCFAST_DISABLE; | |
1143 | |
1144 const SDiveState * pStateReal = stateRealGetPointer(); | |
1145 | |
1146 | |
1147 // if(pStateReal->data_old__lost_connection_to_slave) | |
1148 // { | |
1149 // changed 160613 from 6000 to 12000 | |
1150 // removed hw 161209 | |
1151 // levelAmbient = 12000; | |
1152 // levelActual = 12000; | |
1153 // wasLostConnection = 1; | |
1154 // } | |
1155 // else | |
1156 // { | |
1157 SSettings *pSettings = settingsGetPointer(); | |
1158 /* 300 - 4000 */ | |
1159 /* important levelAmbient 300 - 1200 */ | |
1160 levelAmbient = 10 * pStateReal->lifeData.ambient_light_level; | |
1161 | |
670
7a352b449055
Reduce display brightness in case the charger is connected:
Ideenmodellierer
parents:
662
diff
changeset
|
1162 if((pStateReal->chargeStatus == CHARGER_running) || (pStateReal->chargeStatus == CHARGER_lostConnection)) |
7a352b449055
Reduce display brightness in case the charger is connected:
Ideenmodellierer
parents:
662
diff
changeset
|
1163 { |
7a352b449055
Reduce display brightness in case the charger is connected:
Ideenmodellierer
parents:
662
diff
changeset
|
1164 levelMax = 1000; |
7a352b449055
Reduce display brightness in case the charger is connected:
Ideenmodellierer
parents:
662
diff
changeset
|
1165 levelMin = 500; |
7a352b449055
Reduce display brightness in case the charger is connected:
Ideenmodellierer
parents:
662
diff
changeset
|
1166 } |
7a352b449055
Reduce display brightness in case the charger is connected:
Ideenmodellierer
parents:
662
diff
changeset
|
1167 else |
7a352b449055
Reduce display brightness in case the charger is connected:
Ideenmodellierer
parents:
662
diff
changeset
|
1168 { |
549
469e93f8633e
Only execute motion detection functions if features is enabled:
Ideenmodellierer
parents:
540
diff
changeset
|
1169 switch( pSettings->brightness + blBoost) |
38 | 1170 { |
1171 case 0: /* Cave */ | |
1172 levelMax = 3000;/* max 25 % (x2) */ | |
1173 levelMin = 1500; | |
1174 break; | |
1175 case 1: /* Eco */ | |
1176 levelMax = 6000;/* max 50 % (x2) */ | |
1177 levelMin = 3000; | |
1178 break; | |
1179 case 2: /* Std */ | |
1180 levelAmbient += 1000; | |
1181 levelMax = 9000; | |
1182 levelMin = 4500; | |
1183 levelUpStep_100ms += levelUpStep_100ms/2; // 4500 instead of 3000 | |
1184 levelDnStep_100ms += levelDnStep_100ms/2; | |
1185 break; | |
1186 case 3: /* High */ | |
1187 default: | |
1188 levelAmbient += 3000; | |
1189 levelMax = 12000; /* max 100% (x2) */ | |
1190 levelMin = 6000; | |
1191 levelUpStep_100ms += levelUpStep_100ms; // 6000 instead of 3000 | |
1192 levelDnStep_100ms += levelDnStep_100ms; | |
1193 break; | |
1194 case 4: /* New Max */ | |
1195 levelAmbient = 12000; | |
1196 levelMax = 12000; /* max 100% (x2) */ | |
1197 levelMin = 12000; | |
1198 levelUpStep_100ms += 12000; | |
1199 levelDnStep_100ms += 0; | |
1200 break; | |
1201 } | |
1202 | |
1203 if((pSettings->brightness != brightnessModeLast))// || wasLostConnection) | |
1204 { | |
1205 levelActual = levelAmbient; | |
1206 brightnessModeLast = pSettings->brightness; | |
1207 // wasLostConnection = 0; | |
1208 } | |
1209 // } | |
670
7a352b449055
Reduce display brightness in case the charger is connected:
Ideenmodellierer
parents:
662
diff
changeset
|
1210 } |
38 | 1211 |
1212 if(levelAmbient > levelActual) | |
1213 levelActual += levelUpStep_100ms; | |
1214 else | |
1215 if((levelAmbient < levelActual) && (levelActual > levelMin) && (levelActual > levelDnStep_100ms)) | |
1216 levelActual -= levelDnStep_100ms; | |
1217 | |
1218 if(levelActual > levelMax) | |
1219 levelActual = levelMax; | |
1220 else | |
1221 if(levelActual < levelMin) | |
670
7a352b449055
Reduce display brightness in case the charger is connected:
Ideenmodellierer
parents:
662
diff
changeset
|
1222 { |
38 | 1223 levelActual = levelMin; |
670
7a352b449055
Reduce display brightness in case the charger is connected:
Ideenmodellierer
parents:
662
diff
changeset
|
1224 } |
38 | 1225 // sConfig.Pulse = levelActual / 20; |
1226 sConfig.Pulse = (levelMin + ((levelMax - levelMin)/2)) / 20; // added 170306 | |
1227 | |
1228 /* xx - 600 */ | |
1229 if(sConfig.Pulse > 600) | |
1230 sConfig.Pulse = 600; | |
1231 else | |
670
7a352b449055
Reduce display brightness in case the charger is connected:
Ideenmodellierer
parents:
662
diff
changeset
|
1232 if(sConfig.Pulse < 25) |
7a352b449055
Reduce display brightness in case the charger is connected:
Ideenmodellierer
parents:
662
diff
changeset
|
1233 sConfig.Pulse = 25; |
38 | 1234 |
1235 HAL_TIM_PWM_ConfigChannel(&TimBacklightHandle, &sConfig, TIM_BACKLIGHT_CHANNEL); | |
1236 HAL_TIM_PWM_Start(&TimBacklightHandle, TIM_BACKLIGHT_CHANNEL); | |
1237 | |
1238 return levelActual; | |
1239 } | |
1240 | |
1241 static void TIM_BACKLIGHT_init(void) | |
1242 { | |
1243 uint32_t uwPrescalerValue = 0; | |
1244 TIM_OC_InitTypeDef sConfig; | |
1245 | |
1246 uwPrescalerValue = (uint32_t) ((SystemCoreClock /2) / 18000000) - 1; | |
1247 | |
1248 TimBacklightHandle.Instance = TIM_BACKLIGHT; | |
1249 | |
1250 /* Initialize TIM3 peripheral as follows: | |
1251 30 kHz | |
1252 */ | |
1253 TimBacklightHandle.Init.Period = 600 - 1; | |
1254 TimBacklightHandle.Init.Prescaler = uwPrescalerValue; | |
1255 TimBacklightHandle.Init.ClockDivision = 0; | |
1256 TimBacklightHandle.Init.CounterMode = TIM_COUNTERMODE_UP; | |
1257 HAL_TIM_PWM_Init(&TimBacklightHandle); | |
1258 | |
1259 sConfig.OCMode = TIM_OCMODE_PWM1; | |
1260 sConfig.OCPolarity = TIM_OCPOLARITY_HIGH; | |
1261 sConfig.OCFastMode = TIM_OCFAST_DISABLE; | |
263
a6c0375bc950
Forward 100ms time stamp to RTE and handle logbook in main loop
ideenmodellierer
parents:
250
diff
changeset
|
1262 sConfig.Pulse = 100; /* Initial brigthness of display */ |
38 | 1263 |
1264 HAL_TIM_PWM_ConfigChannel(&TimBacklightHandle, &sConfig, TIM_BACKLIGHT_CHANNEL); | |
1265 HAL_TIM_PWM_Start(&TimBacklightHandle, TIM_BACKLIGHT_CHANNEL); | |
1266 } | |
1267 #endif | |
1268 | |
1269 | |
549
469e93f8633e
Only execute motion detection functions if features is enabled:
Ideenmodellierer
parents:
540
diff
changeset
|
1270 void set_Backlight_Boost(uint8_t level) |
469e93f8633e
Only execute motion detection functions if features is enabled:
Ideenmodellierer
parents:
540
diff
changeset
|
1271 { |
469e93f8633e
Only execute motion detection functions if features is enabled:
Ideenmodellierer
parents:
540
diff
changeset
|
1272 if(level < 3) |
469e93f8633e
Only execute motion detection functions if features is enabled:
Ideenmodellierer
parents:
540
diff
changeset
|
1273 { |
469e93f8633e
Only execute motion detection functions if features is enabled:
Ideenmodellierer
parents:
540
diff
changeset
|
1274 blBoost = level; |
469e93f8633e
Only execute motion detection functions if features is enabled:
Ideenmodellierer
parents:
540
diff
changeset
|
1275 } |
469e93f8633e
Only execute motion detection functions if features is enabled:
Ideenmodellierer
parents:
540
diff
changeset
|
1276 } |
469e93f8633e
Only execute motion detection functions if features is enabled:
Ideenmodellierer
parents:
540
diff
changeset
|
1277 |
38 | 1278 static void EXTILine_Buttons_Config(void) |
1279 { | |
1280 GPIO_InitTypeDef GPIO_InitStructure; | |
1281 | |
1282 BUTTON_ENTER_GPIO_ENABLE(); | |
1283 BUTTON_NEXT_GPIO_ENABLE(); | |
1284 BUTTON_BACK_GPIO_ENABLE(); | |
1285 | |
1286 /* Configure pin as weak PULLUP input */ | |
1287 /* buttons */ | |
1288 GPIO_InitStructure.Mode = GPIO_MODE_IT_RISING; | |
1289 GPIO_InitStructure.Pull = GPIO_NOPULL; | |
1290 GPIO_InitStructure.Speed = GPIO_SPEED_LOW; | |
1291 | |
1292 GPIO_InitStructure.Pin = BUTTON_ENTER_PIN; | |
1293 HAL_GPIO_Init(BUTTON_ENTER_GPIO_PORT, &GPIO_InitStructure); | |
1294 | |
1295 GPIO_InitStructure.Pin = BUTTON_NEXT_PIN; | |
1296 HAL_GPIO_Init(BUTTON_NEXT_GPIO_PORT, &GPIO_InitStructure); | |
1297 | |
1298 GPIO_InitStructure.Pin = BUTTON_BACK_PIN; | |
1299 HAL_GPIO_Init(BUTTON_BACK_GPIO_PORT, &GPIO_InitStructure); | |
1300 | |
1301 /* Enable and set EXTI Line0 Interrupt to the lowest priority */ | |
1302 HAL_NVIC_SetPriority(BUTTON_ENTER_EXTI_IRQn, 2, 0); | |
1303 HAL_NVIC_SetPriority(BUTTON_NEXT_EXTI_IRQn, 2, 0); | |
1304 HAL_NVIC_SetPriority(BUTTON_BACK_EXTI_IRQn, 2, 0); | |
1305 HAL_NVIC_EnableIRQ(BUTTON_ENTER_EXTI_IRQn); | |
1306 HAL_NVIC_EnableIRQ(BUTTON_NEXT_EXTI_IRQn); | |
1307 HAL_NVIC_EnableIRQ(BUTTON_BACK_EXTI_IRQn); | |
1308 | |
1309 #ifdef BUTTON_CUSTOM_PIN | |
1310 BUTTON_CUSTOM_GPIO_ENABLE(); | |
1311 GPIO_InitStructure.Pin = BUTTON_CUSTOM_PIN; | |
1312 HAL_GPIO_Init(BUTTON_CUSTOM_GPIO_PORT, &GPIO_InitStructure); | |
1313 HAL_NVIC_SetPriority(BUTTON_CUSTOM_EXTI_IRQn, 2, 0); | |
1314 HAL_NVIC_EnableIRQ(BUTTON_CUSTOM_EXTI_IRQn); | |
1315 #endif | |
1316 } | |
1317 | |
1318 | |
1319 /** | |
1320 * @brief System Clock Configuration | |
1321 * The system Clock is configured as follow : | |
1322 * System Clock source = PLL (HSE) | |
1323 * SYSCLK(Hz) = 180000000 | |
1324 * HCLK(Hz) = 180000000 | |
1325 * AHB Prescaler = 1 | |
1326 * APB1 Prescaler = 4 | |
1327 * APB2 Prescaler = 2 | |
1328 * HSE Frequency(Hz) = 8000000 | |
1329 * PLL_M = 8 | |
1330 * PLL_N = 360 | |
1331 * PLL_P = 2 | |
1332 * PLL_Q = 7 | |
1333 * VDD(V) = 3.3 | |
1334 * Main regulator output voltage = Scale1 mode | |
1335 * Flash Latency(WS) = 5 | |
1336 * The LTDC Clock is configured as follow : | |
1337 * PLLSAIN = 192 | |
1338 * PLLSAIR = 4 | |
1339 * PLLSAIDivR = 8 | |
1340 * @param None | |
1341 * @retval None | |
1342 */ | |
1343 static void SystemClock_Config(void) | |
1344 { | |
1345 | |
1346 /* Enable Power Control clock */ | |
1347 __PWR_CLK_ENABLE(); | |
1348 | |
1349 /* The voltage scaling allows optimizing the power consumption when the device is | |
1350 clocked below the maximum system frequency, to update the voltage scaling value | |
1351 regarding system frequency refer to product datasheet. */ | |
1352 __HAL_PWR_VOLTAGESCALING_CONFIG( PWR_REGULATOR_VOLTAGE_SCALE1 ); | |
1353 | |
1354 /*##-1- System Clock Configuration #########################################*/ | |
1355 /* Enable HighSpeed Oscillator and activate PLL with HSE/HSI as source */ | |
1356 RCC_OscInitTypeDef RCC_OscInitStruct = { 0 }; | |
1357 #ifdef DISC1_BOARD | |
1358 // Use High Speed Internal (HSI) oscillator, running at 16MHz. | |
1359 RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI; | |
1360 RCC_OscInitStruct.HSIState = RCC_HSI_ON; | |
1361 RCC_OscInitStruct.HSICalibrationValue = 0x10; | |
1362 RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSI; | |
1363 RCC_OscInitStruct.PLL.PLLM = 16; // HSI/16 is 1Mhz. | |
1364 #else | |
1365 // Use High Speed External oscillator, running at 8MHz | |
1366 RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE; | |
1367 RCC_OscInitStruct.HSEState = RCC_HSE_ON; | |
1368 RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE; | |
1369 RCC_OscInitStruct.PLL.PLLM = 8; // HSE/8 is 1Mhz. | |
1370 #endif | |
1371 // System clock = PLL (1MHz) * N/p = 180 MHz. | |
1372 RCC_OscInitStruct.PLL.PLLN = 360; | |
1373 RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV2; | |
1374 RCC_OscInitStruct.PLL.PLLQ = 7; | |
1375 RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON; | |
1376 HAL_RCC_OscConfig( &RCC_OscInitStruct ); | |
1377 | |
1378 // HAL_PWREx_ActivateOverDrive(); | |
1379 HAL_PWREx_DeactivateOverDrive(); | |
1380 | |
1381 /* Select PLL as system clock source and configure the HCLK, PCLK1 and PCLK2 clocks dividers */ | |
1382 RCC_ClkInitTypeDef RCC_ClkInitStruct = { 0 }; | |
1383 RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_SYSCLK | RCC_CLOCKTYPE_HCLK | |
1384 | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2; | |
1385 RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK; | |
1386 RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1; | |
1387 RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV4; | |
1388 RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV2; | |
1389 HAL_RCC_ClockConfig( &RCC_ClkInitStruct, FLASH_LATENCY_8 ); //FLASH_LATENCY_5); | |
1390 | |
1391 /*##-2- LTDC Clock Configuration ###########################################*/ | |
1392 /* LCD clock configuration */ | |
1393 /* PLLSAI_VCO Input = HSE_VALUE/PLL_M = 1 Mhz */ | |
1394 /* PLLSAI_VCO Output = PLLSAI_VCO Input * PLLSAIN = 192 Mhz */ | |
1395 /* PLLLCDCLK = PLLSAI_VCO Output/PLLSAIR = 192/4 = 48 Mhz */ | |
1396 /* LTDC clock frequency = PLLLCDCLK / RCC_PLLSAIDIVR_8 = 48/8 = 6 Mhz */ | |
1397 | |
1398 /* neu: 8MHz/8*300/5/8 = 7,5 MHz = 19,5 Hz bei 800 x 480 */ | |
1399 RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; | |
1400 PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_LTDC; | |
1401 PeriphClkInitStruct.PLLSAI.PLLSAIN = 300; //192; | |
1402 PeriphClkInitStruct.PLLSAI.PLLSAIR = 5; //4; | |
1403 PeriphClkInitStruct.PLLSAIDivR = RCC_PLLSAIDIVR_8;//RCC_PLLSAIDIVR_4;// RCC_PLLSAIDIVR_2; // RCC_PLLSAIDIVR_8 | |
1404 HAL_RCCEx_PeriphCLKConfig( &PeriphClkInitStruct ); | |
1405 } | |
1406 | |
1407 | |
1408 /** | |
1409 * @brief This function is executed in case of error occurrence. | |
1410 * @param None | |
1411 * @retval None | |
1412 */ | |
1413 static void Error_Handler(void) | |
1414 { | |
1415 /* Turn LED3 on */ | |
1416 // BSP_LED_On(LED3); | |
1417 while(1) | |
1418 { | |
1419 } | |
1420 } | |
1421 | |
95
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
1422 /** |
38 | 1423 * @brief Perform the SDRAM exernal memory inialization sequence |
1424 * @param hsdram: SDRAM handle | |
1425 * @param Command: Pointer to SDRAM command structure | |
1426 * @retval None | |
1427 */ | |
1428 static void SDRAM_Initialization_Sequence(SDRAM_HandleTypeDef *hsdram, FMC_SDRAM_CommandTypeDef *Command) | |
1429 { | |
1430 __IO uint32_t tmpmrd =0; | |
1431 /* Step 3: Configure a clock configuration enable command */ | |
1432 Command->CommandMode = FMC_SDRAM_CMD_CLK_ENABLE; | |
1433 Command->CommandTarget = FMC_SDRAM_CMD_TARGET_BANK2; | |
1434 Command->AutoRefreshNumber = 1; | |
1435 Command->ModeRegisterDefinition = 0; | |
95
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
1436 |
38 | 1437 /* Send the command */ |
1438 HAL_SDRAM_SendCommand(hsdram, Command, 0x1000); | |
1439 | |
1440 /* Step 4: Insert 100 ms delay */ | |
1441 HAL_Delay(100); | |
95
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
1442 |
38 | 1443 /* Step 5: Configure a PALL (precharge all) command */ |
1444 Command->CommandMode = FMC_SDRAM_CMD_PALL; | |
1445 Command->CommandTarget = FMC_SDRAM_CMD_TARGET_BANK2; | |
1446 Command->AutoRefreshNumber = 1; | |
1447 Command->ModeRegisterDefinition = 0; | |
1448 | |
1449 /* Send the command */ | |
1450 HAL_SDRAM_SendCommand(hsdram, Command, 0x1000); | |
95
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
1451 |
38 | 1452 /* Step 6 : Configure a Auto-Refresh command */ |
1453 Command->CommandMode = FMC_SDRAM_CMD_AUTOREFRESH_MODE; | |
1454 Command->CommandTarget = FMC_SDRAM_CMD_TARGET_BANK2; | |
1455 Command->AutoRefreshNumber = 4; | |
1456 Command->ModeRegisterDefinition = 0; | |
1457 | |
1458 /* Send the command */ | |
1459 HAL_SDRAM_SendCommand(hsdram, Command, 0x1000); | |
95
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
1460 |
38 | 1461 /* Step 7: Program the external memory mode register */ |
1462 tmpmrd = (uint32_t)SDRAM_MODEREG_BURST_LENGTH_2 | | |
1463 SDRAM_MODEREG_BURST_TYPE_SEQUENTIAL | | |
1464 SDRAM_MODEREG_CAS_LATENCY_3 | | |
1465 SDRAM_MODEREG_OPERATING_MODE_STANDARD | | |
1466 SDRAM_MODEREG_WRITEBURST_MODE_SINGLE; | |
95
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
1467 |
38 | 1468 Command->CommandMode = FMC_SDRAM_CMD_LOAD_MODE; |
1469 Command->CommandTarget = FMC_SDRAM_CMD_TARGET_BANK2; | |
1470 Command->AutoRefreshNumber = 1; | |
1471 Command->ModeRegisterDefinition = tmpmrd; | |
95
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
1472 |
38 | 1473 /* Send the command */ |
1474 HAL_SDRAM_SendCommand(hsdram, Command, 0x1000); | |
1475 | |
1476 /* Step 8: Set the refresh rate counter */ | |
1477 /* (15.62 us x Freq) - 20 */ | |
1478 /* neu: (8 us x Freq) - 20 */ | |
1479 /* Set the device refresh counter */ | |
1480 HAL_SDRAM_ProgramRefreshRate(hsdram, REFRESH_COUNT); | |
95
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
1481 } |
38 | 1482 |
1483 | |
1484 /** | |
1485 ****************************************************************************** | |
1486 ****************************************************************************** | |
1487 ****************************************************************************** | |
1488 */ | |
1489 | |
1490 | |
1491 /** | |
1492 * @brief DMA2D configuration. | |
1493 * @note This function Configure tha DMA2D peripheral : | |
1494 * 1) Configure the transfer mode : memory to memory W/ pixel format conversion | |
1495 * 2) Configure the output color mode as ARGB4444 | |
1496 * 3) Configure the output memory address at SRAM memory | |
1497 * 4) Configure the data size : 320x120 (pixels) | |
1498 * 5) Configure the input color mode as ARGB8888 | |
1499 * 6) Configure the input memory address at FLASH memory | |
1500 * @retval | |
1501 * None | |
1502 */ | |
1503 | |
1504 static void SDRAM_Config(void) | |
1505 { | |
1506 /*##-1- Configure the SDRAM device #########################################*/ | |
1507 /* SDRAM device configuration */ | |
1508 hsdram.Instance = FMC_SDRAM_DEVICE; | |
1509 | |
1510 /* Timing configuration for 90 Mhz of SD clock frequency (180Mhz/2) */ | |
1511 /* TMRD: 2 Clock cycles */ | |
1512 SDRAM_Timing.LoadToActiveDelay = 2; | |
1513 /* TXSR: min=70ns (6x11.90ns) */ | |
1514 SDRAM_Timing.ExitSelfRefreshDelay = 7; | |
1515 /* TRAS: min=42ns (4x11.90ns) max=120k (ns) */ | |
1516 SDRAM_Timing.SelfRefreshTime = 4; | |
1517 /* TRC: min=63 (6x11.90ns) */ | |
1518 SDRAM_Timing.RowCycleDelay = 7; | |
1519 /* TWR: 2 Clock cycles */ | |
1520 SDRAM_Timing.WriteRecoveryTime = 2; | |
1521 /* TRP: 15ns => 2x11.90ns */ | |
1522 SDRAM_Timing.RPDelay = 2; | |
1523 /* TRCD: 15ns => 2x11.90ns */ | |
1524 SDRAM_Timing.RCDDelay = 2; | |
1525 | |
1526 hsdram.Init.SDBank = FMC_SDRAM_BANK2; | |
1527 hsdram.Init.ColumnBitsNumber = FMC_SDRAM_COLUMN_BITS_NUM_9; | |
1528 hsdram.Init.RowBitsNumber = FMC_SDRAM_ROW_BITS_NUM_13; | |
1529 hsdram.Init.MemoryDataWidth = SDRAM_MEMORY_WIDTH; | |
1530 hsdram.Init.InternalBankNumber = FMC_SDRAM_INTERN_BANKS_NUM_4; | |
1531 hsdram.Init.CASLatency = FMC_SDRAM_CAS_LATENCY_3; | |
1532 hsdram.Init.WriteProtection = FMC_SDRAM_WRITE_PROTECTION_DISABLE; | |
1533 hsdram.Init.SDClockPeriod = SDCLOCK_PERIOD; | |
1534 hsdram.Init.ReadBurst = FMC_SDRAM_RBURST_DISABLE; | |
1535 hsdram.Init.ReadPipeDelay = FMC_SDRAM_RPIPE_DELAY_1; | |
1536 | |
1537 /* Initialize the SDRAM controller */ | |
1538 if(HAL_SDRAM_Init(&hsdram, &SDRAM_Timing) != HAL_OK) | |
1539 { | |
1540 /* Initialization Error */ | |
1541 Error_Handler(); | |
1542 } | |
95
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
1543 |
38 | 1544 /* Program the SDRAM external device */ |
1545 SDRAM_Initialization_Sequence(&hsdram, &command); | |
1546 } | |
1547 | |
1548 | |
1549 #ifdef USE_FULL_ASSERT | |
1550 | |
1551 /** | |
1552 * @brief Reports the name of the source file and the source line number | |
1553 * where the assert_param error has occurred. | |
1554 * @param file: pointer to the source file name | |
1555 * @param line: assert_param error line source number | |
1556 * @retval None | |
1557 */ | |
1558 void assert_failed(uint8_t* file, uint32_t line) | |
1559 { | |
1560 /* User can add his own implementation to report the file name and line number, | |
1561 ex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */ | |
1562 | |
1563 /* Infinite loop */ | |
1564 while (1) | |
1565 { | |
1566 } | |
1567 } | |
1568 #endif | |
1569 | |
1570 | |
300
5ca177d2df5d
cleanup: remove commented/unused code, make static
Jan Mulder <jlmulder@xs4all.nl>
parents:
272
diff
changeset
|
1571 static void deco_loop(void) |
38 | 1572 { |
1573 typedef enum | |
1574 { | |
1575 CALC_VPM, | |
1576 CALC_VPM_FUTURE, | |
1577 CALC_BUEHLMANN, | |
1578 CALC_BUEHLMANN_FUTURE, | |
149 | 1579 CALC_INVALID |
38 | 1580 } CALC_WHAT; |
1581 | |
149 | 1582 static CALC_WHAT what = CALC_INVALID; |
223
5f535ef6a3db
Bugfix, minor: properly alternate VPM/Buhlmann in deco loop
Jan Mulder <jlmulder@xs4all.nl>
parents:
217
diff
changeset
|
1583 static int counter = 0; |
412 | 1584 if((stateUsed->mode != MODE_DIVE) || (stateUsed->diveSettings.diveMode == DIVEMODE_Apnea) || (stateUsed->diveSettings.diveMode == DIVEMODE_Gauge) || (decoLock != DECO_CALC_ready )) |
38 | 1585 return; |
1586 | |
651 | 1587 if((stateUsed->warnings.betterSetpoint) && (settingsGetPointer()->autoSetpoint) && (settingsGetPointer()->CCR_Mode == CCRMODE_FixedSetpoint)) |
1588 { | |
1589 openEdit_DiveSelectBetterSetpoint(); | |
1590 } | |
1591 | |
38 | 1592 decoLock = DECO_CALC_running; |
1593 | |
1594 if(stateDeco.diveSettings.deco_type.ub.standard == GF_MODE) | |
1595 { | |
1596 // hw 151110 mh wants future TTS even in deco zone if((what == CALC_BUEHLMANN) && (stateDeco.lifeData.pressure_ambient_bar > stateDeco.diveSettings.internal__pressure_first_stop_ambient_bar_as_upper_limit_for_gf_low_otherwise_zero)) | |
1597 if(what == CALC_BUEHLMANN) | |
1598 { | |
1599 //Calc future | |
1600 what = CALC_BUEHLMANN_FUTURE; | |
1601 } | |
1602 else | |
1603 what = CALC_BUEHLMANN; | |
1604 | |
1605 } | |
1606 else | |
1607 { | |
1608 // hw 151110 mh wants future TTS even in deco zone if((what == CALC_VPM) && (!stateDeco.vpm.deco_zone_reached)) | |
1609 if(what == CALC_VPM) | |
1610 { | |
1611 //Calc future | |
1612 what = CALC_VPM_FUTURE; | |
1613 } | |
1614 else | |
1615 what = CALC_VPM; | |
1616 } | |
1617 | |
1618 //In one of ten calc the other option | |
1619 if(counter == 10) | |
1620 { | |
1621 if(what == CALC_VPM) | |
1622 what = CALC_BUEHLMANN; | |
1623 if(what == CALC_BUEHLMANN) | |
1624 what = CALC_VPM; | |
1625 counter = 0; | |
1626 } | |
1627 | |
1628 decom_CreateGasChangeList(&stateDeco.diveSettings, &stateDeco.lifeData); | |
1629 | |
1630 switch(what) | |
1631 { | |
149 | 1632 case CALC_VPM: |
1633 vpm_calc(&stateDeco.lifeData,&stateDeco.diveSettings,&stateDeco.vpm,&stateDeco.decolistVPM, DECOSTOPS); | |
1634 decoLock = DECO_CALC_FINSHED_vpm; | |
1635 return; | |
1636 case CALC_VPM_FUTURE: | |
1637 decom_tissues_exposure(stateDeco.diveSettings.future_TTS_minutes * 60,&stateDeco.lifeData); | |
1638 vpm_calc(&stateDeco.lifeData,&stateDeco.diveSettings,&stateDeco.vpm,&stateDeco.decolistFutureVPM, FUTURESTOPS); | |
1639 decoLock = DECO_CALC_FINSHED_Futurevpm; | |
1640 return; | |
1641 case CALC_BUEHLMANN: | |
1642 buehlmann_calc_deco(&stateDeco.lifeData,&stateDeco.diveSettings,&stateDeco.decolistBuehlmann); | |
250
822416168585
Buelmann: new implementation for ceiling
Jan Mulder <jlmulder@xs4all.nl>
parents:
248
diff
changeset
|
1643 buehlmann_ceiling_calculator(&stateDeco.lifeData, &stateDeco.decolistBuehlmann); |
248 | 1644 buehlmann_super_saturation_calculator(&stateDeco.lifeData,&stateDeco.decolistBuehlmann); |
149 | 1645 decoLock = DECO_CALC_FINSHED_Buehlmann; |
1646 return; | |
1647 case CALC_BUEHLMANN_FUTURE: | |
1648 decom_tissues_exposure(stateDeco.diveSettings.future_TTS_minutes * 60,&stateDeco.lifeData); | |
1649 buehlmann_calc_deco(&stateDeco.lifeData,&stateDeco.diveSettings,&stateDeco.decolistFutureBuehlmann); | |
1650 decoLock = DECO_CALC_FINSHED_FutureBuehlmann; | |
1651 return; | |
1652 default: break; | |
38 | 1653 } |
1654 counter++; | |
1655 } | |
1656 | |
300
5ca177d2df5d
cleanup: remove commented/unused code, make static
Jan Mulder <jlmulder@xs4all.nl>
parents:
272
diff
changeset
|
1657 static void resetToFirmwareUpdate(void) |
38 | 1658 { |
1659 __HAL_RCC_CLEAR_RESET_FLAGS(); | |
1660 HAL_NVIC_SystemReset(); | |
1661 } | |
1662 | |
422
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1663 static void TimeoutControlRequestModechange(void) |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1664 { |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1665 RequestModeChange = 1; |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1666 } |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1667 |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1668 static void TimeoutControl(void) |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1669 { |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1670 static uint8_t last_base; |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1671 |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1672 SStateList status; |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1673 uint32_t timeout_in_seconds; |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1674 uint32_t timeout_limit_Surface_in_seconds; |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1675 _Bool InDiveMode = 0; |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1676 |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1677 get_globalStateList(&status); |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1678 |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1679 if(stateUsed->mode == MODE_DIVE) |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1680 { |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1681 InDiveMode = 1; |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1682 } |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1683 else |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1684 { |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1685 InDiveMode = 0; |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1686 } |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1687 /* timeout control */ |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1688 if(RequestModeChange) ///< from RTE, set in data_exchange_main.c |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1689 time_without_button_pressed_deciseconds = (settingsGetPointer()->timeoutSurfacemode / 4) * 3; |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1690 if(status.base != last_base) |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1691 time_without_button_pressed_deciseconds = 0; |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1692 last_base = status.base; |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1693 timeout_in_seconds = time_without_button_pressed_deciseconds / 10; |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1694 time_without_button_pressed_deciseconds += 1; |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1695 if(RequestModeChange || (timeout_in_seconds != time_without_button_pressed_deciseconds / 10)) |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1696 { |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1697 #ifdef NO_TIMEOUT |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1698 timeout_in_seconds = 0; |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1699 #else |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1700 timeout_in_seconds += 1; |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1701 #endif |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1702 |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1703 if(InDiveMode) |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1704 { |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1705 switch(status.base) |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1706 { |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1707 case BaseHome: |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1708 if((status.line != 0) && (timeout_in_seconds >= settingsGetPointer()->timeoutEnterButtonSelectDive)) |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1709 { |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1710 set_globalState(StD); |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1711 timeout_in_seconds = 0; |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1712 } |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1713 break; |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1714 |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1715 case BaseMenu: |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1716 if((status.line == 0) && ((timeout_in_seconds >= settingsGetPointer()->timeoutMenuDive) || RequestModeChange)) |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1717 { |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1718 exitMenu(); |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1719 timeout_in_seconds = 0; |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1720 } |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1721 if((status.line != 0) && ((timeout_in_seconds >= settingsGetPointer()->timeoutMenuEdit) || RequestModeChange)) |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1722 { |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1723 exitMenuEdit_to_Home(); |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1724 timeout_in_seconds = 0; |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1725 } |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1726 break; |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1727 default: |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1728 break; |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1729 } |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1730 } |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1731 else /* surface mode */ |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1732 { |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1733 switch(status.base) |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1734 { |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1735 case BaseHome: |
670
7a352b449055
Reduce display brightness in case the charger is connected:
Ideenmodellierer
parents:
662
diff
changeset
|
1736 /* The RTE will mark a charge value as suspect after startup. Main know the update condition and may confirm that the value is most likely valid */ |
7a352b449055
Reduce display brightness in case the charger is connected:
Ideenmodellierer
parents:
662
diff
changeset
|
1737 // if(!(stateRealGetPointer()->warnings.lowBattery) && ((stateRealGetPointer()->lifeData.battery_charge > 9) || (wasFirmwareUpdateCheckBattery))) |
422
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1738 { |
670
7a352b449055
Reduce display brightness in case the charger is connected:
Ideenmodellierer
parents:
662
diff
changeset
|
1739 if(stateRealGetPointer()->lifeData.battery_charge < 0.0) |
7a352b449055
Reduce display brightness in case the charger is connected:
Ideenmodellierer
parents:
662
diff
changeset
|
1740 { |
7a352b449055
Reduce display brightness in case the charger is connected:
Ideenmodellierer
parents:
662
diff
changeset
|
1741 if(fabs(stateRealGetPointerWrite()->lastKnownBatteryPercentage - fabs(stateRealGetPointer()->lifeData.battery_charge)) < 1.0) |
7a352b449055
Reduce display brightness in case the charger is connected:
Ideenmodellierer
parents:
662
diff
changeset
|
1742 { |
7a352b449055
Reduce display brightness in case the charger is connected:
Ideenmodellierer
parents:
662
diff
changeset
|
1743 setBatteryPercentage(settingsGetPointer()->lastKnownBatteryPercentage); /* confirm that value provided by RTE is valid (maybe reset happened) */ |
7a352b449055
Reduce display brightness in case the charger is connected:
Ideenmodellierer
parents:
662
diff
changeset
|
1744 } |
7a352b449055
Reduce display brightness in case the charger is connected:
Ideenmodellierer
parents:
662
diff
changeset
|
1745 } |
7a352b449055
Reduce display brightness in case the charger is connected:
Ideenmodellierer
parents:
662
diff
changeset
|
1746 else |
7a352b449055
Reduce display brightness in case the charger is connected:
Ideenmodellierer
parents:
662
diff
changeset
|
1747 { |
7a352b449055
Reduce display brightness in case the charger is connected:
Ideenmodellierer
parents:
662
diff
changeset
|
1748 if(!(stateRealGetPointer()->warnings.lowBattery) && (stateRealGetPointer()->lifeData.battery_charge > 9)) |
7a352b449055
Reduce display brightness in case the charger is connected:
Ideenmodellierer
parents:
662
diff
changeset
|
1749 { |
7a352b449055
Reduce display brightness in case the charger is connected:
Ideenmodellierer
parents:
662
diff
changeset
|
1750 stateRealGetPointerWrite()->lastKnownBatteryPercentage = stateRealGetPointer()->lifeData.battery_charge; |
7a352b449055
Reduce display brightness in case the charger is connected:
Ideenmodellierer
parents:
662
diff
changeset
|
1751 } |
7a352b449055
Reduce display brightness in case the charger is connected:
Ideenmodellierer
parents:
662
diff
changeset
|
1752 } |
422
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1753 } |
670
7a352b449055
Reduce display brightness in case the charger is connected:
Ideenmodellierer
parents:
662
diff
changeset
|
1754 if((wasFirmwareUpdateCheckBattery) && (timeout_in_seconds > 3)) |
422
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1755 { |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1756 wasFirmwareUpdateCheckBattery = 0; |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1757 setButtonResponsiveness(settingsGetPointer()->ButtonResponsiveness); // added 170306 |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1758 if( (settingsGetPointer()->lastKnownBatteryPercentage > 0) |
670
7a352b449055
Reduce display brightness in case the charger is connected:
Ideenmodellierer
parents:
662
diff
changeset
|
1759 && (settingsGetPointer()->lastKnownBatteryPercentage <= 101.0) |
422
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1760 && (stateRealGetPointer()->warnings.lowBattery)) |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1761 { |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1762 setBatteryPercentage(settingsGetPointer()->lastKnownBatteryPercentage); |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1763 } |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1764 } |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1765 // stuff before and new @161121 CCR-sensor limit 10 minutes |
662 | 1766 if(isLoopMode(settingsGetPointer()->dive_mode) && (settingsGetPointer()->CCR_Mode == CCRMODE_Sensors)) |
422
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1767 { |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1768 timeout_limit_Surface_in_seconds = settingsGetPointer()->timeoutSurfacemodeWithSensors; |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1769 } |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1770 else |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1771 { |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1772 timeout_limit_Surface_in_seconds = settingsGetPointer()->timeoutSurfacemode; |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1773 } |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1774 if(timeout_in_seconds >= timeout_limit_Surface_in_seconds) |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1775 { |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1776 gotoSleep(); |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1777 } |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1778 break; |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1779 case BaseMenu: |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1780 if((status.line == 0) && ((timeout_in_seconds >= settingsGetPointer()->timeoutMenuSurface) || RequestModeChange)) |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1781 { |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1782 exitMenu(); |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1783 timeout_in_seconds = 0; |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1784 } |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1785 if((status.line != 0) && ((timeout_in_seconds >= settingsGetPointer()->timeoutMenuEdit) || RequestModeChange)) |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1786 { |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1787 if((status.page != (uint8_t)((StMPLAN >> 24) & 0x0F)) || (timeout_in_seconds >= 10*(settingsGetPointer()->timeoutMenuEdit))) |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1788 { |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1789 exitMenuEdit_to_Home(); |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1790 timeout_in_seconds = 0; |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1791 } |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1792 } |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1793 break; |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1794 |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1795 case BaseInfo: |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1796 if((timeout_in_seconds >= settingsGetPointer()->timeoutInfo) || RequestModeChange) |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1797 { |
718
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
697
diff
changeset
|
1798 timeout_in_seconds = 0; |
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
697
diff
changeset
|
1799 |
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
697
diff
changeset
|
1800 switch(status.page) |
422
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1801 { |
718
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
697
diff
changeset
|
1802 case InfoPageLogList: exitLog(); |
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
697
diff
changeset
|
1803 break; |
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
697
diff
changeset
|
1804 case InfoPageLogShow: show_logbook_exit(); |
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
697
diff
changeset
|
1805 exitLog(); |
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
697
diff
changeset
|
1806 break; |
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
697
diff
changeset
|
1807 case InfoPageCompass: /* compass has individual timeout */ |
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
697
diff
changeset
|
1808 break; |
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
697
diff
changeset
|
1809 case InfoPageSensor: exitInfoToBack(); |
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
697
diff
changeset
|
1810 break; |
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
697
diff
changeset
|
1811 default: exitInfo(); |
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
697
diff
changeset
|
1812 break; |
422
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1813 } |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1814 } |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1815 break; |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1816 default: |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1817 break; |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1818 } |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1819 } |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1820 } |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1821 RequestModeChange = 0; |
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1822 } |
38 | 1823 // debugging by https://blog.feabhas.com/2013/02/developing-a-generic-hard-fault-handler-for-arm-cortex-m3cortex-m4/ |
1824 | |
1825 /* | |
1826 void printErrorMsg(const char * errMsg) | |
1827 { | |
1828 | |
1829 // printf(errMsg); | |
1830 // return; | |
1831 | |
1832 while(*errMsg != 0){ | |
1833 ITM_SendChar(*errMsg); | |
1834 ++errMsg; | |
1835 } | |
1836 } | |
1837 | |
1838 enum { r0, r1, r2, r3, r12, lr, pc, psr}; | |
1839 | |
1840 void stackDump(uint32_t stack[]) | |
1841 { | |
1842 static char msg[80]; | |
1843 sprintf(msg, "r0 = 0x%08x\n", stack[r0]); printErrorMsg(msg); | |
1844 sprintf(msg, "r1 = 0x%08x\n", stack[r1]); printErrorMsg(msg); | |
1845 sprintf(msg, "r2 = 0x%08x\n", stack[r2]); printErrorMsg(msg); | |
1846 sprintf(msg, "r3 = 0x%08x\n", stack[r3]); printErrorMsg(msg); | |
1847 sprintf(msg, "r12 = 0x%08x\n", stack[r12]); printErrorMsg(msg); | |
1848 sprintf(msg, "lr = 0x%08x\n", stack[lr]); printErrorMsg(msg); | |
1849 sprintf(msg, "pc = 0x%08x\n", stack[pc]); printErrorMsg(msg); | |
1850 sprintf(msg, "psr = 0x%08x\n", stack[psr]); printErrorMsg(msg); | |
1851 } | |
1852 | |
1853 void printUsageErrorMsg(uint32_t CFSRValue) | |
1854 { | |
1855 printErrorMsg("Usage fault: "); | |
1856 CFSRValue >>= 16; // right shift to lsb | |
1857 if((CFSRValue & (1 << 9)) != 0) { | |
1858 printErrorMsg("Divide by zero\n"); | |
1859 } | |
1860 } | |
1861 | |
1862 void Hard_Fault_Handler()//uint32_t stack[]) | |
1863 { | |
1864 static char msg[80]; | |
1865 printErrorMsg("In Hard Fault Handler\n"); | |
1866 sprintf(msg, "SCB->HFSR = 0x%08x\n", SCB->HFSR); | |
1867 printErrorMsg(msg); | |
1868 if ((SCB->HFSR & (1 << 30)) != 0) { | |
1869 printErrorMsg("Forced Hard Fault\n"); | |
1870 sprintf(msg, "SCB->CFSR = 0x%08x\n", SCB->CFSR ); | |
1871 printErrorMsg(msg); | |
1872 if((SCB->CFSR & 0xFFFF0000) != 0) { | |
1873 printUsageErrorMsg(SCB->CFSR); | |
1874 } | |
1875 } | |
1876 __ASM volatile("BKPT #01"); | |
1877 while(1); | |
1878 } | |
1879 | |
1880 int my_store_of_MSP; | |
1881 | |
1882 void HardFault_Handler(void) | |
1883 { | |
1884 __asm ("MRS my_store_of_MSP, MSP"); | |
1885 Hard_Fault_Handler(); | |
1886 } | |
1887 */ | |
1888 | |
1889 /* | |
1890 __asm void HardFault_Handler(void) | |
1891 { | |
1892 TST lr, #4 // Test for MSP or PSP | |
1893 ITE EQ | |
1894 MRSEQ r0, MSP | |
1895 MRSNE r0, PSP | |
1896 B __cpp(Hard_Fault_Handler) | |
1897 } | |
1898 */ | |
1899 /* | |
1900 HardFault_Handler\ | |
1901 PROC | |
1902 EXPORT HardFault_Handler | |
1903 B . | |
1904 ENDP | |
1905 */ | |
1906 | |
1907 /* | |
1908 __asm int f(int i) | |
1909 { | |
1910 ADD i, i, #1 // error | |
1911 } | |
1912 | |
1913 EXPORT HardFault_Handler | |
1914 HardFault_Handler FUNCTION | |
1915 MRS r0, MSP | |
1916 B __cpp(Hard_Fault_Handler) | |
1917 ENDFUNC | |
1918 */ |