Mercurial > public > ostc4
changeset 341:591c03a1e68d
change max. allowed surface pressure to 1030hPa (As in the small OSTC)
Change Firmware to 1.5.1
Change RTE to 2.0
Create install file for testing and release
author | heinrichsweikamp |
---|---|
date | Sun, 06 Oct 2019 14:07:51 +0200 |
parents | 0756013e43b3 |
children | ba53ab77f059 |
files | Current build/OSTC4update_190804.bin Current build/OSTC4update_191006.bin Discovery/Src/settings.c Small_CPU/Src/baseCPU2.c Small_CPU/Src/pressure.c |
diffstat | 5 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/Discovery/Src/settings.c Mon Aug 19 11:42:31 2019 +0000 +++ b/Discovery/Src/settings.c Sun Oct 06 14:07:51 2019 +0200 @@ -55,15 +55,15 @@ { .versionFirst = 1, .versionSecond = 5, - .versionThird = 0, + .versionThird = 1, .versionBeta = 0, /* 4 bytes with trailing 0 */ .signature = "mh", .release_year = 19, - .release_month = 8, - .release_day = 5, + .release_month = 10, + .release_day = 6, .release_sub = 0, /* max 48 with trailing 0 */
--- a/Small_CPU/Src/baseCPU2.c Mon Aug 19 11:42:31 2019 +0000 +++ b/Small_CPU/Src/baseCPU2.c Sun Oct 06 14:07:51 2019 +0200 @@ -161,8 +161,8 @@ // SHALL LOAD AT 0x08000000 + 0x00005000 = 0x08005000. // See CPU2-RTE.ld const SFirmwareData cpu2_FirmwareData __attribute__(( section(".firmware_data") ))= { - .versionFirst = 1, - .versionSecond = 9, + .versionFirst = 2, + .versionSecond = 0, .versionThird = 0, .versionBeta = 0, @@ -170,8 +170,8 @@ .signature = "mh", .release_year = 19, - .release_month = 8, - .release_day = 5, + .release_month = 10, + .release_day = 6, .release_sub = 0, /* max 48 with trailing 0 */
--- a/Small_CPU/Src/pressure.c Mon Aug 19 11:42:31 2019 +0000 +++ b/Small_CPU/Src/pressure.c Sun Oct 06 14:07:51 2019 +0200 @@ -46,7 +46,7 @@ #define CMD_ADC_4096 0x08 // ADC OSR=4096 #define CMD_PROM_RD 0xA0 // Prom read command -#define PRESSURE_SURFACE_MAX_MBAR (1070.0f) /* It is very unlikely that pressure at surface is greater than this value => clip to it */ +#define PRESSURE_SURFACE_MAX_MBAR (1030.0f) /* It is unlikely that pressure at surface is greater than this value => clip to it */ #define PRESSURE_HISTORY_SIZE (8u) #define PRESSURE_JUMP_VALID_MBAR (500.0f) /* values are measure several times a second => jumps > 5m very unlikely */