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