Mercurial > public > ostc4
view Discovery/Src/firmwareJumpToApplication.c @ 224:ceecabfddb57 div-fixes-3
Bugfix, deco: fix 2 (small) problems with calculated ceiling
This fixes 1 trivial, and 1 not really trivial bug in the calculation
of the ceiling. When simulating a bounce dive to 80m, things become
clear (tried this on a CCR dive, fixed setpoint 1.2bar, about 15 minutes
of bottom time). Closely watch the behavior of the ceiling data. At some
point during the ascent, the ceiling begins to decrease in 10cm steps.
Then suddenly (while still ascending), the ceiling increases again with 1m,
does not change for some time, and then suddenly steps 1.1m less deep.
While not very relevant to real deco diving, it is simply wrong.
The reason for this is subtle. The algorithm used to find the ceiling
is a sort of linear search, stepping down a meter, overshoot the depth, and
search back in 10cm steps. It seems some numerical instability. Fixing
this, was a bit more computational intensive search by stepping up down in
equal steps of 10cm. But, I'm pretty sure that things can be speeded up here, as a
ceiling does not change fast, so it should be not that difficult to limit
the search space, or use a binary search algorithm instead.
The trivial second problem fixed, is that the ceiling ends at the surface
and not at 1m depth. This small issue became visible after changing the step
down size above.
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
author | Jan Mulder <jlmulder@xs4all.nl> |
---|---|
date | Sun, 31 Mar 2019 19:35:51 +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 ---------------------------------------------------------*/