annotate BootLoader/Src/settings_bootloader.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 7801c5d8a562
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
30
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
1 ///////////////////////////////////////////////////////////////////////////////
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
2 /// -*- coding: UTF-8 -*-
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
3 ///
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
4 /// \file BootLoader/Src/settings_bootloader.c
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
5 /// \brief mini version for firmwareDataGetPointer() etc.
36
7801c5d8a562 Update author name for release
heinrichsweikamp
parents: 30
diff changeset
6 /// \author heinrichs weikamp gmbh
30
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
7 /// \date 21-March-2016
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
8 ///
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
9 /// $Id$
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
10 ///////////////////////////////////////////////////////////////////////////////
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
11 /// \par Copyright (c) 2014-2018 Heinrichs Weikamp gmbh
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
12 ///
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
13 /// This program is free software: you can redistribute it and/or modify
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
14 /// it under the terms of the GNU General Public License as published by
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
15 /// the Free Software Foundation, either version 3 of the License, or
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
16 /// (at your option) any later version.
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
17 ///
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
18 /// This program is distributed in the hope that it will be useful,
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
19 /// but WITHOUT ANY WARRANTY; without even the implied warranty of
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
20 /// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
21 /// GNU General Public License for more details.
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
22 ///
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
23 /// You should have received a copy of the GNU General Public License
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
24 /// along with this program. If not, see <http://www.gnu.org/licenses/>.
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
25 //////////////////////////////////////////////////////////////////////////////
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
26
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
27 /* Includes ------------------------------------------------------------------*/
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
28 #include <string.h>
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
29 #include "settings.h"
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
30
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
31 /* always at 0x8080000, do not move -> bootloader access */
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
32 const SFirmwareData* firmwareDataGetPointer(void)
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
33 {
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
34 return (const SFirmwareData*)(0x08040000 + 0x00010000);
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
35 }
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
36
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
37
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
38 void getActualRTEandFONTversion(uint8_t *RTEhigh, uint8_t *RTElow, uint8_t *FONThigh, uint8_t *FONTlow)
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
39 {
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
40 if(RTEhigh && RTElow)
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
41 {
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
42 *RTEhigh = 0;
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
43 *RTElow = 0;
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
44 }
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
45 if(FONThigh && FONTlow)
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
46 {
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
47 *FONThigh = *(uint8_t *)0x08132000;
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
48 *FONTlow = *(uint8_t *)0x08132001;
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
49 }
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
50 }
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
51
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
52
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
53 uint8_t getLicence(void)
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
54 {
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
55 //return 0xFF;
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
56 //return LICENCEBONEX;
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
57 return hardwareDataGetPointer()->primaryLicence;
ea1003f63e44 ADD GPL License ...
jDG
parents: 5
diff changeset
58 }