From b19be17f0192e8bfff044c11e43749c26719075b Mon Sep 17 00:00:00 2001 From: OneOfEleven Date: Tue, 10 Oct 2023 10:52:57 +0100 Subject: [PATCH] battery current rename --- app/app.c | 6 +++--- app/spectrum.c | 18 +++++++++--------- firmware.bin | Bin 61136 -> 61136 bytes firmware.packed.bin | Bin 61154 -> 61154 bytes helper/battery.c | 6 +++--- helper/battery.h | 4 ++-- main.c | 4 ++-- ui/menu.c | 2 +- ui/welcome.c | 2 +- 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/app/app.c b/app/app.c index 3288392..784f7e8 100644 --- a/app/app.c +++ b/app/app.c @@ -1894,9 +1894,9 @@ void APP_TimeSlice500ms(void) if (g_reduced_service) { - BOARD_ADC_GetBatteryInfo(&g_battery_current_voltage, &g_battery_current); + BOARD_ADC_GetBatteryInfo(&g_usb_current_voltage, &g_usb_current); - if (g_battery_current > 500 || g_battery_calibration[3] < g_battery_current_voltage) + if (g_usb_current > 500 || g_battery_calibration[3] < g_usb_current_voltage) { #ifdef ENABLE_OVERLAY overlay_FLASH_RebootToBootloader(); @@ -1914,7 +1914,7 @@ void APP_TimeSlice500ms(void) if ((g_battery_check_counter & 1) == 0) { - BOARD_ADC_GetBatteryInfo(&g_battery_voltages[g_battery_voltage_index++], &g_battery_current); + BOARD_ADC_GetBatteryInfo(&g_battery_voltages[g_battery_voltage_index++], &g_usb_current); if (g_battery_voltage_index > 3) g_battery_voltage_index = 0; BATTERY_GetReadings(true); diff --git a/app/spectrum.c b/app/spectrum.c index 3f7f758..8a2c9cc 100644 --- a/app/spectrum.c +++ b/app/spectrum.c @@ -733,15 +733,15 @@ static void DrawSpectrum() { static void UpdateBatteryInfo() { for (int i = 0; i < 4; i++) { - BOARD_ADC_GetBatteryInfo(&gBatteryVoltages[i], &gBatteryCurrent); + BOARD_ADC_GetBatteryInfo(&g_battery_voltages[i], &g_usb_current); } - uint16_t voltage = Mid(gBatteryVoltages, ARRAY_SIZE(gBatteryVoltages)); - gBatteryDisplayLevel = 0; + uint16_t voltage = Mid(g_battery_voltages, ARRAY_SIZE(g_battery_voltages)); + g_battery_display_level = 0; - for (int i = ARRAY_SIZE(gBatteryCalibration) - 1; i >= 0; --i) { - if (gBatteryCalibration[i] < voltage) { - gBatteryDisplayLevel = i + 1; + for (int i = ARRAY_SIZE(g_battery_calibration) - 1; i >= 0; --i) { + if (g_battery_calibration[i] < voltage) { + g_battery_display_level = i + 1; break; } } @@ -753,7 +753,7 @@ static void DrawStatus() { for (int i = 126; i >= 116; i--) { g_status_line[i] = 0b01000010; } - uint8_t v = gBatteryDisplayLevel; + uint8_t v = g_battery_display_level; v <<= 1; for (int i = 125; i >= 116; i--) { if (126 - i <= v) { @@ -768,7 +768,7 @@ static void DrawF(uint32_t f) { sprintf(String, "%u.%05u", f / 100000, f % 100000); if (currentState == STILL && kbd.current == KEY_PTT) { - if (gBatteryDisplayLevel == 6) { + if (g_battery_display_level == 6) { sprintf(String, "VOLTAGE HIGH"); } else if (!IsTXAllowed()) { sprintf(String, "DISABLED"); @@ -1021,7 +1021,7 @@ void OnKeyDownStill(key_code_t key) { case KEY_PTT: // start transmit UpdateBatteryInfo(); - if (gBatteryDisplayLevel != 6 && IsTXAllowed()) { + if (g_battery_display_level != 6 && IsTXAllowed()) { ToggleTX(true); } redrawScreen = true; diff --git a/firmware.bin b/firmware.bin index e2610a6cb8a6efacdbc56b3d0f715f7a2108653f..386073f47a878c0f0d6bf6c34ed9e7325d30623b 100644 GIT binary patch delta 35 kcmca`m-)h7<_!}svzwS3o0_L3ZJu#iS{TmR^-PQd01)~Ov?1F!}l2YjP~Radv?1F!}l2P~$5QUvc?vkf4Wvj<+KT7n8V&$Fo08xseDl3Rk?@{zO3 J<`xJ7x<^Fp7N`IK diff --git a/helper/battery.c b/helper/battery.c index fc62dc7..9cfb054 100644 --- a/helper/battery.c +++ b/helper/battery.c @@ -22,8 +22,8 @@ #include "ui/ui.h" uint16_t g_battery_calibration[6]; -uint16_t g_battery_current_voltage; -uint16_t g_battery_current; +uint16_t g_usb_current_voltage; +uint16_t g_usb_current; uint16_t g_battery_voltages[4]; uint16_t g_battery_voltage_average; uint8_t g_battery_display_level; @@ -109,7 +109,7 @@ void BATTERY_GetReadings(const bool bDisplayBatteryLevel) if ((g_screen_to_display == DISPLAY_MENU) && g_menu_cursor == MENU_VOL) g_update_display = true; - if (g_battery_current < 501) + if (g_usb_current < 501) { if (g_charging_with_type_c) { diff --git a/helper/battery.h b/helper/battery.h index 8b37bf7..bf5c13f 100644 --- a/helper/battery.h +++ b/helper/battery.h @@ -21,8 +21,8 @@ #include extern uint16_t g_battery_calibration[6]; -extern uint16_t g_battery_current_voltage; -extern uint16_t g_battery_current; +extern uint16_t g_usb_current_voltage; +extern uint16_t g_usb_current; extern uint16_t g_battery_voltages[4]; extern uint16_t g_battery_voltage_average; extern uint8_t g_battery_display_level; diff --git a/main.c b/main.c index 803bbad..2402b52 100644 --- a/main.c +++ b/main.c @@ -83,7 +83,7 @@ void Main(void) BK4819_Init(); - BOARD_ADC_GetBatteryInfo(&g_battery_current_voltage, &g_battery_current); + BOARD_ADC_GetBatteryInfo(&g_usb_current_voltage, &g_usb_current); BOARD_EEPROM_Init(); @@ -97,7 +97,7 @@ void Main(void) RADIO_SetupRegisters(true); for (i = 0; i < ARRAY_SIZE(g_battery_voltages); i++) - BOARD_ADC_GetBatteryInfo(&g_battery_voltages[i], &g_battery_current); + BOARD_ADC_GetBatteryInfo(&g_battery_voltages[i], &g_usb_current); BATTERY_GetReadings(false); diff --git a/ui/menu.c b/ui/menu.c index f373316..a733db1 100644 --- a/ui/menu.c +++ b/ui/menu.c @@ -955,7 +955,7 @@ void UI_DisplayMenu(void) sprintf(String, "%u.%02uV\n%u%%\ncurr %u", g_battery_voltage_average / 100, g_battery_voltage_average % 100, BATTERY_VoltsToPercent(g_battery_voltage_average), - g_battery_current); + g_usb_current); break; case MENU_SIDE1_SHORT: diff --git a/ui/welcome.c b/ui/welcome.c index 90c5083..f6e0e1c 100644 --- a/ui/welcome.c +++ b/ui/welcome.c @@ -72,7 +72,7 @@ void UI_DisplayWelcome(void) BATTERY_VoltsToPercent(g_battery_voltage_average)); #if 0 - sprintf(WelcomeString2, "Current %u", g_battery_current); // needs scaling into mA + sprintf(WelcomeString2, "Current %u", g_usb_current); // needs scaling into mA #endif } else