From ffb6e00f1e7072bf41870ed5b4ea858b0c92c078 Mon Sep 17 00:00:00 2001 From: Philippe Teuwen Date: Tue, 10 Oct 2023 20:24:31 +0200 Subject: [PATCH] fix spurious LED in battery level, assign battery level to long press B --- CHANGELOG.md | 1 + firmware/application/src/app_main.c | 1 + firmware/application/src/settings.c | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ba2e3531..c47d4176 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file. This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log... ## [unreleased][unreleased] + - Fixed spurious LED in battery level, assigned battery level to long press B (@doegox) - Changed `hw slot list` to display LF ID & HF anticol data, and names in the --short version too (@doegox) - Added colors to CLI help (@doegox) - Changed massively CLI, cf https://github.com/RfidResearchGroup/ChameleonUltra/issues/164#issue-1930580576 (@doegox) diff --git a/firmware/application/src/app_main.c b/firmware/application/src/app_main.c index 16723d34..26d1fc57 100644 --- a/firmware/application/src/app_main.c +++ b/firmware/application/src/app_main.c @@ -533,6 +533,7 @@ static void cycle_slot(bool dec) { } static void show_battery(void) { + rgb_marquee_stop(); uint32_t *led_pins = hw_get_led_array(); // if still in the first 4s after boot, blink red while waiting for battery info while (percentage_batt_lvl == 0) { diff --git a/firmware/application/src/settings.c b/firmware/application/src/settings.c index 159d54a8..b5e2b722 100644 --- a/firmware/application/src/settings.c +++ b/firmware/application/src/settings.c @@ -39,7 +39,7 @@ void settings_init_button_press_config(void) { // add on version3 void settings_init_button_long_press_config(void) { config.button_a_long_press = SettingsButtonCloneIcUid; - config.button_b_long_press = SettingsButtonCloneIcUid; + config.button_b_long_press = SettingsButtonShowBattery; } // add on version4