Mercurial > public > ostc4
view Discovery/Src/firmwareJumpToApplication.c @ 311:ddbe8bed5096 cleanup-4
bugfix: make stopwatch and divetime run in sync
And this shows the fundamental issue in the difference between dive time and
stopwatch time. The dive time is constructed on the RTE, and rather
independently, the stopwatch time is constructed on CPU1.
This works rather well, but not perfect. This commit fixes things in
a relatively straightforward way. Instead of incrementing the stopwatch
locally on CPU1, simply use the same time data that is coming from the
RTE. Some logic was added to make this stopwatch resettable again.
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
author | Jan Mulder <jlmulder@xs4all.nl> |
---|---|
date | Wed, 29 May 2019 14:02:27 +0200 |
parents | 5f11787b4f42 |
children |
line wrap: on
line source
/** ****************************************************************************** * @file firmwareJumpToApplication.c * @author heinrichs weikamp gmbh * @version V0.0.1 * @date 05-May-2015 * @version V0.0.1 * @since 05-May-2015 * @brief jump to application in higher flash region * @verbatim ============================================================================== ##### How to use ##### ============================================================================== ============================================================================== ##### From AN2557 ##### STM32F10xxx In-Application programming CD00161640.pdf 2010 ============================================================================== User program conditions The user application to be loaded into the Flash memory using IAP should be built with these configuration settings: 1. Set the program load address at 0x08003000, using your toolchain linker file 2. Relocate the vector table at address 0x08003000, using the "NVIC_SetVectorTable"function or the VECT_TAB_OFFSET definition inside the "system_stm32f10x.c" can be found here system_stm32f4xx.c @endverbatim ****************************************************************************** * @attention * * <h2><center>© COPYRIGHT(c) 2015 heinrichs weikamp</center></h2> * ****************************************************************************** */ /* Includes ------------------------------------------------------------------*/ #include "stm32f4xx_hal.h" #include "stdio.h" #include "firmwareJumpToApplication.h" /* Exported variables --------------------------------------------------------*/ /* Private types -------------------------------------------------------------*/ typedef void (*pFunction)(void); #define ApplicationAddress 0x08040000 /* Private variables ---------------------------------------------------------*/ pFunction Jump_To_Application; uint32_t JumpAddress; /* Private function prototypes -----------------------------------------------*/ /* Exported functions --------------------------------------------------------*/ uint8_t firmware_MainCodeIsProgammed(void) { uint32_t content_start; content_start = *(__IO uint32_t*)ApplicationAddress; if ((content_start & 0x2FFE0000 ) == 0x20000000) return 1; else return 0; } void firmware_JumpTo_Application(void) { /* Test if user code is programmed starting from address "ApplicationAddress" */ if (((*(__IO uint32_t*)ApplicationAddress) & 0x2FFE0000 ) == 0x20000000) { /* Jump to user application */ JumpAddress = *(__IO uint32_t*) (ApplicationAddress + 4); Jump_To_Application = (pFunction) JumpAddress; /* Initialize user application's Stack Pointer */ __set_MSP(*(__IO uint32_t*) ApplicationAddress); Jump_To_Application(); } while (1) {} } /* Private functions ---------------------------------------------------------*/