From 6eaacb7f99485e777891338196b9bc1abfd617f4 Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Mon, 13 Jan 2025 20:06:51 +0100 Subject: [PATCH] Cleanup --- Bluetooth.h | 2 ++ Power.h | 7 ++----- Utilities.h | 9 ++------- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/Bluetooth.h b/Bluetooth.h index 72f4ab0..bbb0c82 100644 --- a/Bluetooth.h +++ b/Bluetooth.h @@ -383,6 +383,8 @@ char bt_devname[11]; } } + void bt_flush() { if (bt_state == BT_STATE_CONNECTED) { SerialBT.flushTXD(); } } + void bt_disable_pairing() { bt_allow_pairing = false; bt_ssp_pin = 0; diff --git a/Power.h b/Power.h index b88a66f..0379c49 100644 --- a/Power.h +++ b/Power.h @@ -216,11 +216,8 @@ void measure_battery() { // if (bt_state == BT_STATE_CONNECTED) { // SerialBT.printf("Bus voltage %.3fv. Unfiltered %.3fv.", battery_voltage, bat_v_samples[BAT_SAMPLES-1]); - // if (bat_voltage_dropping) { - // SerialBT.printf(" Voltage is dropping. Percentage %.1f%%.", battery_percent); - // } else { - // SerialBT.printf(" Voltage is not dropping. Percentage %.1f%%.", battery_percent); - // } + // if (bat_voltage_dropping) { SerialBT.printf(" Voltage is dropping. Percentage %.1f%%.", battery_percent); } + // else { SerialBT.printf(" Voltage is not dropping. Percentage %.1f%%.", battery_percent); } // if (battery_state == BATTERY_STATE_DISCHARGING) { SerialBT.printf(" Battery discharging. delay_v %.3fv", bat_delay_v); } // if (battery_state == BATTERY_STATE_CHARGING) { SerialBT.printf(" Battery charging. delay_v %.3fv", bat_delay_v); } // if (battery_state == BATTERY_STATE_CHARGED) { SerialBT.print(" Battery is charged."); } diff --git a/Utilities.h b/Utilities.h index 9a5d51e..06c6819 100644 --- a/Utilities.h +++ b/Utilities.h @@ -732,13 +732,8 @@ void serial_write(uint8_t byte) { #if MCU_VARIANT == MCU_NRF52 && HAS_BLE // This ensures that the TX buffer is flushed after a frame is queued in serial. // serial_in_frame is used to ensure that the flush only happens at the end of the frame - if (serial_in_frame && byte == FEND) { - SerialBT.flushTXD(); - serial_in_frame = false; - } - else if (!serial_in_frame && byte == FEND) { - serial_in_frame = true; - } + if (serial_in_frame && byte == FEND) { SerialBT.flushTXD(); serial_in_frame = false; } + else if (!serial_in_frame && byte == FEND) { serial_in_frame = true; } #endif } #else