switch to event based expander interface (WIP)

main/drivers/CMakeLists.txt

@@ -4,18 +4,24 @@ set(SOURCES
     "TM1640/TM1640.cpp"
     "SparkFunBQ27441/SparkFunBQ27441.cpp"
     "esp_lcd_ili9488/esp_lcd_ili9488.c"
-    "bottom_half.cpp"
+    # "bottom_half.cpp"
     "char_lcd.cpp"
+    "game_info.cpp"
     "game_timer.cpp"
     "i2c_lcd_pcf8574.c"
+    "i2c.cpp"
+    "inputs.cpp"
     "leds.cpp"
+    "perh.cpp"
     "power.cpp"
     "sd.cpp"
     "speaker.cpp"
     "sseg.cpp"
+    "starcode.cpp"
     "state_tracking.cpp"
     "tft.cpp"
     "wires.cpp"
+    "wlvgl.cpp"
 )
 
 target_sources(${COMPONENT_LIB} PRIVATE ${SOURCES})

main/drivers/SparkFunBQ27441/SparkFunBQ27441.cpp

@@ -32,6 +32,7 @@ Arduino Uno (any 'duino should do)
 ******************************************************************************/
 
 #include "SparkFunBQ27441.h"
+#include "../i2c.h"
 
 /*****************************************************************************
  ************************** Initialization Functions *************************
@@ -710,7 +711,9 @@ bool BQ27441::writeExtendedData(uint8_t classID, uint8_t offset, uint8_t * data,
 int16_t BQ27441::i2cReadBytes(uint8_t subAddress, uint8_t * dest, uint8_t count)
 {
 	int16_t timeout = BQ72441_I2C_TIMEOUT;
+	xSemaphoreTake(main_i2c_mutex, portMAX_DELAY);
 	i2c_master_write_read_device(BQ72441_I2C_NUM, _deviceAddress, &subAddress, 1, dest, count, timeout);
+	xSemaphoreGive(main_i2c_mutex);
 	return timeout;
 }
 

main/drivers/all.cpp

@@ -1,12 +1,10 @@
 #include "all.h"
 
-static const char *TAG = "driver_all";
-static void init_i2c();
-
 void init_drivers() {
     init_i2c();
     // init char_lcd so we can use it to report other initialization errors.
     init_lcd();
+    init_star_code_system();
     // init the bottom half so that we can get user input.
     init_bottom_half();
     init_sd();
@@ -16,36 +14,6 @@ void init_drivers() {
     init_tft();
     init_leds();
     init_power_board();
+
+    set_lcd_header_enabled(true);
 }
-
-/// @brief Initializes I2C_NUM_0. 
-///
-/// This is hooked up the to:
-///  - The bottom half
-///  - The char lcd
-///  - The power board
-///  - The MPU6050
-///  - The PERH port
-///  - The Capacitive Touch Panel
-static void init_i2c() {
-    ESP_LOGI(TAG, "Initializing i2c...");
-
-    i2c_config_t conf = {
-        .mode = I2C_MODE_MASTER,
-        .sda_io_num = GPIO_NUM_5,
-        .scl_io_num = GPIO_NUM_6,
-        .sda_pullup_en = GPIO_PULLUP_DISABLE,
-        .scl_pullup_en = GPIO_PULLUP_DISABLE,
-        // .sda_pullup_en = GPIO_PULLUP_ENABLE,
-        // .scl_pullup_en = GPIO_PULLUP_ENABLE,
-        .master = {
-            .clk_speed = 100*1000,
-        },
-        .clk_flags = I2C_SCLK_SRC_FLAG_FOR_NOMAL
-    };
-
-    ESP_ERROR_CHECK(i2c_param_config(I2C_NUM_0, &conf));
-    ESP_ERROR_CHECK(i2c_driver_install(I2C_NUM_0, conf.mode, 0, 0, 0));
-
-    ESP_LOGI(TAG, "i2c initialized!");
-}

main/drivers/all.h

@@ -1,14 +1,19 @@
 #ifndef ALL_H
 #define ALL_H
 
-#include "char_lcd.h"
 #include "bottom_half.h"
+#include "char_lcd.h"
+#include "game_timer.h"
+#include "i2c.h"
+#include "leds.h"
+#include "power.h"
 #include "sd.h"
 #include "speaker.h"
-#include "game_timer.h"
-#include "drivers/tft.h"
-#include "drivers/leds.h"
-#include "drivers/power.h"
+#include "sseg.h"
+#include "starcode.h"
+#include "state_tracking.h"
+#include "tft.h"
+#include "wires.h"
 
 void init_drivers();
 

main/drivers/bottom_half.cpp

@@ -1,6 +1,7 @@
 #include "bottom_half.h"
 #include <esp_log.h>
 #include "state_tracking.h"
+#include "starcode.h"
 
 static const char *TAG = "bottom_half";
 
@@ -45,8 +46,14 @@ static bool replay_handler(const char* event, char* arg) {
 void init_bottom_half() {
     ESP_LOGI(TAG, "Initializing bottom half...");
 
-    ESP_ERROR_CHECK(gpio_set_direction(BOTTOM_PIN_INTERUPT, GPIO_MODE_INPUT));
-    ESP_ERROR_CHECK(gpio_set_pull_mode(BOTTOM_PIN_INTERUPT, GPIO_PULLUP_ONLY));
+    gpio_config_t int_conf = {
+        .pin_bit_mask = 1ULL << BOTTOM_PIN_INTERUPT,
+        .mode = GPIO_MODE_INPUT,
+        .pull_up_en = GPIO_PULLUP_ENABLE,
+        .pull_down_en = GPIO_PULLDOWN_DISABLE,
+        .intr_type = GPIO_INTR_DISABLE,
+    };
+    ESP_ERROR_CHECK(gpio_config(&int_conf));
 
     // TODO: do interupt stuff.
     // ESP_ERROR_CHECK(gpio_intr_enable(BOTTOM_PIN_INTERUPT));
@@ -69,20 +76,25 @@ void init_bottom_half() {
 
 static uint8_t receive_delta(void) {
     uint8_t reg = 1;
-    buf[0] = 0;
-    ESP_ERROR_CHECK_WITHOUT_ABORT(i2c_master_write_read_device(BOTTOM_I2C_NUM, BOTTOM_I2C_ADDR, &reg, 1, buf, 1, (100 / portTICK_PERIOD_MS)));
+    esp_err_t result = i2c_master_write_read_device(BOTTOM_I2C_NUM, BOTTOM_I2C_ADDR, &reg, 1, buf, 1, (100 / portTICK_PERIOD_MS));
+    ESP_ERROR_CHECK_WITHOUT_ABORT(result);
+    if (result != ESP_OK) {
+        return 0;
+    }
     return buf[0];
 }
 
 static void receive_keypad(void) {
+    // TODO: use mutex
+    // TODO: change the bottom half polling scheme from a state-based protocol to an event based protocol
     uint8_t reg = 2;
-    buf[0] = 0;
-    buf[1] = 0;
-    ESP_ERROR_CHECK_WITHOUT_ABORT(i2c_master_write_read_device(BOTTOM_I2C_NUM, BOTTOM_I2C_ADDR, &reg, 1, buf, 2, (100 / portTICK_PERIOD_MS)));
+    esp_err_t result = i2c_master_write_read_device(BOTTOM_I2C_NUM, BOTTOM_I2C_ADDR, &reg, 1, buf, 2, (100 / portTICK_PERIOD_MS));
+    ESP_ERROR_CHECK_WITHOUT_ABORT(result);
+    if (result != ESP_OK) {
+        return;
+    }
     uint16_t new_keypad_state = buf[0] | (buf[1] << 8);
-
     uint16_t just_pressed = new_keypad_state & ~keypad_state;
-    keypad_pressed |= just_pressed;
     if (is_state_tracking() && just_pressed) {
         char buf[6];
         sprintf(buf, "%d", just_pressed);
@@ -90,19 +102,27 @@ static void receive_keypad(void) {
     }
 
     uint16_t just_released = ~new_keypad_state & keypad_state;
-    keypad_released |= just_released;
     if (is_state_tracking() && just_released) {
         char buf[6];
         sprintf(buf, "%d", just_released);
         event_occured("KP_RELEASE", buf);
     }
 
+    star_code_handle_keypad(&just_pressed, &just_released);
+
+    keypad_pressed |= just_pressed;
+    keypad_released |= just_released;
     keypad_state = new_keypad_state;
 }
 
 static void receive_button_switch(void) {
     uint8_t reg = 3;
-    ESP_ERROR_CHECK_WITHOUT_ABORT(i2c_master_write_read_device(BOTTOM_I2C_NUM, BOTTOM_I2C_ADDR, &reg, 1, buf, 2, (100 / portTICK_PERIOD_MS)));
+    esp_err_t result = i2c_master_write_read_device(BOTTOM_I2C_NUM, BOTTOM_I2C_ADDR, &reg, 1, buf, 2, (100 / portTICK_PERIOD_MS));
+    ESP_ERROR_CHECK_WITHOUT_ABORT(result);
+    if (result != ESP_OK) {
+        return;
+    }
+
     uint8_t new_button_state = buf[1] & 0xF;
     uint8_t new_switch_state = (~buf[0]) & 0xF;
     uint8_t new_switch_touch_state = (buf[1] >> 4) & 0xF;
@@ -217,7 +237,8 @@ void clear_all_pressed_released(void) {
     touch_released = 0;
 }
 
-static bool _take_key(KeypadKey* kp, uint16_t* keypad_bitfield) {
+// TODO: this is public, but it won't need to be after the event-based protocol refactor
+bool take_key(KeypadKey* kp, uint16_t* keypad_bitfield) {
     for (int i = 0; i < 16; i++) {
         int bit_selector = (1 << i);
         if ((*keypad_bitfield) & bit_selector) {
@@ -233,10 +254,10 @@ static bool _take_key(KeypadKey* kp, uint16_t* keypad_bitfield) {
 }
 
 bool get_keypad_pressed(KeypadKey* kp) {
-    return _take_key(kp, &keypad_pressed);
+    return take_key(kp, &keypad_pressed);
 }
 bool get_keypad_released(KeypadKey* kp) {
-    return _take_key(kp, &keypad_released);
+    return take_key(kp, &keypad_released);
 }
 
 char char_of_keypad_key(KeypadKey kp) {

main/drivers/bottom_half.h

@@ -6,7 +6,7 @@
 
 #define BOTTOM_I2C_NUM I2C_NUM_0
 #define BOTTOM_I2C_ADDR 126
-#define BOTTOM_PIN_INTERUPT GPIO_NUM_0
+#define BOTTOM_PIN_INTERUPT GPIO_NUM_13
 
 #define DELTA_BIT_KP 0
 #define DELTA_BIT_BUTTON_SWITCH 1
@@ -14,22 +14,22 @@
 
 /// @brief An enum for the possible keypad buttons.
 typedef enum {
-    k1 = 0,
-    k4 = 1,
-    k7 = 2,
+    kd = 0,
+    pound = 1,
+    k0 = 2,
     star = 3,
-    k2 = 4,
-    k5 = 5,
+    kc = 4,
+    k9 = 5,
     k8 = 6,
-    k0 = 7,
-    k3 = 8,
+    k7 = 7,
+    kb = 8,
     k6 = 9,
-    k9 = 10,
-    pound = 11,
+    k5 = 10,
+    k4 = 11,
     ka = 12,
-    kb = 13,
-    kc = 14,
-    kd = 15,
+    k3 = 13,
+    k2 = 14,
+    k1 = 15,
 } KeypadKey;
 
 /// @brief An enum for the possible buttons.
@@ -126,6 +126,14 @@ bool get_touch_pressed();
 /// @return true if the touch sensor was just released
 bool get_touch_released();
 
+/// @brief A helper function for internal use.
+/// 
+/// Takes one key from the bitfield and sets the `kp` variable accordingly if the bitfield is not 0.
+/// @param kp Out. The keypad key to set.
+/// @param keypad_bitfield A pointer to the keypad bitfield to take a key from
+/// @return true if a key was taken from the bitfield
+bool take_key(KeypadKey* kp, uint16_t* keypad_bitfield);
+
 // TODO: add touch sensor for switch
 
 #endif /* BOTTOM_HALF_HPP */

main/drivers/char_lcd.cpp

@@ -4,13 +4,28 @@
 #include <esp_log.h>
 #include "state_tracking.h"
 #include <cstring>
+#include "power.h"
+#include "starcode.h"
+#include "game_info.h"
 
 i2c_lcd_pcf8574_handle_t lcd;
 
+static volatile bool header_enabled = false;
+
 static const char *TAG = "char_lcd";
+static const char* EMPTY_ROW = "                    ";
 
 static char buf[65];
 
+static void monitor_battery_task(void* _arg) {
+    (void) _arg;
+
+    while (true) {
+        vTaskDelay(pdMS_TO_TICKS(1'000));
+        lcd_print_header_bat();
+    }
+}
+
 static bool replay_handler(const char* event, char* arg) {
     if (strcmp(event, "LCD_CLEAR") == 0) {
         lcd_clear();
@@ -57,8 +72,7 @@ static bool replay_handler(const char* event, char* arg) {
         return true;
     }
     if (strcmp(event, "LCD_BACKLIGHT") == 0) {
-        uint32_t brightness = atoi(arg);
-        lcd_set_backlight(brightness);
+        lcd_set_backlight(strcmp(arg, "true") == 0);
         return true;
     }
     if (strcmp(event, "LCD_CREATE_CHAR") == 0) {
@@ -74,14 +88,9 @@ static bool replay_handler(const char* event, char* arg) {
         lcd_create_char(location, charmap);
         return true;
     }
-    if (strcmp(event, "LCD_WRITE") == 0) {
-        uint8_t value = atoi(arg);
-        lcd_write(value);
-        return true;
-    }
     if (strcmp(event, "LCD_PRINT") == 0) {
         // TODO: handle \r and \n
-        lcd_print(arg);
+        lcd_print(&lcd, arg);
         return true;
     }
 
@@ -98,25 +107,31 @@ void init_lcd() {
 
     register_replay_fn(replay_handler);
 
+    xTaskCreate(monitor_battery_task, "bat_monitor", 1024*2, nullptr, 0, nullptr);
+
     ESP_LOGI(TAG, "LCD initialized!");
 }
 
 void lcd_clear() {
-    lcd_clear(&lcd);
+    if (!header_enabled) {
+        lcd_clear(&lcd);
 
-    if (is_state_tracking()) {
-        event_occured("LCD_CLEAR", NULL);
+        if (is_state_tracking()) {
+            event_occured("LCD_CLEAR", NULL);
+        }
+    } else {
+        lcd_print(0, 1, EMPTY_ROW);
+        lcd_print(0, 2, EMPTY_ROW);
+        lcd_print(0, 3, EMPTY_ROW);
     }
 }
 
+// TODO: rm
 void lcd_cursor_home() {
-    lcd_home(&lcd);
-
-    if (is_state_tracking()) {
-        event_occured("LCD_CURSOR", "0,0");
-    }
+    lcd_set_cursor_pos(0, 0);
 }
 
+// TODO: with print requiring you to set a pos every time, this function is not helpful
 void lcd_set_cursor_pos(uint8_t col, uint8_t row) {
     lcd_set_cursor(&lcd, col, row);
 
@@ -204,16 +219,16 @@ void lcd_set_autoscroll(bool autoscroll) {
     }
 }
 
-void lcd_set_backlight(uint8_t brightness) {
-    lcd_set_backlight(&lcd, brightness);
+void lcd_set_backlight(bool backlight) {
+    lcd_set_backlight(&lcd, backlight);
 
     if (is_state_tracking()) {
-        sprintf(buf, "%d", brightness);
-        event_occured("LCD_BACKLIGHT", buf);
+        sprintf(buf, "%d", backlight);
+        event_occured("LCD_BACKLIGHT", backlight ? "true" : "false");
     }
 }
 
-void lcd_create_char(uint8_t location, uint8_t* charmap) {
+void lcd_create_char(uint8_t location, const uint8_t charmap[]) {
     lcd_create_char(&lcd, location, charmap);
 
     if (is_state_tracking()) {
@@ -225,16 +240,9 @@ void lcd_create_char(uint8_t location, uint8_t* charmap) {
     }
 }
 
-void lcd_write(uint8_t value) {
-    lcd_write(&lcd, value);
-
-    if (is_state_tracking()) {
-        sprintf(buf, "%d", value);
-        event_occured("LCD_WRITE", buf);
-    }
-}
-
-void lcd_print(const char* str) {
+// TODO: switch to row, col
+void lcd_print(uint8_t col, uint8_t row, const char* str) {
+    lcd_set_cursor_pos(col, row);
     lcd_print(&lcd, str);
 
     if (is_state_tracking()) {
@@ -243,7 +251,46 @@ void lcd_print(const char* str) {
     }
 }
 
-void lcd_print(uint8_t col, uint8_t row, const char* str) {
-    lcd_set_cursor_pos(col, row);
-    lcd_print(str);
+void set_lcd_header_enabled(bool enable) {
+    bool old_header_enabled = header_enabled;
+    header_enabled = enable;
+
+    // update header in response to enabling/disabling the header
+    if (enable && !old_header_enabled) {
+        lcd_print_header();
+    } else if (!enable && old_header_enabled) {
+        lcd_print(0, 0, EMPTY_ROW);
+    }
 }
+
+bool lcd_header_enabled() {
+    return header_enabled;
+}
+
+void lcd_print_header() {
+    lcd_print_header_star_code();
+    lcd_print_header_step();
+    lcd_print_header_bat();
+}
+
+void lcd_do_splash() {
+    const uint8_t custom_char[6][8] = {
+        { 0x01, 0x01, 0x02, 0x02, 0x07, 0x07, 0x0F, 0x0D },
+        { 0x10, 0x10, 0x18, 0x18, 0x1C, 0x0C, 0x0E, 0x06 },
+        { 0x00, 0x00, 0x01, 0x01, 0x03, 0x03, 0x07, 0x07 },
+        { 0x19, 0x1B, 0x13, 0x17, 0x07, 0x0F, 0x0F, 0x1F },
+        { 0x13, 0x1B, 0x1F, 0x1F, 0x00, 0x1F, 0x1F, 0x1F },
+        { 0x00, 0x00, 0x10, 0x10, 0x00, 0x18, 0x1C, 0x1C },
+    };
+
+    // TODO: make the lcd_lib somehow support the custom character 0 which would otherwise be a null terminator
+    lcd_create_char(1, custom_char[0]);
+    lcd_create_char(2, custom_char[1]);
+    lcd_create_char(3, custom_char[2]);
+    lcd_create_char(4, custom_char[3]);
+    lcd_create_char(5, custom_char[4]);
+    lcd_create_char(6, custom_char[5]);
+
+    lcd_print(6, 1, "\x01\x02Marino");
+    lcd_print(5, 2, "\x03\x04\x05\x06""DEV");
+}

main/drivers/char_lcd.h

@@ -44,18 +44,29 @@ void lcd_right_to_left();
 void lcd_set_autoscroll(bool autoscroll);
 
 // Set backlight brightness
-void lcd_set_backlight(uint8_t brightness);
+void lcd_set_backlight(bool backlight);
 
 // Create a custom character
-void lcd_create_char(uint8_t location, uint8_t charmap[]);
+void lcd_create_char(uint8_t location, const uint8_t charmap[]);
 
-// Write a character to the LCD
-void lcd_write(uint8_t value);
-
-// Print a string to the LCD
-void lcd_print(const char* str);
-
-// Print a string to the LCD at a given pos
+/// @brief Print a string to the LCD at a given pos. 
+/// @param col the column to print the string at.
+/// @param row the row the print the string at.
+/// @param str the string to print.
 void lcd_print(uint8_t col, uint8_t row, const char* str);
 
+/// @brief Enables or disables the header on the LCD.
+/// @param enable `true` to enable the header, `false` to disable.
+void set_lcd_header_enabled(bool enable);
+
+/// @brief Returns weather or not the lcd_header is enabled.
+/// @return `true` if the header is enabled, `false` otherwise.
+bool lcd_header_enabled();
+
+/// @brief Prints the header in the LCD.
+void lcd_print_header();
+
+/// @brief Prints the splash screen for the BLK_BOX.
+void lcd_do_splash();
+
 #endif /* CHAR_LCD_H */

main/drivers/game_info.cpp

@@ -0,0 +1,21 @@
+#include "game_info.h"
+#include "starcode.h"
+#include <stdio.h>
+#include "char_lcd.h"
+
+static char game_state[GAME_STATE_MAX_LEN+2] = " MENU ";
+
+void set_game_state(const char* new_state) {
+    snprintf(game_state, sizeof(game_state), " %-5s", new_state);
+}
+
+void reset_game_state() {
+    set_game_state("");
+}
+
+void lcd_print_header_step() {
+    if (!lcd_header_enabled()) return;
+    if (lcd_starcode_displaying_result()) return;
+
+    lcd_print(10, 0, game_state);
+}

main/drivers/game_info.h

@@ -0,0 +1,17 @@
+#ifndef GAME_INFO_H
+#define GAME_INFO_H
+
+#define GAME_STATE_MAX_LEN 5
+
+/// @brief Sets the game state, used for the header.
+///
+/// Must be <= 5 characters
+void set_game_state(const char* new_state);
+
+/// @brief Resets the game state to be blank.
+void reset_game_state();
+
+/// @brief Prints the game state section of the header to the char_lcd. (row 0, columns 11-15)
+void lcd_print_header_step();
+
+#endif /* GAME_INFO_H */

main/drivers/i2c.cpp

@@ -0,0 +1,35 @@
+#include "i2c.h"
+#include "esp_log.h"
+#include "esp_err.h"
+#include "driver/i2c.h"
+
+static const char *TAG = "i2c";
+
+SemaphoreHandle_t main_i2c_mutex;
+
+void init_i2c() {
+    ESP_LOGI(TAG, "Initializing i2c...");
+
+    i2c_config_t conf = {
+        .mode = I2C_MODE_MASTER,
+        .sda_io_num = PIN_I2C_SDA,
+        .scl_io_num = PIN_I2C_SCL,
+        .sda_pullup_en = GPIO_PULLUP_DISABLE,
+        .scl_pullup_en = GPIO_PULLUP_DISABLE,
+        // .sda_pullup_en = GPIO_PULLUP_ENABLE,
+        // .scl_pullup_en = GPIO_PULLUP_ENABLE,
+        .master = {
+            // TODO: 400k?
+            .clk_speed = 100*1000,
+        },
+        .clk_flags = I2C_SCLK_SRC_FLAG_FOR_NOMAL
+    };
+
+    ESP_ERROR_CHECK(i2c_param_config(MAIN_I2C_BUS_NUM, &conf));
+    ESP_ERROR_CHECK(i2c_driver_install(MAIN_I2C_BUS_NUM, conf.mode, 0, 0, 0));
+
+    main_i2c_mutex = xSemaphoreCreateMutex();
+    assert(main_i2c_mutex != NULL);
+
+    ESP_LOGI(TAG, "i2c initialized!");
+}

main/drivers/i2c.h

@@ -0,0 +1,26 @@
+#ifndef I2C_H
+#define I2C_H
+
+#include "freertos/FreeRTOS.h"
+#include "freertos/semphr.h"
+
+#define MAIN_I2C_BUS_NUM I2C_NUM_0
+
+#define PIN_I2C_SDA GPIO_NUM_7
+#define PIN_I2C_SCL GPIO_NUM_15
+
+/// The mutex for accessing `I2C_NUM_0`.
+extern SemaphoreHandle_t main_i2c_mutex;
+
+/// @brief Initializes `I2C_NUM_0`.
+///
+/// This is hooked up the to:
+///  - The bottom half
+///  - The char lcd
+///  - The power board
+///  - The MPU6050
+///  - The PERH port
+///  - The Capacitive Touch Panel
+void init_i2c();
+
+#endif /* I2C_H */

main/drivers/i2c_lcd_pcf8574.c

@@ -12,6 +12,7 @@
 #include "esp_check.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
+#include "i2c.h"
 
 #define TAG "I2C_LCD_PCF8574"
 
@@ -58,6 +59,7 @@ void lcd_begin(i2c_lcd_pcf8574_handle_t* lcd, uint8_t cols, uint8_t rows) {
     lcd->entrymode = 0x02;
 
     // The following are the reset sequence: Please see "Initialization instruction in the PCF8574 datasheet."
+    xSemaphoreTake(main_i2c_mutex, portMAX_DELAY);
     i2c_cmd_handle_t cmd = i2c_cmd_link_create();
     i2c_master_start(cmd);
     // We left-shift the device addres and add the read/write command
@@ -95,6 +97,7 @@ void lcd_begin(i2c_lcd_pcf8574_handle_t* lcd, uint8_t cols, uint8_t rows) {
     i2c_master_stop(cmd);
     i2c_master_cmd_begin(lcd->i2c_port, cmd, I2C_MASTER_TIMEOUT_MS / portTICK_PERIOD_MS);
     i2c_cmd_link_delete(cmd);
+    xSemaphoreGive(main_i2c_mutex);
 
     // Instruction: function set = 0x20
     lcd_send(lcd, 0x20 | (rows > 1 ? 0x08 : 0x00), false);
@@ -110,7 +113,7 @@ void lcd_clear(i2c_lcd_pcf8574_handle_t* lcd) {
     // Instruction: Clear display = 0x01
     lcd_send(lcd, 0x01, false);
     // Clearing the display takes a while: takes approx. 1.5ms
-    esp_rom_delay_us(1600);
+    esp_rom_delay_us(2000);
 }  // lcd_clear()
 
 // Set the display to home
@@ -118,7 +121,7 @@ void lcd_home(i2c_lcd_pcf8574_handle_t* lcd) {
     // Instruction: Return home = 0x02
     lcd_send(lcd, 0x02, false);
     // Same as clearing the display: takes approx. 1.5ms
-    esp_rom_delay_us(1600);
+    esp_rom_delay_us(2000);
 }  // lcd_home()
 
 // Set the cursor to a new position.
@@ -238,7 +241,7 @@ void lcd_set_backlight(i2c_lcd_pcf8574_handle_t* lcd, uint8_t brightness) {
 }  // lcd_set_backlight()
 
 // Custom character creation: allows us to create up to 8 custom characters in the CGRAM locations
-void lcd_create_char(i2c_lcd_pcf8574_handle_t* lcd, uint8_t location, uint8_t charmap[]) {
+void lcd_create_char(i2c_lcd_pcf8574_handle_t* lcd, uint8_t location, const uint8_t charmap[]) {
     location &= 0x7;  // Only 8 locations are available
     // Set the CGRAM address
     lcd_send(lcd, 0x40 | (location << 3), false);
@@ -295,6 +298,7 @@ void lcd_print_number(i2c_lcd_pcf8574_handle_t* lcd, uint8_t col, uint8_t row, u
 
 
 static void lcd_send(i2c_lcd_pcf8574_handle_t* lcd, uint8_t value, bool is_data) {
+    xSemaphoreTake(main_i2c_mutex, portMAX_DELAY);
     i2c_cmd_handle_t cmd = i2c_cmd_link_create();
     i2c_master_start(cmd);
     i2c_master_write_byte(cmd, (lcd->i2c_addr << 1) | I2C_MASTER_WRITE, true);
@@ -303,6 +307,7 @@ static void lcd_send(i2c_lcd_pcf8574_handle_t* lcd, uint8_t value, bool is_data)
     i2c_master_stop(cmd);
     esp_err_t ret = i2c_master_cmd_begin(lcd->i2c_port, cmd, I2C_MASTER_TIMEOUT_MS / portTICK_PERIOD_MS);
     i2c_cmd_link_delete(cmd);
+    xSemaphoreGive(main_i2c_mutex);
     
     if (ret != ESP_OK) {
         ESP_LOGE(TAG, "Failed to send data to LCD: %s", esp_err_to_name(ret));
@@ -341,6 +346,7 @@ static void lcd_write_i2c(i2c_lcd_pcf8574_handle_t* lcd, uint8_t data, bool is_d
         data |= lcd->backlight_mask;
     }
 
+    xSemaphoreTake(main_i2c_mutex, portMAX_DELAY);
     i2c_cmd_handle_t cmd = i2c_cmd_link_create();
     i2c_master_start(cmd);
     i2c_master_write_byte(cmd, (lcd->i2c_addr << 1) | I2C_MASTER_WRITE, true);
@@ -348,6 +354,7 @@ static void lcd_write_i2c(i2c_lcd_pcf8574_handle_t* lcd, uint8_t data, bool is_d
     i2c_master_stop(cmd);
     esp_err_t ret = i2c_master_cmd_begin(lcd->i2c_port, cmd, I2C_MASTER_TIMEOUT_MS / portTICK_PERIOD_MS);
     i2c_cmd_link_delete(cmd);
+    xSemaphoreGive(main_i2c_mutex);
 
     if (ret != ESP_OK) {
         ESP_LOGE(TAG, "Failed to write to LCD: %s", esp_err_to_name(ret));

main/drivers/i2c_lcd_pcf8574.h

@@ -94,7 +94,7 @@ void lcd_no_autoscroll(i2c_lcd_pcf8574_handle_t* lcd);
 void lcd_set_backlight(i2c_lcd_pcf8574_handle_t* lcd, uint8_t brightness);
 
 // Create a custom character
-void lcd_create_char(i2c_lcd_pcf8574_handle_t* lcd, uint8_t location, uint8_t charmap[]);
+void lcd_create_char(i2c_lcd_pcf8574_handle_t* lcd, uint8_t location, const uint8_t charmap[]);
 
 // Write a character to the LCD
 void lcd_write(i2c_lcd_pcf8574_handle_t* lcd, uint8_t value);

main/drivers/inputs.cpp

@@ -0,0 +1,486 @@
+#include "blk_box_drivers/inputs.hpp"
+
+#include "bottom_half.h"
+#include "pins.h"
+#include "driver/i2c.h"
+#include "driver/gpio.h"
+#include "freertos/FreeRTOS.h"
+#include "freertos/task.h"
+#include "esp_log.h"
+#include "esp_err.h"
+
+static const char *TAG = "INPUTS";
+
+static TaskHandle_t expander_task_handle = NULL;
+
+static i2c_master_dev_handle_t expander_i2c_dev_handle;
+
+const static uint8_t REG_WHOAMI = 0x01;
+const static uint8_t REG_SW_VERSION = 0x02;
+const static uint8_t REG_EVENT_QUEUE_POP = 0x10;
+const static uint8_t REG_EVENT_QUEUE_LEN = 0x11;
+const static uint8_t REG_STATE_BUTTONS = 0x20;
+const static uint8_t REG_STATE_SWITCHES = 0x21;
+const static uint8_t REG_STATE_KEYPAD = 0x22;
+const static uint8_t REG_STATE_TOUCH = 0x23;
+const static uint8_t REG_STATE_RFID = 0x24;
+const static uint8_t REG_STATE_HALL = 0x25;
+const static uint8_t REG_STATE_CLOSE = 0x26;
+const static uint8_t REG_RESET = 0x30;
+const static uint8_t REG_HALL_SENSITIVITY = 0x31;
+const static uint8_t REG_CLOSE_SENSITIVITY = 0x32;
+const static uint8_t REG_SWITCH_TOUCH_EVENT = 0x33;
+
+/// The global data for the expander peripheral.
+class ExpanderPeripheral {
+    // TODO: change these to private
+    // or even make this class hidden
+    public: 
+    SemaphoreHandle_t state_mutex;
+    InputsState state;
+
+    // channels
+    QueueHandle_t button_press_events;
+    QueueHandle_t button_release_events;
+    QueueHandle_t switch_flip_events;
+    QueueHandle_t switch_touch_events;
+    QueueHandle_t touch_events;
+    QueueHandle_t keypad_press_events;
+    QueueHandle_t keypad_release_events;
+};
+
+ExpanderPeripheral expander_peripheral_singleton;
+
+// forward declarations
+static void get_events();
+static void handle_event(uint8_t event);
+static void handle_button_switch_event(uint8_t event);
+static void handle_keypad_event(uint8_t event);
+static void handle_touch_event(uint8_t event);
+static void handle_rfid_event(uint8_t event);
+static void handle_close_hal_event(uint8_t event);
+static void expander_task(void *arg);
+
+// ISR handler
+static void IRAM_ATTR expander_isr_handler(void *arg) {
+    BaseType_t xHigherPriorityTaskWoken = pdFALSE;
+
+    if (expander_task_handle != NULL) {
+        vTaskNotifyGiveFromISR(expander_task_handle, &xHigherPriorityTaskWoken);
+    }
+
+    if (xHigherPriorityTaskWoken == pdTRUE) {
+        portYIELD_FROM_ISR();
+    }
+}
+
+void init_expander() {
+    ESP_LOGI(TAG, "Initializing expander...");
+
+    i2c_device_config_t dev_config = {
+        .dev_addr_length = I2C_ADDR_BIT_LEN_7,
+        .device_address = EXPANDER_I2C_ADDR,
+        .scl_speed_hz = EXPANDER_I2C_SPEED,
+        .scl_wait_us = 0, // default
+        .flags = {
+            .disable_ack_check = 0,
+        }
+    };
+
+    // setup interrupt on BOTTOM_PIN_INTERUPT
+    gpio_config_t io_conf = {
+        .pin_bit_mask = (1ULL << BOTTOM_PIN_INTERUPT),
+        .mode = GPIO_MODE_INPUT,
+        .pull_up_en = GPIO_PULLUP_ENABLE,
+        .pull_down_en = GPIO_PULLDOWN_DISABLE,
+        .intr_type = GPIO_INTR_NEGEDGE
+    };
+
+    ESP_ERROR_CHECK(gpio_config(&io_conf));
+
+    // Install ISR service (only call once in your program)
+    ESP_ERROR_CHECK(gpio_install_isr_service(0));
+
+    // Attach the ISR to the expander pin
+    ESP_ERROR_CHECK(gpio_isr_handler_add(BOTTOM_PIN_INTERUPT, expander_isr_handler, NULL));
+
+    // verify the expander connection status by reading the WHOAMI register
+    uint8_t read_buf[2] = {0};
+
+    i2c_master_write_read_device(I2C_NUM_0, BOTTOM_I2C_ADDR, &REG_WHOAMI, 1, read_buf, 1, 1000);
+
+    if (read_buf[0] != EXPANDER_WHOAMI_VALUE) {
+        ESP_LOGE(TAG, "WHOAMI mismatch, expected 0x%02X, got 0x%02X", EXPANDER_WHOAMI_VALUE, read_buf[0]);
+        return;
+    }
+
+    ESP_LOGD(TAG, "Expander WHOAMI check passed");
+
+    ESP_ERROR_CHECK(i2c_master_transmit_receive(expander_i2c_dev_handle, &REG_SW_VERSION, 1, read_buf, 2, EXPANDER_TIMEOUT_MS));
+
+    // init the peripheral struct
+    expander_peripheral_singleton.state_mutex = xSemaphoreCreateMutex();
+    expander_peripheral_singleton.button_press_events= xQueueCreate(EXPANDER_EVENT_QUEUE_SIZE, sizeof(Button));
+    expander_peripheral_singleton.button_release_events= xQueueCreate(EXPANDER_EVENT_QUEUE_SIZE, sizeof(Button));
+    expander_peripheral_singleton.switch_flip_events= xQueueCreate(EXPANDER_EVENT_QUEUE_SIZE, sizeof(SwitchFlip));
+    expander_peripheral_singleton.switch_touch_events= xQueueCreate(EXPANDER_EVENT_QUEUE_SIZE, sizeof(SwitchTouch));
+    expander_peripheral_singleton.touch_events= xQueueCreate(EXPANDER_EVENT_QUEUE_SIZE, sizeof(TouchedReleased));
+    expander_peripheral_singleton.keypad_press_events= xQueueCreate(EXPANDER_KEYPAD_QUEUE_SIZE, sizeof(KeypadKey));
+    expander_peripheral_singleton.keypad_release_events= xQueueCreate(EXPANDER_KEYPAD_QUEUE_SIZE, sizeof(KeypadKey));
+
+    ESP_LOGI(TAG, "Expander initialized! SW version: v%d.%d", read_buf[0], read_buf[1]);
+
+    // Create the expander background worker task
+    BaseType_t task_created = xTaskCreate(
+        expander_task,
+        "expander_task",
+        4096,
+        NULL,
+        tskIDLE_PRIORITY + 1,
+        &expander_task_handle
+    );
+
+    if (task_created != pdPASS) {
+        ESP_LOGE(TAG, "Failed to create expander task");
+    }
+}
+
+static void expander_task(void *arg) {
+    (void)arg;
+
+    while (true) {
+        get_events();
+
+        // Wait for interrupt notification (signal is sent when INT falls)
+        ulTaskNotifyTake(pdTRUE, portMAX_DELAY);
+    }
+}
+
+static void get_events() {
+    uint8_t recv;
+    while (gpio_get_level(PIN_EXPANDER_INT) == 0) {
+        ESP_ERROR_CHECK(i2c_master_transmit_receive(expander_i2c_dev_handle, &REG_EVENT_QUEUE_POP, 1, &recv, 1, EXPANDER_TIMEOUT_MS));
+        handle_event(recv);
+    }
+}
+
+static void handle_event(uint8_t event) {
+    const uint8_t BUTTON_SWITCH = 0b000;
+    const uint8_t KEYPAD = 0b001;
+    const uint8_t TOUCH = 0b010;
+    const uint8_t RFID = 0b011;
+
+    ESP_LOGD(TAG, "Expander event: 0b%08b (0x%02X)", event, event);
+
+    if (event == 0) {
+        ESP_LOGE(TAG, "We read from event queue while it was empty!");
+        return;
+    }
+
+    uint8_t type_bits = event >> 5;
+
+    switch (type_bits) {
+        case BUTTON_SWITCH:
+            handle_button_switch_event(event);
+            break;
+        case KEYPAD:
+            handle_keypad_event(event);
+            break;
+        case TOUCH:
+            handle_touch_event(event);
+            break;
+        case RFID:
+            handle_rfid_event(event);
+            break;
+        default:
+            handle_close_hal_event(event);
+            break;
+    }
+}
+
+static void handle_button_switch_event(uint8_t event) {
+    const uint8_t PRESSED_NOT_RELEASED_BIT = 0b10000;
+    const uint8_t SWITCH_NOT_BUTTON_BIT = 0b01000;
+    const uint8_t SWITCH_UP_NOT_DOWN_BIT = 0b00100;
+    const uint8_t NUMBER_MASK = 0b00011;
+
+    bool pressed = (event & PRESSED_NOT_RELEASED_BIT) != 0;
+    uint8_t number = event & NUMBER_MASK;
+
+    if ((event & SWITCH_NOT_BUTTON_BIT) != 0) {
+        // For now, we support two position switches by only looking at the switch up events
+        bool switch_up = (event & SWITCH_UP_NOT_DOWN_BIT) != 0;
+        if (!switch_up) {
+            return;
+        }
+
+        Switch sw = static_cast<Switch>(number);
+        SwitchFlip sw_flip = SwitchFlip(sw, pressed);
+        xQueueSendToBack(expander_peripheral_singleton.switch_flip_events, &sw_flip, 0);
+        xSemaphoreTake(expander_peripheral_singleton.state_mutex, portMAX_DELAY);
+        if (pressed) {
+            // set
+            expander_peripheral_singleton.state.switch_state |= 1 << number;
+        } else {
+            // clear
+            expander_peripheral_singleton.state.switch_state &= ~(1 << number);
+        }
+        xSemaphoreGive(expander_peripheral_singleton.state_mutex);
+    } else {
+        // button
+        Button button = static_cast<Button>(number);
+        if (pressed) {
+            xQueueSendToBack(expander_peripheral_singleton.button_press_events, &button, 0);
+            xSemaphoreTake(expander_peripheral_singleton.state_mutex, portMAX_DELAY);
+            expander_peripheral_singleton.state.button_state |= 1 << number;
+            xSemaphoreGive(expander_peripheral_singleton.state_mutex);
+        } else {
+            xQueueSendToBack(expander_peripheral_singleton.button_release_events, &button, 0);
+            xSemaphoreTake(expander_peripheral_singleton.state_mutex, portMAX_DELAY);
+            expander_peripheral_singleton.state.button_state &= ~(1 << number);
+            xSemaphoreGive(expander_peripheral_singleton.state_mutex);
+        }
+    }
+}
+
+static void handle_keypad_event(uint8_t event) {
+    const uint8_t PRESSED_NOT_RELEASED_BIT = 0b10000;
+    const uint8_t KEY_MASK = 0b1111;
+
+    bool pressed = (event & PRESSED_NOT_RELEASED_BIT) != 0;
+    uint8_t number = event & KEY_MASK;
+    KeypadKey key = static_cast<KeypadKey>(number);
+
+    // starcode system gets first dibs
+    // TODO: do starcode inbetweener
+    // if starcode_handle_keypad(key, pressed).await {
+    //     return;
+    // }
+
+    if (pressed) {
+        xQueueSendToBack(expander_peripheral_singleton.keypad_press_events, &key, 0);
+        xSemaphoreTake(expander_peripheral_singleton.state_mutex, portMAX_DELAY);
+        expander_peripheral_singleton.state.keypad_state |= 1 << number;
+        xSemaphoreGive(expander_peripheral_singleton.state_mutex);
+    } else {
+        xQueueSendToBack(expander_peripheral_singleton.keypad_release_events, &key, 0);
+        xSemaphoreTake(expander_peripheral_singleton.state_mutex, portMAX_DELAY);
+        expander_peripheral_singleton.state.keypad_state &= ~(1 << number);
+        xSemaphoreGive(expander_peripheral_singleton.state_mutex);
+    }
+}
+
+static void handle_touch_event(uint8_t event) {
+    const uint8_t TOUCHED_NOT_UNTOUCHED_BIT = 0b10000;
+    const uint8_t SENSOR_MASK = 0b0111;
+    const uint8_t FINGERPRINT_BIT = 0b0100;
+
+    bool touched = (event & TOUCHED_NOT_UNTOUCHED_BIT) != 0;
+    uint8_t sensor = event & SENSOR_MASK;
+
+    if ((sensor & FINGERPRINT_BIT) != 0) {
+        TouchedReleased touch_state = static_cast<TouchedReleased>(touched);
+        xQueueSendToBack(expander_peripheral_singleton.touch_events, &touch_state, 0);
+    } else {
+        Switch sw = static_cast<Switch>(sensor);
+        SwitchTouch sw_touch = SwitchTouch(sw, touched);
+        xQueueSendToBack(expander_peripheral_singleton.switch_touch_events, &sw_touch, 0);
+    }
+
+    xSemaphoreTake(expander_peripheral_singleton.state_mutex, portMAX_DELAY);
+    if (touched) {
+        expander_peripheral_singleton.state.touch_state |= 1 << sensor;
+    } else {
+        expander_peripheral_singleton.state.touch_state &= ~(1 << sensor);
+    }
+    xSemaphoreGive(expander_peripheral_singleton.state_mutex);
+}
+
+static void handle_rfid_event(uint8_t event) {
+    // TODO: impl
+    (void)event;
+}
+
+static void handle_close_hal_event(uint8_t event) {
+    // TODO: impl
+    (void)event;
+}
+
+// InputsController implementations
+
+/// Clears all events waiting in the queues.
+void InputsController::clear_all_events() {
+    xQueueReset(expander_peripheral_singleton.button_press_events);
+    xQueueReset(expander_peripheral_singleton.button_release_events);
+    xQueueReset(expander_peripheral_singleton.switch_flip_events);
+    xQueueReset(expander_peripheral_singleton.switch_touch_events);
+    xQueueReset(expander_peripheral_singleton.touch_events);
+    xQueueReset(expander_peripheral_singleton.keypad_press_events);
+    xQueueReset(expander_peripheral_singleton.keypad_release_events);
+}
+
+InputsState InputsController::get_input_state() {
+    xSemaphoreTake(expander_peripheral_singleton.state_mutex, portMAX_DELAY);
+    InputsState state_copy = expander_peripheral_singleton.state;
+    xSemaphoreGive(expander_peripheral_singleton.state_mutex);
+    return state_copy;
+}
+
+/// Returns `true` iff there is a button press event waiting.
+bool InputsController::has_button_press() {
+    return uxQueueMessagesWaiting(expander_peripheral_singleton.button_press_events) > 0;
+}
+
+/// Gets the next button press event (if any).
+std::optional<Button> InputsController::get_button_press() {
+    Button b;
+    if (xQueueReceive(expander_peripheral_singleton.button_press_events, &b, 0) == pdTRUE) {
+        return b;
+    }
+    return std::nullopt;
+}
+
+/// Gets the next button press event, waiting if neccesary.
+Button InputsController::wait_button_press() {
+    Button b;
+    xQueueReceive(expander_peripheral_singleton.button_press_events, &b, portMAX_DELAY);
+    return b;
+}
+
+/// Gets the current state of the buttons.
+uint8_t InputsController::button_state() {
+    xSemaphoreTake(expander_peripheral_singleton.state_mutex, portMAX_DELAY);
+    uint8_t value = expander_peripheral_singleton.state.button_state;
+    xSemaphoreGive(expander_peripheral_singleton.state_mutex);
+    return value;
+}
+
+/// Returns `true` iff there is a button release event waiting.
+bool InputsController::has_button_release() {
+    return uxQueueMessagesWaiting(expander_peripheral_singleton.button_release_events) > 0;
+}
+
+/// Gets the next button release event (if any).
+std::optional<Button> InputsController::get_button_release() {
+    Button b;
+    if (xQueueReceive(expander_peripheral_singleton.button_release_events, &b, 0) == pdTRUE) {
+        return b;
+    }
+    return std::nullopt;
+}
+
+/// Gets the next button release event, waiting if neccesary.
+Button InputsController::wait_button_release() {
+    Button b;
+    xQueueReceive(expander_peripheral_singleton.button_release_events, &b, portMAX_DELAY);
+    return b;
+}
+
+/// Returns `true` iff there is a switch flip event waiting.
+bool InputsController::has_switch_flip() {
+    return uxQueueMessagesWaiting(expander_peripheral_singleton.switch_flip_events) > 0;
+}
+
+/// Gets the next switch flip event (if any).
+std::optional<SwitchFlip> InputsController::get_switch_flip() {
+    SwitchFlip s;
+    if (xQueueReceive(expander_peripheral_singleton.switch_flip_events, &s, 0) == pdTRUE) {
+        return s;
+    }
+    return std::nullopt;
+}
+
+/// Gets the next switch flip event, waiting if neccesary.
+SwitchFlip InputsController::wait_switch_flip() {
+    SwitchFlip s;
+    xQueueReceive(expander_peripheral_singleton.switch_flip_events, &s, portMAX_DELAY);
+    return s;
+}
+
+/// Gets the current state of the switches.
+uint8_t InputsController::switch_state() {
+    xSemaphoreTake(expander_peripheral_singleton.state_mutex, portMAX_DELAY);
+    uint8_t value = expander_peripheral_singleton.state.switch_state;
+    xSemaphoreGive(expander_peripheral_singleton.state_mutex);
+    return value;
+}
+
+/// Returns `true` iff there is a switch touch event waiting.
+bool InputsController::has_switch_touch() {
+    return uxQueueMessagesWaiting(expander_peripheral_singleton.switch_touch_events) > 0;
+}
+
+/// Gets the next switch touch event (if any).
+std::optional<SwitchTouch> InputsController::get_switch_touch() {
+    SwitchTouch s;
+    if (xQueueReceive(expander_peripheral_singleton.switch_touch_events, &s, 0) == pdTRUE) {
+        return s;
+    }
+    return std::nullopt;
+}
+
+/// Gets the next switch touch event, waiting if neccesary.
+SwitchTouch InputsController::wait_switch_touch() {
+    SwitchTouch s;
+    xQueueReceive(expander_peripheral_singleton.switch_touch_events, &s, portMAX_DELAY);
+    return s;
+}
+
+/// Gets the current state of the touch sensors.
+uint8_t InputsController::switch_touch_state() {
+    xSemaphoreTake(expander_peripheral_singleton.state_mutex, portMAX_DELAY);
+    uint8_t value = expander_peripheral_singleton.state.touch_state;
+    xSemaphoreGive(expander_peripheral_singleton.state_mutex);
+    return value;
+}
+
+/// Returns `true` iff there is a keypad press event waiting.
+bool InputsController::has_keypad_press() {
+    return uxQueueMessagesWaiting(expander_peripheral_singleton.keypad_press_events) > 0;
+}
+
+/// Gets the next keypad press event (if any).
+std::optional<KeypadKey> InputsController::get_keypad_press() {
+    KeypadKey k;
+    if (xQueueReceive(expander_peripheral_singleton.keypad_press_events, &k, 0) == pdTRUE) {
+        return k;
+    }
+    return std::nullopt;
+}
+
+/// Gets the next keypad press event, waiting if neccesary.
+KeypadKey InputsController::wait_keypad_press() {
+    KeypadKey k;
+    xQueueReceive(expander_peripheral_singleton.keypad_press_events, &k, portMAX_DELAY);
+    return k;
+}
+
+/// Returns `true` iff there is a keypad release event waiting.
+bool InputsController::has_keypad_release() {
+    return uxQueueMessagesWaiting(expander_peripheral_singleton.keypad_release_events) > 0;
+}
+
+/// Gets the next keypad release event (if any).
+std::optional<KeypadKey> InputsController::get_keypad_release() {
+    KeypadKey k;
+    if (xQueueReceive(expander_peripheral_singleton.keypad_release_events, &k, 0) == pdTRUE) {
+        return k;
+    }
+    return std::nullopt;
+}
+
+/// Gets the next keypad release event, waiting if neccesary.
+KeypadKey InputsController::wait_keypad_release() {
+    KeypadKey k;
+    xQueueReceive(expander_peripheral_singleton.keypad_release_events, &k, portMAX_DELAY);
+    return k;
+}
+
+/// Gets the current state of the keypad.
+uint16_t InputsController::keypad_state() {
+    xSemaphoreTake(expander_peripheral_singleton.state_mutex, portMAX_DELAY);
+    uint16_t value = expander_peripheral_singleton.state.keypad_state;
+    xSemaphoreGive(expander_peripheral_singleton.state_mutex);
+    return value;
+}
+

main/drivers/leds.cpp

@@ -8,11 +8,11 @@ static const char* TAG = "leds";
 
 static led_strip_handle_t leds;
 
+// TODO: rename these to playback_handler
 static bool replay_handler(const char* event, char* arg) {
     if (strcmp(event, "LED_SET") == 0) {
         uint32_t led = atoi(strtok(arg, ","));
         uint32_t color = atoi(strtok(NULL, ","));
-        ESP_LOGI("leds", "color: %ld", color);
         led_set(led, color);
         return true;
     }

main/drivers/leds.h

@@ -4,7 +4,7 @@
 #include <stdint.h>
 
 #define LED_COUNT 21
-#define NEOPIXEL_PIN GPIO_NUM_7
+#define NEOPIXEL_PIN GPIO_NUM_0
 // 10MHz resolution, 1 tick = 0.1us (led strip needs a high resolution)
 #define LED_STRIP_RMT_RES_HZ  (10 * 1000 * 1000)
 
@@ -26,6 +26,7 @@ enum LEDColor: uint32_t {
     LED_COLOR_WHITE_STRONG = 0xFF'FF'FF,
 };
 
+// TODO: sepperate the indicator leds from the shape display.
 enum IndicatorLED {
     LED_SHAPE1 = 0u,
     LED_SHAPE2 = 1u,

main/drivers/perh.cpp

@@ -0,0 +1,2 @@
+#include "perh.h"
+

main/drivers/perh.h

@@ -0,0 +1,12 @@
+#ifndef PERH_H
+#define PERH_H
+
+#include "driver/gpio.h"
+
+#define PIN_PERH0 GPIO_NUM_6
+#define PIN_PERH1 GPIO_NUM_5
+#define PIN_PERH2 GPIO_NUM_4
+#define PIN_PERH3 GPIO_NUM_2
+#define PIN_PERH4 GPIO_NUM_1
+
+#endif /* PERH_H */

main/drivers/power.cpp

@@ -1,5 +1,6 @@
 #include "power.h"
 #include "char_lcd.h"
+#include "starcode.h"
 #include <esp_log.h>
 
 static const char* TAG = "power";
@@ -50,4 +51,28 @@ void init_power_board() {
     ESP_LOGI(TAG, "Power board initialized!");
 }
 
+uint16_t get_bat_voltage() {
+    return lipo.voltage();
+}
 
+void lcd_print_header_bat() {
+    if (!lcd_header_enabled()) return;
+    if (lcd_starcode_displaying_result()) return;
+    
+    uint8_t soc = lipo.soc();
+    uint8_t current = lipo.current();
+    char buf[6];
+    if (soc < 5 && current <= 0) {
+        snprintf(buf, sizeof(buf), " LOW");
+    } else if (soc == 100) {
+        snprintf(buf, sizeof(buf), " 100");
+    } else {
+        if (current > 0) {
+            snprintf(buf, sizeof(buf), " %2d+", soc);
+        } else {
+            snprintf(buf, sizeof(buf), " %2d%%", soc);
+        }
+    }
+
+    lcd_print(16, 0, buf);
+}

main/drivers/power.h

@@ -3,13 +3,18 @@
 
 #include "SparkFunBQ27441/SparkFunBQ27441.h"
 
+extern volatile uint32_t battery_charge;
+
 void bat_monitor_task(void* arg);
 
 /// Initializes the battery gas guage for getting battery stats.
 void init_power_board();
 
-/// @brief Gets the battery voltage
+/// @brief Gets the battery voltage.
 /// @return battery voltage in mV.
 uint16_t get_bat_voltage();
 
+/// @brief Prints the battery section of the header to the char_lcd. (row 0, columns 17-19)
+void lcd_print_header_bat();
+
 #endif /* POWER_H */

main/drivers/sd.h

@@ -12,12 +12,12 @@
 
 extern sdmmc_card_t *card;
 
-#define SD_PIN_CLK GPIO_NUM_48
-#define SD_PIN_CMD GPIO_NUM_45
-#define SD_PIN_D0  GPIO_NUM_47
-#define SD_PIN_D1  GPIO_NUM_21
-#define SD_PIN_D2  GPIO_NUM_39
-#define SD_PIN_D3  GPIO_NUM_38
+#define SD_PIN_CLK GPIO_NUM_39
+#define SD_PIN_CMD GPIO_NUM_40
+#define SD_PIN_D0  GPIO_NUM_38
+#define SD_PIN_D1  GPIO_NUM_45
+#define SD_PIN_D2  GPIO_NUM_42
+#define SD_PIN_D3  GPIO_NUM_41
 
 /// @brief Initializes the SD card
 ///

main/drivers/speaker.h

@@ -15,8 +15,8 @@
 #include "sdkconfig.h"
 #include "sd.h"
 
-#define SPEAKER_PIN_BCLK  GPIO_NUM_46
-#define SPEAKER_PIN_WS    GPIO_NUM_9
+#define SPEAKER_PIN_BCLK  GPIO_NUM_11
+#define SPEAKER_PIN_WS    GPIO_NUM_12
 #define SPEAKER_PIN_DOUT  GPIO_NUM_3
 #define SAMPLE_RATE 44100
 // The maximum number of clips that can be queued at one time.

main/drivers/sseg.h

@@ -4,8 +4,8 @@
 #include "TM1640/TM1640.h"
 #include <esp_log.h>
 
-#define SSEG_PIN_DATA GPIO_NUM_10
-#define SSEG_PIN_CLK  GPIO_NUM_11
+#define SSEG_PIN_DATA GPIO_NUM_46
+#define SSEG_PIN_CLK  GPIO_NUM_48
 
 extern TM1640* sseg;
 

main/drivers/starcode.cpp

@@ -0,0 +1,256 @@
+#include "starcode.h"
+#include <vector>
+#include <algorithm>
+#include <string.h>
+#include <stdint.h>
+#include <esp_log.h>
+#include "drivers/bottom_half.h"
+#include "char_lcd.h"
+#include "esp_timer.h"
+
+static const char* TAG = "star_code";
+
+volatile bool handling_new_starcodes = false;
+static volatile bool system_initialized = false;
+
+// TODO: use the semaphore, convert to RWLock?
+static volatile SemaphoreHandle_t star_codes_sem;
+static std::vector<StarCodeEntry> star_codes;
+
+static const char EMPTY_STAR_CODE_HEADER[] = "          ";
+
+esp_timer_handle_t starcode_delay_timer;
+/// @brief `true` if we are delaying for a starcode
+static volatile bool delaying_for_starcode;
+static volatile StarCodeEntry* current_starcode = nullptr;
+/// @brief `true` when we are handling user input for a starcode
+static volatile bool doing_starcode = false;
+static uint16_t starcode_waiting_on_release;
+static char current[STARCODE_MAX_LEN + 1];
+static size_t current_idx;
+
+static void starcode_trigger_cb(void* arg) {
+    (void) arg;
+
+    delaying_for_starcode = false;
+
+    if (current_starcode != nullptr) {
+        if (current_starcode->triggered_sem != nullptr)
+            xSemaphoreGive(current_starcode->triggered_sem);
+        if (current_starcode->callback != nullptr) 
+            (current_starcode->callback)();
+        
+        current_starcode = nullptr;
+    }
+
+    // TODO: rename star code everywhere to starcode
+    lcd_print_header();
+}
+
+
+void star_code_handle_keypad(uint16_t* just_pressed, uint16_t* just_released) {
+    if ((!delaying_for_starcode) && handling_new_starcodes &&  (*just_pressed & (1 << KeypadKey::star))) {
+        current_idx = 0;
+        current[current_idx] = '\0';
+        doing_starcode = true;
+    }
+    if (doing_starcode) {
+        // If we get a press while handling a starcode, we also want to capture the release of that key.
+        starcode_waiting_on_release |= *just_pressed;
+
+        KeypadKey key;
+        while (take_key(&key, just_pressed)) {
+            if (key == KeypadKey::star) {
+                current_idx = 0;
+                current[current_idx] = '\0';
+            } else if (key == KeypadKey::pound) {
+                doing_starcode = false;
+                if (current_idx != 0) {
+                    trigger_star_code(current);
+                }
+            } else {
+                // shift the digits left if neccesary
+                if (current_idx >= STARCODE_MAX_LEN) {
+                    for (int i = 1; i < current_idx; i++) {
+                        current[i-1] = current[i];
+                    }
+                    current_idx--;
+                }
+                // append the character
+                current[current_idx++] = char_of_keypad_key(key);
+                current[current_idx] = '\0';
+            }
+            lcd_print_header_star_code();
+        }
+    }
+
+    // capture any releases from starcodes
+    uint16_t new_just_released = (*just_released) & (~starcode_waiting_on_release);
+    starcode_waiting_on_release = starcode_waiting_on_release & (~*just_released);
+    *just_released = new_just_released;
+}
+
+void init_star_code_system() {
+    star_codes_sem = xSemaphoreCreateBinary();
+    xSemaphoreGive(star_codes_sem);
+
+    const esp_timer_create_args_t timer_args = {
+        .callback = &starcode_trigger_cb,
+        .arg = nullptr,
+        .dispatch_method = ESP_TIMER_TASK,
+        .name = "starcode_trigger",
+        .skip_unhandled_events = false,
+    };
+    
+    ESP_ERROR_CHECK(esp_timer_create(&timer_args, &starcode_delay_timer));
+
+    handling_new_starcodes = true;
+    system_initialized = true;
+}
+
+/// Checks if a triggered code matches an expected code.
+/// @return true iff the codes match, where '*'s in the expected code can match any character in the triggered code
+static bool check_code_match(const char* triggered, const char* expected) {
+    size_t triggered_len = strlen(triggered);
+    size_t match_len = strlen(triggered);
+
+    if (triggered_len != match_len) 
+        return false;
+
+    for (int i = 0; i < triggered_len; i++) {
+        if (!(expected[i] == '*' || expected[i] == triggered[i])) {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+bool add_star_code(StarCodeEntry code) {
+    ESP_LOGI(TAG, "Adding starcode: %s", code.code);
+    if (code.code == nullptr || strlen(code.code) > STARCODE_MAX_LEN) {
+        ESP_LOGW(TAG, "invalid code");
+        return false;
+    }
+    if (code.display_text != nullptr && strlen(code.display_text) > STARCODE_DISPLAY_TEXT_MAX_LEN) {
+        ESP_LOGW(TAG, "invalid display_text");
+        return false;
+    }
+
+    // check for a existing entry
+    auto it = std::find_if(star_codes.begin(), star_codes.end(), [&](const StarCodeEntry& other) {
+        return check_code_match(code.code, other.code);
+    });
+
+    if (it != star_codes.end()) {
+        // existing star code found!
+        ESP_LOGW(TAG, "Duplicate starcode %s", code.code);
+        return false;
+    }
+
+    star_codes.push_back(code);
+    return true;
+}
+
+bool add_star_codes(const StarCodeEntry* codes, size_t len) {
+    bool success = true;
+    for (int i = 0; i < len; i++) {
+        if (!add_star_code(codes[i])) {
+            success = false;
+        }
+    }
+    return success;
+}
+
+bool rm_star_code(const char* code) {
+    ESP_LOGI(TAG, "Removing starcode: %s", code);
+
+    auto it = std::find_if(star_codes.begin(), star_codes.end(), [&](const StarCodeEntry& star_code) {
+        return strcmp(code, star_code.code) == 0;
+    });
+    
+    if (it == star_codes.end()) {
+        ESP_LOGW(TAG, "Failed to remove star code %s", code);
+        return false;
+    }
+
+    star_codes.erase(it);
+    return true;
+}
+
+bool rm_star_codes(const StarCodeEntry* codes, size_t len) {
+    bool success = true;
+    for (int i = 0; i < len; i++) {
+        if (!rm_star_code(codes[i].code)) {
+            success = false;
+        }
+    }
+    return success;
+}
+
+bool rm_star_codes_str(const char** codes, size_t len) {
+    bool success = true;
+    for (int i = 0; i < len; i++) {
+        if (!rm_star_code(codes[i])) {
+            success = false;
+        }
+    }
+    return success;
+}
+
+void clear_star_codes() {
+    star_codes.clear();
+}
+
+bool trigger_star_code(const char* code) {
+    auto it = std::find_if(star_codes.begin(), star_codes.end(), [&](const StarCodeEntry& other) {
+        return check_code_match(code, other.code);
+    });
+
+    uint64_t delay_us = 2'000'000;
+    delaying_for_starcode = true;
+    if (it != star_codes.end()) {
+        current_starcode = &*it;
+        delay_us = current_starcode->delay_us;
+    }
+
+    ESP_ERROR_CHECK(esp_timer_start_once(starcode_delay_timer, delay_us));
+
+    return current_starcode != nullptr;
+}
+
+void pause_star_code_system() {
+    doing_starcode = false;
+    handling_new_starcodes = false;
+}
+
+void resume_star_code_system() {
+    handling_new_starcodes = system_initialized;
+}
+
+void lcd_print_header_star_code() {
+    if (!lcd_header_enabled()) return;
+
+    // TODO: consider upping the display text size to be able to overwrite the game_state area.
+    if (delaying_for_starcode) {
+        if (current_starcode == nullptr) {
+            lcd_print(0, 0, "Invalid starcode    ");
+        } else if (current_starcode->display_text != nullptr) {
+            char buf[21];
+            snprintf(buf, sizeof(buf), "%-20s", current_starcode->display_text);
+            lcd_print(0, 0, buf);
+        } else {
+            lcd_print(0, 0, EMPTY_STAR_CODE_HEADER);
+        }
+    } else if (doing_starcode) {
+        char buf[STARCODE_MAX_LEN + 2];
+        snprintf(buf, sizeof(buf), "*%-9s", current);
+        lcd_print(0, 0, buf);
+    } else {
+        lcd_print(0, 0, EMPTY_STAR_CODE_HEADER);
+    }
+}
+
+bool lcd_starcode_displaying_result() {
+    return delaying_for_starcode;
+}

main/drivers/starcode.h

@@ -0,0 +1,90 @@
+#ifndef STAR_CODE_H
+#define STAR_CODE_H
+
+#include <stddef.h>
+#include <freertos/FreeRTOS.h>
+#include <freertos/semphr.h>
+
+/// The max length of a starcode (not counting the star)
+#define STARCODE_MAX_LEN 9
+#define STARCODE_DISPLAY_TEXT_MAX_LEN 20
+
+/// @brief A handler for a specific star code
+struct StarCodeEntry {
+    /// @brief The star code without the star
+    ///
+    /// This must be <= 9 characters.
+    ///
+    /// You may include a * in the code to match on any character
+    const char* code;
+    /// @brief The text to display when the star code is entered (or null).
+    /// 
+    /// This must be <= 20 characters.
+    const char* display_text;
+    /// @brief The number of microseconds to delay when the star code is entered before calling the handler.
+    uint64_t delay_us;
+    /// @brief The function to call when the star code is entered.
+    /// Can be null.
+    void (*callback)(void);
+    /// @brief The binary semaphore that will be given when this star code is triggered.
+    /// Can be null.
+    SemaphoreHandle_t triggered_sem;
+};
+
+/// @brief Initializes the star code system.
+void init_star_code_system();
+
+/// @brief Handles any keypad presses and releases before they bubble up to the rest of the BLK_BOX.
+void star_code_handle_keypad(uint16_t* just_pressed, uint16_t* just_released);
+
+/// @brief Adds a star code to be handled.
+/// @param code the star code to add
+/// @return true iff the star code was added
+bool add_star_code(StarCodeEntry code);
+
+/// @brief Adds a list of star codes to be handled.
+/// @param codes the list of star codes to add
+/// @param len the length of the list
+/// @return true iff all the star codes were added
+bool add_star_codes(const StarCodeEntry* codes, size_t len);
+
+/// @brief removes a star code to stop handling it.
+/// @param code the star code to remove
+/// @return true iff the star code was removed
+bool rm_star_code(const char* code);
+
+/// @brief removes all given star codes to stop handling them.
+/// @param codes the list of star codes to remove
+/// @param len the length of the list
+/// @return true iff all star codes were removed
+bool rm_star_codes(const StarCodeEntry* codes, size_t len);
+
+/// @brief removes all given star codes to stop handling them.
+/// @param codes the list of star codes to remove
+/// @param len the length of the list
+/// @return true iff all star codes were removed
+bool rm_star_codes_str(const char** codes, size_t len);
+
+/// @brief clears all star codes.
+void clear_star_codes();
+
+/// @brief Triggers the given star code.
+/// @param code the star code to trigger (without the *)
+/// @return true iff a star code was triggered
+bool trigger_star_code(const char* code);
+
+
+/// @brief Starts/stops the star code system from handling new star codes.
+/// If one is being handled currently, it is canceled.
+void set_star_code_sys_enabled(bool enable);
+
+/// @return `true` iff the star code system is handling star codes.
+bool star_code_sys_enabled();
+
+/// @brief Prints the star code section of the header to the char_lcd. (row 0, columns 0-9)
+void lcd_print_header_star_code();
+
+/// @return `true` iff the starcode system is using the full header.
+bool lcd_starcode_displaying_result();
+
+#endif /* STAR_CODE_H */

main/drivers/state_tracking.cpp

@@ -1,6 +1,7 @@
 #include "state_tracking.h"
 #include <unistd.h>
 #include <vector>
+#include "wlvgl.h"
 
 static const char* PLAYBACK_TAG = "playback";
 
@@ -24,7 +25,6 @@ TaskHandle_t playback_task_handle;
 
 static volatile state_t state = STATE_IDLE;
 
-
 /// @brief Periodically flushes and syncs (if neccesary) the output stream.
 /// @param arg unused.
 static void flush_file_task(void* arg) {
@@ -171,6 +171,7 @@ bool start_recording() {
     state = STATE_RECORDING;
     recording_start_time = xTaskGetTickCount();
     xTaskCreate(flush_file_task, "flush_recording", 2048, NULL, 2, &flush_file_task_handle);
+    reset_wlv_tables(); // TODO: generify this
     return true;
 }
 
@@ -198,6 +199,7 @@ bool start_playback() {
     state = STATE_PLAYBACK;
     playback_start_time = xTaskGetTickCount();
     xTaskCreate(playback_task, "playback", 4096, NULL, 2, &playback_task_handle);
+    reset_wlv_tables(); // TODO: generify this
     return true;
 }
 

main/drivers/tft.cpp

@@ -26,7 +26,7 @@ static bool notify_lvgl_flush_ready(
     esp_lcd_panel_io_event_data_t *edata,
     void *user_ctx
 ) {
-    lv_disp_drv_t *disp_driver = (lv_disp_drv_t *)user_ctx;
+    lv_disp_drv_t* disp_driver = (lv_disp_drv_t *)user_ctx;
     lv_disp_flush_ready(disp_driver);
     return false;
 }

main/drivers/tft.h

@@ -44,11 +44,11 @@
 #define SPI_MAX_TRANSFER_SIZE 32768
 
 #define TFT_PIN_MOSI GPIO_NUM_17
-#define TFT_PIN_MISO GPIO_NUM_18
-#define TFT_PIN_CLK GPIO_NUM_16
+#define TFT_PIN_MISO GPIO_NUM_16
+#define TFT_PIN_CLK GPIO_NUM_18
 #define TFT_PIN_CS GPIO_NUM_NC
-#define TFT_PIN_DC GPIO_NUM_15
-#define TFT_PIN_RESET GPIO_NUM_8
+#define TFT_PIN_DC GPIO_NUM_8
+#define TFT_PIN_RESET GPIO_NUM_9
 
 #define TFT_INVERT_COLOR false
 

main/drivers/wires.cpp

@@ -26,17 +26,17 @@ static void receive_button(void);
 void init_wires(void) {
     i2c_config_t wires_conf = {
         .mode = I2C_MODE_MASTER,
-        .sda_io_num = GPIO_NUM_41,
-        .scl_io_num = GPIO_NUM_42,
+        .sda_io_num = PIN_WIRES_SDA,
+        .scl_io_num = PIN_WIRES_SCL,
         .sda_pullup_en = GPIO_PULLUP_ENABLE,
         .scl_pullup_en = GPIO_PULLUP_ENABLE,
         .master = {
             .clk_speed = 100000,
-        }
+        },
     };
 
-    gpio_reset_pin(GPIO_NUM_41);
-    gpio_reset_pin(GPIO_NUM_42);
+    gpio_reset_pin(PIN_WIRES_SDA);
+    gpio_reset_pin(PIN_WIRES_SCL);
 
     ESP_ERROR_CHECK(i2c_param_config(WIRES_I2C_NUM, &wires_conf));
     ESP_ERROR_CHECK(i2c_driver_install(WIRES_I2C_NUM, wires_conf.mode, 0, 0, 0));

main/drivers/wires.h

@@ -8,8 +8,11 @@
 #include "drivers/char_lcd.h"
 #include "drivers/game_timer.h"
 #include "main.h"
+#include "perh.h"
 
-#define WIRES_PIN_DELTA GPIO_NUM_2
+#define WIRES_PIN_DELTA PIN_PERH3
+#define PIN_WIRES_SDA PIN_PERH1
+#define PIN_WIRES_SCL PIN_PERH2
 #define WIRES_I2C_NUM I2C_NUM_1
 #define WIRES_I2C_ADDR 125
 

main/drivers/wlvgl.cpp

@@ -0,0 +1,152 @@
+#include "wlvgl.h"
+#include <vector>
+
+/// A table that maps an incrementing integer to a style reference
+static std::vector<lv_style_t*> style_table;
+
+/// A table that maps an incrementing integer to a style reference
+static std::vector<lv_obj_t*> obj_table;
+
+static int index_of_style(lv_style_t* style) {
+    for (size_t i = 0; i < style_table.size(); i++) {
+        if (style_table[i] == style) {
+            return i;
+        }
+    }
+    return -1;
+}
+
+static int index_of_obj(lv_obj_t* obj) {
+    for (size_t i = 0; i < obj_table.size(); i++) {
+        if (obj_table[i] == obj) {
+            return i;
+        }
+    }
+    return -1;
+}
+
+
+void reset_wlv_tables() {
+    style_table.clear();
+    obj_table.clear();
+}
+
+lv_obj_t * wlv_obj_create(lv_obj_t* parent) {
+    // initialize the obj
+    lv_obj_t* value = lv_obj_create(parent);
+    
+    if (is_state_tracking()) {
+        // add the style to the table
+        obj_table.push_back(value);
+        size_t obj_index = obj_table.size();
+
+		char buf[8];
+		sprintf(buf, "%d", obj_index);
+		event_occured("lv_obj_create", buf);
+	}
+    return value;
+}
+
+void wlv_style_init(lv_style_t* style) {
+    // initialize the style
+    lv_style_init(style);
+
+    if (is_state_tracking()) {
+        // add the style to the table
+        style_table.push_back(style);
+        size_t style_index = style_table.size();
+
+		char buf[8];
+		sprintf(buf, "%d", style_index);
+		event_occured("lv_style_init", buf);
+	}
+}
+
+void wlv_obj_set_style_bg_color(lv_obj_t* obj, lv_color_t value, lv_style_selector_t selector) {
+    lv_obj_set_style_bg_color(obj, value, selector);
+
+    if (is_state_tracking()) {
+        int obj_index = index_of_obj(obj);
+		char buf[64];
+		sprintf(buf, "%d,%d,%ld", obj_index, value.full, selector);
+		event_occured("lv_obj_set_style_bg_color", buf);
+	}
+}
+
+
+void wlv_style_set_text_color() {
+    
+}
+
+void wlv_style_set_text_align() {
+
+}
+
+void wlv_obj_align() {
+
+}
+
+void wlv_obj_set_size() {
+
+}
+
+void wlv_obj_add_style() {
+
+}
+
+void wlv_obj_set_style_text_align() {
+
+}
+
+void wlv_label_set_text() {
+
+}
+
+void wlv_scr_load() {
+
+}
+
+void wlv_scr_act() {
+
+}
+
+void wlv_style_set_bg_color() {
+
+}
+
+void wlv_style_set_bg_opa() {
+
+}
+
+void wlv_obj_set_width() {
+
+}
+
+void wlv_style_set_text_font() {
+    
+}
+
+void wlv_label_create() {
+
+}
+
+void wlv_obj_del() {
+
+}
+
+void wlv_obj_center() {
+
+}
+
+void wlv_obj_remove_style() {
+
+}
+
+void wlv_obj_add_flag() {
+
+}
+
+void wlv_obj_clear_flag() {
+
+}
+

main/drivers/wlvgl.h

@@ -0,0 +1,32 @@
+#ifndef WLVGL_H
+#define WLVGL_H
+
+#include "lvgl.h"
+#include "state_tracking.h"
+
+void reset_wlv_tables();
+
+lv_obj_t* wlv_obj_create(lv_obj_t* parent);
+void wlv_style_init(lv_style_t* style);
+void wlv_obj_set_style_bg_color(struct _lv_obj_t * obj, lv_color_t value, lv_style_selector_t selector);
+void wlv_style_set_text_color();
+void wlv_style_set_text_align();
+void wlv_obj_align();
+void wlv_obj_set_size();
+void wlv_obj_add_style();
+void wlv_obj_set_style_text_align();
+void wlv_label_set_text();
+void wlv_scr_load();
+void wlv_scr_act();
+void wlv_style_set_bg_color();
+void wlv_style_set_bg_opa();
+void wlv_obj_set_width();
+void wlv_style_set_text_font();
+void wlv_label_create();
+void wlv_obj_del();
+void wlv_obj_center();
+void wlv_obj_remove_style();
+void wlv_obj_add_flag();
+void wlv_obj_clear_flag();
+
+#endif /* WLVGL_H */

main/helper.cpp

@@ -17,76 +17,10 @@ void clean_bomb(void) {
     set_module_sseg_raw(clear);
 
     // clear char lcd
-    lcd_clear();
     lcd_set_cursor_vis(false);
-    lcd_cursor_home();
-}
+    lcd_clear();
 
-static const int STRING_MAX_LEN = 8;
-void do_star_codes(StarCodeHandler* star_codes, int star_codes_len) {
-    KeypadKey key;
-
-    int current_idx = 0;
-    char current[STRING_MAX_LEN+1] = {0};
-
-    while (1) {
-        while (get_keypad_pressed(&key)) {
-            if (key == KeypadKey::star) {
-                current[0] = '*';
-                for (int i = 1; i < STRING_MAX_LEN; i++) {
-                    current[i] = 0;
-                }
-                current_idx = 1;
-            } else if (key == KeypadKey::pound) {
-                // submit
-                if (current[0] == '\0') {
-                    continue;
-                }
-
-                bool hit = false;
-                for (int i = 0; i < star_codes_len; i++) {
-                    StarCodeHandler sch = star_codes[i];
-                    if (strcmp(current, sch.code) == 0) {
-                        hit = true;
-                        lcd_print(1, 2, sch.display_text);
-                        vTaskDelay(pdMS_TO_TICKS(2000));
-                        if (sch.callback != nullptr) {
-                            (sch.callback)();
-                        }
-                        if (sch.should_exit) {
-                            return;
-                        }
-                        break;
-                    }
-                }
-                
-                if (!hit) {
-                    lcd_print(1, 2, "Invalid Star Code");
-                    vTaskDelay(pdMS_TO_TICKS(2000));
-                }
-                
-                // clear
-                for (int i = 0; i < STRING_MAX_LEN; i++) {
-                    current[i] = 0;
-                }
-                current_idx = 0;
-            } else {
-                // out of room. skip
-                if (current_idx >= STRING_MAX_LEN) break;
-                // no code started.
-                if (current[0] != '*') continue;
-
-                char c = char_of_keypad_key(key);
-                current[current_idx++] = c;
-            }
-            // ESP_LOGI(STEP0_TAG, "Pressed: %c", c);
-
-            lcd_clear();
-            lcd_print(1, 1, current);
-        }
-
-        vTaskDelay(pdMS_TO_TICKS(10));
-    }
+    // TODO: add stuff for starcode system
 }
 
 static lv_obj_t* old_scr;
@@ -120,7 +54,6 @@ void display_game_results(void) {
     
     lv_style_init(&game_results_style);
     lv_style_set_text_color(&game_results_style, lv_color_white());
-    // lv_style_set_bg_color(&game_results_style, lv_color_black());
     lv_style_set_text_align(&game_results_style, LV_TEXT_ALIGN_LEFT);
 
     overall_results_label = lv_label_create(scr);

main/helper.h

@@ -10,20 +10,11 @@
 #include "drivers/speaker.h"
 #include "drivers/tft.h"
 
-struct StarCodeHandler {
-    const char* code;
-    const char* display_text;
-    bool should_exit;
-    void (*callback)(void);
-};
-
 // TODO: add something for RNG.
-// TODO: add something for colors, to make everything consistant.
 
 /// Clears most persistant bomb state
 void clean_bomb(void);
 void poster_child_task(void* arg);
-void do_star_codes(StarCodeHandler* star_codes, int star_codes_len);
 void display_game_results();
 
 #endif /* HELPER_H */

main/main.cpp

@@ -37,6 +37,7 @@ extern "C" void app_main(void) {
     vTaskDelay(pdMS_TO_TICKS(1000));
 
     clean_bomb();
+    lcd_do_splash();
     step0();
 
     // set_recording_source(stdout, false);

main/steps/step0.cpp

@@ -45,137 +45,166 @@ static void replay_last() {
     start_playback();
 }
 
-/// Wait for "*9819"
+
 void step0() {
     led_set(IndicatorLED::LED_SPEAKER, LEDColor::LED_COLOR_BLUE);
     leds_flush();
 
-    StarCodeHandler star_codes[] = {
+    SemaphoreHandle_t continue_sem = xSemaphoreCreateBinary();
+    if (continue_sem == nullptr) {
+        ESP_LOGE(TAG, "could not create semaphore");
+        return;
+    }
+
+    StarCodeEntry star_codes[] = {
         {
-            .code = "*9819",
-            .display_text = "Defusal Initiated",
-            .should_exit = true,
+            .code = "9819",
+            .display_text = "Diffusal Initiated",
+            .delay_us = 2'000'000,
             .callback = nullptr,
+            .triggered_sem = continue_sem,
         },
         {
-            .code = "*59861",
-            .display_text = "Set Up Wires",
-            .should_exit = false,
+            .code = "59861",
+            .display_text = "Setup Wires",
+            .delay_us = 10'000'000,
             .callback = setup_wires,
+            .triggered_sem = nullptr,
         },
         {
-            .code = "*59862",
+            .code = "59862",
             .display_text = "Set Game Time",
-            .should_exit = false,
+            .delay_us = 2'000'000,
             .callback = set_game_time,
+            .triggered_sem = nullptr,
         },
         {
-            .code = "*59863",
-            .display_text = "Debug Switches",
-            .should_exit = false,
+            .code = "59863",
+            .display_text = "Debug switches",
+            .delay_us = 2'000'000,
             .callback = debug_switches,
+            .triggered_sem = nullptr,
         },
         {
-            .code = "*59864",
+            .code = "59864",
             .display_text = "Battery Stats",
-            .should_exit = false,
+            .delay_us = 2'000'000,
             .callback = battery_stats,
+            .triggered_sem = nullptr,
         },
         {
-            .code = "*59871",
+            .code = "59871",
             .display_text = "Try Step 1",
-            .should_exit = false,
+            .delay_us = 2'000'000,
             .callback = try_step1,
+            .triggered_sem = nullptr,
         },
         {
-            .code = "*59872",
+            .code = "59872",
             .display_text = "Try Step 2",
-            .should_exit = false,
+            .delay_us = 2'000'000,
             .callback = try_step2,
+            .triggered_sem = nullptr,
         },
         {
-            .code = "*59873",
+            .code = "59873",
             .display_text = "Try Step 3",
-            .should_exit = false,
+            .delay_us = 2'000'000,
             .callback = try_step3,
+            .triggered_sem = nullptr,
         },
         {
-            .code = "*59874",
+            .code = "59874",
             .display_text = "Try Step 4",
-            .should_exit = false,
+            .delay_us = 2'000'000,
             .callback = try_step4,
+            .triggered_sem = nullptr,
         },
         {
-            .code = "*59875",
+            .code = "59875",
             .display_text = "Try Step 5",
-            .should_exit = false,
+            .delay_us = 2'000'000,
             .callback = try_step5,
+            .triggered_sem = nullptr,
         },
         {
-            .code = "*59876",
+            .code = "59876",
             .display_text = "Try Step 6",
-            .should_exit = false,
+            .delay_us = 2'000'000,
             .callback = try_step6,
+            .triggered_sem = nullptr,
         },
         {
-            .code = "*59881",
+            .code = "59881",
             .display_text = "Skip To Step 1",
-            .should_exit = true,
+            .delay_us = 2'000'000,
             .callback = skip_to_step1,
+            .triggered_sem = continue_sem,
         },
         {
-            .code = "*59882",
+            .code = "59882",
             .display_text = "Skip To Step 2",
-            .should_exit = true,
+            .delay_us = 2'000'000,
             .callback = skip_to_step2,
+            .triggered_sem = continue_sem,
         },
         {
-            .code = "*59883",
+            .code = "59883",
             .display_text = "Skip To Step 3",
-            .should_exit = true,
+            .delay_us = 2'000'000,
             .callback = skip_to_step3,
+            .triggered_sem = continue_sem,
         },
         {
-            .code = "*59884",
+            .code = "59884",
             .display_text = "Skip To Step 4",
-            .should_exit = true,
+            .delay_us = 2'000'000,
             .callback = skip_to_step4,
+            .triggered_sem = continue_sem,
         },
         {
-            .code = "*59885",
+            .code = "59885",
             .display_text = "Skip To Step 5",
-            .should_exit = true,
+            .delay_us = 2'000'000,
             .callback = skip_to_step5,
+            .triggered_sem = continue_sem,
         },
         {
-            .code = "*59886",
+            .code = "59886",
             .display_text = "Skip To Step 6",
-            .should_exit = true,
+            .delay_us = 2'000'000,
             .callback = skip_to_step6,
+            .triggered_sem = continue_sem,
         },
         {
-            .code = "*1111",
+            .code = "1111",
             .display_text = "Issue Strike",
-            .should_exit = false,
+            .delay_us = 2'000'000,
             .callback = issue_strike,
+            .triggered_sem = nullptr,
         },
         {
-            .code = "*1112",
+            .code = "1112",
             .display_text = "????",
-            .should_exit = false,
+            .delay_us = 2'000'000,
             .callback = flashbang,
+            .triggered_sem = nullptr,
         },
         {
-            .code = "*1113",
-            .display_text = "replay_last",
-            .should_exit = false,
+            .code = "1113",
+            .display_text = "replay",
+            .delay_us = 2'000'000,
             .callback = replay_last,
+            .triggered_sem = continue_sem,
         },
     };
-    int len = sizeof(star_codes)/sizeof(StarCodeHandler);
-    do_star_codes(star_codes, len);
-}
+    size_t len = sizeof(star_codes)/sizeof(star_codes[0]);
 
+    add_star_codes(star_codes, len);
+    xSemaphoreTake(continue_sem, portMAX_DELAY);
+    rm_star_codes(star_codes, len);
+    vSemaphoreDelete(continue_sem);
+}
 
 static const int CURSOR_POS_MAP[5] = {1, 3, 4, 6, 7};
 static char str_buf[18] = {0};

main/steps/step0.h

@@ -1,13 +1,9 @@
 #ifndef STEP_0_H
 #define STEP_0_H
 
-#include "../drivers/bottom_half.h"
-#include "../drivers/char_lcd.h"
-#include "../drivers/wires.h"
-#include "../drivers/power.h"
-#include "setup_wires.h"
-#include "../helper.h"
+#include "../drivers/all.h"
 
+#include "setup_wires.h"
 #include "step1.h"
 #include "step2.h"
 #include "step3.h"

main/steps/step1.cpp

@@ -206,18 +206,17 @@ static bool play_part(uint32_t time) {
     set_module_time(time);
 
     lcd_clear();
-    lcd_set_cursor_pos(1, 1);
     switch (part) {
         case 0:
-        lcd_print("COLOR");
+        lcd_print(1, 1, "COLOR");
         led_set(IndicatorLED::LED_LCD, LEDColor::LED_COLOR_PINK);
         break;
         case 1:
-        lcd_print("NUMBER");
+        lcd_print(1, 1, "NUMBER");
         led_set(IndicatorLED::LED_LCD, LEDColor::LED_COLOR_BLUE);
         break;
         case 2:
-        lcd_print("SWITCH");
+        lcd_print(1, 1, "SWITCH");
         led_set(IndicatorLED::LED_LCD, LEDColor::LED_COLOR_YELLOW);
         break;
     }

main/steps/step1.h

@@ -2,13 +2,8 @@
 #define STEP_1_H
 
 #include <random>
-#include "../drivers/bottom_half.h"
-#include "../drivers/tft.h"
-#include "../drivers/leds.h"
-#include "../drivers/wires.h"
-#include "../drivers/speaker.h"
-#include "../drivers/game_timer.h"
-#include "../drivers/char_lcd.h"
+#include "../drivers/all.h"
+#include "../helper.h"
 
 void step1(void);
 

main/steps/step2.h

@@ -1,11 +1,7 @@
 #ifndef STEP_2_H
 #define STEP_2_H
 
-#include "../drivers/bottom_half.h"
-#include "../drivers/wires.h"
-#include "../drivers/game_timer.h"
-#include "../drivers/leds.h"
-#include "../drivers/speaker.h"
+#include "../drivers/all.h"
 #include "../helper.h"
 #include <iostream>
 #include <random>

main/steps/step3.cpp

@@ -21,6 +21,8 @@ static const char* TONE_FILES[] = {
     MOUNT_POINT "/high-6.wav",
 };
 
+static const size_t LCD_STRING_SOMETHING = 0;
+static const size_t LCD_STRING_NOTHING = 1;
 static const char* LCD_STRINGS[] = {
     "something",
     "nothing",
@@ -49,13 +51,20 @@ static std::uniform_int_distribution<> lcd_rand_char_dist(0, sizeof(lcd_random_c
 static std::uniform_int_distribution<> has_coconut_dist(0, 2);
 static std::uniform_int_distribution<> coconut_position_dist(0, 13);
 
+const static uint32_t NEOPIXEL_COLOR_IDX_RED = 0;
+const static uint32_t NEOPIXEL_COLOR_IDX_YELLOW = 1;
+const static uint32_t NEOPIXEL_COLOR_IDX_GREEN = 2;
+const static uint32_t NEOPIXEL_COLOR_IDX_BLUE = 3;
+const static uint32_t NEOPIXEL_COLOR_IDX_PINK = 4;
+const static uint32_t NEOPIXEL_COLOR_IDX_WHITE = 5;
+const static uint32_t NEOPIXEL_COLOR_IDX_OFF = 6;
 static uint32_t NEOPIXEL_COLORS[7] = {
     LEDColor::LED_COLOR_RED,
-    LEDColor::LED_COLOR_ORANGE,
     LEDColor::LED_COLOR_YELLOW,
     LEDColor::LED_COLOR_GREEN,
     LEDColor::LED_COLOR_BLUE,
     LEDColor::LED_COLOR_PINK,
+    LEDColor::LED_COLOR_WHITE,
     LEDColor::LED_COLOR_OFF,
 };
 
@@ -64,16 +73,24 @@ static bool three_second();
 static bool six_second();
 
 void step3(void) {
-    StarCodeHandler star_codes[] = {
-        {
-            .code = "*1642",
-            .display_text = "Starting...",
-            .should_exit = true,
-            .callback = nullptr,
-        },
+    SemaphoreHandle_t continue_sem = xSemaphoreCreateBinary();
+    if (continue_sem == nullptr) {
+        ESP_LOGE(TAG, "could not create semaphore");
+        return;
+    }
+
+    StarCodeEntry start_code = {
+        .code = "1642",
+        .display_text = "Starting...",
+        .delay_us = 2'000'000,
+        .callback = nullptr,
+        .triggered_sem = continue_sem,
     };
-    int len = sizeof(star_codes)/sizeof(StarCodeHandler);
-    do_star_codes(star_codes, len);
+
+    add_star_code(start_code);
+    xSemaphoreTake(continue_sem, portMAX_DELAY);
+    rm_star_code(start_code.code);
+    vSemaphoreDelete(continue_sem);
 
     while (times < TIMES_TO_COMPLETE) {
         tone = tone_dist(gen);
@@ -82,7 +99,7 @@ void step3(void) {
 
         play_clip_wav(MOUNT_POINT "/ready.wav", true, false, 3, 0);
         // The high pitched tones need to be scaled down by 3 more
-        play_clip_wav(TONE_FILES[tone], false, false, 2 + (tone/3) * 3, 0);
+        play_clip_wav(TONE_FILES[tone], false, false, 1 + (tone/3) * 4, 0);
         
         bool correct = false;
         switch (tone % 3) {
@@ -221,16 +238,16 @@ static bool one_second() {
     int red_led_count = 0;
     int blue_led_count = 0;
     for (int i = 0; i < LED_COUNT; i++) {
-        if (indicator_led_idxs[i] == 0) {
+        if (indicator_led_idxs[i] == NEOPIXEL_COLOR_IDX_RED) {
             red_led_count++;
-        } else if (indicator_led_idxs[i] == 4) {
+        } else if (indicator_led_idxs[i] == NEOPIXEL_COLOR_IDX_BLUE) {
             blue_led_count++;
         }
     }
 
     uint8_t correct_switches = four_bit_flag(
-        speaker_color == 0 || speaker_color == 1 || speaker_color == 2,
-        lcd_string_idx == 0 || lcd_string_idx == 1,
+        speaker_color == NEOPIXEL_COLOR_IDX_RED || speaker_color == NEOPIXEL_COLOR_IDX_YELLOW || speaker_color == NEOPIXEL_COLOR_IDX_PINK,
+        lcd_string_idx == LCD_STRING_SOMETHING || lcd_string_idx == LCD_STRING_NOTHING,
         was_high,
         !was_high
     );
@@ -280,9 +297,9 @@ static bool three_second() {
     int red_led_count = 0;
     int blue_led_count = 0;
     for (int i = 0; i < LED_COUNT; i++) {
-        if (indicator_led_idxs[i] == 0) {
+        if (indicator_led_idxs[i] == NEOPIXEL_COLOR_IDX_RED) {
             red_led_count++;
-        } else if (indicator_led_idxs[i] == 4) {
+        } else if (indicator_led_idxs[i] == NEOPIXEL_COLOR_IDX_BLUE) {
             blue_led_count++;
         }
     }
@@ -345,7 +362,7 @@ static bool six_second() {
 
     bool was_high = (tone / 3) == 1;
 
-    bool second_switch_correct_state = (indicator_led_idxs[IndicatorLED::LED_S2] == 0) || (indicator_led_idxs[IndicatorLED::LED_S2] == 6);
+    bool second_switch_correct_state = (indicator_led_idxs[IndicatorLED::LED_S2] == NEOPIXEL_COLOR_IDX_RED) || (indicator_led_idxs[IndicatorLED::LED_S2] == NEOPIXEL_COLOR_IDX_OFF);
     second_switch_correct_state = second_switch_correct_state || was_high;
 
     rng_leds();
@@ -354,16 +371,16 @@ static bool six_second() {
     int green_led_count = 0;
     int blue_led_count = 0;
     for (int i = 0; i < LED_COUNT; i++) {
-        if (indicator_led_idxs[i] == 4) {
+        if (indicator_led_idxs[i] == NEOPIXEL_COLOR_IDX_BLUE) {
             blue_led_count++;
-        } else if (indicator_led_idxs[i] == 3) {
+        } else if (indicator_led_idxs[i] == NEOPIXEL_COLOR_IDX_GREEN) {
             green_led_count++;
         }
     }
 
     int pink_led_on_bottom_count = 0;
     for (int i = IndicatorLED::LED_RFID; i < LED_COUNT; i++) {
-        if (indicator_led_idxs[i] == 5) {
+        if (indicator_led_idxs[i] == NEOPIXEL_COLOR_IDX_PINK) {
             pink_led_on_bottom_count++;
         }
     }

main/steps/step3.h

@@ -2,12 +2,7 @@
 #define STEP_3_H
 
 #include <random>
-#include "../drivers/bottom_half.h"
-#include "../drivers/wires.h"
-#include "../drivers/speaker.h"
-#include "../drivers/leds.h"
-#include "../drivers/char_lcd.h"
-#include "../drivers/game_timer.h"
+#include "../drivers/all.h"
 #include "../helper.h"
 
 void step3(void);

main/steps/step4.cpp

@@ -380,16 +380,29 @@ static void fail() {
 }
 
 void step4() {
-    StarCodeHandler star_code = {
-        .code = "*3850",
+    // TODO: extract to helper function
+    SemaphoreHandle_t continue_sem = xSemaphoreCreateBinary();
+    if (continue_sem == nullptr) {
+        ESP_LOGE(TAG, "could not create semaphore");
+    }
+
+    StarCodeEntry start_code = {
+        .code = "3850",
         .display_text = "Starting...",
-        .should_exit = true,
+        .delay_us = 2'000'000,
         .callback = nullptr,
+        .triggered_sem = continue_sem,
     };
-    do_star_codes(&star_code, 1);
+
+    add_star_code(start_code);
+    xSemaphoreTake(continue_sem, portMAX_DELAY);
+    rm_star_code(start_code.code);
+    vSemaphoreDelete(continue_sem);
+
     init_screen();
 
     while (!play_game(4*60*1000, 2)) fail();
+    // TODO: create constants for common assets, and put them in a folder.
     play_clip_wav(MOUNT_POINT "/partdone.wav", true, false, 0, 0);
     complete();
     while (!play_game(4*60*1000, 4)) fail();

main/steps/step4.h

@@ -2,13 +2,9 @@
 #define STEP_4_H
 
 #include <random>
-#include "../drivers/tft.h"
-#include "../drivers/speaker.h"
-#include "../drivers/bottom_half.h"
-#include "../drivers/game_timer.h"
-#include "../drivers/wires.h"
-#include "../drivers/char_lcd.h"
+#include "../drivers/all.h"
 #include "../helper.h"
+#include "esp_log.h"
 
 #define TETRIS_USE_FLASH_IMG
 #define TETRIS_USE_FLASH_BG_IMG

main/steps/step5.cpp

@@ -179,16 +179,23 @@ bool submit_6(bool* buttons_cycling, bool button_turned_on, int led_off) {
 }
 
 void step5(void) {
-    StarCodeHandler star_codes[] = {
-        {
-            .code = "*2648",
-            .display_text = "Starting...",
-            .should_exit = true,
-            .callback = nullptr,
-        },
+    SemaphoreHandle_t continue_sem = xSemaphoreCreateBinary();
+    if (continue_sem == nullptr) {
+        ESP_LOGE(TAG, "could not create semaphore");
+    }
+
+    StarCodeEntry start_code = {
+        .code = "2648",
+        .display_text = "Starting...",
+        .delay_us = 2'000'000,
+        .callback = nullptr,
+        .triggered_sem = continue_sem,
     };
-    int len = sizeof(star_codes)/sizeof(StarCodeHandler);
-    do_star_codes(star_codes, len);
+
+    add_star_code(start_code);
+    xSemaphoreTake(continue_sem, portMAX_DELAY);
+    rm_star_code(start_code.code);
+    vSemaphoreDelete(continue_sem);
 
     std::vector<int> all_leds;
 
@@ -222,15 +229,13 @@ void step5(void) {
     clean_bomb();
     int solved_puzzles = 0;
     while (solved_puzzles < TIMES_TO_SOLVE) {
-        lcd_set_cursor_pos(1, 1);
         bool solved_correctly = false;
 
         int puzzle = puzzle_dist(gen);
-        // int puzzle = 2;
 
         switch (puzzle) {
             case 0: {
-                lcd_print("Clear");
+                lcd_print(1, 1, "Clear");
                 set_module_time(TIME_CLEAR);
                 start_module_timer();
 
@@ -265,7 +270,7 @@ void step5(void) {
                 break;
             }
             case 1: {
-                lcd_print("Blank");
+                lcd_print(1, 1, "Blank");
                 set_module_time(TIME_BLANK);
                 start_module_timer();
                 
@@ -379,7 +384,7 @@ void step5(void) {
                 break;
             }
             case 3: {
-                lcd_print("Nothing");
+                lcd_print(1, 1, "Nothing");
                 set_module_time(TIME_NOTHING);
                 start_module_timer();
 
@@ -438,7 +443,7 @@ void step5(void) {
                 break;
             }
             case 4: {
-                lcd_print("Blink");
+                lcd_print(1, 1, "Blink");
                 set_module_time(TIME_BLINK);
                 start_module_timer();
 
@@ -502,7 +507,7 @@ void step5(void) {
                 break;
             }
             case 5: {
-                lcd_print("Ummm");
+                lcd_print(1, 1, "Ummm");
                 set_module_time(TIME_UMMM);
                 start_module_timer();
 
@@ -558,7 +563,7 @@ void step5(void) {
                 break;
             }
             case 6: {
-                lcd_print("Plank");
+                lcd_print(1, 1, "Plank");
                 set_module_time(TIME_PLANK);
                 start_module_timer();
 
@@ -651,7 +656,7 @@ void step5(void) {
                 break;
             }
             case 7: {
-                lcd_print("What");
+                lcd_print(1, 1, "What");
                 set_module_time(TIME_WHAT);
                 start_module_timer();
 
@@ -799,7 +804,7 @@ void step5(void) {
                 break;
             }
             case 8: {
-                lcd_print("Plink");
+                lcd_print(1, 1, "Plink");
                 set_module_time(TIME_PLINK);
                 start_module_timer();
 
@@ -900,13 +905,13 @@ void step5(void) {
         stop_module_timer();
         if (solved_correctly) {
             solved_puzzles++;
-            play_clip_wav(MOUNT_POINT "/correct.wav", true, false, 3, 0);
+            play_clip_wav(MOUNT_POINT "/partdone.wav", true, false, 0, 0);
             vTaskDelay(pdMS_TO_TICKS(500));
             solved_correctly = false;
         } else {
             vTaskDelay(pdMS_TO_TICKS(3000));
         }
-        clear_all_pressed_released();
+        play_clip_wav(MOUNT_POINT "/stepdone.wav", true, false, 1, 0);
         clean_bomb();
     }
 }

main/steps/step5.h

@@ -1,11 +1,7 @@
 #ifndef STEP_5_H
 #define STEP_5_H
 
-#include "../drivers/bottom_half.h"
-#include "../drivers/game_timer.h"
-#include "../drivers/char_lcd.h"
-#include "../drivers/leds.h"
-#include "../drivers/wires.h"
+#include "../drivers/all.h"
 #include "../helper.h"
 #include <random>
 #include <iostream>

main/steps/step6.h

@@ -2,10 +2,8 @@
 #define STEP_6_H
 
 #include "wires_puzzle.h"
-#include "drivers/wires.h"
-#include "drivers/bottom_half.h"
-#include "drivers/sd.h"
-#include "drivers/speaker.h"
+#include "../drivers/all.h"
+#include "../helper.h"
 
 void step6(void);
 

partitions.csv

@@ -0,0 +1,8 @@
+# ESP-IDF Partition Table
+# Name, Type, SubType, Offset, Size, Flags
+nvs,data,nvs,0x9000,0x6000,,
+phy_init,data,phy,0xf000,0x1000,,
+ota,data,ota,0x10000,0x2000,,
+factory,app,factory,0x20000,2M,,
+ota0,app,ota_0,0x220000,2M,,
+ota1,app,ota_1,0x420000,2M,,

sdkconfig

@@ -527,11 +527,11 @@ CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
 # Partition Table
 #
 # CONFIG_PARTITION_TABLE_SINGLE_APP is not set
-CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
+# CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE is not set
 # CONFIG_PARTITION_TABLE_TWO_OTA is not set
-# CONFIG_PARTITION_TABLE_CUSTOM is not set
+CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
-CONFIG_PARTITION_TABLE_FILENAME="partitions_singleapp_large.csv"
+CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
 CONFIG_PARTITION_TABLE_OFFSET=0x8000
 CONFIG_PARTITION_TABLE_MD5=y
 # end of Partition Table
@@ -539,7 +539,7 @@ CONFIG_PARTITION_TABLE_MD5=y
 #
 # BLK_BOX Config
 #
-CONFIG_USE_NEW_DISPLAY=y
+# CONFIG_USE_NEW_DISPLAY is not set
 # end of BLK_BOX Config
 
 #
@@ -1035,9 +1035,11 @@ CONFIG_SPIRAM=y
 #
 # SPI RAM config
 #
-# CONFIG_SPIRAM_MODE_QUAD is not set
-CONFIG_SPIRAM_MODE_OCT=y
+CONFIG_SPIRAM_MODE_QUAD=y
+# CONFIG_SPIRAM_MODE_OCT is not set
 CONFIG_SPIRAM_TYPE_AUTO=y
+# CONFIG_SPIRAM_TYPE_ESPPSRAM16 is not set
+# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
 # CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
 CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY=y
 CONFIG_SPIRAM_CLK_IO=30
@@ -1045,10 +1047,10 @@ CONFIG_SPIRAM_CS_IO=26
 # CONFIG_SPIRAM_XIP_FROM_PSRAM is not set
 # CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set
 # CONFIG_SPIRAM_RODATA is not set
+# CONFIG_SPIRAM_SPEED_120M is not set
 # CONFIG_SPIRAM_SPEED_80M is not set
 CONFIG_SPIRAM_SPEED_40M=y
 CONFIG_SPIRAM_SPEED=40
-# CONFIG_SPIRAM_ECC_ENABLE is not set
 CONFIG_SPIRAM_BOOT_INIT=y
 # CONFIG_SPIRAM_IGNORE_NOTFOUND is not set
 # CONFIG_SPIRAM_USE_MEMMAP is not set