led playback

main/drivers/CMakeLists.txt

@@ -6,21 +6,16 @@ set(SOURCES
     "esp_lcd_ili9488/esp_lcd_ili9488.c"
     "bottom_half.cpp"
     "char_lcd.cpp"
-    "game_info.cpp"
     "game_timer.cpp"
     "i2c_lcd_pcf8574.c"
-    "i2c.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,7 +32,6 @@ Arduino Uno (any 'duino should do)
 ******************************************************************************/
 
 #include "SparkFunBQ27441.h"
-#include "../i2c.h"
 
 /*****************************************************************************
  ************************** Initialization Functions *************************
@@ -711,9 +710,7 @@ 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,10 +1,12 @@
 #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();
@@ -14,6 +16,36 @@ 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,19 +1,14 @@
 #ifndef ALL_H
 #define ALL_H
 
-#include "bottom_half.h"
 #include "char_lcd.h"
-#include "game_timer.h"
+#include "bottom_half.h"
-#include "i2c.h"
-#include "leds.h"
-#include "power.h"
 #include "sd.h"
 #include "speaker.h"
-#include "sseg.h"
+#include "game_timer.h"
-#include "starcode.h"
+#include "drivers/tft.h"
-#include "state_tracking.h"
+#include "drivers/leds.h"
-#include "tft.h"
+#include "drivers/power.h"
-#include "wires.h"
 
 void init_drivers();
 

main/drivers/bottom_half.cpp

@@ -1,7 +1,6 @@
 #include "bottom_half.h"
 #include <esp_log.h>
 #include "state_tracking.h"
-#include "starcode.h"
 
 static const char *TAG = "bottom_half";
 
@@ -46,14 +45,8 @@ static bool replay_handler(const char* event, char* arg) {
 void init_bottom_half() {
     ESP_LOGI(TAG, "Initializing bottom half...");
 
-    gpio_config_t int_conf = {
+    ESP_ERROR_CHECK(gpio_set_direction(BOTTOM_PIN_INTERUPT, GPIO_MODE_INPUT));
-        .pin_bit_mask = 1ULL << BOTTOM_PIN_INTERUPT,
+    ESP_ERROR_CHECK(gpio_set_pull_mode(BOTTOM_PIN_INTERUPT, GPIO_PULLUP_ONLY));
-        .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));
@@ -76,25 +69,20 @@ void init_bottom_half() {
 
 static uint8_t receive_delta(void) {
     uint8_t reg = 1;
-    esp_err_t result = i2c_master_write_read_device(BOTTOM_I2C_NUM, BOTTOM_I2C_ADDR, &reg, 1, buf, 1, (100 / portTICK_PERIOD_MS));
+    buf[0] = 0;
-    ESP_ERROR_CHECK_WITHOUT_ABORT(result);
+    ESP_ERROR_CHECK_WITHOUT_ABORT(i2c_master_write_read_device(BOTTOM_I2C_NUM, BOTTOM_I2C_ADDR, &reg, 1, buf, 1, (100 / portTICK_PERIOD_MS)));
-    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;
-    esp_err_t result = i2c_master_write_read_device(BOTTOM_I2C_NUM, BOTTOM_I2C_ADDR, &reg, 1, buf, 2, (100 / portTICK_PERIOD_MS));
+    buf[0] = 0;
-    ESP_ERROR_CHECK_WITHOUT_ABORT(result);
+    buf[1] = 0;
-    if (result != ESP_OK) {
+    ESP_ERROR_CHECK_WITHOUT_ABORT(i2c_master_write_read_device(BOTTOM_I2C_NUM, BOTTOM_I2C_ADDR, &reg, 1, buf, 2, (100 / portTICK_PERIOD_MS)));
-        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);
@@ -102,27 +90,19 @@ 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_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(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;
@@ -237,8 +217,7 @@ void clear_all_pressed_released(void) {
     touch_released = 0;
 }
 
-// TODO: this is public, but it won't need to be after the event-based protocol refactor
+static bool _take_key(KeypadKey* kp, uint16_t* keypad_bitfield) {
-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) {
@@ -254,10 +233,10 @@ 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_13
+#define BOTTOM_PIN_INTERUPT GPIO_NUM_0
 
 #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 {
-    kd = 0,
+    k1 = 0,
-    pound = 1,
+    k4 = 1,
-    k0 = 2,
+    k7 = 2,
     star = 3,
-    kc = 4,
+    k2 = 4,
-    k9 = 5,
+    k5 = 5,
     k8 = 6,
-    k7 = 7,
+    k0 = 7,
-    kb = 8,
+    k3 = 8,
     k6 = 9,
-    k5 = 10,
+    k9 = 10,
-    k4 = 11,
+    pound = 11,
     ka = 12,
-    k3 = 13,
+    kb = 13,
-    k2 = 14,
+    kc = 14,
-    k1 = 15,
+    kd = 15,
 } KeypadKey;
 
 /// @brief An enum for the possible buttons.
@@ -126,14 +126,6 @@ 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,28 +4,13 @@
 #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();
@@ -72,7 +57,8 @@ static bool replay_handler(const char* event, char* arg) {
         return true;
     }
     if (strcmp(event, "LCD_BACKLIGHT") == 0) {
-        lcd_set_backlight(strcmp(arg, "true") == 0);
+        uint32_t brightness = atoi(arg);
+        lcd_set_backlight(brightness);
         return true;
     }
     if (strcmp(event, "LCD_CREATE_CHAR") == 0) {
@@ -88,9 +74,14 @@ 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(&lcd, arg);
+        lcd_print(arg);
         return true;
     }
 
@@ -107,31 +98,25 @@ 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() {
-    if (!header_enabled) {
     lcd_clear(&lcd);
 
     if (is_state_tracking()) {
         event_occured("LCD_CLEAR", NULL);
     }
-    } else {
+}
-        lcd_print(0, 1, EMPTY_ROW);
+
-        lcd_print(0, 2, EMPTY_ROW);
+void lcd_cursor_home() {
-        lcd_print(0, 3, EMPTY_ROW);
+    lcd_home(&lcd);
+
+    if (is_state_tracking()) {
+        event_occured("LCD_CURSOR", "0,0");
     }
 }
 
-// TODO: rm
-void lcd_cursor_home() {
-    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);
 
@@ -219,16 +204,16 @@ void lcd_set_autoscroll(bool autoscroll) {
     }
 }
 
-void lcd_set_backlight(bool backlight) {
+void lcd_set_backlight(uint8_t brightness) {
-    lcd_set_backlight(&lcd, backlight);
+    lcd_set_backlight(&lcd, brightness);
 
     if (is_state_tracking()) {
-        sprintf(buf, "%d", backlight);
+        sprintf(buf, "%d", brightness);
-        event_occured("LCD_BACKLIGHT", backlight ? "true" : "false");
+        event_occured("LCD_BACKLIGHT", buf);
     }
 }
 
-void lcd_create_char(uint8_t location, const uint8_t charmap[]) {
+void lcd_create_char(uint8_t location, uint8_t* charmap) {
     lcd_create_char(&lcd, location, charmap);
 
     if (is_state_tracking()) {
@@ -240,9 +225,16 @@ void lcd_create_char(uint8_t location, const uint8_t charmap[]) {
     }
 }
 
-// TODO: switch to row, col
+void lcd_write(uint8_t value) {
-void lcd_print(uint8_t col, uint8_t row, const char* str) {
+    lcd_write(&lcd, value);
-    lcd_set_cursor_pos(col, row);
+
+    if (is_state_tracking()) {
+        sprintf(buf, "%d", value);
+        event_occured("LCD_WRITE", buf);
+    }
+}
+
+void lcd_print(const char* str) {
     lcd_print(&lcd, str);
 
     if (is_state_tracking()) {
@@ -251,46 +243,7 @@ void lcd_print(uint8_t col, uint8_t row, const char* str) {
     }
 }
 
-void set_lcd_header_enabled(bool enable) {
+void lcd_print(uint8_t col, uint8_t row, const char* str) {
-    bool old_header_enabled = header_enabled;
+    lcd_set_cursor_pos(col, row);
-    header_enabled = enable;
+    lcd_print(str);
-
-    // 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,29 +44,18 @@ void lcd_right_to_left();
 void lcd_set_autoscroll(bool autoscroll);
 
 // Set backlight brightness
-void lcd_set_backlight(bool backlight);
+void lcd_set_backlight(uint8_t brightness);
 
 // Create a custom character
-void lcd_create_char(uint8_t location, const uint8_t charmap[]);
+void lcd_create_char(uint8_t location, uint8_t charmap[]);
 
-/// @brief Print a string to the LCD at a given pos. 
+// Write a character to the LCD
-/// @param col the column to print the string at.
+void lcd_write(uint8_t value);
-/// @param row the row the print the string at.
+
-/// @param str the string to print.
+// Print a string to the LCD
+void lcd_print(const char* str);
+
+// Print a string to the LCD at a given pos
 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

@@ -1,21 +0,0 @@
-#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

@@ -1,17 +0,0 @@
-#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

@@ -1,35 +0,0 @@
-#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

@@ -1,26 +0,0 @@
-#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,7 +12,6 @@
 #include "esp_check.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
-#include "i2c.h"
 
 #define TAG "I2C_LCD_PCF8574"
 
@@ -59,7 +58,6 @@ 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
@@ -97,7 +95,6 @@ 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);
@@ -113,7 +110,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(2000);
+    esp_rom_delay_us(1600);
 }  // lcd_clear()
 
 // Set the display to home
@@ -121,7 +118,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(2000);
+    esp_rom_delay_us(1600);
 }  // lcd_home()
 
 // Set the cursor to a new position.
@@ -241,7 +238,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, const uint8_t charmap[]) {
+void lcd_create_char(i2c_lcd_pcf8574_handle_t* lcd, uint8_t location, uint8_t charmap[]) {
     location &= 0x7;  // Only 8 locations are available
     // Set the CGRAM address
     lcd_send(lcd, 0x40 | (location << 3), false);
@@ -298,7 +295,6 @@ 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);
@@ -307,7 +303,6 @@ 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));
@@ -346,7 +341,6 @@ 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);
@@ -354,7 +348,6 @@ 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, const uint8_t charmap[]);
+void lcd_create_char(i2c_lcd_pcf8574_handle_t* lcd, uint8_t location, uint8_t charmap[]);
 
 // Write a character to the LCD
 void lcd_write(i2c_lcd_pcf8574_handle_t* lcd, uint8_t 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_0
+#define NEOPIXEL_PIN GPIO_NUM_7
 // 10MHz resolution, 1 tick = 0.1us (led strip needs a high resolution)
 #define LED_STRIP_RMT_RES_HZ  (10 * 1000 * 1000)
 
@@ -26,7 +26,6 @@ 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

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

main/drivers/perh.h

@@ -1,12 +0,0 @@
-#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,6 +1,5 @@
 #include "power.h"
 #include "char_lcd.h"
-#include "starcode.h"
 #include <esp_log.h>
 
 static const char* TAG = "power";
@@ -51,28 +50,4 @@ 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,18 +3,13 @@
 
 #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_39
+#define SD_PIN_CLK GPIO_NUM_48
-#define SD_PIN_CMD GPIO_NUM_40
+#define SD_PIN_CMD GPIO_NUM_45
-#define SD_PIN_D0  GPIO_NUM_38
+#define SD_PIN_D0  GPIO_NUM_47
-#define SD_PIN_D1  GPIO_NUM_45
+#define SD_PIN_D1  GPIO_NUM_21
-#define SD_PIN_D2  GPIO_NUM_42
+#define SD_PIN_D2  GPIO_NUM_39
-#define SD_PIN_D3  GPIO_NUM_41
+#define SD_PIN_D3  GPIO_NUM_38
 
 /// @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_11
+#define SPEAKER_PIN_BCLK  GPIO_NUM_46
-#define SPEAKER_PIN_WS    GPIO_NUM_12
+#define SPEAKER_PIN_WS    GPIO_NUM_9
 #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_46
+#define SSEG_PIN_DATA GPIO_NUM_10
-#define SSEG_PIN_CLK  GPIO_NUM_48
+#define SSEG_PIN_CLK  GPIO_NUM_11
 
 extern TM1640* sseg;
 

main/drivers/starcode.cpp

@@ -1,256 +0,0 @@
-#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

@@ -1,90 +0,0 @@
-#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,7 +1,6 @@
 #include "state_tracking.h"
 #include <unistd.h>
 #include <vector>
-#include "wlvgl.h"
 
 static const char* PLAYBACK_TAG = "playback";
 
@@ -25,6 +24,7 @@ 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,7 +171,6 @@ 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;
 }
 
@@ -199,7 +198,6 @@ 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_16
+#define TFT_PIN_MISO GPIO_NUM_18
-#define TFT_PIN_CLK GPIO_NUM_18
+#define TFT_PIN_CLK GPIO_NUM_16
 #define TFT_PIN_CS GPIO_NUM_NC
-#define TFT_PIN_DC GPIO_NUM_8
+#define TFT_PIN_DC GPIO_NUM_15
-#define TFT_PIN_RESET GPIO_NUM_9
+#define TFT_PIN_RESET GPIO_NUM_8
 
 #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 = PIN_WIRES_SDA,
+        .sda_io_num = GPIO_NUM_41,
-        .scl_io_num = PIN_WIRES_SCL,
+        .scl_io_num = GPIO_NUM_42,
         .sda_pullup_en = GPIO_PULLUP_ENABLE,
         .scl_pullup_en = GPIO_PULLUP_ENABLE,
         .master = {
             .clk_speed = 100000,
-        },
+        }
     };
 
-    gpio_reset_pin(PIN_WIRES_SDA);
+    gpio_reset_pin(GPIO_NUM_41);
-    gpio_reset_pin(PIN_WIRES_SCL);
+    gpio_reset_pin(GPIO_NUM_42);
 
     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,11 +8,8 @@
 #include "drivers/char_lcd.h"
 #include "drivers/game_timer.h"
 #include "main.h"
-#include "perh.h"
 
-#define WIRES_PIN_DELTA PIN_PERH3
+#define WIRES_PIN_DELTA GPIO_NUM_2
-#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

@@ -1,152 +0,0 @@
-#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

@@ -1,32 +0,0 @@
-#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,10 +17,76 @@ void clean_bomb(void) {
     set_module_sseg_raw(clear);
 
     // clear char lcd
-    lcd_set_cursor_vis(false);
     lcd_clear();
+    lcd_set_cursor_vis(false);
+    lcd_cursor_home();
+}
 
-    // TODO: add stuff for starcode system
+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));
+    }
 }
 
 static lv_obj_t* old_scr;
@@ -54,6 +120,7 @@ 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,11 +10,20 @@
 #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

@@ -13,102 +13,19 @@
 #include "helper.h"
 
 #include "steps/step0.h"
-#include "steps/p001_step1.h"
+#include "steps/step1.h"
-#include "steps/p001_step2.h"
+#include "steps/step2.h"
-#include "steps/p001_step3.h"
+#include "steps/step3.h"
-#include "steps/p001_step4.h"
+#include "steps/step4.h"
-#include "steps/p001_step5.h"
+#include "steps/step5.h"
-#include "steps/p001_step6.h"
+#include "steps/step6.h"
-#include "steps/p002_step1.h"
-#include "steps/p002_step2.h"
-#include "steps/p002_step3.h"
-#include "steps/p002_step4.h"
-#include "steps/p002_step5.h"
-#include "steps/p002_step6.h"
 
 static const char *TAG = "main";
 uint32_t initial_game_time = 90*60*1000 + 1000;
 uint32_t skip_to_step = 0;
 uint32_t current_step = 0;
-uint32_t puzzle = 0;
 extern uint32_t total_strikes;
 
-static void do_p001() {
-    set_game_time(initial_game_time);
-    start_game_timer();
-    total_strikes = 0;
-    clean_bomb();
-    current_step = 1;
-    if (skip_to_step <= 1) p001_step1();
-    step_finish_times[current_step-1] = get_game_time();
-    clean_bomb();
-    current_step = 2;
-    if (skip_to_step <= 2) p001_step2();
-    step_finish_times[current_step-1] = get_game_time();
-    clean_bomb();
-    current_step = 3;
-    if (skip_to_step <= 3) p001_step3();
-    step_finish_times[current_step-1] = get_game_time();
-    clean_bomb();
-    current_step = 4;
-    if (skip_to_step <= 4) p001_step4();
-    step_finish_times[current_step-1] = get_game_time();
-    clean_bomb();
-    current_step = 5;
-    if (skip_to_step <= 5) p001_step5();
-    step_finish_times[current_step-1] = get_game_time();
-    clean_bomb();
-    current_step = 6;
-    if (skip_to_step <= 6) p001_step6();
-    start_game_timer();
-    step_finish_times[current_step-1] = get_game_time();
-    clean_bomb();
-
-    stop_game_timer();
-    ESP_LOGI(TAG, "Bomb has been diffused. Counter-Terrorists win.");
-    play_clip_wav(MOUNT_POINT "/diffuse.wav", true, false, 3, 0);
-
-    display_game_results();
-}
-
-static void do_p002() {
-    set_game_time(initial_game_time);
-    start_game_timer();
-    total_strikes = 0;
-    clean_bomb();
-    current_step = 1;
-    if (skip_to_step <= 1) p002_step1();
-    step_finish_times[current_step-1] = get_game_time();
-    clean_bomb();
-    current_step = 2;
-    if (skip_to_step <= 2) p002_step2();
-    step_finish_times[current_step-1] = get_game_time();
-    clean_bomb();
-    current_step = 3;
-    if (skip_to_step <= 3) p002_step3();
-    step_finish_times[current_step-1] = get_game_time();
-    clean_bomb();
-    current_step = 4;
-    if (skip_to_step <= 4) p002_step4();
-    step_finish_times[current_step-1] = get_game_time();
-    clean_bomb();
-    current_step = 5;
-    if (skip_to_step <= 5) p002_step5();
-    step_finish_times[current_step-1] = get_game_time();
-    clean_bomb();
-    current_step = 6;
-    if (skip_to_step <= 6) p002_step6();
-    start_game_timer();
-    step_finish_times[current_step-1] = get_game_time();
-    clean_bomb();
-
-    stop_game_timer();
-    ESP_LOGI(TAG, "Bomb has been diffused. Counter-Terrorists win.");
-    play_clip_wav(MOUNT_POINT "/diffuse.wav", true, false, 3, 0);
-
-    display_game_results();
-}
-
 extern "C" void app_main(void) {
     printf("app_main\n");
 
@@ -120,23 +37,51 @@ extern "C" void app_main(void) {
     vTaskDelay(pdMS_TO_TICKS(1000));
 
     clean_bomb();
-    lcd_do_splash();
     step0();
 
-    if (puzzle == 1) {
-        do_p001();
-    } else {
-        do_p002();
-    }
-
     // set_recording_source(stdout, false);
-    // FILE* record_file = fopen(MOUNT_POINT "/record.txt", "w");
+    FILE* record_file = fopen(MOUNT_POINT "/record.txt", "w");
-    // if (record_file == nullptr) {
+    if (record_file == nullptr) {
-        // ESP_LOGE("main", "failed to open record.txt");
+        ESP_LOGE("main", "failed to open record.txt");
-    // }
+    }
-    // set_recording_source(record_file, true);
+    set_recording_source(record_file, true);
-    // start_recording();
+    start_recording();
 
-    // stop_recording();
+    set_game_time(initial_game_time);
+    start_game_timer();
+    total_strikes = 0;
+    clean_bomb();
+    current_step = 1;
+    if (skip_to_step <= 1) step1();
+    step_finish_times[current_step-1] = get_game_time();
+    clean_bomb();
+    current_step = 2;
+    if (skip_to_step <= 2) step2();
+    step_finish_times[current_step-1] = get_game_time();
+    clean_bomb();
+    current_step = 3;
+    if (skip_to_step <= 3) step3();
+    step_finish_times[current_step-1] = get_game_time();
+    clean_bomb();
+    current_step = 4;
+    if (skip_to_step <= 4) step4();
+    step_finish_times[current_step-1] = get_game_time();
+    clean_bomb();
+    current_step = 5;
+    if (skip_to_step <= 5) step5();
+    step_finish_times[current_step-1] = get_game_time();
+    clean_bomb();
+    current_step = 6;
+    if (skip_to_step <= 6) step6();
+    start_game_timer();
+    step_finish_times[current_step-1] = get_game_time();
+    clean_bomb();
+
+    stop_game_timer();
+    ESP_LOGI(TAG, "Bomb has been diffused. Counter-Terrorists win.");
+    play_clip_wav(MOUNT_POINT "/diffuse.wav", true, false, 3, 0);
+
+    display_game_results();
+    stop_recording();
 
 }

main/steps/CMakeLists.txt

@@ -1,18 +1,12 @@
 set(SOURCES 
     "setup_wires.cpp"
     "step0.cpp"
-    "p001_step1.cpp"
+    "step1.cpp"
-    "p001_step2.cpp"
+    "step2.cpp"
-    "p001_step3.cpp"
+    "step3.cpp"
-    "p001_step4.cpp"
+    "step4.cpp"
-    "p001_step5.cpp"
+    "step5.cpp"
-    "p001_step6.cpp"
+    "step6.cpp"
-    "p002_step1.cpp"
-    "p002_step2.cpp"
-    "p002_step3.cpp"
-    "p002_step4.cpp"
-    "p002_step5.cpp"
-    "p002_step6.cpp"
     "wires_puzzle.cpp"
 )
 

main/steps/p001_step1.h

@@ -1,10 +0,0 @@
-#ifndef P001_STEP_1_H
-#define P001_STEP_1_H
-
-#include <random>
-#include "../drivers/all.h"
-#include "../helper.h"
-
-void p001_step1(void);
-
-#endif /* P001_STEP_1_H */

main/steps/p001_step2.h

@@ -1,12 +0,0 @@
-#ifndef P001_STEP_2_H
-#define P001_STEP_2_H
-
-#include "../drivers/all.h"
-#include "../helper.h"
-#include <iostream>
-#include <random>
-#include <map>
-
-void p001_step2(void);
-
-#endif /* P001_STEP_2_H */

main/steps/p001_step3.h

@@ -1,10 +0,0 @@
-#ifndef P001_STEP_3_H
-#define P001_STEP_3_H
-
-#include <random>
-#include "../drivers/all.h"
-#include "../helper.h"
-
-void p001_step3(void);
-
-#endif /* P001_STEP_3_H */

main/steps/p001_step4.h

@@ -1,14 +0,0 @@
-#ifndef P001_STEP_4_H
-#define P001_STEP_4_H
-
-#include <random>
-#include "../drivers/all.h"
-#include "../helper.h"
-#include "esp_log.h"
-
-#define TETRIS_USE_FLASH_IMG
-#define TETRIS_USE_FLASH_BG_IMG
-
-void p001_step4(void);
-
-#endif /* P001_STEP_4_H */

main/steps/p001_step5.h

@@ -1,16 +0,0 @@
-#ifndef P001_STEP_5_H
-#define P001_STEP_5_H
-
-#include "../drivers/all.h"
-#include "../helper.h"
-#include <random>
-#include <iostream>
-#include <set>
-#include <map>
-#include <vector>
-#include <cmath>
-#include <array>
-
-void p001_step5(void);
-
-#endif /* P001_STEP_5_H */

main/steps/p001_step6.h

@@ -1,10 +0,0 @@
-#ifndef P001_STEP_6_H
-#define P001_STEP_6_H
-
-#include "wires_puzzle.h"
-#include "../drivers/all.h"
-#include "../helper.h"
-
-void p001_step6(void);
-
-#endif /* P001_STEP_6_H */

main/steps/p002_step1.cpp

@@ -1,10 +0,0 @@
-#include "p002_step1.h"
-
-__attribute__((unused))
-static const char *TAG = "step1";
-
-void p002_step1(void) {
-    // TODO: implement step 1
-}
-
-

main/steps/p002_step1.h

@@ -1,8 +0,0 @@
-#ifndef P002_STEP_1_H
-#define P002_STEP_1_H
-
-#include "../drivers/all.h"
-
-void p002_step1(void);
-
-#endif /* P002_STEP_1_H */

main/steps/p002_step2.cpp

@@ -1,8 +0,0 @@
-#include "p002_step2.h"
-
-__attribute__((unused))
-static const char *TAG = "step2";
-
-void p002_step2(void) {
-    // TODO: implement step 2
-}

main/steps/p002_step2.h

@@ -1,8 +0,0 @@
-#ifndef P002_STEP_2_H
-#define P002_STEP_2_H
-
-#include "../drivers/all.h"
-
-void p002_step2(void);
-
-#endif /* P002_STEP_2_H */

main/steps/p002_step3.cpp

@@ -1,8 +0,0 @@
-#include "p002_step3.h"
-
-__attribute__((unused))
-static const char *TAG = "step3";
-
-void p002_step3(void) {
-    // TODO: implement step 3
-}

main/steps/p002_step3.h

@@ -1,8 +0,0 @@
-#ifndef P002_STEP_3_H
-#define P002_STEP_3_H
-
-#include "../drivers/all.h"
-
-void p002_step3(void);
-
-#endif /* P002_STEP_3_H */

main/steps/p002_step4.cpp

@@ -1,8 +0,0 @@
-#include "p002_step4.h"
-
-__attribute__((unused))
-static const char *TAG = "step4";
-
-void p002_step4(void) {
-    // TODO: implement step 4
-}

main/steps/p002_step4.h

@@ -1,8 +0,0 @@
-#ifndef P002_STEP_4_H
-#define P002_STEP_4_H
-
-#include "../drivers/all.h"
-
-void p002_step4(void);
-
-#endif /* P002_STEP_4_H */

main/steps/p002_step5.cpp

@@ -1,8 +0,0 @@
-#include "p002_step5.h"
-
-__attribute__((unused))
-static const char *TAG = "step5";
-
-void p002_step5(void) {
-    // TODO: implement step 5
-}

main/steps/p002_step5.h

@@ -1,8 +0,0 @@
-#ifndef P002_STEP_5_H
-#define P002_STEP_5_H
-
-#include "../drivers/all.h"
-
-void p002_step5(void);
-
-#endif /* P002_STEP_5_H */

main/steps/p002_step6.cpp

@@ -1,8 +0,0 @@
-#include "p002_step6.h"
-
-__attribute__((unused))
-static const char *TAG = "step6";
-
-void p002_step6(void) {
-    // TODO: implement step 6
-}

main/steps/p002_step6.h

@@ -1,8 +0,0 @@
-#ifndef P002_STEP_6_H
-#define P002_STEP_6_H
-
-#include "../drivers/all.h"
-
-void p002_step6(void);
-
-#endif /* P002_STEP_6_H */

main/steps/step0.cpp

@@ -5,7 +5,6 @@ static const char* TAG = "step0";
 
 extern uint32_t initial_game_time;
 extern uint32_t skip_to_step;
-extern uint32_t puzzle;
 
 static void set_game_time();
 static void skip_to_step1() { skip_to_step = 1; }
@@ -14,12 +13,12 @@ static void skip_to_step3() { skip_to_step = 3; }
 static void skip_to_step4() { skip_to_step = 4; }
 static void skip_to_step5() { skip_to_step = 5; }
 static void skip_to_step6() { skip_to_step = 6; }
-static void try_step1() { clean_bomb(); p001_step1(); }
+static void try_step1() { clean_bomb(); step1(); }
-static void try_step2() { clean_bomb(); p001_step2(); }
+static void try_step2() { clean_bomb(); step2(); }
-static void try_step3() { clean_bomb(); p001_step3(); }
+static void try_step3() { clean_bomb(); step3(); }
-static void try_step4() { clean_bomb(); p001_step4(); }
+static void try_step4() { clean_bomb(); step4(); }
-static void try_step5() { clean_bomb(); p001_step5(); }
+static void try_step5() { clean_bomb(); step5(); }
-static void try_step6() { clean_bomb(); p001_step6(); }
+static void try_step6() { clean_bomb(); step6(); }
 static void issue_strike() { strike("Strike Issued"); }
 static void flashbang();
 static void debug_switches();
@@ -46,181 +45,138 @@ static void replay_last() {
     start_playback();
 }
 
-static void do_p001() {
+/// Wait for "*9819"
-    puzzle = 1;
-}
-
-static void do_p002() {
-    puzzle = 2;
-}
-
 void step0() {
     led_set(IndicatorLED::LED_SPEAKER, LEDColor::LED_COLOR_BLUE);
     leds_flush();
 
-    SemaphoreHandle_t continue_sem = xSemaphoreCreateBinary();
+    StarCodeHandler star_codes[] = {
-    if (continue_sem == nullptr) {
-        ESP_LOGE(TAG, "could not create semaphore");
-        return;
-    }
-
-    StarCodeEntry star_codes[] = {
         {
-            .code = "9819",
+            .code = "*9819",
-            .display_text = "Start P001",
+            .display_text = "Defusal Initiated",
-            .delay_us = 2'000'000,
+            .should_exit = true,
-            .callback = do_p001,
+            .callback = nullptr,
-            .triggered_sem = continue_sem,
         },
         {
-            .code = "3141",
+            .code = "*59861",
-            .display_text = "Start P002",
+            .display_text = "Set Up Wires",
-            .delay_us = 2'000'000,
+            .should_exit = false,
-            .callback = do_p002,
-            .triggered_sem = continue_sem,
-        },
-        {
-            .code = "59861",
-            .display_text = "Setup Wires",
-            .delay_us = 2'000'000,
             .callback = setup_wires,
-            .triggered_sem = nullptr,
         },
         {
-            .code = "59862",
+            .code = "*59862",
             .display_text = "Set Game Time",
-            .delay_us = 2'000'000,
+            .should_exit = false,
             .callback = set_game_time,
-            .triggered_sem = nullptr,
         },
         {
-            .code = "59863",
+            .code = "*59863",
-            .display_text = "Debug switches",
+            .display_text = "Debug Switches",
-            .delay_us = 2'000'000,
+            .should_exit = false,
             .callback = debug_switches,
-            .triggered_sem = nullptr,
         },
         {
-            .code = "59864",
+            .code = "*59864",
             .display_text = "Battery Stats",
-            .delay_us = 2'000'000,
+            .should_exit = false,
             .callback = battery_stats,
-            .triggered_sem = nullptr,
         },
         {
-            .code = "59871",
+            .code = "*59871",
             .display_text = "Try Step 1",
-            .delay_us = 2'000'000,
+            .should_exit = false,
             .callback = try_step1,
-            .triggered_sem = nullptr,
         },
         {
-            .code = "59872",
+            .code = "*59872",
             .display_text = "Try Step 2",
-            .delay_us = 2'000'000,
+            .should_exit = false,
             .callback = try_step2,
-            .triggered_sem = nullptr,
         },
         {
-            .code = "59873",
+            .code = "*59873",
             .display_text = "Try Step 3",
-            .delay_us = 2'000'000,
+            .should_exit = false,
             .callback = try_step3,
-            .triggered_sem = nullptr,
         },
         {
-            .code = "59874",
+            .code = "*59874",
             .display_text = "Try Step 4",
-            .delay_us = 2'000'000,
+            .should_exit = false,
             .callback = try_step4,
-            .triggered_sem = nullptr,
         },
         {
-            .code = "59875",
+            .code = "*59875",
             .display_text = "Try Step 5",
-            .delay_us = 2'000'000,
+            .should_exit = false,
             .callback = try_step5,
-            .triggered_sem = nullptr,
         },
         {
-            .code = "59876",
+            .code = "*59876",
             .display_text = "Try Step 6",
-            .delay_us = 2'000'000,
+            .should_exit = false,
             .callback = try_step6,
-            .triggered_sem = nullptr,
         },
         {
-            .code = "59881",
+            .code = "*59881",
             .display_text = "Skip To Step 1",
-            .delay_us = 2'000'000,
+            .should_exit = true,
             .callback = skip_to_step1,
-            .triggered_sem = continue_sem,
         },
         {
-            .code = "59882",
+            .code = "*59882",
             .display_text = "Skip To Step 2",
-            .delay_us = 2'000'000,
+            .should_exit = true,
             .callback = skip_to_step2,
-            .triggered_sem = continue_sem,
         },
         {
-            .code = "59883",
+            .code = "*59883",
             .display_text = "Skip To Step 3",
-            .delay_us = 2'000'000,
+            .should_exit = true,
             .callback = skip_to_step3,
-            .triggered_sem = continue_sem,
         },
         {
-            .code = "59884",
+            .code = "*59884",
             .display_text = "Skip To Step 4",
-            .delay_us = 2'000'000,
+            .should_exit = true,
             .callback = skip_to_step4,
-            .triggered_sem = continue_sem,
         },
         {
-            .code = "59885",
+            .code = "*59885",
             .display_text = "Skip To Step 5",
-            .delay_us = 2'000'000,
+            .should_exit = true,
             .callback = skip_to_step5,
-            .triggered_sem = continue_sem,
         },
         {
-            .code = "59886",
+            .code = "*59886",
             .display_text = "Skip To Step 6",
-            .delay_us = 2'000'000,
+            .should_exit = true,
             .callback = skip_to_step6,
-            .triggered_sem = continue_sem,
         },
         {
-            .code = "1111",
+            .code = "*1111",
             .display_text = "Issue Strike",
-            .delay_us = 2'000'000,
+            .should_exit = false,
             .callback = issue_strike,
-            .triggered_sem = nullptr,
         },
         {
-            .code = "1112",
+            .code = "*1112",
             .display_text = "????",
-            .delay_us = 2'000'000,
+            .should_exit = false,
             .callback = flashbang,
-            .triggered_sem = nullptr,
         },
         {
-            .code = "1113",
+            .code = "*1113",
-            .display_text = "replay",
+            .display_text = "replay_last",
-            .delay_us = 2'000'000,
+            .should_exit = false,
             .callback = replay_last,
-            .triggered_sem = continue_sem,
         },
     };
-    size_t len = sizeof(star_codes)/sizeof(star_codes[0]);
+    int len = sizeof(star_codes)/sizeof(StarCodeHandler);
-
+    do_star_codes(star_codes, len);
-    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};
 static void _update_display(uint8_t* digits, uint8_t cursor_pos) {

main/steps/step0.h

@@ -1,15 +1,19 @@
 #ifndef STEP_0_H
 #define STEP_0_H
 
-#include "../drivers/all.h"
+#include "../drivers/bottom_half.h"
-
+#include "../drivers/char_lcd.h"
+#include "../drivers/wires.h"
+#include "../drivers/power.h"
 #include "setup_wires.h"
-#include "p001_step1.h"
+#include "../helper.h"
-#include "p001_step2.h"
+
-#include "p001_step3.h"
+#include "step1.h"
-#include "p001_step4.h"
+#include "step2.h"
-#include "p001_step5.h"
+#include "step3.h"
-#include "p001_step6.h"
+#include "step4.h"
+#include "step5.h"
+#include "step6.h"
 
 /// Wait for "*9819"
 void step0(void);

main/steps/step1.cpp

@@ -1,4 +1,4 @@
-#include "p001_step1.h"
+#include "step1.h"
 
 __attribute__((unused))
 static const char *TAG = "step1";
@@ -206,17 +206,18 @@ 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(1, 1, "COLOR");
+        lcd_print("COLOR");
         led_set(IndicatorLED::LED_LCD, LEDColor::LED_COLOR_PINK);
         break;
         case 1:
-        lcd_print(1, 1, "NUMBER");
+        lcd_print("NUMBER");
         led_set(IndicatorLED::LED_LCD, LEDColor::LED_COLOR_BLUE);
         break;
         case 2:
-        lcd_print(1, 1, "SWITCH");
+        lcd_print("SWITCH");
         led_set(IndicatorLED::LED_LCD, LEDColor::LED_COLOR_YELLOW);
         break;
     }
@@ -275,7 +276,7 @@ static bool play_part(uint32_t time) {
     return true;
 }
 
-void p001_step1(void) {
+void step1(void) {
     while (get_switch_flipped(nullptr));
 
     init_step();

main/steps/step1.h

@@ -0,0 +1,15 @@
+#ifndef STEP_1_H
+#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"
+
+void step1(void);
+
+#endif /* STEP_1_H */

main/steps/step2.cpp

@@ -1,4 +1,4 @@
-#include "p001_step2.h"
+#include "step2.h"
 
 __attribute__((unused))
 static const char *TAG = "step2";
@@ -91,7 +91,7 @@ static void new_puzzle(void) {
     set_module_sseg_raw(display_map);
 }
 
-void p001_step2(void) {
+void step2(void) {
     KeypadKey key;
     int solved_times = 0;
 

main/steps/step2.h

@@ -0,0 +1,16 @@
+#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 "../helper.h"
+#include <iostream>
+#include <random>
+#include <map>
+
+void step2(void);
+
+#endif /* STEP_2_H */

main/steps/step3.cpp

@@ -1,4 +1,4 @@
-#include "p001_step3.h"
+#include "step3.h"
 
 #define ONE_SECOND_TIME 90'000
 #define THREE_SECOND_TIME 90'000
@@ -21,8 +21,6 @@ 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",
@@ -51,20 +49,13 @@ 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,
 };
 
@@ -72,25 +63,17 @@ static bool one_second();
 static bool three_second();
 static bool six_second();
 
-void p001_step3(void) {
+void step3(void) {
-    SemaphoreHandle_t continue_sem = xSemaphoreCreateBinary();
+    StarCodeHandler star_codes[] = {
-    if (continue_sem == nullptr) {
+        {
-        ESP_LOGE(TAG, "could not create semaphore");
+            .code = "*1642",
-        return;
-    }
-
-    StarCodeEntry start_code = {
-        .code = "1642",
             .display_text = "Starting...",
-        .delay_us = 2'000'000,
+            .should_exit = true,
             .callback = nullptr,
-        .triggered_sem = continue_sem,
+        },
     };
-
+    int len = sizeof(star_codes)/sizeof(StarCodeHandler);
-    add_star_code(start_code);
+    do_star_codes(star_codes, len);
-    xSemaphoreTake(continue_sem, portMAX_DELAY);
-    rm_star_code(start_code.code);
-    vSemaphoreDelete(continue_sem);
 
     while (times < TIMES_TO_COMPLETE) {
         tone = tone_dist(gen);
@@ -99,7 +82,7 @@ void p001_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, 1 + (tone/3) * 4, 0);
+        play_clip_wav(TONE_FILES[tone], false, false, 2 + (tone/3) * 3, 0);
         
         bool correct = false;
         switch (tone % 3) {
@@ -238,16 +221,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] == NEOPIXEL_COLOR_IDX_RED) {
+        if (indicator_led_idxs[i] == 0) {
             red_led_count++;
-        } else if (indicator_led_idxs[i] == NEOPIXEL_COLOR_IDX_BLUE) {
+        } else if (indicator_led_idxs[i] == 4) {
             blue_led_count++;
         }
     }
 
     uint8_t correct_switches = four_bit_flag(
-        speaker_color == NEOPIXEL_COLOR_IDX_RED || speaker_color == NEOPIXEL_COLOR_IDX_YELLOW || speaker_color == NEOPIXEL_COLOR_IDX_PINK,
+        speaker_color == 0 || speaker_color == 1 || speaker_color == 2,
-        lcd_string_idx == LCD_STRING_SOMETHING || lcd_string_idx == LCD_STRING_NOTHING,
+        lcd_string_idx == 0 || lcd_string_idx == 1,
         was_high,
         !was_high
     );
@@ -297,9 +280,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] == NEOPIXEL_COLOR_IDX_RED) {
+        if (indicator_led_idxs[i] == 0) {
             red_led_count++;
-        } else if (indicator_led_idxs[i] == NEOPIXEL_COLOR_IDX_BLUE) {
+        } else if (indicator_led_idxs[i] == 4) {
             blue_led_count++;
         }
     }
@@ -362,7 +345,7 @@ static bool six_second() {
 
     bool was_high = (tone / 3) == 1;
 
-    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);
+    bool second_switch_correct_state = (indicator_led_idxs[IndicatorLED::LED_S2] == 0) || (indicator_led_idxs[IndicatorLED::LED_S2] == 6);
     second_switch_correct_state = second_switch_correct_state || was_high;
 
     rng_leds();
@@ -371,16 +354,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] == NEOPIXEL_COLOR_IDX_BLUE) {
+        if (indicator_led_idxs[i] == 4) {
             blue_led_count++;
-        } else if (indicator_led_idxs[i] == NEOPIXEL_COLOR_IDX_GREEN) {
+        } else if (indicator_led_idxs[i] == 3) {
             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] == NEOPIXEL_COLOR_IDX_PINK) {
+        if (indicator_led_idxs[i] == 5) {
             pink_led_on_bottom_count++;
         }
     }

main/steps/step3.h

@@ -0,0 +1,15 @@
+#ifndef STEP_3_H
+#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 "../helper.h"
+
+void step3(void);
+
+#endif /* STEP_3_H */

main/steps/step4.cpp

@@ -1,4 +1,4 @@
-#include "p001_step4.h"
+#include "step4.h"
 
 __attribute__((unused))
 static const char *TAG = "step4";
@@ -379,30 +379,17 @@ static void fail() {
     }
 }
 
-void p001_step4() {
+void step4() {
-    // TODO: extract to helper function
+    StarCodeHandler star_code = {
-    SemaphoreHandle_t continue_sem = xSemaphoreCreateBinary();
+        .code = "*3850",
-    if (continue_sem == nullptr) {
-        ESP_LOGE(TAG, "could not create semaphore");
-    }
-
-    StarCodeEntry start_code = {
-        .code = "3850",
         .display_text = "Starting...",
-        .delay_us = 2'000'000,
+        .should_exit = true,
         .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

@@ -0,0 +1,18 @@
+#ifndef STEP_4_H
+#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 "../helper.h"
+
+#define TETRIS_USE_FLASH_IMG
+#define TETRIS_USE_FLASH_BG_IMG
+
+void step4(void);
+
+#endif /* STEP_4_H */

main/steps/step5.cpp

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

main/steps/step5.h

@@ -0,0 +1,20 @@
+#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 "../helper.h"
+#include <random>
+#include <iostream>
+#include <set>
+#include <map>
+#include <vector>
+#include <cmath>
+#include <array>
+
+void step5(void);
+
+#endif /* STEP_5_H */

main/steps/step6.cpp

@@ -1,11 +1,11 @@
-#include "p001_step6.h"
+#include "step6.h"
 
 __attribute__((unused))
 static const char *TAG = "step6";
 
 static uint8_t cut_wires = 0;
 
-void p001_step6(void) {
+void step6(void) {
     get_cut_wires();
     clear_all_pressed_released();
 

main/steps/step6.h

@@ -0,0 +1,12 @@
+#ifndef STEP_6_H
+#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"
+
+void step6(void);
+
+#endif /* STEP_6_H */

partitions.csv

@@ -1,8 +0,0 @@
-# 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

@@ -1,6 +1,6 @@
 #
 # Automatically generated file. DO NOT EDIT.
-# Espressif IoT Development Framework (ESP-IDF) 5.3.5 Project Configuration
+# Espressif IoT Development Framework (ESP-IDF) 5.3.2 Project Configuration
 #
 CONFIG_SOC_MPU_MIN_REGION_SIZE=0x20000000
 CONFIG_SOC_MPU_REGIONS_MAX_NUM=8
@@ -11,7 +11,6 @@ CONFIG_SOC_PHY_SUPPORTED=y
 CONFIG_SOC_WIFI_SUPPORTED=y
 CONFIG_SOC_TWAI_SUPPORTED=y
 CONFIG_SOC_GDMA_SUPPORTED=y
-CONFIG_SOC_UHCI_SUPPORTED=y
 CONFIG_SOC_AHB_GDMA_SUPPORTED=y
 CONFIG_SOC_GPTIMER_SUPPORTED=y
 CONFIG_SOC_LCDCAM_SUPPORTED=y
@@ -65,7 +64,6 @@ CONFIG_SOC_LIGHT_SLEEP_SUPPORTED=y
 CONFIG_SOC_DEEP_SLEEP_SUPPORTED=y
 CONFIG_SOC_LP_PERIPH_SHARE_INTERRUPT=y
 CONFIG_SOC_PM_SUPPORTED=y
-CONFIG_SOC_SIMD_INSTRUCTION_SUPPORTED=y
 CONFIG_SOC_XTAL_SUPPORT_40M=y
 CONFIG_SOC_APPCPU_HAS_CLOCK_GATING_BUG=y
 CONFIG_SOC_ADC_RTC_CTRL_SUPPORTED=y
@@ -102,8 +100,7 @@ CONFIG_SOC_CPU_HAS_FPU=y
 CONFIG_SOC_HP_CPU_HAS_MULTIPLE_CORES=y
 CONFIG_SOC_CPU_BREAKPOINTS_NUM=2
 CONFIG_SOC_CPU_WATCHPOINTS_NUM=2
-CONFIG_SOC_CPU_WATCHPOINT_MAX_REGION_SIZE=0x40
+CONFIG_SOC_CPU_WATCHPOINT_MAX_REGION_SIZE=64
-CONFIG_SOC_SIMD_PREFERRED_DATA_ALIGNMENT=16
 CONFIG_SOC_DS_SIGNATURE_MAX_BIT_LEN=4096
 CONFIG_SOC_DS_KEY_PARAM_MD_IV_LENGTH=16
 CONFIG_SOC_DS_KEY_CHECK_MAX_WAIT_US=1100
@@ -179,7 +176,7 @@ CONFIG_SOC_RMT_CHANNELS_PER_GROUP=8
 CONFIG_SOC_RMT_MEM_WORDS_PER_CHANNEL=48
 CONFIG_SOC_RMT_SUPPORT_RX_PINGPONG=y
 CONFIG_SOC_RMT_SUPPORT_RX_DEMODULATION=y
-CONFIG_SOC_RMT_SUPPORT_ASYNC_STOP=y
+CONFIG_SOC_RMT_SUPPORT_TX_ASYNC_STOP=y
 CONFIG_SOC_RMT_SUPPORT_TX_LOOP_COUNT=y
 CONFIG_SOC_RMT_SUPPORT_TX_LOOP_AUTO_STOP=y
 CONFIG_SOC_RMT_SUPPORT_TX_SYNCHRO=y
@@ -206,8 +203,7 @@ CONFIG_SOC_RTCIO_PIN_COUNT=22
 CONFIG_SOC_RTCIO_INPUT_OUTPUT_SUPPORTED=y
 CONFIG_SOC_RTCIO_HOLD_SUPPORTED=y
 CONFIG_SOC_RTCIO_WAKE_SUPPORTED=y
-CONFIG_SOC_LP_IO_CLOCK_IS_INDEPENDENT=y
+CONFIG_SOC_SDM_GROUPS=y
-CONFIG_SOC_SDM_GROUPS=1
 CONFIG_SOC_SDM_CHANNELS_PER_GROUP=8
 CONFIG_SOC_SDM_CLK_SUPPORT_APB=y
 CONFIG_SOC_SPI_PERIPH_NUM=3
@@ -247,8 +243,6 @@ CONFIG_SOC_TIMER_GROUP_COUNTER_BIT_WIDTH=54
 CONFIG_SOC_TIMER_GROUP_SUPPORT_XTAL=y
 CONFIG_SOC_TIMER_GROUP_SUPPORT_APB=y
 CONFIG_SOC_TIMER_GROUP_TOTAL_TIMERS=4
-CONFIG_SOC_LP_TIMER_BIT_WIDTH_LO=32
-CONFIG_SOC_LP_TIMER_BIT_WIDTH_HI=16
 CONFIG_SOC_TOUCH_SENSOR_VERSION=2
 CONFIG_SOC_TOUCH_SENSOR_NUM=15
 CONFIG_SOC_TOUCH_SUPPORT_SLEEP_WAKEUP=y
@@ -271,7 +265,6 @@ CONFIG_SOC_UART_SUPPORT_WAKEUP_INT=y
 CONFIG_SOC_UART_SUPPORT_APB_CLK=y
 CONFIG_SOC_UART_SUPPORT_RTC_CLK=y
 CONFIG_SOC_UART_SUPPORT_XTAL_CLK=y
-CONFIG_SOC_UHCI_NUM=1
 CONFIG_SOC_USB_OTG_PERIPH_NUM=1
 CONFIG_SOC_SHA_DMA_MAX_BUFFER_SIZE=3968
 CONFIG_SOC_SHA_SUPPORT_DMA=y
@@ -357,7 +350,6 @@ CONFIG_SOC_WIFI_HW_TSF=y
 CONFIG_SOC_WIFI_FTM_SUPPORT=y
 CONFIG_SOC_WIFI_GCMP_SUPPORT=y
 CONFIG_SOC_WIFI_WAPI_SUPPORT=y
-CONFIG_SOC_WIFI_TXOP_SUPPORT=y
 CONFIG_SOC_WIFI_CSI_SUPPORT=y
 CONFIG_SOC_WIFI_MESH_SUPPORT=y
 CONFIG_SOC_WIFI_SUPPORT_VARIABLE_BEACON_WINDOW=y
@@ -535,11 +527,11 @@ CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
 # Partition Table
 #
 # CONFIG_PARTITION_TABLE_SINGLE_APP is not set
-# CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE is not set
+CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
 # CONFIG_PARTITION_TABLE_TWO_OTA is not set
-CONFIG_PARTITION_TABLE_CUSTOM=y
+# CONFIG_PARTITION_TABLE_CUSTOM is not set
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
-CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
+CONFIG_PARTITION_TABLE_FILENAME="partitions_singleapp_large.csv"
 CONFIG_PARTITION_TABLE_OFFSET=0x8000
 CONFIG_PARTITION_TABLE_MD5=y
 # end of Partition Table
@@ -547,7 +539,7 @@ CONFIG_PARTITION_TABLE_MD5=y
 #
 # BLK_BOX Config
 #
-# CONFIG_USE_NEW_DISPLAY is not set
+CONFIG_USE_NEW_DISPLAY=y
 # end of BLK_BOX Config
 
 #
@@ -601,21 +593,7 @@ CONFIG_APPTRACE_LOCK_ENABLE=y
 # Bluetooth
 #
 # CONFIG_BT_ENABLED is not set
-
+CONFIG_BT_ALARM_MAX_NUM=50
-#
-# Common Options
-#
-
-#
-# BLE Log
-#
-# CONFIG_BLE_LOG_ENABLED is not set
-# end of BLE Log
-
-# CONFIG_BT_BLE_LOG_SPI_OUT_ENABLED is not set
-# CONFIG_BT_BLE_LOG_UHCI_OUT_ENABLED is not set
-# CONFIG_BT_LE_USED_MEM_STATISTICS_ENABLED is not set
-# end of Common Options
 # end of Bluetooth
 
 #
@@ -639,7 +617,6 @@ CONFIG_TWAI_ERRATA_FIX_LISTEN_ONLY_DOM=y
 # Legacy ADC Driver Configuration
 #
 # CONFIG_ADC_SUPPRESS_DEPRECATE_WARN is not set
-# CONFIG_ADC_SKIP_LEGACY_CONFLICT_CHECK is not set
 
 #
 # Legacy ADC Calibration Configuration
@@ -652,55 +629,42 @@ CONFIG_TWAI_ERRATA_FIX_LISTEN_ONLY_DOM=y
 # Legacy MCPWM Driver Configurations
 #
 # CONFIG_MCPWM_SUPPRESS_DEPRECATE_WARN is not set
-# CONFIG_MCPWM_SKIP_LEGACY_CONFLICT_CHECK is not set
 # end of Legacy MCPWM Driver Configurations
 
 #
 # Legacy Timer Group Driver Configurations
 #
 # CONFIG_GPTIMER_SUPPRESS_DEPRECATE_WARN is not set
-# CONFIG_GPTIMER_SKIP_LEGACY_CONFLICT_CHECK is not set
 # end of Legacy Timer Group Driver Configurations
 
 #
 # Legacy RMT Driver Configurations
 #
 # CONFIG_RMT_SUPPRESS_DEPRECATE_WARN is not set
-# CONFIG_RMT_SKIP_LEGACY_CONFLICT_CHECK is not set
 # end of Legacy RMT Driver Configurations
 
 #
 # Legacy I2S Driver Configurations
 #
 # CONFIG_I2S_SUPPRESS_DEPRECATE_WARN is not set
-# CONFIG_I2S_SKIP_LEGACY_CONFLICT_CHECK is not set
 # end of Legacy I2S Driver Configurations
 
-#
-# Legacy I2C Driver Configurations
-#
-# CONFIG_I2C_SKIP_LEGACY_CONFLICT_CHECK is not set
-# end of Legacy I2C Driver Configurations
-
 #
 # Legacy PCNT Driver Configurations
 #
 # CONFIG_PCNT_SUPPRESS_DEPRECATE_WARN is not set
-# CONFIG_PCNT_SKIP_LEGACY_CONFLICT_CHECK is not set
 # end of Legacy PCNT Driver Configurations
 
 #
 # Legacy SDM Driver Configurations
 #
 # CONFIG_SDM_SUPPRESS_DEPRECATE_WARN is not set
-# CONFIG_SDM_SKIP_LEGACY_CONFLICT_CHECK is not set
 # end of Legacy SDM Driver Configurations
 
 #
 # Legacy Temperature Sensor Driver Configurations
 #
 # CONFIG_TEMP_SENSOR_SUPPRESS_DEPRECATE_WARN is not set
-# CONFIG_TEMP_SENSOR_SKIP_LEGACY_CONFLICT_CHECK is not set
 # end of Legacy Temperature Sensor Driver Configurations
 # end of Driver Configurations
 
@@ -723,7 +687,6 @@ CONFIG_ESP_TLS_USE_DS_PERIPHERAL=y
 # CONFIG_ESP_TLS_SERVER_MIN_AUTH_MODE_OPTIONAL is not set
 # CONFIG_ESP_TLS_PSK_VERIFICATION is not set
 # CONFIG_ESP_TLS_INSECURE is not set
-CONFIG_ESP_TLS_DYN_BUF_STRATEGY_SUPPORTED=y
 # end of ESP-TLS
 
 #
@@ -761,7 +724,6 @@ CONFIG_ESP_ERR_TO_NAME_LOOKUP=y
 CONFIG_GPTIMER_ISR_HANDLER_IN_IRAM=y
 # CONFIG_GPTIMER_CTRL_FUNC_IN_IRAM is not set
 # CONFIG_GPTIMER_ISR_IRAM_SAFE is not set
-CONFIG_GPTIMER_OBJ_CACHE_SAFE=y
 # CONFIG_GPTIMER_ENABLE_DEBUG_LOG is not set
 # end of ESP-Driver:GPTimer Configurations
 
@@ -845,14 +807,6 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=y
 # CONFIG_UART_ISR_IN_IRAM is not set
 # end of ESP-Driver:UART Configurations
 
-#
-# ESP-Driver:UHCI Configurations
-#
-# CONFIG_UHCI_ISR_HANDLER_IN_IRAM is not set
-# CONFIG_UHCI_ISR_CACHE_SAFE is not set
-# CONFIG_UHCI_ENABLE_DEBUG_LOG is not set
-# end of ESP-Driver:UHCI Configurations
-
 #
 # ESP-Driver:USB Serial/JTAG Configuration
 #
@@ -888,13 +842,6 @@ CONFIG_ESP_GDBSTUB_SUPPORT_TASKS=y
 CONFIG_ESP_GDBSTUB_MAX_TASKS=32
 # end of GDB Stub
 
-#
-# ESP HID
-#
-CONFIG_ESPHID_TASK_SIZE_BT=2048
-CONFIG_ESPHID_TASK_SIZE_BLE=4096
-# end of ESP HID
-
 #
 # ESP HTTP client
 #
@@ -1068,11 +1015,7 @@ CONFIG_ESP_PHY_RF_CAL_PARTIAL=y
 # CONFIG_ESP_PHY_RF_CAL_NONE is not set
 # CONFIG_ESP_PHY_RF_CAL_FULL is not set
 CONFIG_ESP_PHY_CALIBRATION_MODE=0
-CONFIG_ESP_PHY_PLL_TRACK_PERIOD_MS=1000
 # CONFIG_ESP_PHY_PLL_TRACK_DEBUG is not set
-# CONFIG_ESP_PHY_RECORD_USED_TIME is not set
-CONFIG_ESP_PHY_IRAM_OPT=y
-# CONFIG_ESP_PHY_DEBUG is not set
 # end of PHY
 
 #
@@ -1092,11 +1035,9 @@ CONFIG_SPIRAM=y
 #
 # SPI RAM config
 #
-CONFIG_SPIRAM_MODE_QUAD=y
+# CONFIG_SPIRAM_MODE_QUAD is not set
-# CONFIG_SPIRAM_MODE_OCT is not set
+CONFIG_SPIRAM_MODE_OCT=y
 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
@@ -1104,12 +1045,11 @@ 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_PRE_CONFIGURE_MEMORY_PROTECTION=y
 # CONFIG_SPIRAM_IGNORE_NOTFOUND is not set
 # CONFIG_SPIRAM_USE_MEMMAP is not set
 # CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
@@ -1274,9 +1214,9 @@ CONFIG_ESP_WIFI_ENABLED=y
 CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=10
 CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=32
 CONFIG_ESP_WIFI_STATIC_TX_BUFFER=y
-# CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER is not set
 CONFIG_ESP_WIFI_TX_BUFFER_TYPE=0
 CONFIG_ESP_WIFI_STATIC_TX_BUFFER_NUM=16
+CONFIG_ESP_WIFI_CACHE_TX_BUFFER_NUM=32
 CONFIG_ESP_WIFI_STATIC_RX_MGMT_BUFFER=y
 # CONFIG_ESP_WIFI_DYNAMIC_RX_MGMT_BUFFER is not set
 CONFIG_ESP_WIFI_DYNAMIC_RX_MGMT_BUF=0
@@ -1286,6 +1226,7 @@ CONFIG_ESP_WIFI_AMPDU_TX_ENABLED=y
 CONFIG_ESP_WIFI_TX_BA_WIN=6
 CONFIG_ESP_WIFI_AMPDU_RX_ENABLED=y
 CONFIG_ESP_WIFI_RX_BA_WIN=6
+# CONFIG_ESP_WIFI_AMSDU_TX_ENABLED is not set
 CONFIG_ESP_WIFI_NVS_ENABLED=y
 CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_0=y
 # CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_1 is not set
@@ -1327,6 +1268,7 @@ CONFIG_ESP_WIFI_MBEDTLS_TLS_CLIENT=y
 # end of WPS Configuration Options
 
 # CONFIG_ESP_WIFI_DEBUG_PRINT is not set
+# CONFIG_ESP_WIFI_TESTING_OPTIONS is not set
 CONFIG_ESP_WIFI_ENTERPRISE_SUPPORT=y
 # CONFIG_ESP_WIFI_ENT_FREE_DYNAMIC_BUFFER is not set
 # end of Wi-Fi
@@ -1456,6 +1398,7 @@ CONFIG_HAL_DEFAULT_ASSERTION_LEVEL=2
 CONFIG_HAL_WDT_USE_ROM_IMPL=y
 CONFIG_HAL_SPI_MASTER_FUNC_IN_IRAM=y
 CONFIG_HAL_SPI_SLAVE_FUNC_IN_IRAM=y
+# CONFIG_HAL_ECDSA_GEN_SIG_CM is not set
 # end of Hardware Abstraction Layer (HAL) and Low Level (LL)
 
 #
@@ -1544,7 +1487,6 @@ CONFIG_LWIP_DHCPS=y
 CONFIG_LWIP_DHCPS_LEASE_UNIT=60
 CONFIG_LWIP_DHCPS_MAX_STATION_NUM=8
 CONFIG_LWIP_DHCPS_STATIC_ENTRIES=y
-CONFIG_LWIP_DHCPS_ADD_DNS=y
 # end of DHCP server
 
 # CONFIG_LWIP_AUTOIP is not set
@@ -1696,7 +1638,6 @@ CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=4096
 # CONFIG_MBEDTLS_X509_TRUSTED_CERT_CALLBACK is not set
 # CONFIG_MBEDTLS_SSL_CONTEXT_SERIALIZATION is not set
 CONFIG_MBEDTLS_SSL_KEEP_PEER_CERTIFICATE=y
-# CONFIG_MBEDTLS_SSL_KEYING_MATERIAL_EXPORT is not set
 CONFIG_MBEDTLS_PKCS7_C=y
 # end of mbedTLS v3.x related
 
@@ -1730,7 +1671,6 @@ CONFIG_MBEDTLS_HAVE_TIME=y
 # CONFIG_MBEDTLS_PLATFORM_TIME_ALT is not set
 # CONFIG_MBEDTLS_HAVE_TIME_DATE is not set
 CONFIG_MBEDTLS_ECDSA_DETERMINISTIC=y
-CONFIG_MBEDTLS_SHA1_C=y
 CONFIG_MBEDTLS_SHA512_C=y
 # CONFIG_MBEDTLS_SHA3_C is not set
 CONFIG_MBEDTLS_TLS_SERVER_AND_CLIENT=y
@@ -1810,7 +1750,6 @@ CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=y
 # CONFIG_MBEDTLS_THREADING_C is not set
 CONFIG_MBEDTLS_ERROR_STRINGS=y
 CONFIG_MBEDTLS_FS_IO=y
-# CONFIG_MBEDTLS_ALLOW_WEAK_CERTIFICATE_VERIFICATION is not set
 # end of mbedTLS
 
 #
@@ -1861,12 +1800,25 @@ CONFIG_STDATOMIC_S32C1I_SPIRAM_WORKAROUND=y
 # CONFIG_OPENTHREAD_ENABLED is not set
 
 #
-# OpenThread Spinel
+# Thread Operational Dataset
 #
-# CONFIG_OPENTHREAD_SPINEL_ONLY is not set
+CONFIG_OPENTHREAD_NETWORK_NAME="OpenThread-ESP"
-# end of OpenThread Spinel
+CONFIG_OPENTHREAD_MESH_LOCAL_PREFIX="fd00:db8:a0:0::/64"
+CONFIG_OPENTHREAD_NETWORK_CHANNEL=15
+CONFIG_OPENTHREAD_NETWORK_PANID=0x1234
+CONFIG_OPENTHREAD_NETWORK_EXTPANID="dead00beef00cafe"
+CONFIG_OPENTHREAD_NETWORK_MASTERKEY="00112233445566778899aabbccddeeff"
+CONFIG_OPENTHREAD_NETWORK_PSKC="104810e2315100afd6bc9215a6bfac53"
+# end of Thread Operational Dataset
 
-# CONFIG_OPENTHREAD_DEBUG is not set
+CONFIG_OPENTHREAD_XTAL_ACCURACY=130
+# CONFIG_OPENTHREAD_SPINEL_ONLY is not set
+CONFIG_OPENTHREAD_RX_ON_WHEN_IDLE=y
+
+#
+# Thread Address Query Config
+#
+# end of Thread Address Query Config
 # end of OpenThread
 
 #
@@ -1875,7 +1827,6 @@ CONFIG_STDATOMIC_S32C1I_SPIRAM_WORKAROUND=y
 CONFIG_ESP_PROTOCOMM_SUPPORT_SECURITY_VERSION_0=y
 CONFIG_ESP_PROTOCOMM_SUPPORT_SECURITY_VERSION_1=y
 CONFIG_ESP_PROTOCOMM_SUPPORT_SECURITY_VERSION_2=y
-CONFIG_ESP_PROTOCOMM_SUPPORT_SECURITY_PATCH_VERSION=y
 # end of Protocomm
 
 #
@@ -1927,7 +1878,6 @@ CONFIG_SPI_FLASH_SUSPEND_QVL_SUPPORTED=y
 # CONFIG_SPI_FLASH_AUTO_SUSPEND is not set
 CONFIG_SPI_FLASH_SUSPEND_TSUS_VAL_US=50
 # CONFIG_SPI_FLASH_FORCE_ENABLE_XMC_C_SUSPEND is not set
-# CONFIG_SPI_FLASH_FORCE_ENABLE_C6_H2_SUSPEND is not set
 # end of Optional and Experimental Features (READ DOCS FIRST)
 # end of Main Flash configuration
 
@@ -2507,6 +2457,7 @@ CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU1=y
 CONFIG_ESP32S3_DEBUG_OCDAWARE=y
 CONFIG_BROWNOUT_DET=y
 CONFIG_ESP32S3_BROWNOUT_DET=y
+CONFIG_ESP32S3_BROWNOUT_DET=y
 CONFIG_BROWNOUT_DET_LVL_SEL_7=y
 CONFIG_ESP32S3_BROWNOUT_DET_LVL_SEL_7=y
 # CONFIG_BROWNOUT_DET_LVL_SEL_6 is not set
@@ -2529,14 +2480,17 @@ CONFIG_ESP32_WIFI_ENABLED=y
 CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=10
 CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=32
 CONFIG_ESP32_WIFI_STATIC_TX_BUFFER=y
-# CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER is not set
 CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=0
 CONFIG_ESP32_WIFI_STATIC_TX_BUFFER_NUM=16
+CONFIG_ESP32_WIFI_CACHE_TX_BUFFER_NUM=32
 # CONFIG_ESP32_WIFI_CSI_ENABLED is not set
 CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=y
 CONFIG_ESP32_WIFI_TX_BA_WIN=6
 CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y
+CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y
 CONFIG_ESP32_WIFI_RX_BA_WIN=6
+CONFIG_ESP32_WIFI_RX_BA_WIN=6
+# CONFIG_ESP32_WIFI_AMSDU_TX_ENABLED is not set
 CONFIG_ESP32_WIFI_NVS_ENABLED=y
 CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_0=y
 # CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_1 is not set
@@ -2557,6 +2511,7 @@ CONFIG_WPA_MBEDTLS_TLS_CLIENT=y
 # CONFIG_WPA_WPS_SOFTAP_REGISTRAR is not set
 # CONFIG_WPA_WPS_STRICT is not set
 # CONFIG_WPA_DEBUG_PRINT is not set
+# CONFIG_WPA_TESTING_OPTIONS is not set
 # CONFIG_ESP32_ENABLE_COREDUMP_TO_FLASH is not set
 # CONFIG_ESP32_ENABLE_COREDUMP_TO_UART is not set
 CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE=y