From 202b926eb7689e2de79d0ac3e64e366584594133 Mon Sep 17 00:00:00 2001 From: Mitchell Marino Date: Thu, 21 Aug 2025 20:15:29 -0500 Subject: [PATCH] starcode updates --- main/drivers/CMakeLists.txt | 2 +- main/drivers/all.h | 2 +- main/drivers/bottom_half.cpp | 2 +- main/drivers/char_lcd.cpp | 2 +- main/drivers/game_info.cpp | 15 ++++++--------- main/drivers/game_info.h | 2 +- main/drivers/power.cpp | 14 +++++++------- main/drivers/{star_code.cpp => starcode.cpp} | 2 +- main/drivers/{star_code.h => starcode.h} | 0 9 files changed, 19 insertions(+), 22 deletions(-) rename main/drivers/{star_code.cpp => starcode.cpp} (99%) rename main/drivers/{star_code.h => starcode.h} (100%) diff --git a/main/drivers/CMakeLists.txt b/main/drivers/CMakeLists.txt index ce668aa..c734a66 100644 --- a/main/drivers/CMakeLists.txt +++ b/main/drivers/CMakeLists.txt @@ -16,7 +16,7 @@ set(SOURCES "sd.cpp" "speaker.cpp" "sseg.cpp" - "star_code.cpp" + "starcode.cpp" "state_tracking.cpp" "tft.cpp" "wires.cpp" diff --git a/main/drivers/all.h b/main/drivers/all.h index 72a02c3..48047d9 100644 --- a/main/drivers/all.h +++ b/main/drivers/all.h @@ -10,7 +10,7 @@ #include "sd.h" #include "speaker.h" #include "sseg.h" -#include "star_code.h" +#include "starcode.h" #include "state_tracking.h" #include "tft.h" #include "wires.h" diff --git a/main/drivers/bottom_half.cpp b/main/drivers/bottom_half.cpp index f854b0d..fdd401a 100644 --- a/main/drivers/bottom_half.cpp +++ b/main/drivers/bottom_half.cpp @@ -1,7 +1,7 @@ #include "bottom_half.h" #include #include "state_tracking.h" -#include "star_code.h" +#include "starcode.h" static const char *TAG = "bottom_half"; diff --git a/main/drivers/char_lcd.cpp b/main/drivers/char_lcd.cpp index 3f06776..6212187 100644 --- a/main/drivers/char_lcd.cpp +++ b/main/drivers/char_lcd.cpp @@ -5,7 +5,7 @@ #include "state_tracking.h" #include #include "power.h" -#include "star_code.h" +#include "starcode.h" #include "game_info.h" i2c_lcd_pcf8574_handle_t lcd; diff --git a/main/drivers/game_info.cpp b/main/drivers/game_info.cpp index f98ac9e..26b8ded 100644 --- a/main/drivers/game_info.cpp +++ b/main/drivers/game_info.cpp @@ -1,24 +1,21 @@ #include "game_info.h" -#include "star_code.h" +#include "starcode.h" #include #include "char_lcd.h" -static char game_state[GAME_STATE_MAX_LEN+1] = "MENU "; +static char game_state[GAME_STATE_MAX_LEN+2] = " MENU "; -void set_game_state(char* new_state) { - snprintf(game_state, sizeof(game_state), "%-5s", new_state); +void set_game_state(const char* new_state) { + snprintf(game_state, sizeof(game_state), " %-5s", new_state); } void reset_game_state() { - for (int i = 0; i < GAME_STATE_MAX_LEN; i++) { - game_state[i] = '\0'; - } - game_state[GAME_STATE_MAX_LEN] = '\0'; + set_game_state(""); } void lcd_print_header_step() { if (!lcd_header_enabled()) return; if (lcd_starcode_displaying_result()) return; - lcd_print(11, 0, game_state); + lcd_print(10, 0, game_state); } diff --git a/main/drivers/game_info.h b/main/drivers/game_info.h index 1e261c2..d9d5154 100644 --- a/main/drivers/game_info.h +++ b/main/drivers/game_info.h @@ -6,7 +6,7 @@ /// @brief Sets the game state, used for the header. /// /// Must be <= 5 characters -void set_game_state(char* new_state); +void set_game_state(const char* new_state); /// @brief Resets the game state to be blank. void reset_game_state(); diff --git a/main/drivers/power.cpp b/main/drivers/power.cpp index 5a8bab5..6931f89 100644 --- a/main/drivers/power.cpp +++ b/main/drivers/power.cpp @@ -1,6 +1,6 @@ #include "power.h" #include "char_lcd.h" -#include "star_code.h" +#include "starcode.h" #include static const char* TAG = "power"; @@ -61,18 +61,18 @@ void lcd_print_header_bat() { uint8_t soc = lipo.soc(); uint8_t current = lipo.current(); - char buf[5]; + char buf[6]; if (soc < 5 && current <= 0) { - snprintf(buf, sizeof(buf), "LOW"); + snprintf(buf, sizeof(buf), " LOW"); } else if (soc == 100) { - snprintf(buf, sizeof(buf), "100"); + snprintf(buf, sizeof(buf), " 100"); } else { if (current > 0) { - snprintf(buf, sizeof(buf), "%2d+", soc); + snprintf(buf, sizeof(buf), " %2d+", soc); } else { - snprintf(buf, sizeof(buf), "%2d%%", soc); + snprintf(buf, sizeof(buf), " %2d%%", soc); } } - lcd_print(17, 0, buf); + lcd_print(16, 0, buf); } diff --git a/main/drivers/star_code.cpp b/main/drivers/starcode.cpp similarity index 99% rename from main/drivers/star_code.cpp rename to main/drivers/starcode.cpp index 423b81b..4aa9d80 100644 --- a/main/drivers/star_code.cpp +++ b/main/drivers/starcode.cpp @@ -1,4 +1,4 @@ -#include "star_code.h" +#include "starcode.h" #include #include #include diff --git a/main/drivers/star_code.h b/main/drivers/starcode.h similarity index 100% rename from main/drivers/star_code.h rename to main/drivers/starcode.h