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