Mercurial > public > ostc4
changeset 644:ebe3fc302ab8
Compile with ENABLE_CHARGER_STATUS_V2
author | heinrichs weikamp |
---|---|
date | Tue, 30 Mar 2021 10:34:12 +0200 |
parents | 5149cd644fbc |
children | e58f81cb25a7 |
files | Current build/OSTC4update_210225.bin Current build/OSTC4update_210330.bin Discovery/Src/settings.c Small_CPU/Src/baseCPU2.c Small_CPU/Src/batteryCharger.c |
diffstat | 5 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/Discovery/Src/settings.c Wed Mar 24 22:06:00 2021 +0100 +++ b/Discovery/Src/settings.c Tue Mar 30 10:34:12 2021 +0200 @@ -39,7 +39,7 @@ SSettings Settings; const uint8_t RTErequiredHigh = 2; -const uint8_t RTErequiredLow = 6; +const uint8_t RTErequiredLow = 7; const uint8_t FONTrequiredHigh = 1; const uint8_t FONTrequiredLow = 0; @@ -58,15 +58,15 @@ { .versionFirst = 1, .versionSecond = 5, - .versionThird = 7, + .versionThird = 8, .versionBeta = 0, /* 4 bytes with trailing 0 */ .signature = "mh", .release_year = 21, - .release_month = 02, - .release_day = 25, + .release_month = 03, + .release_day = 30, .release_sub = 0, /* max 48 with trailing 0 */
--- a/Small_CPU/Src/baseCPU2.c Wed Mar 24 22:06:00 2021 +0100 +++ b/Small_CPU/Src/baseCPU2.c Tue Mar 30 10:34:12 2021 +0200 @@ -165,7 +165,7 @@ // See CPU2-RTE.ld const SFirmwareData cpu2_FirmwareData __attribute__(( section(".firmware_data") ))= { .versionFirst = 2, - .versionSecond = 6, + .versionSecond = 7, .versionThird = 0, .versionBeta = 0, @@ -173,8 +173,8 @@ .signature = "mh", .release_year = 21, - .release_month = 2, - .release_day = 5, + .release_month = 3, + .release_day = 30, .release_sub = 0, /* max 48 with trailing 0 */
--- a/Small_CPU/Src/batteryCharger.c Wed Mar 24 22:06:00 2021 +0100 +++ b/Small_CPU/Src/batteryCharger.c Tue Mar 30 10:34:12 2021 +0200 @@ -17,7 +17,7 @@ enabled. As a note, the output of the charger supply will not be enabled if the VRECT-REG does not converge to the no-load target voltage. -CHG F4 7 O Open-drain output – active when BAT is enabled. Float if not used. +CHG F4 7 O Open-drain output � active when BAT is enabled. Float if not used. @endverbatim ****************************************************************************** @@ -35,7 +35,7 @@ /* Use This compile switch to select the new charger status control implementation */ -/* #define ENABLE_CHARGER_STATUS_V2 */ +#define ENABLE_CHARGER_STATUS_V2 #define CHARGE_IN_PIN GPIO_PIN_2 #define CHARGE_IN_GPIO_PORT GPIOC