fix spurious LED in battery level, assign battery level to long press B

RfidResearchGroup · Oct 10, 2023 · ffb6e00 · ffb6e00
1 parent c4aef7e
commit ffb6e00
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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