main/drivers/CMakeLists.txt

@@ -11,7 +11,6 @@ set(SOURCES
     "i2c_lcd_pcf8574.c"
     "i2c.cpp"
     "leds.cpp"
-    "perh.cpp"
     "power.cpp"
     "sd.cpp"
     "speaker.cpp"

main/drivers/SparkFunBQ27441/SparkFunBQ27441.cpp

@@ -711,9 +711,9 @@ bool BQ27441::writeExtendedData(uint8_t classID, uint8_t offset, uint8_t * data,
 int16_t BQ27441::i2cReadBytes(uint8_t subAddress, uint8_t * dest, uint8_t count)
 {
 	int16_t timeout = BQ72441_I2C_TIMEOUT;
-	xSemaphoreTake(main_i2c_mutex, portMAX_DELAY);
+	xSemaphoreTake(i2c0_mutex, portMAX_DELAY);
 	i2c_master_write_read_device(BQ72441_I2C_NUM, _deviceAddress, &subAddress, 1, dest, count, timeout);
-	xSemaphoreGive(main_i2c_mutex);
+	xSemaphoreGive(i2c0_mutex);
 	return timeout;
 }
 

main/drivers/bottom_half.cpp

@@ -46,14 +46,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 = {
-        .pin_bit_mask = 1ULL << BOTTOM_PIN_INTERUPT,
-        .mode = GPIO_MODE_INPUT,
-        .pull_up_en = GPIO_PULLUP_ENABLE,
-        .pull_down_en = GPIO_PULLDOWN_DISABLE,
-        .intr_type = GPIO_INTR_DISABLE,
-    };
-    ESP_ERROR_CHECK(gpio_config(&int_conf));
+    ESP_ERROR_CHECK(gpio_set_direction(BOTTOM_PIN_INTERUPT, GPIO_MODE_INPUT));
+    ESP_ERROR_CHECK(gpio_set_pull_mode(BOTTOM_PIN_INTERUPT, GPIO_PULLUP_ONLY));
 
     // TODO: do interupt stuff.
     // ESP_ERROR_CHECK(gpio_intr_enable(BOTTOM_PIN_INTERUPT));

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,
-    pound = 1,
-    k0 = 2,
+    k1 = 0,
+    k4 = 1,
+    k7 = 2,
     star = 3,
-    kc = 4,
-    k9 = 5,
+    k2 = 4,
+    k5 = 5,
     k8 = 6,
-    k7 = 7,
-    kb = 8,
+    k0 = 7,
+    k3 = 8,
     k6 = 9,
-    k5 = 10,
-    k4 = 11,
+    k9 = 10,
+    pound = 11,
     ka = 12,
-    k3 = 13,
-    k2 = 14,
-    k1 = 15,
+    kb = 13,
+    kc = 14,
+    kd = 15,
 } KeypadKey;
 
 /// @brief An enum for the possible buttons.

main/drivers/char_lcd.cpp

@@ -5,8 +5,6 @@
 #include "state_tracking.h"
 #include <cstring>
 #include "power.h"
-#include "star_code.h"
-#include "game_info.h"
 
 i2c_lcd_pcf8574_handle_t lcd;
 

main/drivers/char_lcd.h

@@ -66,6 +66,15 @@ bool lcd_header_enabled();
 /// @brief Prints the header in the LCD.
 void lcd_print_header();
 
+/// @brief Prints the star code section of the LCD header.
+void lcd_print_header_star_code();
+
+/// @brief Prints the step section of the LCD header.
+void lcd_print_header_step();
+
+/// @brief Prints the battery section of the LCD header.
+void lcd_print_header_bat();
+
 /// @brief Prints the splash screen for the BLK_BOX.
 void lcd_do_splash();
 

main/drivers/game_info.cpp

@@ -1,8 +1,8 @@
 #include "game_info.h"
-#include "star_code.h"
 #include <stdio.h>
 #include "char_lcd.h"
 
+// static char game_state[GAME_STATE_MAX_LEN+1] = "     ";
 static char game_state[GAME_STATE_MAX_LEN+1] = "MENU ";
 
 void set_game_state(char* new_state) {
@@ -18,7 +18,6 @@ void reset_game_state() {
 
 void lcd_print_header_step() {
     if (!lcd_header_enabled()) return;
-    if (lcd_starcode_displaying_result()) return;
 
-    lcd_print(11, 0, game_state);
+    lcd_print(10, 0, game_state);
 }

main/drivers/game_info.h

@@ -11,7 +11,7 @@ void set_game_state(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)
+/// @brief Prints the game state section of the header to the char_lcd. (row 0, columns 10-14)
 void lcd_print_header_step();
 
 #endif /* GAME_INFO_H */

main/drivers/i2c.cpp

@@ -5,31 +5,30 @@
 
 static const char *TAG = "i2c";
 
-SemaphoreHandle_t main_i2c_mutex;
+SemaphoreHandle_t i2c0_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_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 = {
-            // 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));
+    ESP_ERROR_CHECK(i2c_param_config(I2C_NUM_0, &conf));
+    ESP_ERROR_CHECK(i2c_driver_install(I2C_NUM_0, conf.mode, 0, 0, 0));
 
-    main_i2c_mutex = xSemaphoreCreateMutex();
-    assert(main_i2c_mutex != NULL);
+    i2c0_mutex = xSemaphoreCreateMutex();
+    assert(i2c0_mutex != NULL);
 
     ESP_LOGI(TAG, "i2c initialized!");
 }

main/drivers/i2c.h

@@ -4,13 +4,8 @@
 #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;
+extern SemaphoreHandle_t i2c0_mutex;
 
 /// @brief Initializes `I2C_NUM_0`.
 ///

main/drivers/i2c_lcd_pcf8574.c

@@ -59,7 +59,7 @@ void lcd_begin(i2c_lcd_pcf8574_handle_t* lcd, uint8_t cols, uint8_t rows) {
     lcd->entrymode = 0x02;
 
     // The following are the reset sequence: Please see "Initialization instruction in the PCF8574 datasheet."
-    xSemaphoreTake(main_i2c_mutex, portMAX_DELAY);
+    xSemaphoreTake(i2c0_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 +97,7 @@ void lcd_begin(i2c_lcd_pcf8574_handle_t* lcd, uint8_t cols, uint8_t rows) {
     i2c_master_stop(cmd);
     i2c_master_cmd_begin(lcd->i2c_port, cmd, I2C_MASTER_TIMEOUT_MS / portTICK_PERIOD_MS);
     i2c_cmd_link_delete(cmd);
-    xSemaphoreGive(main_i2c_mutex);
+    xSemaphoreGive(i2c0_mutex);
 
     // Instruction: function set = 0x20
     lcd_send(lcd, 0x20 | (rows > 1 ? 0x08 : 0x00), false);
@@ -298,7 +298,7 @@ void lcd_print_number(i2c_lcd_pcf8574_handle_t* lcd, uint8_t col, uint8_t row, u
 
 
 static void lcd_send(i2c_lcd_pcf8574_handle_t* lcd, uint8_t value, bool is_data) {
-    xSemaphoreTake(main_i2c_mutex, portMAX_DELAY);
+    xSemaphoreTake(i2c0_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 +307,7 @@ static void lcd_send(i2c_lcd_pcf8574_handle_t* lcd, uint8_t value, bool is_data)
     i2c_master_stop(cmd);
     esp_err_t ret = i2c_master_cmd_begin(lcd->i2c_port, cmd, I2C_MASTER_TIMEOUT_MS / portTICK_PERIOD_MS);
     i2c_cmd_link_delete(cmd);
-    xSemaphoreGive(main_i2c_mutex);
+    xSemaphoreGive(i2c0_mutex);
     
     if (ret != ESP_OK) {
         ESP_LOGE(TAG, "Failed to send data to LCD: %s", esp_err_to_name(ret));
@@ -346,7 +346,7 @@ static void lcd_write_i2c(i2c_lcd_pcf8574_handle_t* lcd, uint8_t data, bool is_d
         data |= lcd->backlight_mask;
     }
 
-    xSemaphoreTake(main_i2c_mutex, portMAX_DELAY);
+    xSemaphoreTake(i2c0_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 +354,7 @@ static void lcd_write_i2c(i2c_lcd_pcf8574_handle_t* lcd, uint8_t data, bool is_d
     i2c_master_stop(cmd);
     esp_err_t ret = i2c_master_cmd_begin(lcd->i2c_port, cmd, I2C_MASTER_TIMEOUT_MS / portTICK_PERIOD_MS);
     i2c_cmd_link_delete(cmd);
-    xSemaphoreGive(main_i2c_mutex);
+    xSemaphoreGive(i2c0_mutex);
 
     if (ret != ESP_OK) {
         ESP_LOGE(TAG, "Failed to write to LCD: %s", esp_err_to_name(ret));

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)
 

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 "star_code.h"
 #include <esp_log.h>
 
 static const char* TAG = "power";
@@ -57,22 +56,18 @@ uint16_t get_bat_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[5];
-    if (soc < 5 && current <= 0) {
-        snprintf(buf, sizeof(buf), "LOW");
-    } else if (soc == 100) {
-        snprintf(buf, sizeof(buf), "100");
+    if (soc < 5) {
+        sprintf(buf, "LOW ");
     } else {
-        if (current > 0) {
-            snprintf(buf, sizeof(buf), "%2d+", soc);
-        } else {
-            snprintf(buf, sizeof(buf), "%2d%%", soc);
-        }
+        snprintf(buf, sizeof(buf), "%3d%%", soc);
     }
 
-    lcd_print(17, 0, buf);
+    if (lipo.current() > 0) {
+        buf[3] = '+';
+    }
+
+    lcd_print(16, 0, buf);
 }

main/drivers/power.h

@@ -14,7 +14,7 @@ void init_power_board();
 /// @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)
+/// @brief Prints the battery section of the header to the char_lcd. (row 0, columns 16-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_CMD GPIO_NUM_40
-#define SD_PIN_D0  GPIO_NUM_38
-#define SD_PIN_D1  GPIO_NUM_45
-#define SD_PIN_D2  GPIO_NUM_42
-#define SD_PIN_D3  GPIO_NUM_41
+#define SD_PIN_CLK GPIO_NUM_48
+#define SD_PIN_CMD GPIO_NUM_45
+#define SD_PIN_D0  GPIO_NUM_47
+#define SD_PIN_D1  GPIO_NUM_21
+#define SD_PIN_D2  GPIO_NUM_39
+#define SD_PIN_D3  GPIO_NUM_38
 
 /// @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_WS    GPIO_NUM_12
+#define SPEAKER_PIN_BCLK  GPIO_NUM_46
+#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_CLK  GPIO_NUM_48
+#define SSEG_PIN_DATA GPIO_NUM_10
+#define SSEG_PIN_CLK  GPIO_NUM_11
 
 extern TM1640* sseg;
 

main/drivers/star_code.cpp

@@ -20,10 +20,8 @@ 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 bool processing_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];
@@ -32,7 +30,7 @@ static size_t current_idx;
 static void starcode_trigger_cb(void* arg) {
     (void) arg;
 
-    delaying_for_starcode = false;
+    processing_starcode = false;
 
     if (current_starcode != nullptr) {
         if (current_starcode->triggered_sem != nullptr)
@@ -44,12 +42,12 @@ static void starcode_trigger_cb(void* arg) {
     }
 
     // TODO: rename star code everywhere to starcode
-    lcd_print_header();
+    lcd_print_header_star_code();
 }
 
 
 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))) {
+    if ((!processing_starcode) && handling_new_starcodes &&  (*just_pressed & (1 << KeypadKey::star))) {
         current_idx = 0;
         current[current_idx] = '\0';
         doing_starcode = true;
@@ -127,13 +125,10 @@ static bool check_code_match(const char* triggered, const char* expected) {
 }
 
 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");
+    if (code.display_text != nullptr && strlen(code.display_text) > STARCODE_MAX_LEN + 1) {
         return false;
     }
 
@@ -144,7 +139,7 @@ bool add_star_code(StarCodeEntry code) {
 
     if (it != star_codes.end()) {
         // existing star code found!
-        ESP_LOGW(TAG, "Duplicate starcode %s", code.code);
+        ESP_LOGW(TAG, "Failed to add star code %s", code.code);
         return false;
     }
 
@@ -162,9 +157,7 @@ bool add_star_codes(const StarCodeEntry* codes, size_t len) {
     return success;
 }
 
-bool rm_star_code(const char* code) {
-    ESP_LOGI(TAG, "Removing starcode: %s", code);
-
+bool rm_star_code(const char* code){
     auto it = std::find_if(star_codes.begin(), star_codes.end(), [&](const StarCodeEntry& star_code) {
         return strcmp(code, star_code.code) == 0;
     });
@@ -203,12 +196,18 @@ void clear_star_codes() {
 }
 
 bool trigger_star_code(const char* code) {
+    ESP_LOGI(TAG, "Star codes to checK:");
+    for (const auto& entry : star_codes) {
+        ESP_LOGI(TAG, "%s", entry.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;
+    processing_starcode = true;
     if (it != star_codes.end()) {
         current_starcode = &*it;
         delay_us = current_starcode->delay_us;
@@ -232,25 +231,22 @@ 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 (processing_starcode) {
         if (current_starcode == nullptr) {
-            lcd_print(0, 0, "Invalid starcode    ");
+            lcd_print(0, 0, "Invalid  ");
         } else if (current_starcode->display_text != nullptr) {
-            char buf[21];
-            snprintf(buf, sizeof(buf), "%-20s", current_starcode->display_text);
+            char buf[STARCODE_MAX_LEN + 2];
+            snprintf(buf, sizeof(buf), "%s", 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);
+        snprintf(buf, sizeof(buf), "*%-8s", 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/star_code.h

@@ -6,20 +6,19 @@
 #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
+#define STARCODE_MAX_LEN 8
 
 /// @brief A handler for a specific star code
 struct StarCodeEntry {
     /// @brief The star code without the star
     ///
-    /// This must be <= 9 characters.
+    /// This must be <= 8 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.
+    /// This must be <= 9 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;
@@ -78,13 +77,11 @@ bool trigger_star_code(const char* code);
 /// 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.
+/// @brief Gets weather or not the star code system is handling new star codes.
+/// @return `true` if 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/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_CLK GPIO_NUM_18
+#define TFT_PIN_MISO 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_RESET GPIO_NUM_9
+#define TFT_PIN_DC GPIO_NUM_15
+#define TFT_PIN_RESET GPIO_NUM_8
 
 #define TFT_INVERT_COLOR false
 

main/drivers/wires.cpp

@@ -26,8 +26,8 @@ static void receive_button(void);
 void init_wires(void) {
     i2c_config_t wires_conf = {
         .mode = I2C_MODE_MASTER,
-        .sda_io_num = PIN_WIRES_SDA,
-        .scl_io_num = PIN_WIRES_SCL,
+        .sda_io_num = GPIO_NUM_41,
+        .scl_io_num = GPIO_NUM_42,
         .sda_pullup_en = GPIO_PULLUP_ENABLE,
         .scl_pullup_en = GPIO_PULLUP_ENABLE,
         .master = {
@@ -35,8 +35,8 @@ void init_wires(void) {
         },
     };
 
-    gpio_reset_pin(PIN_WIRES_SDA);
-    gpio_reset_pin(PIN_WIRES_SCL);
+    gpio_reset_pin(GPIO_NUM_41);
+    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 PIN_WIRES_SDA PIN_PERH1
-#define PIN_WIRES_SCL PIN_PERH2
+#define WIRES_PIN_DELTA GPIO_NUM_2
 #define WIRES_I2C_NUM I2C_NUM_1
 #define WIRES_I2C_ADDR 125
 

main/steps/step0.cpp

@@ -59,14 +59,14 @@ void step0() {
     StarCodeEntry star_codes[] = {
         {
             .code = "9819",
-            .display_text = "Diffusal Initiated",
+            .display_text = "Defusal Initiated",
             .delay_us = 2'000'000,
             .callback = nullptr,
             .triggered_sem = continue_sem,
         },
         {
-            .code = "59861",
-            .display_text = "Setup Wires",
+            .code = "59862",
+            .display_text = "Set Up Wires",
             .delay_us = 10'000'000,
             .callback = setup_wires,
             .triggered_sem = nullptr,
@@ -80,7 +80,7 @@ void step0() {
         },
         {
             .code = "59863",
-            .display_text = "Debug switches",
+            .display_text = "Debug Switches",
             .delay_us = 2'000'000,
             .callback = debug_switches,
             .triggered_sem = nullptr,
@@ -192,7 +192,7 @@ void step0() {
         },
         {
             .code = "1113",
-            .display_text = "replay",
+            .display_text = "replay_last",
             .delay_us = 2'000'000,
             .callback = replay_last,
             .triggered_sem = continue_sem,

sdkconfig

@@ -539,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
 
 #
@@ -1035,11 +1035,9 @@ CONFIG_SPIRAM=y
 #
 # SPI RAM config
 #
-CONFIG_SPIRAM_MODE_QUAD=y
-# CONFIG_SPIRAM_MODE_OCT is not set
+# CONFIG_SPIRAM_MODE_QUAD 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
@@ -1047,10 +1045,10 @@ CONFIG_SPIRAM_CS_IO=26
 # CONFIG_SPIRAM_XIP_FROM_PSRAM is not set
 # CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set
 # CONFIG_SPIRAM_RODATA is not set
-# CONFIG_SPIRAM_SPEED_120M is not set
 # CONFIG_SPIRAM_SPEED_80M is not set
 CONFIG_SPIRAM_SPEED_40M=y
 CONFIG_SPIRAM_SPEED=40
+# CONFIG_SPIRAM_ECC_ENABLE is not set
 CONFIG_SPIRAM_BOOT_INIT=y
 # CONFIG_SPIRAM_IGNORE_NOTFOUND is not set
 # CONFIG_SPIRAM_USE_MEMMAP is not set