annotate BootLoader/Src/settings_bootloader.c @ 303:90e65971f15d cleanup-4

bugfix, cleanup: simplify stopwatch logic and fix fallout The previous 2 commits (making the depth switch between surface and diving consistent) increased the time difference (in the simulator) to about 4 seconds. This commit fixes this again, and we are back at 1 sec. difference between the 2 timers (notice: in the simulator). Still not the wanted 0 sec. difference, but the old stopwatch logic logic was rather convoluted. Resetting to 1 second (instead of 0), and second-1 logic. Basically, this feels like a bug fixed with a second bug on top to mask it. The code is now much more logic and consistent (despite the fact that the real reason for the 1 sec. difference is not yet found). Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
author Jan Mulder <jlmulder@xs4all.nl>
date Mon, 20 May 2019 12:57:31 +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 }