Mercurial > public > ostc4
annotate Discovery/Src/base.c @ 1075:ef99fff2d2de Icon_Integration tip
Unlock button lock if BT is connected:
In the previous version the button lock coluld only be disabled by following the correct button press order. In case a button does not work (e.g. low button sensitifity) the OSTC would be locked. To avoid such a scenario the button lock is now also removed if the OSTC is connected via Bluetooth
| author | ideenmodellierer |
|---|---|
| date | Sun, 22 Feb 2026 20:00:00 +0100 |
| parents | 24c1e3367a2e |
| children |
| 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" |
| 845 | 216 #include "tInfoPreDive.h" |
| 38 | 217 #include "tMenu.h" |
| 218 #include "tMenuEdit.h" | |
| 219 #include "tMenuEditGasOC.h" | |
| 220 #include "tStructure.h" | |
| 221 #include "externLogbookFlash.h" | |
| 222 #include "tComm.h" | |
| 223 #include "tCCR.h" | |
| 224 #include "data_exchange.h" | |
| 225 #include "data_exchange_main.h" | |
| 226 #include "vpm.h" | |
| 227 #include "buehlmann.h" | |
| 228 #include "logbook.h" | |
| 229 #include "check_warning.h" | |
| 230 #include "simulation.h" | |
| 231 #include "decom.h" | |
| 232 #include "timer.h" | |
| 233 #include "logbook_miniLive.h" | |
| 234 #include "test_vpm.h" | |
| 235 #include "tDebug.h" | |
|
360
fc5e9fdcb156
Added trigger of middle button action in case of a detected shake
ideenmodellierer
parents:
272
diff
changeset
|
236 #include "motion.h" |
|
586
bb5ce239741f
Motion control: Jump back to primary view if focus is lost:
Ideenmodellierer
parents:
561
diff
changeset
|
237 #include "t7.h" |
|
bb5ce239741f
Motion control: Jump back to primary view if focus is lost:
Ideenmodellierer
parents:
561
diff
changeset
|
238 #include "t3.h" |
| 651 | 239 #include "tMenuEditSetpoint.h" |
|
1033
5f66e44d69f0
Added functionality needed for subscription of standard Bluetooth pulse service notifications
Ideenmodellierer
parents:
1032
diff
changeset
|
240 #include "cv_heartbeat.h" |
|
5f66e44d69f0
Added functionality needed for subscription of standard Bluetooth pulse service notifications
Ideenmodellierer
parents:
1032
diff
changeset
|
241 #include "tInfoLogger.h" |
| 38 | 242 |
| 243 #ifdef DEMOMODE | |
| 244 #include "demo.h" | |
| 245 static void TIM_DEMO_init(void); | |
| 246 #endif | |
| 247 | |
| 1036 | 248 #ifdef ENABLE_USART_RADIO |
| 249 #include "demo.h" | |
| 250 #endif | |
|
361
b111fc4250e9
Pass action to customer vie update function.
Ideenmodellierer
parents:
360
diff
changeset
|
251 |
| 38 | 252 //#include "lodepng.h" |
| 253 //#include <stdlib.h> // for malloc and free | |
| 254 | |
| 255 /** @addtogroup OSTC 4 | |
| 256 * @{ | |
| 257 */ | |
| 258 | |
| 259 /* Private typedef -----------------------------------------------------------*/ | |
| 260 | |
| 261 //#define NO_TIMEOUT | |
| 262 //#define QUICK_SLEEP | |
| 263 | |
| 264 /* Private define ------------------------------------------------------------*/ | |
| 265 #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
|
266 #define INVALID_BUTTON ((uint8_t) 0xFF) |
| 38 | 267 /* Private macro -------------------------------------------------------------*/ |
| 268 /* Private variables ---------------------------------------------------------*/ | |
| 269 | |
|
300
5ca177d2df5d
cleanup: remove commented/unused code, make static
Jan Mulder <jlmulder@xs4all.nl>
parents:
272
diff
changeset
|
270 static RTC_HandleTypeDef RtcHandle; /* used to change time and date, no RTC is running on this MCU */ |
| 38 | 271 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
|
272 static TIM_HandleTypeDef TimBacklightHandle; |
|
225
2bb1db22b5f5
cleanup: random set of cleanups
Jan Mulder <jlmulder@xs4all.nl>
parents:
223
diff
changeset
|
273 #ifdef DEMOMODE |
| 38 | 274 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
|
275 #endif |
| 38 | 276 |
|
549
469e93f8633e
Only execute motion detection functions if features is enabled:
Ideenmodellierer
parents:
540
diff
changeset
|
277 |
|
469e93f8633e
Only execute motion detection functions if features is enabled:
Ideenmodellierer
parents:
540
diff
changeset
|
278 static uint8_t blBoost = 0; |
|
422
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
279 static uint8_t RequestModeChange = 0; |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
280 |
| 697 | 281 static uint8_t LastButtonPressed = INVALID_BUTTON; |
| 282 static uint32_t LastButtonPressedTick = 0; | |
|
300
5ca177d2df5d
cleanup: remove commented/unused code, make static
Jan Mulder <jlmulder@xs4all.nl>
parents:
272
diff
changeset
|
283 static uint32_t BaseTick100ms; /* Tick at last 100ms cycle */ |
| 38 | 284 |
| 285 /* SDRAM handler declaration */ | |
|
300
5ca177d2df5d
cleanup: remove commented/unused code, make static
Jan Mulder <jlmulder@xs4all.nl>
parents:
272
diff
changeset
|
286 static SDRAM_HandleTypeDef hsdram; |
|
5ca177d2df5d
cleanup: remove commented/unused code, make static
Jan Mulder <jlmulder@xs4all.nl>
parents:
272
diff
changeset
|
287 static FMC_SDRAM_TimingTypeDef SDRAM_Timing; |
|
5ca177d2df5d
cleanup: remove commented/unused code, make static
Jan Mulder <jlmulder@xs4all.nl>
parents:
272
diff
changeset
|
288 static FMC_SDRAM_CommandTypeDef command; |
| 38 | 289 |
| 290 /* This was used for Dual Boot */ | |
| 291 //FLASH_OBProgramInitTypeDef OBInit; | |
| 292 //FLASH_AdvOBProgramInitTypeDef AdvOBInit; | |
| 293 | |
| 294 /* Private variables with external access ------------------------------------*/ | |
| 295 | |
|
300
5ca177d2df5d
cleanup: remove commented/unused code, make static
Jan Mulder <jlmulder@xs4all.nl>
parents:
272
diff
changeset
|
296 static uint32_t globalStateID = 0; |
|
5ca177d2df5d
cleanup: remove commented/unused code, make static
Jan Mulder <jlmulder@xs4all.nl>
parents:
272
diff
changeset
|
297 static uint32_t time_without_button_pressed_deciseconds = 0; /**< langbeschreibung (eigenes Feld) warum diese variable verwendet wird um den sleepmode zu aktivieren */ |
| 38 | 298 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
|
299 static uint8_t returnFromCommCleanUpRequest = 0; ///< use this to exit bluetooth mode and call tComm_exit() |
| 38 | 300 uint32_t base_tempLightLevel = 0; |
|
300
5ca177d2df5d
cleanup: remove commented/unused code, make static
Jan Mulder <jlmulder@xs4all.nl>
parents:
272
diff
changeset
|
301 static uint8_t wasFirmwareUpdateCheckBattery = 0; |
|
740
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
302 static uint8_t DoDisplayRefresh = 0; /* trigger to refresh display data */ |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
303 static uint8_t DoHousekeeping = 0; /* trigger to cleanup the frame buffers */ |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
304 static SButtonLock ButtonLockState = LOCK_OFF; /* Used for button unlock sequence */ |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
305 |
| 896 | 306 #ifdef T7_DEBUG_RUNTIME |
| 307 static uint32_t startTimeMainLoop = 0; | |
| 308 static uint32_t startTimeDecoLoop = 0; | |
| 309 static uint32_t startTimeGfxLoop = 0; | |
| 310 static uint32_t timeMainLoop = 0; | |
| 311 static uint32_t timeDecoLoop = 0; | |
| 312 static uint32_t timeGfxLoop = 0; | |
| 313 #endif | |
|
217
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
314 |
| 38 | 315 /* Private function prototypes -----------------------------------------------*/ |
| 316 static void SystemClock_Config(void); | |
| 317 static void Error_Handler(void); | |
| 318 static void SDRAM_Initialization_Sequence(SDRAM_HandleTypeDef *hsdram, FMC_SDRAM_CommandTypeDef *Command); | |
| 319 static void SDRAM_Config(void); | |
| 320 static void EXTILine_Buttons_Config(void); | |
| 321 static void TIM_init(void); | |
| 322 static void TIM_BACKLIGHT_init(void); | |
| 323 static uint32_t TIM_BACKLIGHT_adjust(void); | |
| 324 static void gotoSleep(void); | |
| 325 static void deco_loop(void); | |
| 326 static void resetToFirmwareUpdate(void); | |
|
217
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
327 static void TriggerButtonAction(void); |
|
740
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
328 static void TriggerButtonUnlock(void); |
|
217
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
329 static void EvaluateButton(void); |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
330 static void RefreshDisplay(void); |
|
422
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
331 static void TimeoutControlRequestModechange(void); |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
332 static void TimeoutControl(void); |
| 38 | 333 |
| 334 /* ITM Trace-------- ---------------------------------------------------------*/ | |
| 335 /* | |
| 336 #define ITM_Port8(n) (*((volatile unsigned char *)(0xE0000000+4*n))) | |
| 337 #define ITM_Port16(n) (*((volatile unsigned short*)(0xE0000000+4*n))) | |
| 338 #define ITM_Port32(n) (*((volatile unsigned long *)(0xE0000000+4*n))) | |
| 339 | |
| 340 #define DEMCR (*((volatile unsigned long *)(0xE000EDFC))) | |
| 341 #define TRCENA 0x01000000 | |
| 342 | |
| 343 struct __FILE { int handle; }; | |
| 344 FILE __stdout; | |
| 345 FILE __stdin; | |
| 346 | |
| 347 int fputc(int ch, FILE *f) { | |
| 348 if (DEMCR & TRCENA) { | |
| 349 while (ITM_Port32(0) == 0); | |
| 350 ITM_Port8(0) = ch; | |
| 351 } | |
| 352 return(ch); | |
| 353 } | |
| 354 */ | |
|
360
fc5e9fdcb156
Added trigger of middle button action in case of a detected shake
ideenmodellierer
parents:
272
diff
changeset
|
355 static uint8_t ButtonAction = ACTION_END; |
|
fc5e9fdcb156
Added trigger of middle button action in case of a detected shake
ideenmodellierer
parents:
272
diff
changeset
|
356 |
|
611
916998f90e39
Suspend MotionDetection events while diver is operationg the OSTC:
Ideenmodellierer
parents:
597
diff
changeset
|
357 void StoreButtonAction(uint8_t action) |
|
360
fc5e9fdcb156
Added trigger of middle button action in case of a detected shake
ideenmodellierer
parents:
272
diff
changeset
|
358 { |
|
fc5e9fdcb156
Added trigger of middle button action in case of a detected shake
ideenmodellierer
parents:
272
diff
changeset
|
359 ButtonAction = action; |
|
fc5e9fdcb156
Added trigger of middle button action in case of a detected shake
ideenmodellierer
parents:
272
diff
changeset
|
360 } |
|
fc5e9fdcb156
Added trigger of middle button action in case of a detected shake
ideenmodellierer
parents:
272
diff
changeset
|
361 |
| 38 | 362 // =============================================================================== |
| 363 // main | |
| 364 /// @brief This function makes initializations and has the nonIRQ endless loop | |
| 365 /// for bluetooth and deco calculations | |
| 366 /// | |
| 367 // =============================================================================== | |
| 368 int main(void) | |
| 369 { | |
| 370 uint32_t pLayerInvisible; | |
| 371 uint16_t totalDiveCounterFound; | |
| 116 | 372 |
|
407
b11e50415982
Bugfix parallel call of external flash functions:
ideenmodellierer
parents:
395
diff
changeset
|
373 SStateList status; |
|
611
916998f90e39
Suspend MotionDetection events while diver is operationg the OSTC:
Ideenmodellierer
parents:
597
diff
changeset
|
374 |
| 38 | 375 set_globalState( StBoot0 ); |
|
152
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
376 LastButtonPressed = 0; |
| 38 | 377 |
| 378 HAL_Init(); | |
| 379 HAL_NVIC_SetPriorityGrouping( NVIC_PRIORITYGROUP_2 ); | |
| 380 | |
| 381 SystemClock_Config(); | |
| 382 | |
| 383 MX_GPIO_Init(); | |
| 384 // MX_SmallCPU_NO_Reset_Helper(); //161116 hw | |
| 385 MX_SPI_Init(); | |
| 386 MX_UART_Init(); | |
| 387 SDRAM_Config(); | |
| 388 HAL_Delay( 100 ); | |
| 116 | 389 |
| 390 stateRealGetPointerWrite()->lastKnownBatteryPercentage = 0; // damit das nicht in settings kopiert wird. | |
|
1028
3d9552e4997c
Code improvment: line <=> menu id function:
Ideenmodellierer
parents:
998
diff
changeset
|
391 set_settings_to_Standard(EF_SETTINGS); /* initialize setting structure with default value => will be overwritten by flash read operation */ |
| 116 | 392 mod_settings_for_first_start_with_empty_ext_flash(); |
|
1028
3d9552e4997c
Code improvment: line <=> menu id function:
Ideenmodellierer
parents:
998
diff
changeset
|
393 ext_flash_read_settings(EF_SETTINGS); |
| 116 | 394 if( newFirmwareVersionCheckViaSettings() ) // test for old firmware version in loaded settings |
| 395 { | |
| 396 wasFirmwareUpdateCheckBattery = 1; | |
|
765
da8126d5ea9f
After a firmware update, use the factory settings for button sensitivity if these exist, the default settings otherwise.
heinrichsweikamp
parents:
745
diff
changeset
|
397 set_settings_button_to_factory_with_individual_buttonBalance(); // will adapt individual values |
| 116 | 398 } |
| 998 | 399 |
|
1028
3d9552e4997c
Code improvment: line <=> menu id function:
Ideenmodellierer
parents:
998
diff
changeset
|
400 set_new_settings_missing_in_ext_flash(EF_SETTINGS); // includes update of firmware version 161121 |
| 116 | 401 |
| 38 | 402 GFX_init( &pLayerInvisible ); |
| 403 TIM_BACKLIGHT_init(); | |
| 404 | |
| 405 /* | |
| 406 if( (hardwareDataGetPointer()->primarySerial == 20+18) | |
| 407 || (hardwareDataGetPointer()->primarySerial == 20+25) | |
| 408 || (hardwareDataGetPointer()->primarySerial == 20+27)) | |
| 409 { | |
| 410 MX_Bluetooth_PowerOn(); | |
| 411 tComm_Set_Bluetooth_Name(1); | |
| 412 } | |
| 413 */ | |
|
1028
3d9552e4997c
Code improvment: line <=> menu id function:
Ideenmodellierer
parents:
998
diff
changeset
|
414 errorsInSettings = check_and_correct_settings(EF_SETTINGS); |
| 38 | 415 createDiveSettings(); |
| 416 | |
| 417 #ifdef QUICK_SLEEP | |
| 418 settingsGetPointer()->timeoutSurfacemode = 20; | |
| 419 #else | |
| 420 settingsGetPointer()->timeoutSurfacemode = 120; | |
| 421 #endif | |
| 422 | |
| 423 #ifdef DEMOMODE | |
| 424 demoConfigureSettings(); | |
| 425 TIM_DEMO_init(); | |
| 426 #endif | |
| 427 | |
| 428 // ----------------------------- | |
| 429 | |
| 430 display_power_on__1_of_2__pre_RGB(); | |
| 431 GFX_LTDC_Init(); | |
| 432 GFX_LTDC_LayerDefaultInit( TOP_LAYER, pLayerInvisible ); | |
| 433 GFX_LTDC_LayerDefaultInit( BACKGRD_LAYER, pLayerInvisible ); | |
| 434 GFX_SetFramesTopBottom( pLayerInvisible, pLayerInvisible, 480 ); | |
| 435 HAL_Delay( 20 ); | |
| 436 display_power_on__2_of_2__post_RGB(); | |
| 437 GFX_use_colorscheme( settingsGetPointer()->tX_colorscheme ); | |
| 438 | |
| 1045 | 439 |
| 440 // new 170508: bluetooth on at start | |
| 441 settingsGetPointer()->bluetoothActive = 1; | |
| 442 MX_Bluetooth_PowerOn(); | |
| 443 tComm_StartBlueModConfig(); | |
| 444 | |
| 38 | 445 tHome_init(); |
| 446 tI_init(); | |
| 447 tM_init(); | |
| 448 tMenuEdit_init(); | |
| 449 tInfoLog_init(); | |
| 450 tComm_init(); | |
| 451 DataEX_init(); | |
|
476
19cff811616d
Balance value of button responsitivness were not considered during firmware startup:
ideenmodellierer
parents:
447
diff
changeset
|
452 settingsHelperButtonSens_keepPercentageValues(settingsGetPointer()->ButtonResponsiveness[3], settingsGetPointer()->ButtonResponsiveness); |
| 38 | 453 setButtonResponsiveness( settingsGetPointer()->ButtonResponsiveness ); |
| 454 set_globalState_tHome(); | |
| 455 | |
| 456 GFX_start_VSYNC_IRQ(); | |
| 457 tCCR_init(); | |
| 458 | |
| 459 GFX_logoAutoOff(); | |
| 460 EXTILine_Buttons_Config(); | |
| 461 | |
|
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
|
462 #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
|
463 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
|
464 { |
|
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
|
465 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
|
466 } |
|
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
|
467 |
|
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
|
468 #else /* always check and repair log */ |
| 38 | 469 ext_flash_repair_dive_log(); |
| 470 //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
|
471 #endif |
| 38 | 472 totalDiveCounterFound = logbook_lastDive_diveNumber(); |
| 473 if( settingsGetPointer()->totalDiveCounter < totalDiveCounterFound ) | |
| 474 settingsGetPointer()->totalDiveCounter = totalDiveCounterFound; | |
| 475 | |
| 476 if( settingsGetPointer()->debugModeOnStart ) | |
| 477 { | |
| 478 settingsGetPointer()->debugModeOnStart = 0; | |
|
1028
3d9552e4997c
Code improvment: line <=> menu id function:
Ideenmodellierer
parents:
998
diff
changeset
|
479 ext_flash_write_settings(EF_SETTINGS,0); |
| 38 | 480 setDebugMode(); |
| 481 openInfo( StIDEBUG ); | |
| 482 } | |
|
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
|
483 InitMotionDetection(); |
| 38 | 484 |
|
263
a6c0375bc950
Forward 100ms time stamp to RTE and handle logbook in main loop
ideenmodellierer
parents:
250
diff
changeset
|
485 TIM_init(); /* start cylic 100ms task */ |
|
a6c0375bc950
Forward 100ms time stamp to RTE and handle logbook in main loop
ideenmodellierer
parents:
250
diff
changeset
|
486 |
|
740
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
487 if( settingsGetPointer()->buttonLockActive ) |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
488 { |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
489 ButtonLockState = LOCK_FIRST_PRESS; |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
490 } |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
491 |
| 38 | 492 /* @brief main LOOP |
| 493 * | |
| 494 * this is executed while no IRQ interrupts it | |
| 495 * - deco calculation | |
| 496 * - bluetooth | |
| 497 * and resetToFirmwareUpdate() | |
| 498 * because tComm_control() does not exit before disconnection | |
| 499 */ | |
| 500 while( 1 ) | |
| 501 { | |
| 896 | 502 #ifdef T7_DEBUG_RUNTIME |
| 503 startTimeMainLoop = HAL_GetTick(); | |
| 504 #endif | |
| 38 | 505 if( bootToBootloader ) |
| 506 resetToFirmwareUpdate(); | |
| 507 | |
| 508 tCCR_control(); | |
| 1032 | 509 |
| 38 | 510 if( tComm_control() )// will stop while loop if tComm Mode started until exit from UART |
| 511 { | |
| 512 createDiveSettings(); | |
| 513 updateMenu(); | |
|
1028
3d9552e4997c
Code improvment: line <=> menu id function:
Ideenmodellierer
parents:
998
diff
changeset
|
514 ext_flash_write_settings(EF_SETTINGS,0); |
|
1042
7efc8baa3ffa
Reset timeout after Bluetooth disconnect:
Ideenmodellierer
parents:
1037
diff
changeset
|
515 time_without_button_pressed_deciseconds = 0; /* reset timeout to avoid shutdown after long time in Comm state */ |
| 38 | 516 } |
|
407
b11e50415982
Bugfix parallel call of external flash functions:
ideenmodellierer
parents:
395
diff
changeset
|
517 |
|
b11e50415982
Bugfix parallel call of external flash functions:
ideenmodellierer
parents:
395
diff
changeset
|
518 /* check if tasks depending on global state are pending */ |
|
b11e50415982
Bugfix parallel call of external flash functions:
ideenmodellierer
parents:
395
diff
changeset
|
519 get_globalStateList(&status); |
|
b11e50415982
Bugfix parallel call of external flash functions:
ideenmodellierer
parents:
395
diff
changeset
|
520 if(status.base == BaseHome) |
|
b11e50415982
Bugfix parallel call of external flash functions:
ideenmodellierer
parents:
395
diff
changeset
|
521 { |
| 427 | 522 tMenuEdit_writeSettingsToFlash(); |
|
407
b11e50415982
Bugfix parallel call of external flash functions:
ideenmodellierer
parents:
395
diff
changeset
|
523 } |
|
b11e50415982
Bugfix parallel call of external flash functions:
ideenmodellierer
parents:
395
diff
changeset
|
524 |
|
b11e50415982
Bugfix parallel call of external flash functions:
ideenmodellierer
parents:
395
diff
changeset
|
525 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
|
526 |
| 38 | 527 deco_loop(); |
|
740
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
528 if((ButtonLockState) && (stateUsed->mode == MODE_SURFACE)) |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
529 { |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
530 TriggerButtonUnlock(); |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
531 } |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
532 else |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
533 { |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
534 TriggerButtonAction(); |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
535 } |
| 1034 | 536 #ifdef ENABLE_PULSE_SENSOR_BT |
|
1033
5f66e44d69f0
Added functionality needed for subscription of standard Bluetooth pulse service notifications
Ideenmodellierer
parents:
1032
diff
changeset
|
537 cv_heartbeat_HandleData(); |
| 1034 | 538 #endif |
| 1036 | 539 |
| 540 #ifdef ENABLE_USART_RADIO | |
| 541 demo_HandleData(); | |
| 542 #endif | |
| 623 | 543 if(DoHousekeeping) |
| 544 { | |
| 545 DoHousekeeping = housekeepingFrame(); | |
| 546 } | |
|
395
eb7696e0510f
Added start of module configuration after eache modul power on
ideenmodellierer
parents:
384
diff
changeset
|
547 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
|
548 { |
| 1034 | 549 #ifdef ENABLE_PULSE_SENSOR_BT |
| 1032 | 550 cv_heartbeat_Control(); |
| 1034 | 551 #endif |
|
217
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
552 DoDisplayRefresh = 0; |
|
615
556df4a8f418
Moved non critical functions from timer interrupt to main loop:
Ideenmodellierer
parents:
611
diff
changeset
|
553 |
| 662 | 554 updateSetpointStateUsed(); |
|
615
556df4a8f418
Moved non critical functions from timer interrupt to main loop:
Ideenmodellierer
parents:
611
diff
changeset
|
555 if(stateUsed == stateSimGetPointer()) |
|
556df4a8f418
Moved non critical functions from timer interrupt to main loop:
Ideenmodellierer
parents:
611
diff
changeset
|
556 { |
|
556df4a8f418
Moved non critical functions from timer interrupt to main loop:
Ideenmodellierer
parents:
611
diff
changeset
|
557 simulation_UpdateLifeData(1); |
|
1057
24c1e3367a2e
Reset power down timeout after leaving simulator:
Ideenmodellierer
parents:
1045
diff
changeset
|
558 if(stateUsed != stateSimGetPointer()) /* simulation end? => reset timeout */ |
|
24c1e3367a2e
Reset power down timeout after leaving simulator:
Ideenmodellierer
parents:
1045
diff
changeset
|
559 { |
|
24c1e3367a2e
Reset power down timeout after leaving simulator:
Ideenmodellierer
parents:
1045
diff
changeset
|
560 time_without_button_pressed_deciseconds = 0; |
|
24c1e3367a2e
Reset power down timeout after leaving simulator:
Ideenmodellierer
parents:
1045
diff
changeset
|
561 } |
|
615
556df4a8f418
Moved non critical functions from timer interrupt to main loop:
Ideenmodellierer
parents:
611
diff
changeset
|
562 } |
|
556df4a8f418
Moved non critical functions from timer interrupt to main loop:
Ideenmodellierer
parents:
611
diff
changeset
|
563 check_warning(); |
|
556df4a8f418
Moved non critical functions from timer interrupt to main loop:
Ideenmodellierer
parents:
611
diff
changeset
|
564 updateMiniLiveLogbook(1); |
| 896 | 565 #ifdef T7_DEBUG_RUNTIME |
| 566 startTimeGfxLoop = HAL_GetTick(); | |
| 567 #endif | |
|
217
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
568 RefreshDisplay(); |
| 896 | 569 #ifdef T7_DEBUG_RUNTIME |
| 570 timeGfxLoop = time_elapsed_ms(startTimeGfxLoop, HAL_GetTick()); | |
| 571 #endif | |
| 623 | 572 TimeoutControl(); /* exit menus if needed */ |
|
422
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
573 |
|
549
469e93f8633e
Only execute motion detection functions if features is enabled:
Ideenmodellierer
parents:
540
diff
changeset
|
574 #ifdef ENABLE_MOTION_CONTROL |
|
469e93f8633e
Only execute motion detection functions if features is enabled:
Ideenmodellierer
parents:
540
diff
changeset
|
575 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
|
576 { |
|
611
916998f90e39
Suspend MotionDetection events while diver is operationg the OSTC:
Ideenmodellierer
parents:
597
diff
changeset
|
577 if(get_globalState() != StD) |
|
549
469e93f8633e
Only execute motion detection functions if features is enabled:
Ideenmodellierer
parents:
540
diff
changeset
|
578 { |
|
642
c737cf5d9067
Do not show focus indicator in case motion detection is suspended:
Ideenmodellierer
parents:
625
diff
changeset
|
579 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
|
580 } |
|
916998f90e39
Suspend MotionDetection events while diver is operationg the OSTC:
Ideenmodellierer
parents:
597
diff
changeset
|
581 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
|
582 } |
|
549
469e93f8633e
Only execute motion detection functions if features is enabled:
Ideenmodellierer
parents:
540
diff
changeset
|
583 #endif |
| 835 | 584 /* Autofocus for T3 view */ |
| 585 if((settingsGetPointer()->cvAutofocus) && (settingsGetPointer()->design == 3) && (get_globalState() == StD) && (stateUsed->mode == MODE_DIVE)) | |
| 586 { | |
| 587 t3_handleAutofocus(); | |
| 588 } | |
|
272
74a8296a2318
cleanup: simplify stateUsed usage
Jan Mulder <jlmulder@xs4all.nl>
parents:
270
diff
changeset
|
589 #ifdef SIM_WRITES_LOGBOOK |
|
1057
24c1e3367a2e
Reset power down timeout after leaving simulator:
Ideenmodellierer
parents:
1045
diff
changeset
|
590 if(stateUsed == stateSimGetPointer()) |
|
24c1e3367a2e
Reset power down timeout after leaving simulator:
Ideenmodellierer
parents:
1045
diff
changeset
|
591 logbook_InitAndWrite((SDiveState*)stateUsed); |
|
24c1e3367a2e
Reset power down timeout after leaving simulator:
Ideenmodellierer
parents:
1045
diff
changeset
|
592 #else |
|
263
a6c0375bc950
Forward 100ms time stamp to RTE and handle logbook in main loop
ideenmodellierer
parents:
250
diff
changeset
|
593 if(stateUsed == stateRealGetPointer()) /* Handle log entries while in dive mode*/ |
| 941 | 594 logbook_InitAndWrite((SDiveState*)stateUsed); |
|
1057
24c1e3367a2e
Reset power down timeout after leaving simulator:
Ideenmodellierer
parents:
1045
diff
changeset
|
595 #endif |
|
217
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
596 } |
| 896 | 597 #ifdef T7_DEBUG_RUNTIME |
| 598 timeMainLoop = time_elapsed_ms(startTimeMainLoop, HAL_GetTick()); | |
| 599 #endif | |
| 38 | 600 } |
| 601 } | |
| 602 | |
|
360
fc5e9fdcb156
Added trigger of middle button action in case of a detected shake
ideenmodellierer
parents:
272
diff
changeset
|
603 |
|
fc5e9fdcb156
Added trigger of middle button action in case of a detected shake
ideenmodellierer
parents:
272
diff
changeset
|
604 |
|
fc5e9fdcb156
Added trigger of middle button action in case of a detected shake
ideenmodellierer
parents:
272
diff
changeset
|
605 |
| 38 | 606 // =============================================================================== |
| 607 // timer IRQ | |
| 608 /// @brief this is called periodically | |
| 609 /// | |
| 610 /// - refresh screen (the actual change is done in the VSYNC IRQ) | |
| 611 /// - start data transfer with RTE / small CPU (DateEX....) | |
| 612 /// - update logbook | |
| 613 /// - timeouts | |
| 614 /// .... | |
| 615 /// | |
| 616 /// all this in three steps / switch() routines in a given order | |
| 617 /// as the previous switch() might influence the next functions | |
| 618 /// to be called | |
| 619 /// | |
| 620 // =============================================================================== | |
| 348 | 621 |
| 622 //#define NO_TIMEOUT | |
| 38 | 623 void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim) |
| 624 { | |
| 625 #ifdef DEMOMODE | |
| 626 if(htim->Instance==TIM7) | |
| 627 { | |
| 628 HAL_GPIO_EXTI_Callback(demoGetCommand()); | |
| 629 return; | |
| 630 } | |
| 631 #endif | |
| 632 SStateList status; | |
|
422
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
633 _Bool modeChange = 0; |
|
263
a6c0375bc950
Forward 100ms time stamp to RTE and handle logbook in main loop
ideenmodellierer
parents:
250
diff
changeset
|
634 |
|
a6c0375bc950
Forward 100ms time stamp to RTE and handle logbook in main loop
ideenmodellierer
parents:
250
diff
changeset
|
635 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
|
636 |
| 38 | 637 if(returnFromCommCleanUpRequest) |
| 638 { | |
| 639 tComm_exit(); | |
| 640 returnFromCommCleanUpRequest = 0; | |
| 641 } | |
| 642 | |
| 643 get_globalStateList(&status); | |
| 644 | |
| 645 switch(status.base) | |
| 646 { | |
| 647 case BaseHome: | |
| 648 case BaseMenu: | |
| 649 case BaseInfo: | |
| 650 DateEx_copy_to_dataOut(); | |
| 651 DataEX_copy_to_LifeData(&modeChange); | |
| 652 //foto session :-) stateRealGetPointerWrite()->lifeData.battery_charge = 99; | |
| 653 //foto session :-) stateSimGetPointerWrite()->lifeData.battery_charge = 99; | |
| 654 DataEX_copy_to_deco(); | |
|
132
135eae957389
Add compile switch to disable optimization for specific function
Ideenmodellierer
parents:
116
diff
changeset
|
655 DataEX_call(); |
|
135eae957389
Add compile switch to disable optimization for specific function
Ideenmodellierer
parents:
116
diff
changeset
|
656 |
| 38 | 657 timer_UpdateSecond(1); |
|
132
135eae957389
Add compile switch to disable optimization for specific function
Ideenmodellierer
parents:
116
diff
changeset
|
658 base_tempLightLevel = TIM_BACKLIGHT_adjust(); |
| 38 | 659 tCCR_tick(); |
| 660 tHome_tick(); | |
| 661 break; | |
| 662 case BaseStop: | |
| 663 DateEx_copy_to_dataOut(); | |
| 664 DataEX_call(); | |
| 665 DataEX_control_connection_while_asking_for_sleep(); | |
| 666 break; | |
| 667 default: | |
| 668 case BaseComm: | |
| 669 if(get_globalState() == StUART_RTECONNECT) | |
| 670 { | |
| 671 DateEx_copy_to_dataOut(); | |
| 672 DataEX_call(); | |
| 673 DataEX_copy_to_LifeData(0); | |
| 674 } | |
| 675 break; | |
| 676 } | |
| 677 | |
|
422
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
678 get_globalStateList(&status); |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
679 if(modeChange) |
| 38 | 680 { |
|
422
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
681 TimeoutControlRequestModechange(); |
| 38 | 682 } |
|
217
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
683 if(status.base == BaseComm) /* main loop not serviced in com mode */ |
| 38 | 684 { |
|
217
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
685 tComm_refresh(); |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
686 } |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
687 else |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
688 { |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
689 DoDisplayRefresh = 1; |
| 38 | 690 } |
| 691 } | |
| 692 | |
| 693 | |
| 694 /* button and VSYNC IRQ | |
| 695 * | |
| 696 * VSYNC will switch foreground and background picture | |
| 697 * if demanded. see GFX_change_LTDC() | |
| 698 * | |
| 699 */ | |
| 700 // =============================================================================== | |
| 701 // HAL_GPIO_EXTI_Callback | |
| 702 /// @brief button and VSYNC IRQ | |
| 703 /// | |
| 704 /// VSYNC will switch foreground and background picture if demanded - | |
| 705 /// see GFX_change_LTDC() | |
| 706 /// | |
| 707 // =============================================================================== | |
|
95
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
708 void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin) { |
|
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
709 if (!GPIO_Pin) |
|
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
710 return; |
| 38 | 711 |
|
95
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
712 if (GPIO_Pin == VSYNC_IRQ_PIN) // rechts, unten |
|
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
713 { |
|
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
714 GFX_change_LTDC(); |
| 623 | 715 DoHousekeeping = 1; |
|
95
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
716 /* |
|
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
717 #ifdef DEMOMODE |
|
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
718 static uint8_t countCall = 0; |
|
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
719 if(countCall++ < 10) |
|
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
720 return; |
|
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
721 countCall = 0; |
|
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
722 uint8_t buttonAction = demoGetCommand(); |
|
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
723 if(buttonAction) |
|
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
724 GPIO_Pin = buttonAction; |
|
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
725 else |
|
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
726 #endif |
|
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
727 */ |
| 697 | 728 |
|
95
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
729 } |
| 697 | 730 if((GPIO_Pin == BUTTON_ENTER_PIN) || (GPIO_Pin == BUTTON_NEXT_PIN) || (GPIO_Pin == BUTTON_BACK_PIN)) |
| 731 { | |
| 732 LastButtonPressed = GPIO_Pin; | |
| 733 LastButtonPressedTick = HAL_GetTick(); | |
| 734 } | |
| 735 | |
| 736 EvaluateButton(); | |
| 38 | 737 |
| 738 #ifdef DEMOMODE | |
|
95
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
739 uint8_t demoMachineCall = 0; |
|
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
740 if(GPIO_Pin & 0x80) |
|
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
741 { |
|
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
742 demoMachineCall = 1; |
|
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
743 GPIO_Pin &= 0x7F; |
|
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
744 } |
| 38 | 745 #endif |
|
152
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
746 } |
| 38 | 747 |
|
217
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
748 static void RefreshDisplay() |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
749 { |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
750 SStateList status; |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
751 get_globalStateList(&status); |
| 1032 | 752 |
| 1035 | 753 #ifdef ENABLE_LOGGER_WINDOW |
| 754 if((status.base != 0) && (get_globalState() != StILOGGER) && (InfoLogger_isUpdated())) | |
| 1032 | 755 { |
| 756 openInfo_Logger(); | |
| 757 get_globalStateList(&status); | |
| 758 } | |
| 1035 | 759 #endif |
| 1032 | 760 |
|
217
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
761 switch(status.base) |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
762 { |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
763 case BaseHome: |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
764 tHome_refresh(); |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
765 tM_check_content(); |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
766 break; |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
767 case BaseMenu: |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
768 tM_refresh_live_content(); |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
769 tMenuEdit_refresh_live_content(); |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
770 break; |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
771 case BaseInfo: |
|
718
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
697
diff
changeset
|
772 tInfo_refresh(); |
|
217
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
773 break; |
|
718
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
697
diff
changeset
|
774 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
|
775 break; |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
776 default: |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
777 if(get_globalState() == StStop) |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
778 tHome_sleepmode_fun(); |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
779 break; |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
780 } |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
781 } |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
782 |
|
740
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
783 static void TriggerButtonUnlock() |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
784 { |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
785 static uint32_t lastInput = 0; |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
786 uint8_t action = ButtonAction; |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
787 |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
788 if(action != ACTION_END) |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
789 { |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
790 if(((time_elapsed_ms(lastInput, HAL_GetTick()) < 2000)) || (ButtonLockState == LOCK_FIRST_PRESS)) |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
791 { |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
792 switch(ButtonLockState) |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
793 { |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
794 case LOCK_FIRST_PRESS: |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
795 case LOCK_1: if(action == ACTION_BUTTON_ENTER) |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
796 { |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
797 ButtonLockState = LOCK_2; |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
798 } |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
799 else |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
800 { |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
801 ButtonLockState = LOCK_1; |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
802 } |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
803 break; |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
804 case LOCK_2: if(action == ACTION_BUTTON_NEXT) |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
805 { |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
806 ButtonLockState = LOCK_3; |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
807 } |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
808 else |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
809 { |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
810 ButtonLockState = LOCK_1; |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
811 } |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
812 break; |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
813 case LOCK_3: if(action == ACTION_BUTTON_BACK) |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
814 { |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
815 ButtonLockState = LOCK_OFF; |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
816 } |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
817 else |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
818 { |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
819 ButtonLockState = LOCK_1; |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
820 } |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
821 break; |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
822 |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
823 default: ButtonLockState = LOCK_OFF; |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
824 break; |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
825 } |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
826 } |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
827 else |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
828 { |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
829 ButtonLockState = LOCK_1; |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
830 } |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
831 lastInput = LastButtonPressedTick; |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
832 ButtonAction = ACTION_END; |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
833 } |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
834 } |
|
217
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 static void TriggerButtonAction() |
|
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 uint8_t action = ButtonAction; |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
839 SStateList status; |
|
611
916998f90e39
Suspend MotionDetection events while diver is operationg the OSTC:
Ideenmodellierer
parents:
597
diff
changeset
|
840 SSettings* pSettings; |
|
916998f90e39
Suspend MotionDetection events while diver is operationg the OSTC:
Ideenmodellierer
parents:
597
diff
changeset
|
841 pSettings = settingsGetPointer(); |
|
916998f90e39
Suspend MotionDetection events while diver is operationg the OSTC:
Ideenmodellierer
parents:
597
diff
changeset
|
842 |
|
217
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
843 |
| 697 | 844 if(action != ACTION_END) |
|
217
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
845 { |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
846 get_globalStateList(&status); |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
847 |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
848 if (action == ACTION_BUTTON_CUSTOM) { |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
849 GFX_screenshot(); |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
850 } |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
851 |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
852 switch (status.base) { |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
853 case BaseStop: |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
854 if (action == ACTION_BUTTON_BACK) |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
855 resetToFirmwareUpdate(); |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
856 break; |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
857 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
|
858 break; |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
859 case BaseHome: |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
860 if (action == ACTION_BUTTON_NEXT) { |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
861 if (status.page == PageSurface) |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
862 openMenu(1); |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
863 else |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
864 tHomeDiveMenuControl(action); |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
865 } 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
|
866 if (get_globalState() == StS) |
| 540 | 867 { |
|
217
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
868 openInfo(StILOGLIST); |
| 540 | 869 } |
|
611
916998f90e39
Suspend MotionDetection events while diver is operationg the OSTC:
Ideenmodellierer
parents:
597
diff
changeset
|
870 else if ((status.page == PageDive) && (pSettings->design < 7)) |
| 540 | 871 { |
|
611
916998f90e39
Suspend MotionDetection events while diver is operationg the OSTC:
Ideenmodellierer
parents:
597
diff
changeset
|
872 if(pSettings->design == 3) |
| 540 | 873 { |
| 874 if(get_globalState() != StD) /* located in submenu? => return */ | |
| 875 { | |
| 876 set_globalState(StD); | |
| 877 } | |
| 878 else /* return to t7 view */ | |
| 879 { | |
|
611
916998f90e39
Suspend MotionDetection events while diver is operationg the OSTC:
Ideenmodellierer
parents:
597
diff
changeset
|
880 pSettings->design = 7; |
|
916998f90e39
Suspend MotionDetection events while diver is operationg the OSTC:
Ideenmodellierer
parents:
597
diff
changeset
|
881 if(pSettings->MotionDetection == MOTION_DETECT_SECTOR) |
|
586
bb5ce239741f
Motion control: Jump back to primary view if focus is lost:
Ideenmodellierer
parents:
561
diff
changeset
|
882 { |
|
625
028d8f3a9410
Switch Sector / Scroll detection to vector implementation:
Ideenmodellierer
parents:
623
diff
changeset
|
883 DefineSectorCount(CUSTOMER_DEFINED_VIEWS); |
|
597
132e7e3d13a7
MotionControl-Sector: Map sectors during switch T7 <=> T3:
Ideenmodellierer
parents:
586
diff
changeset
|
884 MapCVToSector(); |
|
586
bb5ce239741f
Motion control: Jump back to primary view if focus is lost:
Ideenmodellierer
parents:
561
diff
changeset
|
885 } |
| 540 | 886 } |
| 887 } | |
| 888 else | |
| 889 { | |
|
611
916998f90e39
Suspend MotionDetection events while diver is operationg the OSTC:
Ideenmodellierer
parents:
597
diff
changeset
|
890 pSettings->design = 7; // auto switch to 9 if necessary |
| 540 | 891 } |
| 892 } else if ((status.page == PageDive) && (status.line != 0)) | |
| 893 { | |
| 662 | 894 if(get_globalState() == StDMENU) |
|
384
427ae9f8e28e
Consider number of available t3 views in sector handling:
ideenmodellierer
parents:
382
diff
changeset
|
895 { |
|
740
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
896 if ((pSettings->extraDisplay == EXTRADISPLAY_BIGFONT) || (pSettings->extraDisplay == EXTRADISPLAY_BFACTIVE)) |
|
384
427ae9f8e28e
Consider number of available t3 views in sector handling:
ideenmodellierer
parents:
382
diff
changeset
|
897 { |
| 662 | 898 pSettings->design = 3; |
| 899 if(pSettings->MotionDetection == MOTION_DETECT_SECTOR) | |
| 900 { | |
| 901 DefineSectorCount(CUSTOMER_DEFINED_VIEWS); | |
| 902 MapCVToSector(); | |
| 903 } | |
|
384
427ae9f8e28e
Consider number of available t3 views in sector handling:
ideenmodellierer
parents:
382
diff
changeset
|
904 } |
|
740
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
905 #ifdef HAVEDECOGAME |
| 662 | 906 else if (pSettings->extraDisplay == EXTRADISPLAY_DECOGAME) |
| 907 pSettings->design = 4; | |
|
740
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
908 #endif |
|
384
427ae9f8e28e
Consider number of available t3 views in sector handling:
ideenmodellierer
parents:
382
diff
changeset
|
909 } |
|
217
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
910 set_globalState(StD); |
| 540 | 911 } |
| 912 else | |
| 913 { | |
|
217
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
914 tHome_change_field_button_pressed(); |
| 540 | 915 } |
|
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
|
916 } 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
|
917 { |
|
b111fc4250e9
Pass action to customer vie update function.
Ideenmodellierer
parents:
360
diff
changeset
|
918 |
|
b111fc4250e9
Pass action to customer vie update function.
Ideenmodellierer
parents:
360
diff
changeset
|
919 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
|
920 { |
|
642
c737cf5d9067
Do not show focus indicator in case motion detection is suspended:
Ideenmodellierer
parents:
625
diff
changeset
|
921 if(action == ACTION_BUTTON_ENTER) |
|
611
916998f90e39
Suspend MotionDetection events while diver is operationg the OSTC:
Ideenmodellierer
parents:
597
diff
changeset
|
922 { |
|
916998f90e39
Suspend MotionDetection events while diver is operationg the OSTC:
Ideenmodellierer
parents:
597
diff
changeset
|
923 suspendMotionDetection(10); |
|
916998f90e39
Suspend MotionDetection events while diver is operationg the OSTC:
Ideenmodellierer
parents:
597
diff
changeset
|
924 } |
|
361
b111fc4250e9
Pass action to customer vie update function.
Ideenmodellierer
parents:
360
diff
changeset
|
925 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
|
926 } |
|
361
b111fc4250e9
Pass action to customer vie update function.
Ideenmodellierer
parents:
360
diff
changeset
|
927 else if (status.page == PageSurface) |
|
b111fc4250e9
Pass action to customer vie update function.
Ideenmodellierer
parents:
360
diff
changeset
|
928 tHome_change_customview_button_pressed(action); |
|
b111fc4250e9
Pass action to customer vie update function.
Ideenmodellierer
parents:
360
diff
changeset
|
929 else |
|
642
c737cf5d9067
Do not show focus indicator in case motion detection is suspended:
Ideenmodellierer
parents:
625
diff
changeset
|
930 { |
|
361
b111fc4250e9
Pass action to customer vie update function.
Ideenmodellierer
parents:
360
diff
changeset
|
931 tHomeDiveMenuControl(action); |
|
642
c737cf5d9067
Do not show focus indicator in case motion detection is suspended:
Ideenmodellierer
parents:
625
diff
changeset
|
932 } |
|
361
b111fc4250e9
Pass action to customer vie update function.
Ideenmodellierer
parents:
360
diff
changeset
|
933 } |
|
217
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
934 break; |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
935 |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
936 case BaseMenu: |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
937 if (status.line == 0) |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
938 sendActionToMenu(action); |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
939 else |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
940 sendActionToMenuEdit(action); |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
941 break; |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
942 |
|
718
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
697
diff
changeset
|
943 case BaseInfo: switch(status.page) |
|
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
697
diff
changeset
|
944 { |
|
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
697
diff
changeset
|
945 case InfoPageLogList: sendActionToInfoLogList(action); |
|
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
697
diff
changeset
|
946 break; |
|
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
697
diff
changeset
|
947 case InfoPageLogShow: sendActionToInfoLogShow(action); |
|
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
697
diff
changeset
|
948 break; |
|
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
697
diff
changeset
|
949 case InfoPageSensor: sendActionToInfoSensor(action); |
|
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
697
diff
changeset
|
950 break; |
| 845 | 951 case InfoPagePreDive: sendActionToInfoPreDive(action); |
| 952 break; | |
| 1035 | 953 case InfoPageLogger: exitInfo(); |
| 954 break; | |
|
718
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
697
diff
changeset
|
955 default: sendActionToInfo(action); |
|
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
697
diff
changeset
|
956 break; |
|
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
697
diff
changeset
|
957 } |
|
217
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
958 break; |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
959 |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
960 default: |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
961 break; |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
962 } |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
963 ButtonAction = ACTION_END; |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
964 } |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
965 } |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
966 |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
967 |
|
300
5ca177d2df5d
cleanup: remove commented/unused code, make static
Jan Mulder <jlmulder@xs4all.nl>
parents:
272
diff
changeset
|
968 static void EvaluateButton() |
|
152
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
969 { |
|
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
970 uint8_t action = 0; |
|
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
971 SStateList status; |
|
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
972 SSettings* pSettings; |
|
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
973 pSettings = settingsGetPointer(); |
|
95
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
974 |
|
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
975 if (GFX_logoStatus() != 0) |
|
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
976 return; |
| 38 | 977 |
| 697 | 978 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
|
979 { |
|
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
980 if (LastButtonPressed == BUTTON_BACK_PIN) { // links |
|
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
981 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
|
982 action = ACTION_BUTTON_BACK; |
|
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
983 } |
|
95
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
984 } |
|
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
985 |
|
152
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
986 else if (LastButtonPressed == BUTTON_ENTER_PIN) { // mitte |
|
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
987 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
|
988 action = ACTION_BUTTON_ENTER; |
|
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
989 } |
|
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
990 } |
|
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
991 |
|
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
992 else if (LastButtonPressed == BUTTON_NEXT_PIN) { // rechts |
|
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
993 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
|
994 action = ACTION_BUTTON_NEXT; |
| 108 | 995 } |
| 996 } | |
| 38 | 997 |
|
152
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
998 if(action != 0) |
|
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
999 { |
|
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
1000 time_without_button_pressed_deciseconds = 0; |
|
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
1001 if(pSettings->FlipDisplay) /* switch action resulting from pressed button */ |
|
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
1002 { |
|
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
1003 if (action == ACTION_BUTTON_BACK) |
|
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
1004 { |
|
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
1005 action = ACTION_BUTTON_NEXT; |
|
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
1006 } |
| 158 | 1007 else |
|
152
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
1008 { |
| 158 | 1009 if (action == ACTION_BUTTON_NEXT) |
| 1010 { | |
| 1011 action = ACTION_BUTTON_BACK; | |
| 1012 } | |
|
152
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
1013 } |
|
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
1014 } |
|
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
1015 } |
|
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
1016 |
|
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
1017 #ifdef BUTTON_CUSTOM_PIN |
|
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
1018 else |
|
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
1019 if(LastButtonPressed == BUTTON_CUSTOM_PIN) // extra |
|
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
1020 action = ACTION_BUTTON_CUSTOM; |
| 38 | 1021 #endif |
| 1022 | |
|
152
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
1023 #ifdef DEMOMODE // user pressed button ? |
|
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
1024 if((!demoMachineCall) && demoModeActive()) |
|
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
1025 { |
|
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
1026 demoSendCommand(action); |
|
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
1027 return; |
|
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
1028 } |
|
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
1029 #endif |
| 38 | 1030 |
|
152
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
1031 get_globalStateList(&status); |
|
217
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
1032 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
|
1033 { |
|
395
eb7696e0510f
Added start of module configuration after eache modul power on
ideenmodellierer
parents:
384
diff
changeset
|
1034 switch(action) |
|
eb7696e0510f
Added start of module configuration after eache modul power on
ideenmodellierer
parents:
384
diff
changeset
|
1035 { |
|
eb7696e0510f
Added start of module configuration after eache modul power on
ideenmodellierer
parents:
384
diff
changeset
|
1036 case ACTION_BUTTON_BACK: tComm_exit(); |
|
eb7696e0510f
Added start of module configuration after eache modul power on
ideenmodellierer
parents:
384
diff
changeset
|
1037 break; |
|
eb7696e0510f
Added start of module configuration after eache modul power on
ideenmodellierer
parents:
384
diff
changeset
|
1038 case ACTION_BUTTON_NEXT: tComm_RequestBluetoothStrength(); |
|
eb7696e0510f
Added start of module configuration after eache modul power on
ideenmodellierer
parents:
384
diff
changeset
|
1039 break; |
|
eb7696e0510f
Added start of module configuration after eache modul power on
ideenmodellierer
parents:
384
diff
changeset
|
1040 default: |
|
eb7696e0510f
Added start of module configuration after eache modul power on
ideenmodellierer
parents:
384
diff
changeset
|
1041 break; |
|
152
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
1042 } |
|
217
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
1043 } |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
1044 else |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
1045 { |
|
ce05c801b002
Moved display refresh and button action function from tim callback to main loop
ideenmodellierer
parents:
206
diff
changeset
|
1046 StoreButtonAction(action); /* Handle action in main loop */ |
|
152
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
1047 } |
|
bc7795161549
Moved button evaluation out of interrupt handler
Ideenmodellierer
parents:
149
diff
changeset
|
1048 LastButtonPressed = INVALID_BUTTON; |
|
95
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
1049 } |
| 38 | 1050 } |
| 1051 | |
|
300
5ca177d2df5d
cleanup: remove commented/unused code, make static
Jan Mulder <jlmulder@xs4all.nl>
parents:
272
diff
changeset
|
1052 static void gotoSleep(void) |
| 38 | 1053 { |
| 1054 /* not at the moment of testing */ | |
| 1055 // ext_flash_erase_firmware_if_not_empty(); | |
|
878
6b06143cbfea
brightness settings and proper power down for new screen
heinrichsweikamp
parents:
845
diff
changeset
|
1056 GFX_logoAutoOff(); |
|
6b06143cbfea
brightness settings and proper power down for new screen
heinrichsweikamp
parents:
845
diff
changeset
|
1057 display_power_off(); |
|
422
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1058 ext_flash_write_devicedata(true); /* write data at default position */ |
|
1028
3d9552e4997c
Code improvment: line <=> menu id function:
Ideenmodellierer
parents:
998
diff
changeset
|
1059 ext_flash_write_settings(EF_SETTINGS,true); /* write data at default position */ |
| 38 | 1060 set_globalState(StStop); |
| 1061 } | |
| 1062 | |
| 1063 | |
| 1064 // ----------------------------- | |
| 1065 | |
| 1066 uint32_t get_globalState(void) | |
| 1067 { | |
| 1068 return globalStateID; | |
| 1069 } | |
| 1070 | |
| 1071 | |
| 1072 void get_globalStateList(SStateList *output) | |
| 1073 { | |
| 1074 output->base = (uint8_t)((globalStateID >> 28) & 0x0F); | |
| 1075 output->page = (uint8_t)((globalStateID >> 24) & 0x0F); | |
| 1076 output->line = (uint8_t)((globalStateID >> 16) & 0xFF); | |
| 1077 output->field = (uint8_t)((globalStateID >> 8) & 0xFF); | |
| 1078 output->mode = (uint8_t)((globalStateID ) & 0xFF); | |
| 1079 } | |
| 1080 | |
| 1081 | |
| 1082 void get_idSpecificStateList(uint32_t id, SStateList *output) | |
| 1083 { | |
| 1084 output->base = (uint8_t)((id >> 28) & 0x0F); | |
| 1085 output->page = (uint8_t)((id >> 24) & 0x0F); | |
| 1086 output->line = (uint8_t)((id >> 16) & 0xFF); | |
| 1087 output->field = (uint8_t)((id >> 8) & 0xFF); | |
| 1088 output->mode = (uint8_t)((id ) & 0xFF); | |
| 1089 } | |
| 1090 | |
|
1028
3d9552e4997c
Code improvment: line <=> menu id function:
Ideenmodellierer
parents:
998
diff
changeset
|
1091 uint8_t get_lineOfID(uint32_t id) |
|
3d9552e4997c
Code improvment: line <=> menu id function:
Ideenmodellierer
parents:
998
diff
changeset
|
1092 { |
|
3d9552e4997c
Code improvment: line <=> menu id function:
Ideenmodellierer
parents:
998
diff
changeset
|
1093 uint8_t ret = (uint8_t)((id >> 16) & 0xFF); |
|
3d9552e4997c
Code improvment: line <=> menu id function:
Ideenmodellierer
parents:
998
diff
changeset
|
1094 if(ret > 6) |
|
3d9552e4997c
Code improvment: line <=> menu id function:
Ideenmodellierer
parents:
998
diff
changeset
|
1095 { |
|
3d9552e4997c
Code improvment: line <=> menu id function:
Ideenmodellierer
parents:
998
diff
changeset
|
1096 ret = 0; |
|
3d9552e4997c
Code improvment: line <=> menu id function:
Ideenmodellierer
parents:
998
diff
changeset
|
1097 } |
|
3d9552e4997c
Code improvment: line <=> menu id function:
Ideenmodellierer
parents:
998
diff
changeset
|
1098 return ret; |
|
3d9552e4997c
Code improvment: line <=> menu id function:
Ideenmodellierer
parents:
998
diff
changeset
|
1099 } |
|
3d9552e4997c
Code improvment: line <=> menu id function:
Ideenmodellierer
parents:
998
diff
changeset
|
1100 |
| 1075 | 1101 void reset_ButtonLock(void) |
| 1102 { | |
| 1103 ButtonLockState = LOCK_OFF; | |
| 1104 } | |
|
740
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
1105 SButtonLock get_ButtonLock(void) |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
1106 { |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
1107 return ButtonLockState; |
|
5078da3845c0
Added button lock after wakeup in surface mode:
Ideenmodellierer
parents:
718
diff
changeset
|
1108 } |
| 38 | 1109 |
| 1110 void set_globalState_Menu_Page(uint8_t page) | |
| 1111 { | |
| 1112 globalStateID = ((BaseMenu << 28) + (page << 24)); | |
| 1113 } | |
| 1114 | |
| 1115 void set_globalState_Log_Page(uint8_t pageIsLine) | |
| 1116 { | |
| 1117 globalStateID = StILOGLIST + (pageIsLine << 16); | |
| 1118 } | |
| 1119 | |
| 1120 | |
| 1121 void set_globalState_Menu_Line(uint8_t line) | |
| 1122 { | |
| 1123 globalStateID = ((globalStateID & MaskLineFieldDigit) + (line << 16)); | |
| 1124 } | |
| 1125 | |
| 1126 | |
|
776
45b8f3c2acce
Add support for a configurable compass declination in a range of -99 to 99 degrees.
heinrichsweikamp
parents:
773
diff
changeset
|
1127 uint8_t get_globalState_Menu_Line(void) |
|
45b8f3c2acce
Add support for a configurable compass declination in a range of -99 to 99 degrees.
heinrichsweikamp
parents:
773
diff
changeset
|
1128 { |
|
45b8f3c2acce
Add support for a configurable compass declination in a range of -99 to 99 degrees.
heinrichsweikamp
parents:
773
diff
changeset
|
1129 return (globalStateID & ~MaskLineFieldDigit) >> 16; |
|
45b8f3c2acce
Add support for a configurable compass declination in a range of -99 to 99 degrees.
heinrichsweikamp
parents:
773
diff
changeset
|
1130 } |
|
45b8f3c2acce
Add support for a configurable compass declination in a range of -99 to 99 degrees.
heinrichsweikamp
parents:
773
diff
changeset
|
1131 |
|
45b8f3c2acce
Add support for a configurable compass declination in a range of -99 to 99 degrees.
heinrichsweikamp
parents:
773
diff
changeset
|
1132 |
| 38 | 1133 void set_globalState(uint32_t newID) |
| 1134 { | |
| 1135 globalStateID = newID; | |
| 1136 } | |
| 1137 | |
| 1138 void set_returnFromComm(void) | |
| 1139 { | |
| 1140 returnFromCommCleanUpRequest = 1; | |
| 1141 } | |
| 1142 | |
| 1143 uint8_t font_update_required(void) | |
| 1144 { | |
| 1145 uint8_t *fontVersionHigh; | |
| 1146 uint8_t *fontVersionLow; | |
| 1147 | |
| 1148 fontVersionHigh = (uint8_t *)0x08132000; | |
| 1149 fontVersionLow = (uint8_t *)0x08132001; | |
| 1150 | |
| 1151 if(FONTminimum_required_high() < *fontVersionHigh) | |
| 1152 return 0; | |
| 1153 | |
| 1154 if((FONTminimum_required_high() == *fontVersionHigh) && (FONTminimum_required_low() <= *fontVersionLow)) | |
| 1155 return 0; | |
| 1156 | |
| 1157 return 1; | |
| 1158 } | |
| 1159 | |
| 1160 | |
|
132
135eae957389
Add compile switch to disable optimization for specific function
Ideenmodellierer
parents:
116
diff
changeset
|
1161 __attribute__((optimize("O0"))) void delayMicros(uint32_t micros) |
| 38 | 1162 { |
| 1163 micros = micros * (168/4) - 10; | |
| 1164 while(micros--); | |
| 1165 } | |
| 1166 | |
| 1167 | |
| 1168 void get_RTC_DateTime(RTC_DateTypeDef * sdatestructureget, RTC_TimeTypeDef * stimestructureget) | |
| 1169 { | |
| 1170 /* Get the RTC current Time */ | |
| 1171 if(sdatestructureget) | |
| 1172 HAL_RTC_GetTime(&RtcHandle, stimestructureget, FORMAT_BIN); | |
| 1173 /* Get the RTC current Date */ | |
| 1174 if(stimestructureget) | |
| 1175 HAL_RTC_GetDate(&RtcHandle, sdatestructureget, FORMAT_BIN); | |
| 1176 } | |
| 1177 | |
| 1178 | |
| 1179 void set_RTC_DateTime(RTC_DateTypeDef * sdatestructure, RTC_TimeTypeDef * stimestructure) | |
| 1180 { | |
| 1181 if(sdatestructure) | |
| 1182 if(HAL_RTC_SetDate(&RtcHandle,sdatestructure,FORMAT_BCD) != HAL_OK) | |
| 1183 { | |
| 1184 /* Initialization Error */ | |
| 1185 Error_Handler(); | |
| 1186 } | |
| 1187 | |
| 1188 if(stimestructure) | |
| 1189 if(HAL_RTC_SetTime(&RtcHandle,stimestructure,FORMAT_BCD) != HAL_OK) | |
| 1190 { | |
| 1191 /* Initialization Error */ | |
| 1192 Error_Handler(); | |
| 1193 } | |
| 1194 } | |
| 1195 | |
| 1196 static void TIM_init(void) | |
| 1197 { | |
| 1198 uint16_t uwPrescalerValue = 0; | |
| 1199 | |
| 1200 uwPrescalerValue = (uint32_t) ((SystemCoreClock /2) / 10000) - 1; | |
| 1201 | |
| 1202 /* Set TIMx instance */ | |
| 1203 TimHandle.Instance = TIMx; | |
| 1204 | |
| 1205 /* Initialize TIM3 peripheral as follows: | |
| 1206 + Period = 10000 - 1 | |
| 1207 + Prescaler = ((SystemCoreClock/2)/10000) - 1 | |
| 1208 + ClockDivision = 0 | |
| 1209 + Counter direction = Up | |
| 1210 */ | |
| 1211 TimHandle.Init.Period = 1000 - 1; | |
| 1212 TimHandle.Init.Prescaler = uwPrescalerValue; | |
| 1213 TimHandle.Init.ClockDivision = 0; | |
| 1214 TimHandle.Init.CounterMode = TIM_COUNTERMODE_UP; | |
| 1215 if(HAL_TIM_Base_Init(&TimHandle) != HAL_OK) | |
| 1216 { | |
| 1217 /* Initialization Error */ | |
| 1218 Error_Handler(); | |
| 1219 } | |
| 1220 | |
| 1221 /*##-2- Start the TIM Base generation in interrupt mode ####################*/ | |
| 1222 /* Start Channel1 */ | |
| 1223 if(HAL_TIM_Base_Start_IT(&TimHandle) != HAL_OK) | |
| 1224 { | |
| 1225 /* Starting Error */ | |
| 1226 Error_Handler(); | |
| 1227 } | |
| 1228 } | |
| 1229 | |
| 1230 #ifdef DEMOMODE | |
| 1231 static void TIM_DEMO_init(void) | |
| 1232 { | |
| 1233 uint16_t uwPrescalerValue = 0; | |
| 1234 | |
| 1235 uwPrescalerValue = (uint32_t) ((SystemCoreClock /2) / 10000) - 1; | |
| 1236 | |
| 1237 /* Set TIMx instance */ | |
| 1238 TimDemoHandle.Instance = TIM7; | |
| 1239 | |
| 1240 /* Initialize TIM3 peripheral as follows: | |
| 1241 + Period = 10000 - 1 | |
| 1242 + Prescaler = ((SystemCoreClock/2)/10000) - 1 | |
| 1243 + ClockDivision = 0 | |
| 1244 + Counter direction = Up | |
| 1245 */ | |
| 1246 TimDemoHandle.Init.Period = 1000 - 1; | |
| 1247 TimDemoHandle.Init.Prescaler = uwPrescalerValue; | |
| 1248 TimDemoHandle.Init.ClockDivision = 0; | |
| 1249 TimHandle.Init.CounterMode = TIM_COUNTERMODE_UP; | |
| 1250 if(HAL_TIM_Base_Init(&TimDemoHandle) != HAL_OK) | |
| 1251 { | |
| 1252 /* Initialization Error */ | |
| 1253 Error_Handler(); | |
| 1254 } | |
| 1255 | |
| 1256 /*##-2- Start the TIM Base generation in interrupt mode ####################*/ | |
| 1257 /* Start Channel1 */ | |
| 1258 if(HAL_TIM_Base_Start_IT(&TimDemoHandle) != HAL_OK) | |
| 1259 { | |
| 1260 /* Starting Error */ | |
| 1261 Error_Handler(); | |
| 1262 } | |
| 1263 } | |
| 1264 #endif | |
| 1265 | |
| 1266 | |
| 1267 | |
| 1268 #ifndef TIM_BACKLIGHT | |
| 1269 | |
| 1270 static uint32_t TIM_BACKLIGHT_adjust(void) | |
| 1271 { | |
| 1272 return 0; | |
| 1273 } | |
| 1274 | |
| 1275 static void TIM_BACKLIGHT_init(void) | |
| 1276 { | |
| 1277 } | |
| 1278 #else | |
| 1279 static uint32_t TIM_BACKLIGHT_adjust(void) | |
| 1280 { | |
| 1281 static uint32_t levelActual = 12000; | |
| 1282 static uint8_t brightnessModeLast = 0; | |
| 1283 // static _Bool wasLostConnection = 0; | |
| 1284 | |
| 1285 uint32_t levelAmbient; | |
| 1286 uint32_t levelMax; | |
| 1287 uint32_t levelMin; | |
| 1288 uint32_t levelUpStep_100ms = 200; | |
| 1289 uint32_t levelDnStep_100ms = 20; | |
| 1290 | |
| 1291 TIM_OC_InitTypeDef sConfig; | |
| 1292 sConfig.OCMode = TIM_OCMODE_PWM1; | |
| 1293 sConfig.OCPolarity = TIM_OCPOLARITY_HIGH; | |
| 1294 sConfig.OCFastMode = TIM_OCFAST_DISABLE; | |
| 1295 | |
| 1296 const SDiveState * pStateReal = stateRealGetPointer(); | |
| 1297 | |
| 1298 | |
| 1299 // if(pStateReal->data_old__lost_connection_to_slave) | |
| 1300 // { | |
| 1301 // changed 160613 from 6000 to 12000 | |
| 1302 // removed hw 161209 | |
| 1303 // levelAmbient = 12000; | |
| 1304 // levelActual = 12000; | |
| 1305 // wasLostConnection = 1; | |
| 1306 // } | |
| 1307 // else | |
| 1308 // { | |
| 1309 SSettings *pSettings = settingsGetPointer(); | |
| 1310 /* 300 - 4000 */ | |
| 1311 /* important levelAmbient 300 - 1200 */ | |
| 1312 levelAmbient = 10 * pStateReal->lifeData.ambient_light_level; | |
| 1313 | |
|
670
7a352b449055
Reduce display brightness in case the charger is connected:
Ideenmodellierer
parents:
662
diff
changeset
|
1314 if((pStateReal->chargeStatus == CHARGER_running) || (pStateReal->chargeStatus == CHARGER_lostConnection)) |
|
7a352b449055
Reduce display brightness in case the charger is connected:
Ideenmodellierer
parents:
662
diff
changeset
|
1315 { |
|
7a352b449055
Reduce display brightness in case the charger is connected:
Ideenmodellierer
parents:
662
diff
changeset
|
1316 levelMax = 1000; |
|
7a352b449055
Reduce display brightness in case the charger is connected:
Ideenmodellierer
parents:
662
diff
changeset
|
1317 levelMin = 500; |
|
7a352b449055
Reduce display brightness in case the charger is connected:
Ideenmodellierer
parents:
662
diff
changeset
|
1318 } |
|
7a352b449055
Reduce display brightness in case the charger is connected:
Ideenmodellierer
parents:
662
diff
changeset
|
1319 else |
|
7a352b449055
Reduce display brightness in case the charger is connected:
Ideenmodellierer
parents:
662
diff
changeset
|
1320 { |
|
549
469e93f8633e
Only execute motion detection functions if features is enabled:
Ideenmodellierer
parents:
540
diff
changeset
|
1321 switch( pSettings->brightness + blBoost) |
| 38 | 1322 { |
| 1323 case 0: /* Cave */ | |
| 1324 levelMax = 3000;/* max 25 % (x2) */ | |
| 1325 levelMin = 1500; | |
|
885
8d3f3a635397
Replaced global hardwareDisplay with unit access:
Ideenmodellierer
parents:
878
diff
changeset
|
1326 if( isNewDisplay()) display_1_brightness_cave(); |
| 38 | 1327 break; |
| 1328 case 1: /* Eco */ | |
| 1329 levelMax = 6000;/* max 50 % (x2) */ | |
| 1330 levelMin = 3000; | |
|
885
8d3f3a635397
Replaced global hardwareDisplay with unit access:
Ideenmodellierer
parents:
878
diff
changeset
|
1331 if ( isNewDisplay()) display_1_brightness_eco(); |
| 38 | 1332 break; |
| 1333 case 2: /* Std */ | |
| 1334 levelAmbient += 1000; | |
| 1335 levelMax = 9000; | |
| 1336 levelMin = 4500; | |
| 1337 levelUpStep_100ms += levelUpStep_100ms/2; // 4500 instead of 3000 | |
| 1338 levelDnStep_100ms += levelDnStep_100ms/2; | |
|
885
8d3f3a635397
Replaced global hardwareDisplay with unit access:
Ideenmodellierer
parents:
878
diff
changeset
|
1339 if ( isNewDisplay()) display_1_brightness_std(); |
| 38 | 1340 break; |
| 1341 case 3: /* High */ | |
| 1342 default: | |
| 1343 levelAmbient += 3000; | |
| 1344 levelMax = 12000; /* max 100% (x2) */ | |
| 1345 levelMin = 6000; | |
| 1346 levelUpStep_100ms += levelUpStep_100ms; // 6000 instead of 3000 | |
| 1347 levelDnStep_100ms += levelDnStep_100ms; | |
|
885
8d3f3a635397
Replaced global hardwareDisplay with unit access:
Ideenmodellierer
parents:
878
diff
changeset
|
1348 if ( isNewDisplay()) display_1_brightness_high(); |
| 38 | 1349 break; |
| 1350 case 4: /* New Max */ | |
| 1351 levelAmbient = 12000; | |
| 1352 levelMax = 12000; /* max 100% (x2) */ | |
| 1353 levelMin = 12000; | |
| 1354 levelUpStep_100ms += 12000; | |
| 1355 levelDnStep_100ms += 0; | |
|
885
8d3f3a635397
Replaced global hardwareDisplay with unit access:
Ideenmodellierer
parents:
878
diff
changeset
|
1356 if ( isNewDisplay()) display_1_brightness_max(); |
| 38 | 1357 break; |
| 1358 } | |
| 1359 | |
| 1360 if((pSettings->brightness != brightnessModeLast))// || wasLostConnection) | |
| 1361 { | |
| 1362 levelActual = levelAmbient; | |
| 1363 brightnessModeLast = pSettings->brightness; | |
| 1364 // wasLostConnection = 0; | |
| 1365 } | |
| 1366 // } | |
|
670
7a352b449055
Reduce display brightness in case the charger is connected:
Ideenmodellierer
parents:
662
diff
changeset
|
1367 } |
| 38 | 1368 |
| 1369 if(levelAmbient > levelActual) | |
| 1370 levelActual += levelUpStep_100ms; | |
| 1371 else | |
| 1372 if((levelAmbient < levelActual) && (levelActual > levelMin) && (levelActual > levelDnStep_100ms)) | |
| 1373 levelActual -= levelDnStep_100ms; | |
| 1374 | |
| 1375 if(levelActual > levelMax) | |
| 1376 levelActual = levelMax; | |
| 1377 else | |
| 1378 if(levelActual < levelMin) | |
|
670
7a352b449055
Reduce display brightness in case the charger is connected:
Ideenmodellierer
parents:
662
diff
changeset
|
1379 { |
| 38 | 1380 levelActual = levelMin; |
|
670
7a352b449055
Reduce display brightness in case the charger is connected:
Ideenmodellierer
parents:
662
diff
changeset
|
1381 } |
| 38 | 1382 // sConfig.Pulse = levelActual / 20; |
| 1383 sConfig.Pulse = (levelMin + ((levelMax - levelMin)/2)) / 20; // added 170306 | |
| 1384 | |
| 1385 /* xx - 600 */ | |
| 1386 if(sConfig.Pulse > 600) | |
| 1387 sConfig.Pulse = 600; | |
| 1388 else | |
|
670
7a352b449055
Reduce display brightness in case the charger is connected:
Ideenmodellierer
parents:
662
diff
changeset
|
1389 if(sConfig.Pulse < 25) |
|
7a352b449055
Reduce display brightness in case the charger is connected:
Ideenmodellierer
parents:
662
diff
changeset
|
1390 sConfig.Pulse = 25; |
| 38 | 1391 |
| 1392 HAL_TIM_PWM_ConfigChannel(&TimBacklightHandle, &sConfig, TIM_BACKLIGHT_CHANNEL); | |
| 1393 HAL_TIM_PWM_Start(&TimBacklightHandle, TIM_BACKLIGHT_CHANNEL); | |
| 1394 | |
| 1395 return levelActual; | |
| 1396 } | |
| 1397 | |
| 1398 static void TIM_BACKLIGHT_init(void) | |
| 1399 { | |
| 1400 uint32_t uwPrescalerValue = 0; | |
| 1401 TIM_OC_InitTypeDef sConfig; | |
| 1402 | |
| 1403 uwPrescalerValue = (uint32_t) ((SystemCoreClock /2) / 18000000) - 1; | |
| 1404 | |
| 1405 TimBacklightHandle.Instance = TIM_BACKLIGHT; | |
| 1406 | |
| 1407 /* Initialize TIM3 peripheral as follows: | |
| 1408 30 kHz | |
| 1409 */ | |
| 1410 TimBacklightHandle.Init.Period = 600 - 1; | |
| 1411 TimBacklightHandle.Init.Prescaler = uwPrescalerValue; | |
| 1412 TimBacklightHandle.Init.ClockDivision = 0; | |
| 1413 TimBacklightHandle.Init.CounterMode = TIM_COUNTERMODE_UP; | |
| 1414 HAL_TIM_PWM_Init(&TimBacklightHandle); | |
| 1415 | |
| 1416 sConfig.OCMode = TIM_OCMODE_PWM1; | |
| 1417 sConfig.OCPolarity = TIM_OCPOLARITY_HIGH; | |
| 1418 sConfig.OCFastMode = TIM_OCFAST_DISABLE; | |
|
878
6b06143cbfea
brightness settings and proper power down for new screen
heinrichsweikamp
parents:
845
diff
changeset
|
1419 sConfig.Pulse = 100; /* Initial brightness of display */ |
| 38 | 1420 |
| 1421 HAL_TIM_PWM_ConfigChannel(&TimBacklightHandle, &sConfig, TIM_BACKLIGHT_CHANNEL); | |
| 1422 HAL_TIM_PWM_Start(&TimBacklightHandle, TIM_BACKLIGHT_CHANNEL); | |
| 1423 } | |
| 1424 #endif | |
| 1425 | |
| 1426 | |
|
549
469e93f8633e
Only execute motion detection functions if features is enabled:
Ideenmodellierer
parents:
540
diff
changeset
|
1427 void set_Backlight_Boost(uint8_t level) |
|
469e93f8633e
Only execute motion detection functions if features is enabled:
Ideenmodellierer
parents:
540
diff
changeset
|
1428 { |
|
469e93f8633e
Only execute motion detection functions if features is enabled:
Ideenmodellierer
parents:
540
diff
changeset
|
1429 if(level < 3) |
|
469e93f8633e
Only execute motion detection functions if features is enabled:
Ideenmodellierer
parents:
540
diff
changeset
|
1430 { |
|
469e93f8633e
Only execute motion detection functions if features is enabled:
Ideenmodellierer
parents:
540
diff
changeset
|
1431 blBoost = level; |
|
469e93f8633e
Only execute motion detection functions if features is enabled:
Ideenmodellierer
parents:
540
diff
changeset
|
1432 } |
|
469e93f8633e
Only execute motion detection functions if features is enabled:
Ideenmodellierer
parents:
540
diff
changeset
|
1433 } |
|
469e93f8633e
Only execute motion detection functions if features is enabled:
Ideenmodellierer
parents:
540
diff
changeset
|
1434 |
| 38 | 1435 static void EXTILine_Buttons_Config(void) |
| 1436 { | |
| 1437 GPIO_InitTypeDef GPIO_InitStructure; | |
| 1438 | |
| 1439 BUTTON_ENTER_GPIO_ENABLE(); | |
| 1440 BUTTON_NEXT_GPIO_ENABLE(); | |
| 1441 BUTTON_BACK_GPIO_ENABLE(); | |
| 1442 | |
| 1443 /* Configure pin as weak PULLUP input */ | |
| 1444 /* buttons */ | |
| 1445 GPIO_InitStructure.Mode = GPIO_MODE_IT_RISING; | |
| 1446 GPIO_InitStructure.Pull = GPIO_NOPULL; | |
| 1447 GPIO_InitStructure.Speed = GPIO_SPEED_LOW; | |
| 1448 | |
| 1449 GPIO_InitStructure.Pin = BUTTON_ENTER_PIN; | |
| 1450 HAL_GPIO_Init(BUTTON_ENTER_GPIO_PORT, &GPIO_InitStructure); | |
| 1451 | |
| 1452 GPIO_InitStructure.Pin = BUTTON_NEXT_PIN; | |
| 1453 HAL_GPIO_Init(BUTTON_NEXT_GPIO_PORT, &GPIO_InitStructure); | |
| 1454 | |
| 1455 GPIO_InitStructure.Pin = BUTTON_BACK_PIN; | |
| 1456 HAL_GPIO_Init(BUTTON_BACK_GPIO_PORT, &GPIO_InitStructure); | |
| 1457 | |
| 1458 /* Enable and set EXTI Line0 Interrupt to the lowest priority */ | |
| 1459 HAL_NVIC_SetPriority(BUTTON_ENTER_EXTI_IRQn, 2, 0); | |
| 1460 HAL_NVIC_SetPriority(BUTTON_NEXT_EXTI_IRQn, 2, 0); | |
| 1461 HAL_NVIC_SetPriority(BUTTON_BACK_EXTI_IRQn, 2, 0); | |
| 1462 HAL_NVIC_EnableIRQ(BUTTON_ENTER_EXTI_IRQn); | |
| 1463 HAL_NVIC_EnableIRQ(BUTTON_NEXT_EXTI_IRQn); | |
| 1464 HAL_NVIC_EnableIRQ(BUTTON_BACK_EXTI_IRQn); | |
| 1465 | |
| 1466 #ifdef BUTTON_CUSTOM_PIN | |
| 1467 BUTTON_CUSTOM_GPIO_ENABLE(); | |
| 1468 GPIO_InitStructure.Pin = BUTTON_CUSTOM_PIN; | |
| 1469 HAL_GPIO_Init(BUTTON_CUSTOM_GPIO_PORT, &GPIO_InitStructure); | |
| 1470 HAL_NVIC_SetPriority(BUTTON_CUSTOM_EXTI_IRQn, 2, 0); | |
| 1471 HAL_NVIC_EnableIRQ(BUTTON_CUSTOM_EXTI_IRQn); | |
| 1472 #endif | |
| 1473 } | |
| 1474 | |
| 1475 | |
| 1476 /** | |
| 1477 * @brief System Clock Configuration | |
| 1478 * The system Clock is configured as follow : | |
| 1479 * System Clock source = PLL (HSE) | |
| 1480 * SYSCLK(Hz) = 180000000 | |
| 1481 * HCLK(Hz) = 180000000 | |
| 1482 * AHB Prescaler = 1 | |
| 1483 * APB1 Prescaler = 4 | |
| 1484 * APB2 Prescaler = 2 | |
| 1485 * HSE Frequency(Hz) = 8000000 | |
| 1486 * PLL_M = 8 | |
| 1487 * PLL_N = 360 | |
| 1488 * PLL_P = 2 | |
| 1489 * PLL_Q = 7 | |
| 1490 * VDD(V) = 3.3 | |
| 1491 * Main regulator output voltage = Scale1 mode | |
| 1492 * Flash Latency(WS) = 5 | |
| 1493 * The LTDC Clock is configured as follow : | |
| 1494 * PLLSAIN = 192 | |
| 1495 * PLLSAIR = 4 | |
| 1496 * PLLSAIDivR = 8 | |
| 1497 * @param None | |
| 1498 * @retval None | |
| 1499 */ | |
| 1500 static void SystemClock_Config(void) | |
| 1501 { | |
| 1502 | |
| 1503 /* Enable Power Control clock */ | |
| 1504 __PWR_CLK_ENABLE(); | |
| 1505 | |
| 1506 /* The voltage scaling allows optimizing the power consumption when the device is | |
| 1507 clocked below the maximum system frequency, to update the voltage scaling value | |
| 1508 regarding system frequency refer to product datasheet. */ | |
| 1509 __HAL_PWR_VOLTAGESCALING_CONFIG( PWR_REGULATOR_VOLTAGE_SCALE1 ); | |
| 1510 | |
| 1511 /*##-1- System Clock Configuration #########################################*/ | |
| 1512 /* Enable HighSpeed Oscillator and activate PLL with HSE/HSI as source */ | |
| 1513 RCC_OscInitTypeDef RCC_OscInitStruct = { 0 }; | |
| 1514 #ifdef DISC1_BOARD | |
| 1515 // Use High Speed Internal (HSI) oscillator, running at 16MHz. | |
| 1516 RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI; | |
| 1517 RCC_OscInitStruct.HSIState = RCC_HSI_ON; | |
| 1518 RCC_OscInitStruct.HSICalibrationValue = 0x10; | |
| 1519 RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSI; | |
| 1520 RCC_OscInitStruct.PLL.PLLM = 16; // HSI/16 is 1Mhz. | |
| 1521 #else | |
| 1522 // Use High Speed External oscillator, running at 8MHz | |
| 1523 RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE; | |
| 1524 RCC_OscInitStruct.HSEState = RCC_HSE_ON; | |
| 1525 RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE; | |
| 1526 RCC_OscInitStruct.PLL.PLLM = 8; // HSE/8 is 1Mhz. | |
| 1527 #endif | |
| 1528 // System clock = PLL (1MHz) * N/p = 180 MHz. | |
| 1529 RCC_OscInitStruct.PLL.PLLN = 360; | |
| 1530 RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV2; | |
| 1531 RCC_OscInitStruct.PLL.PLLQ = 7; | |
| 1532 RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON; | |
| 1533 HAL_RCC_OscConfig( &RCC_OscInitStruct ); | |
| 1534 | |
| 1535 // HAL_PWREx_ActivateOverDrive(); | |
| 1536 HAL_PWREx_DeactivateOverDrive(); | |
| 1537 | |
| 1538 /* Select PLL as system clock source and configure the HCLK, PCLK1 and PCLK2 clocks dividers */ | |
| 1539 RCC_ClkInitTypeDef RCC_ClkInitStruct = { 0 }; | |
| 1540 RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_SYSCLK | RCC_CLOCKTYPE_HCLK | |
| 1541 | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2; | |
| 1542 RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK; | |
| 1543 RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1; | |
| 1544 RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV4; | |
| 1545 RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV2; | |
| 1546 HAL_RCC_ClockConfig( &RCC_ClkInitStruct, FLASH_LATENCY_8 ); //FLASH_LATENCY_5); | |
| 1547 | |
| 1548 /*##-2- LTDC Clock Configuration ###########################################*/ | |
| 1549 /* LCD clock configuration */ | |
| 1550 /* PLLSAI_VCO Input = HSE_VALUE/PLL_M = 1 Mhz */ | |
| 1551 /* PLLSAI_VCO Output = PLLSAI_VCO Input * PLLSAIN = 192 Mhz */ | |
| 1552 /* PLLLCDCLK = PLLSAI_VCO Output/PLLSAIR = 192/4 = 48 Mhz */ | |
| 1553 /* LTDC clock frequency = PLLLCDCLK / RCC_PLLSAIDIVR_8 = 48/8 = 6 Mhz */ | |
| 1554 | |
| 1555 /* neu: 8MHz/8*300/5/8 = 7,5 MHz = 19,5 Hz bei 800 x 480 */ | |
| 1556 RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0}; | |
| 1557 PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_LTDC; | |
| 1558 PeriphClkInitStruct.PLLSAI.PLLSAIN = 300; //192; | |
| 1559 PeriphClkInitStruct.PLLSAI.PLLSAIR = 5; //4; | |
| 1560 PeriphClkInitStruct.PLLSAIDivR = RCC_PLLSAIDIVR_8;//RCC_PLLSAIDIVR_4;// RCC_PLLSAIDIVR_2; // RCC_PLLSAIDIVR_8 | |
| 1561 HAL_RCCEx_PeriphCLKConfig( &PeriphClkInitStruct ); | |
| 1562 } | |
| 1563 | |
| 1564 | |
| 1565 /** | |
| 1566 * @brief This function is executed in case of error occurrence. | |
| 1567 * @param None | |
| 1568 * @retval None | |
| 1569 */ | |
| 1570 static void Error_Handler(void) | |
| 1571 { | |
| 1572 /* Turn LED3 on */ | |
| 1573 // BSP_LED_On(LED3); | |
| 1574 while(1) | |
| 1575 { | |
| 1576 } | |
| 1577 } | |
| 1578 | |
|
95
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
1579 /** |
| 38 | 1580 * @brief Perform the SDRAM exernal memory inialization sequence |
| 1581 * @param hsdram: SDRAM handle | |
| 1582 * @param Command: Pointer to SDRAM command structure | |
| 1583 * @retval None | |
| 1584 */ | |
| 1585 static void SDRAM_Initialization_Sequence(SDRAM_HandleTypeDef *hsdram, FMC_SDRAM_CommandTypeDef *Command) | |
| 1586 { | |
| 1587 __IO uint32_t tmpmrd =0; | |
| 1588 /* Step 3: Configure a clock configuration enable command */ | |
| 1589 Command->CommandMode = FMC_SDRAM_CMD_CLK_ENABLE; | |
| 1590 Command->CommandTarget = FMC_SDRAM_CMD_TARGET_BANK2; | |
| 1591 Command->AutoRefreshNumber = 1; | |
| 1592 Command->ModeRegisterDefinition = 0; | |
|
95
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
1593 |
| 38 | 1594 /* Send the command */ |
| 1595 HAL_SDRAM_SendCommand(hsdram, Command, 0x1000); | |
| 1596 | |
| 1597 /* Step 4: Insert 100 ms delay */ | |
| 1598 HAL_Delay(100); | |
|
95
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
1599 |
| 38 | 1600 /* Step 5: Configure a PALL (precharge all) command */ |
| 1601 Command->CommandMode = FMC_SDRAM_CMD_PALL; | |
| 1602 Command->CommandTarget = FMC_SDRAM_CMD_TARGET_BANK2; | |
| 1603 Command->AutoRefreshNumber = 1; | |
| 1604 Command->ModeRegisterDefinition = 0; | |
| 1605 | |
| 1606 /* Send the command */ | |
| 1607 HAL_SDRAM_SendCommand(hsdram, Command, 0x1000); | |
|
95
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
1608 |
| 38 | 1609 /* Step 6 : Configure a Auto-Refresh command */ |
| 1610 Command->CommandMode = FMC_SDRAM_CMD_AUTOREFRESH_MODE; | |
| 1611 Command->CommandTarget = FMC_SDRAM_CMD_TARGET_BANK2; | |
| 1612 Command->AutoRefreshNumber = 4; | |
| 1613 Command->ModeRegisterDefinition = 0; | |
| 1614 | |
| 1615 /* Send the command */ | |
| 1616 HAL_SDRAM_SendCommand(hsdram, Command, 0x1000); | |
|
95
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
1617 |
| 38 | 1618 /* Step 7: Program the external memory mode register */ |
| 1619 tmpmrd = (uint32_t)SDRAM_MODEREG_BURST_LENGTH_2 | | |
| 1620 SDRAM_MODEREG_BURST_TYPE_SEQUENTIAL | | |
| 1621 SDRAM_MODEREG_CAS_LATENCY_3 | | |
| 1622 SDRAM_MODEREG_OPERATING_MODE_STANDARD | | |
| 1623 SDRAM_MODEREG_WRITEBURST_MODE_SINGLE; | |
|
95
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
1624 |
| 38 | 1625 Command->CommandMode = FMC_SDRAM_CMD_LOAD_MODE; |
| 1626 Command->CommandTarget = FMC_SDRAM_CMD_TARGET_BANK2; | |
| 1627 Command->AutoRefreshNumber = 1; | |
| 1628 Command->ModeRegisterDefinition = tmpmrd; | |
|
95
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
1629 |
| 38 | 1630 /* Send the command */ |
| 1631 HAL_SDRAM_SendCommand(hsdram, Command, 0x1000); | |
| 1632 | |
| 1633 /* Step 8: Set the refresh rate counter */ | |
| 1634 /* (15.62 us x Freq) - 20 */ | |
| 1635 /* neu: (8 us x Freq) - 20 */ | |
| 1636 /* Set the device refresh counter */ | |
| 1637 HAL_SDRAM_ProgramRefreshRate(hsdram, REFRESH_COUNT); | |
|
95
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
1638 } |
| 38 | 1639 |
| 1640 | |
| 1641 /** | |
| 1642 ****************************************************************************** | |
| 1643 ****************************************************************************** | |
| 1644 ****************************************************************************** | |
| 1645 */ | |
| 1646 | |
| 1647 | |
| 1648 /** | |
| 1649 * @brief DMA2D configuration. | |
| 1650 * @note This function Configure tha DMA2D peripheral : | |
| 1651 * 1) Configure the transfer mode : memory to memory W/ pixel format conversion | |
| 1652 * 2) Configure the output color mode as ARGB4444 | |
| 1653 * 3) Configure the output memory address at SRAM memory | |
| 1654 * 4) Configure the data size : 320x120 (pixels) | |
| 1655 * 5) Configure the input color mode as ARGB8888 | |
| 1656 * 6) Configure the input memory address at FLASH memory | |
| 1657 * @retval | |
| 1658 * None | |
| 1659 */ | |
| 1660 | |
| 1661 static void SDRAM_Config(void) | |
| 1662 { | |
| 1663 /*##-1- Configure the SDRAM device #########################################*/ | |
| 1664 /* SDRAM device configuration */ | |
| 1665 hsdram.Instance = FMC_SDRAM_DEVICE; | |
| 1666 | |
| 1667 /* Timing configuration for 90 Mhz of SD clock frequency (180Mhz/2) */ | |
| 1668 /* TMRD: 2 Clock cycles */ | |
| 1669 SDRAM_Timing.LoadToActiveDelay = 2; | |
| 1670 /* TXSR: min=70ns (6x11.90ns) */ | |
| 1671 SDRAM_Timing.ExitSelfRefreshDelay = 7; | |
| 1672 /* TRAS: min=42ns (4x11.90ns) max=120k (ns) */ | |
| 1673 SDRAM_Timing.SelfRefreshTime = 4; | |
| 1674 /* TRC: min=63 (6x11.90ns) */ | |
| 1675 SDRAM_Timing.RowCycleDelay = 7; | |
| 1676 /* TWR: 2 Clock cycles */ | |
| 1677 SDRAM_Timing.WriteRecoveryTime = 2; | |
| 1678 /* TRP: 15ns => 2x11.90ns */ | |
| 1679 SDRAM_Timing.RPDelay = 2; | |
| 1680 /* TRCD: 15ns => 2x11.90ns */ | |
| 1681 SDRAM_Timing.RCDDelay = 2; | |
| 1682 | |
| 1683 hsdram.Init.SDBank = FMC_SDRAM_BANK2; | |
| 1684 hsdram.Init.ColumnBitsNumber = FMC_SDRAM_COLUMN_BITS_NUM_9; | |
| 1685 hsdram.Init.RowBitsNumber = FMC_SDRAM_ROW_BITS_NUM_13; | |
| 1686 hsdram.Init.MemoryDataWidth = SDRAM_MEMORY_WIDTH; | |
| 1687 hsdram.Init.InternalBankNumber = FMC_SDRAM_INTERN_BANKS_NUM_4; | |
| 1688 hsdram.Init.CASLatency = FMC_SDRAM_CAS_LATENCY_3; | |
| 1689 hsdram.Init.WriteProtection = FMC_SDRAM_WRITE_PROTECTION_DISABLE; | |
| 1690 hsdram.Init.SDClockPeriod = SDCLOCK_PERIOD; | |
| 1691 hsdram.Init.ReadBurst = FMC_SDRAM_RBURST_DISABLE; | |
| 1692 hsdram.Init.ReadPipeDelay = FMC_SDRAM_RPIPE_DELAY_1; | |
| 1693 | |
| 1694 /* Initialize the SDRAM controller */ | |
| 1695 if(HAL_SDRAM_Init(&hsdram, &SDRAM_Timing) != HAL_OK) | |
| 1696 { | |
| 1697 /* Initialization Error */ | |
| 1698 Error_Handler(); | |
| 1699 } | |
|
95
2a74647d28d1
Debounce. Bounced buttons fixed.
Dmitry Romanov <kitt@bk.ru>
parents:
91
diff
changeset
|
1700 |
| 38 | 1701 /* Program the SDRAM external device */ |
| 1702 SDRAM_Initialization_Sequence(&hsdram, &command); | |
| 1703 } | |
| 1704 | |
| 1705 | |
| 1706 #ifdef USE_FULL_ASSERT | |
| 1707 | |
| 1708 /** | |
| 1709 * @brief Reports the name of the source file and the source line number | |
| 1710 * where the assert_param error has occurred. | |
| 1711 * @param file: pointer to the source file name | |
| 1712 * @param line: assert_param error line source number | |
| 1713 * @retval None | |
| 1714 */ | |
| 1715 void assert_failed(uint8_t* file, uint32_t line) | |
| 1716 { | |
| 1717 /* User can add his own implementation to report the file name and line number, | |
| 1718 ex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */ | |
| 1719 | |
| 1720 /* Infinite loop */ | |
| 1721 while (1) | |
| 1722 { | |
| 1723 } | |
| 1724 } | |
| 1725 #endif | |
| 1726 | |
| 1727 | |
|
300
5ca177d2df5d
cleanup: remove commented/unused code, make static
Jan Mulder <jlmulder@xs4all.nl>
parents:
272
diff
changeset
|
1728 static void deco_loop(void) |
| 38 | 1729 { |
| 1730 typedef enum | |
| 1731 { | |
| 1732 CALC_VPM, | |
| 1733 CALC_VPM_FUTURE, | |
| 1734 CALC_BUEHLMANN, | |
| 1735 CALC_BUEHLMANN_FUTURE, | |
| 149 | 1736 CALC_INVALID |
| 38 | 1737 } CALC_WHAT; |
| 1738 | |
| 149 | 1739 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
|
1740 static int counter = 0; |
| 412 | 1741 if((stateUsed->mode != MODE_DIVE) || (stateUsed->diveSettings.diveMode == DIVEMODE_Apnea) || (stateUsed->diveSettings.diveMode == DIVEMODE_Gauge) || (decoLock != DECO_CALC_ready )) |
| 38 | 1742 return; |
| 1743 | |
| 651 | 1744 if((stateUsed->warnings.betterSetpoint) && (settingsGetPointer()->autoSetpoint) && (settingsGetPointer()->CCR_Mode == CCRMODE_FixedSetpoint)) |
| 1745 { | |
|
773
2c243233c999
Menu shortcut for bailout / return to circuit when diving in CCR mode (mikeller)
heinrichsweikamp
parents:
765
diff
changeset
|
1746 openEdit_DiveSelectBetterSetpoint(false); |
| 651 | 1747 } |
| 1748 | |
| 38 | 1749 decoLock = DECO_CALC_running; |
| 1750 | |
| 1751 if(stateDeco.diveSettings.deco_type.ub.standard == GF_MODE) | |
| 1752 { | |
| 1753 // 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)) | |
| 1754 if(what == CALC_BUEHLMANN) | |
| 1755 { | |
| 1756 //Calc future | |
| 1757 what = CALC_BUEHLMANN_FUTURE; | |
| 1758 } | |
| 1759 else | |
| 1760 what = CALC_BUEHLMANN; | |
| 1761 | |
| 1762 } | |
| 1763 else | |
| 1764 { | |
| 1765 // hw 151110 mh wants future TTS even in deco zone if((what == CALC_VPM) && (!stateDeco.vpm.deco_zone_reached)) | |
| 1766 if(what == CALC_VPM) | |
| 1767 { | |
| 1768 //Calc future | |
| 1769 what = CALC_VPM_FUTURE; | |
| 1770 } | |
| 1771 else | |
| 1772 what = CALC_VPM; | |
| 1773 } | |
| 1774 | |
| 1775 //In one of ten calc the other option | |
| 1776 if(counter == 10) | |
| 1777 { | |
| 1778 if(what == CALC_VPM) | |
| 1779 what = CALC_BUEHLMANN; | |
| 1780 if(what == CALC_BUEHLMANN) | |
| 1781 what = CALC_VPM; | |
| 1782 counter = 0; | |
| 1783 } | |
| 1784 | |
| 1785 decom_CreateGasChangeList(&stateDeco.diveSettings, &stateDeco.lifeData); | |
| 1786 | |
| 1787 switch(what) | |
| 1788 { | |
| 149 | 1789 case CALC_VPM: |
| 896 | 1790 #ifdef T7_DEBUG_RUNTIME |
| 1791 startTimeDecoLoop = HAL_GetTick(); | |
| 1792 #endif | |
| 149 | 1793 vpm_calc(&stateDeco.lifeData,&stateDeco.diveSettings,&stateDeco.vpm,&stateDeco.decolistVPM, DECOSTOPS); |
| 896 | 1794 #ifdef T7_DEBUG_RUNTIME |
| 1795 timeDecoLoop = time_elapsed_ms(startTimeDecoLoop, HAL_GetTick()); | |
| 1796 #endif | |
| 149 | 1797 decoLock = DECO_CALC_FINSHED_vpm; |
| 1798 return; | |
| 1799 case CALC_VPM_FUTURE: | |
| 1800 decom_tissues_exposure(stateDeco.diveSettings.future_TTS_minutes * 60,&stateDeco.lifeData); | |
| 1801 vpm_calc(&stateDeco.lifeData,&stateDeco.diveSettings,&stateDeco.vpm,&stateDeco.decolistFutureVPM, FUTURESTOPS); | |
| 1802 decoLock = DECO_CALC_FINSHED_Futurevpm; | |
| 1803 return; | |
| 1804 case CALC_BUEHLMANN: | |
| 1805 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
|
1806 buehlmann_ceiling_calculator(&stateDeco.lifeData, &stateDeco.decolistBuehlmann); |
| 248 | 1807 buehlmann_super_saturation_calculator(&stateDeco.lifeData,&stateDeco.decolistBuehlmann); |
| 149 | 1808 decoLock = DECO_CALC_FINSHED_Buehlmann; |
| 1809 return; | |
| 1810 case CALC_BUEHLMANN_FUTURE: | |
| 1811 decom_tissues_exposure(stateDeco.diveSettings.future_TTS_minutes * 60,&stateDeco.lifeData); | |
| 1812 buehlmann_calc_deco(&stateDeco.lifeData,&stateDeco.diveSettings,&stateDeco.decolistFutureBuehlmann); | |
| 1813 decoLock = DECO_CALC_FINSHED_FutureBuehlmann; | |
| 1814 return; | |
| 1815 default: break; | |
| 38 | 1816 } |
| 1817 counter++; | |
| 1818 } | |
| 1819 | |
|
300
5ca177d2df5d
cleanup: remove commented/unused code, make static
Jan Mulder <jlmulder@xs4all.nl>
parents:
272
diff
changeset
|
1820 static void resetToFirmwareUpdate(void) |
| 38 | 1821 { |
| 1822 __HAL_RCC_CLEAR_RESET_FLAGS(); | |
| 1823 HAL_NVIC_SystemReset(); | |
| 1824 } | |
| 1825 | |
|
422
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1826 static void TimeoutControlRequestModechange(void) |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1827 { |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1828 RequestModeChange = 1; |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1829 } |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1830 |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1831 static void TimeoutControl(void) |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1832 { |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1833 static uint8_t last_base; |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1834 |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1835 SStateList status; |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1836 uint32_t timeout_in_seconds; |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1837 uint32_t timeout_limit_Surface_in_seconds; |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1838 _Bool InDiveMode = 0; |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1839 |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1840 get_globalStateList(&status); |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1841 |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1842 if(stateUsed->mode == MODE_DIVE) |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1843 { |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1844 InDiveMode = 1; |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1845 } |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1846 else |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1847 { |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1848 InDiveMode = 0; |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1849 } |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1850 /* timeout control */ |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1851 if(RequestModeChange) ///< from RTE, set in data_exchange_main.c |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1852 time_without_button_pressed_deciseconds = (settingsGetPointer()->timeoutSurfacemode / 4) * 3; |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1853 if(status.base != last_base) |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1854 time_without_button_pressed_deciseconds = 0; |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1855 last_base = status.base; |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1856 timeout_in_seconds = time_without_button_pressed_deciseconds / 10; |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1857 time_without_button_pressed_deciseconds += 1; |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1858 if(RequestModeChange || (timeout_in_seconds != time_without_button_pressed_deciseconds / 10)) |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1859 { |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1860 #ifdef NO_TIMEOUT |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1861 timeout_in_seconds = 0; |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1862 #else |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1863 timeout_in_seconds += 1; |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1864 #endif |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1865 |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1866 if(InDiveMode) |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1867 { |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1868 switch(status.base) |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1869 { |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1870 case BaseHome: |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1871 if((status.line != 0) && (timeout_in_seconds >= settingsGetPointer()->timeoutEnterButtonSelectDive)) |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1872 { |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1873 set_globalState(StD); |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1874 timeout_in_seconds = 0; |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1875 } |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1876 break; |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1877 |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1878 case BaseMenu: |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1879 if((status.line == 0) && ((timeout_in_seconds >= settingsGetPointer()->timeoutMenuDive) || RequestModeChange)) |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1880 { |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1881 exitMenu(); |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1882 timeout_in_seconds = 0; |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1883 } |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1884 if((status.line != 0) && ((timeout_in_seconds >= settingsGetPointer()->timeoutMenuEdit) || RequestModeChange)) |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1885 { |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1886 exitMenuEdit_to_Home(); |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1887 timeout_in_seconds = 0; |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1888 } |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1889 break; |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1890 default: |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1891 break; |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1892 } |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1893 } |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1894 else /* surface mode */ |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1895 { |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1896 switch(status.base) |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1897 { |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1898 case BaseHome: |
|
670
7a352b449055
Reduce display brightness in case the charger is connected:
Ideenmodellierer
parents:
662
diff
changeset
|
1899 /* 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
|
1900 // if(!(stateRealGetPointer()->warnings.lowBattery) && ((stateRealGetPointer()->lifeData.battery_charge > 9) || (wasFirmwareUpdateCheckBattery))) |
|
422
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1901 { |
|
670
7a352b449055
Reduce display brightness in case the charger is connected:
Ideenmodellierer
parents:
662
diff
changeset
|
1902 if(stateRealGetPointer()->lifeData.battery_charge < 0.0) |
|
7a352b449055
Reduce display brightness in case the charger is connected:
Ideenmodellierer
parents:
662
diff
changeset
|
1903 { |
|
7a352b449055
Reduce display brightness in case the charger is connected:
Ideenmodellierer
parents:
662
diff
changeset
|
1904 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
|
1905 { |
|
7a352b449055
Reduce display brightness in case the charger is connected:
Ideenmodellierer
parents:
662
diff
changeset
|
1906 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
|
1907 } |
|
7a352b449055
Reduce display brightness in case the charger is connected:
Ideenmodellierer
parents:
662
diff
changeset
|
1908 } |
|
7a352b449055
Reduce display brightness in case the charger is connected:
Ideenmodellierer
parents:
662
diff
changeset
|
1909 else |
|
7a352b449055
Reduce display brightness in case the charger is connected:
Ideenmodellierer
parents:
662
diff
changeset
|
1910 { |
|
7a352b449055
Reduce display brightness in case the charger is connected:
Ideenmodellierer
parents:
662
diff
changeset
|
1911 if(!(stateRealGetPointer()->warnings.lowBattery) && (stateRealGetPointer()->lifeData.battery_charge > 9)) |
|
7a352b449055
Reduce display brightness in case the charger is connected:
Ideenmodellierer
parents:
662
diff
changeset
|
1912 { |
|
7a352b449055
Reduce display brightness in case the charger is connected:
Ideenmodellierer
parents:
662
diff
changeset
|
1913 stateRealGetPointerWrite()->lastKnownBatteryPercentage = stateRealGetPointer()->lifeData.battery_charge; |
|
7a352b449055
Reduce display brightness in case the charger is connected:
Ideenmodellierer
parents:
662
diff
changeset
|
1914 } |
|
7a352b449055
Reduce display brightness in case the charger is connected:
Ideenmodellierer
parents:
662
diff
changeset
|
1915 } |
|
422
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1916 } |
|
670
7a352b449055
Reduce display brightness in case the charger is connected:
Ideenmodellierer
parents:
662
diff
changeset
|
1917 if((wasFirmwareUpdateCheckBattery) && (timeout_in_seconds > 3)) |
|
422
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1918 { |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1919 wasFirmwareUpdateCheckBattery = 0; |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1920 setButtonResponsiveness(settingsGetPointer()->ButtonResponsiveness); // added 170306 |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1921 if( (settingsGetPointer()->lastKnownBatteryPercentage > 0) |
|
670
7a352b449055
Reduce display brightness in case the charger is connected:
Ideenmodellierer
parents:
662
diff
changeset
|
1922 && (settingsGetPointer()->lastKnownBatteryPercentage <= 101.0) |
|
422
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1923 && (stateRealGetPointer()->warnings.lowBattery)) |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1924 { |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1925 setBatteryPercentage(settingsGetPointer()->lastKnownBatteryPercentage); |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1926 } |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1927 } |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1928 // stuff before and new @161121 CCR-sensor limit 10 minutes |
| 662 | 1929 if(isLoopMode(settingsGetPointer()->dive_mode) && (settingsGetPointer()->CCR_Mode == CCRMODE_Sensors)) |
|
422
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1930 { |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1931 timeout_limit_Surface_in_seconds = settingsGetPointer()->timeoutSurfacemodeWithSensors; |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1932 } |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1933 else |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1934 { |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1935 timeout_limit_Surface_in_seconds = settingsGetPointer()->timeoutSurfacemode; |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1936 } |
|
805
dd7ce655db26
Adds a simple countdown timer, available as a custom view in surface and dive mode.
heinrichsweikamp
parents:
776
diff
changeset
|
1937 if (timeout_in_seconds >= timeout_limit_Surface_in_seconds) { |
|
dd7ce655db26
Adds a simple countdown timer, available as a custom view in surface and dive mode.
heinrichsweikamp
parents:
776
diff
changeset
|
1938 if (t7_isTimerRunning(true)) { |
|
dd7ce655db26
Adds a simple countdown timer, available as a custom view in surface and dive mode.
heinrichsweikamp
parents:
776
diff
changeset
|
1939 // Delay sleep until the timer has elapsed |
|
dd7ce655db26
Adds a simple countdown timer, available as a custom view in surface and dive mode.
heinrichsweikamp
parents:
776
diff
changeset
|
1940 timeout_in_seconds = timeout_limit_Surface_in_seconds - 1; |
|
dd7ce655db26
Adds a simple countdown timer, available as a custom view in surface and dive mode.
heinrichsweikamp
parents:
776
diff
changeset
|
1941 } else { |
|
dd7ce655db26
Adds a simple countdown timer, available as a custom view in surface and dive mode.
heinrichsweikamp
parents:
776
diff
changeset
|
1942 gotoSleep(); |
|
dd7ce655db26
Adds a simple countdown timer, available as a custom view in surface and dive mode.
heinrichsweikamp
parents:
776
diff
changeset
|
1943 } |
|
422
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1944 } |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1945 break; |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1946 case BaseMenu: |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1947 if((status.line == 0) && ((timeout_in_seconds >= settingsGetPointer()->timeoutMenuSurface) || RequestModeChange)) |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1948 { |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1949 exitMenu(); |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1950 timeout_in_seconds = 0; |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1951 } |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1952 if((status.line != 0) && ((timeout_in_seconds >= settingsGetPointer()->timeoutMenuEdit) || RequestModeChange)) |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1953 { |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1954 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
|
1955 { |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1956 exitMenuEdit_to_Home(); |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1957 timeout_in_seconds = 0; |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1958 } |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1959 } |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1960 break; |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1961 |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1962 case BaseInfo: |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1963 if((timeout_in_seconds >= settingsGetPointer()->timeoutInfo) || RequestModeChange) |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1964 { |
|
718
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
697
diff
changeset
|
1965 timeout_in_seconds = 0; |
|
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
697
diff
changeset
|
1966 |
|
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
697
diff
changeset
|
1967 switch(status.page) |
|
422
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1968 { |
|
718
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
697
diff
changeset
|
1969 case InfoPageLogList: exitLog(); |
|
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
697
diff
changeset
|
1970 break; |
|
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
697
diff
changeset
|
1971 case InfoPageLogShow: show_logbook_exit(); |
|
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
697
diff
changeset
|
1972 exitLog(); |
|
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
697
diff
changeset
|
1973 break; |
|
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
697
diff
changeset
|
1974 case InfoPageCompass: /* compass has individual timeout */ |
|
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
697
diff
changeset
|
1975 break; |
|
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
697
diff
changeset
|
1976 case InfoPageSensor: exitInfoToBack(); |
|
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
697
diff
changeset
|
1977 break; |
|
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
697
diff
changeset
|
1978 default: exitInfo(); |
|
b9f699d2e3d0
Updated menu structure to support new sensor information page:
Ideenmodellierer
parents:
697
diff
changeset
|
1979 break; |
|
422
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1980 } |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1981 } |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1982 break; |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1983 default: |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1984 break; |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1985 } |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1986 } |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1987 } |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1988 RequestModeChange = 0; |
|
b67327177159
Moved Timeout handling out of 100ms callback:
ideenmodellierer
parents:
412
diff
changeset
|
1989 } |
| 896 | 1990 |
| 1991 #ifdef T7_DEBUG_RUNTIME | |
| 1992 uint32_t getMainLoopTime() | |
| 1993 { | |
| 1994 return timeMainLoop; | |
| 1995 } | |
| 1996 uint32_t getDecoLoopTime() | |
| 1997 { | |
| 1998 return timeDecoLoop; | |
| 1999 } | |
| 2000 uint32_t getGfxLoopTime() | |
| 2001 { | |
| 2002 return timeGfxLoop; | |
| 2003 } | |
| 2004 #endif | |
| 38 | 2005 // debugging by https://blog.feabhas.com/2013/02/developing-a-generic-hard-fault-handler-for-arm-cortex-m3cortex-m4/ |
| 2006 | |
| 2007 /* | |
| 2008 void printErrorMsg(const char * errMsg) | |
| 2009 { | |
| 2010 | |
| 2011 // printf(errMsg); | |
| 2012 // return; | |
| 2013 | |
| 2014 while(*errMsg != 0){ | |
| 2015 ITM_SendChar(*errMsg); | |
| 2016 ++errMsg; | |
| 2017 } | |
| 2018 } | |
| 2019 | |
| 2020 enum { r0, r1, r2, r3, r12, lr, pc, psr}; | |
| 2021 | |
| 2022 void stackDump(uint32_t stack[]) | |
| 2023 { | |
| 2024 static char msg[80]; | |
| 2025 sprintf(msg, "r0 = 0x%08x\n", stack[r0]); printErrorMsg(msg); | |
| 2026 sprintf(msg, "r1 = 0x%08x\n", stack[r1]); printErrorMsg(msg); | |
| 2027 sprintf(msg, "r2 = 0x%08x\n", stack[r2]); printErrorMsg(msg); | |
| 2028 sprintf(msg, "r3 = 0x%08x\n", stack[r3]); printErrorMsg(msg); | |
| 2029 sprintf(msg, "r12 = 0x%08x\n", stack[r12]); printErrorMsg(msg); | |
| 2030 sprintf(msg, "lr = 0x%08x\n", stack[lr]); printErrorMsg(msg); | |
| 2031 sprintf(msg, "pc = 0x%08x\n", stack[pc]); printErrorMsg(msg); | |
| 2032 sprintf(msg, "psr = 0x%08x\n", stack[psr]); printErrorMsg(msg); | |
| 2033 } | |
| 2034 | |
| 2035 void printUsageErrorMsg(uint32_t CFSRValue) | |
| 2036 { | |
| 2037 printErrorMsg("Usage fault: "); | |
| 2038 CFSRValue >>= 16; // right shift to lsb | |
| 2039 if((CFSRValue & (1 << 9)) != 0) { | |
| 2040 printErrorMsg("Divide by zero\n"); | |
| 2041 } | |
| 2042 } | |
| 2043 | |
| 2044 void Hard_Fault_Handler()//uint32_t stack[]) | |
| 2045 { | |
| 2046 static char msg[80]; | |
| 2047 printErrorMsg("In Hard Fault Handler\n"); | |
| 2048 sprintf(msg, "SCB->HFSR = 0x%08x\n", SCB->HFSR); | |
| 2049 printErrorMsg(msg); | |
| 2050 if ((SCB->HFSR & (1 << 30)) != 0) { | |
| 2051 printErrorMsg("Forced Hard Fault\n"); | |
| 2052 sprintf(msg, "SCB->CFSR = 0x%08x\n", SCB->CFSR ); | |
| 2053 printErrorMsg(msg); | |
| 2054 if((SCB->CFSR & 0xFFFF0000) != 0) { | |
| 2055 printUsageErrorMsg(SCB->CFSR); | |
| 2056 } | |
| 2057 } | |
| 2058 __ASM volatile("BKPT #01"); | |
| 2059 while(1); | |
| 2060 } | |
| 2061 | |
| 2062 int my_store_of_MSP; | |
| 2063 | |
| 2064 void HardFault_Handler(void) | |
| 2065 { | |
| 2066 __asm ("MRS my_store_of_MSP, MSP"); | |
| 2067 Hard_Fault_Handler(); | |
| 2068 } | |
| 2069 */ | |
| 2070 | |
| 2071 /* | |
| 2072 __asm void HardFault_Handler(void) | |
| 2073 { | |
| 2074 TST lr, #4 // Test for MSP or PSP | |
| 2075 ITE EQ | |
| 2076 MRSEQ r0, MSP | |
| 2077 MRSNE r0, PSP | |
| 2078 B __cpp(Hard_Fault_Handler) | |
| 2079 } | |
| 2080 */ | |
| 2081 /* | |
| 2082 HardFault_Handler\ | |
| 2083 PROC | |
| 2084 EXPORT HardFault_Handler | |
| 2085 B . | |
| 2086 ENDP | |
| 2087 */ | |
| 2088 | |
| 2089 /* | |
| 2090 __asm int f(int i) | |
| 2091 { | |
| 2092 ADD i, i, #1 // error | |
| 2093 } | |
| 2094 | |
| 2095 EXPORT HardFault_Handler | |
| 2096 HardFault_Handler FUNCTION | |
| 2097 MRS r0, MSP | |
| 2098 B __cpp(Hard_Fault_Handler) | |
| 2099 ENDFUNC | |
| 2100 */ |