# HG changeset patch # User heinrichsweikamp # Date 1557126058 -7200 # Node ID 733877ab87d9b54327f04b3bec9da0df4322ad26 # Parent ab6c42d2d30ba8718106e20dcb74aeb554bc5153 Minor: Some Texts fixed, allign RTErequired* values with RTE firmware diff -r ab6c42d2d30b -r 733877ab87d9 Current build/OSTC4update_190505.bin Binary file Current build/OSTC4update_190505.bin has changed diff -r ab6c42d2d30b -r 733877ab87d9 Current build/OSTC4update_190506.bin Binary file Current build/OSTC4update_190506.bin has changed diff -r ab6c42d2d30b -r 733877ab87d9 Discovery/Src/settings.c --- a/Discovery/Src/settings.c Sun May 05 11:06:02 2019 +0200 +++ b/Discovery/Src/settings.c Mon May 06 09:00:58 2019 +0200 @@ -36,7 +36,7 @@ SSettings Settings; const uint8_t RTErequiredHigh = 1; -const uint8_t RTErequiredLow = 7; +const uint8_t RTErequiredLow = 8; const uint8_t FONTrequiredHigh = 1; const uint8_t FONTrequiredLow = 0; @@ -56,19 +56,19 @@ .versionFirst = 1, .versionSecond = 4, .versionThird = 8, - .versionBeta = 1, + .versionBeta = 0, /* 4 bytes with trailing 0 */ .signature = "mh", .release_year = 19, - .release_month = 3, - .release_day = 10, + .release_month = 5, + .release_day = 6, .release_sub = 0, /* max 48 with trailing 0 */ //release_info ="12345678901234567890123456789012345678901" - .release_info ="gcc_1st", + .release_info ="gcc_2nd", /* for safety reasons and coming functions */ .magic[0] = FIRMWARE_MAGIC_FIRST, diff -r ab6c42d2d30b -r 733877ab87d9 Discovery/Src/text_multilanguage.c --- a/Discovery/Src/text_multilanguage.c Sun May 05 11:06:02 2019 +0200 +++ b/Discovery/Src/text_multilanguage.c Mon May 06 09:00:58 2019 +0200 @@ -65,14 +65,14 @@ static uint8_t text_ES_Divetime[] = "Tiempo"; // dive mode -static uint8_t text_EN_MaxDepth[] = "Max depth"; -static uint8_t text_DE_MaxDepth[] = "Max Tiefe"; +static uint8_t text_EN_MaxDepth[] = "Max. depth"; +static uint8_t text_DE_MaxDepth[] = "Max. Tiefe"; static uint8_t text_FR_MaxDepth[] = "Prof. max"; // Profondeur static uint8_t text_IT_MaxDepth[] = "Prof. max"; static uint8_t text_ES_MaxDepth[] = "Prof. max"; // dive mode -static uint8_t text_EN_AvgDepth[] = "Avg depth"; +static uint8_t text_EN_AvgDepth[] = "Avg. depth"; static uint8_t text_DE_AvgDepth[] = "(/) Tiefe"; static uint8_t text_FR_AvgDepth[] = "Prof. moy"; static uint8_t text_IT_AvgDepth[] = "Prof. media"; @@ -157,7 +157,7 @@ // dive mode static uint8_t text_EN_ActualGradient[] = "Saturation"; -static uint8_t text_DE_ActualGradient[] = ""; +static uint8_t text_DE_ActualGradient[] = "Sättigung"; static uint8_t text_FR_ActualGradient[] = ""; static uint8_t text_IT_ActualGradient[] = ""; static uint8_t text_ES_ActualGradient[] = ""; diff -r ab6c42d2d30b -r 733877ab87d9 Small_CPU/Src/baseCPU2.c --- a/Small_CPU/Src/baseCPU2.c Sun May 05 11:06:02 2019 +0200 +++ b/Small_CPU/Src/baseCPU2.c Mon May 06 09:00:58 2019 +0200 @@ -15,7 +15,7 @@ * @warning @verbatim ============================================================================== - ##### What about hardware without 8 MHz oscilator ##### + ##### What about hardware without 8 MHz oscillator ##### ============================================================================== [..] modify OTP Byte 1 at 0x1FFF7800 with ST-Link utility @@ -33,7 +33,7 @@ ============================================================================== ##### What it does ##### ============================================================================== - [..] All realtime stuff und all what has to be done during sleep + [..] All realtime stuff and all what has to be done during sleep [..] RealTimeClock. The entire time and date handling (including divetime) [..] Hardware control for pressure sensor, compass, battery monitor @@ -64,16 +64,15 @@ ============================================================================== ##### Real Time Clock ##### ============================================================================== - [..] Wehe sie zickt statt tickt! - The RTC is a seperate part of hardware inside the CPU and is not affected + The RTC is a separate part of hardware inside the CPU and is not affected by reset. Only power-on reset does change something. This is fine but the RTC is vital for the Sleep mode as Wakeuptimer. This is the only date/time system in the OSTC. The main CPU is passive. - Data transfer is done with localtime_rtc_tr und localtime_rtc_dr + Data transfer is done with localtime_rtc_tr and localtime_rtc_dr in HAL_RTC format to the main CPU and as HAL_RTC structs the way back for setting the actual time and date. The RTC unit has 20 Byte of V_bat powered SRAM. It could be used - for something usefull in both CPUs. + for something useful in both CPUs. ============================================================================== ##### File system ##### @@ -98,7 +97,7 @@ ##### Firmware Update Info ##### ============================================================================== V0.85 160531 scheduleCheck_pressure_reached_dive_mode_level() changes - 160606 global.no_fly_time_minutes ist at least 24h after the dive + 160606 global.no_fly_time_minutes is at least 24h after the dive 160613 ambient light fixed 160720 compass calib to Flash (8000 writes max. as erase has problems) 160829 do not reset main CPU on power on! @@ -109,7 +108,7 @@ 161024 no_fly_time_minutes Backup FIX seconds_since_last_dive now related to RTC clock 161121 close to surface starts at 1 meter below last known surface pressure - 161121 in surface mode dive mode starts @1 mtr difference if surface 880 mbar instead of 700 mbar before + 161121 in surface mode dive mode starts @1 mtr difference if surface 880 hPa instead of 700 hPa before V0.97+ 170213 added global.dataSendToSlave.diveModeInfo for DIVEMODE_Apnea added global.dataSendToSlave.setEndDive DIVEMODE_Apnea special in scheduler.c (ticksdiff >= 1000) -> no tissue, cns, otu, no change in noFly Time etc. @@ -165,19 +164,19 @@ .versionFirst = 1, .versionSecond = 8, .versionThird = 0, - .versionBeta = 1, + .versionBeta = 0, /* 4 bytes with trailing 0 */ .signature = "mh", .release_year = 19, - .release_month = 3, - .release_day = 10, + .release_month = 5, + .release_day = 6, .release_sub = 0, /* max 48 with trailing 0 */ //release_info ="12345678901234567890123456789012345678901" - .release_info = "compass stuff", + .release_info = "stable May'19", /* for safety reasons and coming functions */ .magic[0] = FIRMWARE_MAGIC_FIRST, .magic[1] = FIRMWARE_MAGIC_SECOND,