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