Namespace the p001 steps

main/drivers/char_lcd.cpp

@@ -9,7 +9,6 @@
 #include "game_info.h"
 
 i2c_lcd_pcf8574_handle_t lcd;
-SemaphoreHandle_t lcd_mutex;
 
 static volatile bool header_enabled = false;
 
@@ -18,7 +17,6 @@ static const char* EMPTY_ROW = "                    ";
 
 static char buf[65];
 
-// TODO: move this to power.cpp
 static void monitor_battery_task(void* _arg) {
     (void) _arg;
 
@@ -31,35 +29,53 @@ static void monitor_battery_task(void* _arg) {
 static bool replay_handler(const char* event, char* arg) {
     if (strcmp(event, "LCD_CLEAR") == 0) {
         lcd_clear();
+        return true;
     }
-    else if (strcmp(event, "LCD_SET_DISPLAY") == 0) {
+    if (strcmp(event, "LCD_CURSOR") == 0) {
+        char* col_str = strtok(arg, ",");
+        char* row_str = strtok(NULL, ",");
+        uint32_t col = atoi(col_str);
+        uint32_t row = atoi(row_str);
+        lcd_set_cursor_pos(col, row);
+        return true;
+    }
+    if (strcmp(event, "LCD_SET_DISPLAY") == 0) {
         lcd_set_display(strcmp(arg, "true") == 0);
+        return true;
     }
-    else if (strcmp(event, "LCD_CURSOR_VIS") == 0) {
+    if (strcmp(event, "LCD_CURSOR_VIS") == 0) {
         lcd_set_cursor_vis(strcmp(arg, "true") == 0);
+        return true;
     }
-    else if (strcmp(event, "LCD_CURSOR_BLINK") == 0) {
+    if (strcmp(event, "LCD_CURSOR_BLINK") == 0) {
         lcd_set_cursor_blink(strcmp(arg, "true") == 0);
+        return true;
     }
-    else if (strcmp(event, "LCD_SCROLL_DISPLAY_LEFT") == 0) {
+    if (strcmp(event, "LCD_SCROLL_DISPLAY_LEFT") == 0) {
         lcd_scroll_display_left();
+        return true;
     }
-    else if (strcmp(event, "LCD_SCROLL_DISPLAY_RIGHT") == 0) {
+    if (strcmp(event, "LCD_SCROLL_DISPLAY_RIGHT") == 0) {
         lcd_scroll_display_right();
+        return true;
     }
-    else if (strcmp(event, "LCD_LEFT_TO_RIGHT") == 0) {
+    if (strcmp(event, "LCD_LEFT_TO_RIGHT") == 0) {
         lcd_left_to_right();
+        return true;
     }
-    else if (strcmp(event, "LCD_RIGHT_TO_LEFT") == 0) {
+    if (strcmp(event, "LCD_RIGHT_TO_LEFT") == 0) {
         lcd_right_to_left();
+        return true;
     }
-    else if (strcmp(event, "LCD_AUTOSCROLL") == 0) {
+    if (strcmp(event, "LCD_AUTOSCROLL") == 0) {
         lcd_set_autoscroll(strcmp(arg, "true") == 0);
+        return true;
     }
-    else if (strcmp(event, "LCD_BACKLIGHT") == 0) {
+    if (strcmp(event, "LCD_BACKLIGHT") == 0) {
         lcd_set_backlight(strcmp(arg, "true") == 0);
+        return true;
     }
-    else if (strcmp(event, "LCD_CREATE_CHAR") == 0) {
+    if (strcmp(event, "LCD_CREATE_CHAR") == 0) {
         char* location_str = strtok(arg, ",");
         uint8_t location = atoi(location_str);
 
@@ -70,34 +86,24 @@ static bool replay_handler(const char* event, char* arg) {
         }
 
         lcd_create_char(location, charmap);
+        return true;
     }
-    else if (strcmp(event, "LCD_PRINT") == 0) {
-        char* str = strtok(arg, ",");
-        uint8_t col = atoi(str);
-        str = strtok(NULL, ",");
-        uint8_t row = atoi(str);
-        // get remaining part of string.
-        str = strtok(NULL, "");
-
+    if (strcmp(event, "LCD_PRINT") == 0) {
         // TODO: handle \r and \n
-        lcd_print(col, row, str);
-    } else {
-        return false;
+        lcd_print(&lcd, arg);
+        return true;
     }
 
-    return true;
+    return false;
 }
 
 void init_lcd() {
     ESP_LOGI(TAG, "Initializing LCD...");
 
-    lcd_mutex = xSemaphoreCreateMutex();
-    assert(lcd_mutex != NULL);
-
     lcd_init(&lcd, LCD_ADDR, CHAR_LCD_I2C_NUM);
     lcd_begin(&lcd, LCD_COLS, LCD_ROWS);
 
-    lcd_set_backlight_to(&lcd, 1);
+    lcd_set_backlight(&lcd, 255);
 
     register_replay_fn(replay_handler);
 
@@ -106,122 +112,115 @@ void init_lcd() {
     ESP_LOGI(TAG, "LCD initialized!");
 }
 
-void lcd_clear(bool no_lock) {
+void lcd_clear() {
     if (!header_enabled) {
-        if (!no_lock) xSemaphoreTake(lcd_mutex, portMAX_DELAY);
         lcd_clear(&lcd);
-        if (!no_lock) xSemaphoreGive(lcd_mutex);
 
         if (is_state_tracking()) {
             event_occured("LCD_CLEAR", NULL);
         }
     } else {
-        if (!no_lock) xSemaphoreTake(lcd_mutex, portMAX_DELAY);
-        lcd_print(0, 1, EMPTY_ROW, true);
-        lcd_print(0, 2, EMPTY_ROW, true);
-        lcd_print(0, 3, EMPTY_ROW, true);
-        if (!no_lock) xSemaphoreGive(lcd_mutex);
+        lcd_print(0, 1, EMPTY_ROW);
+        lcd_print(0, 2, EMPTY_ROW);
+        lcd_print(0, 3, EMPTY_ROW);
     }
 }
 
-void lcd_set_display(bool display,  bool no_lock) {
-    if (!no_lock) xSemaphoreTake(lcd_mutex, portMAX_DELAY);
+// 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);
+
+    if (is_state_tracking()) {
+        sprintf(buf, "%d,%d", col, row);
+        event_occured("LCD_CURSOR", buf);
+    }
+}
+
+void lcd_set_display(bool display) {
     if (display) {
         lcd_display(&lcd);
     } else {
         lcd_no_display(&lcd);
     }
-    if (!no_lock) xSemaphoreGive(lcd_mutex);
 
     if (is_state_tracking()) {
         event_occured("LCD_SET_DISPLAY", display ? "true" : "false");
     }
 }
 
-void lcd_set_cursor_vis(bool cursor, bool no_lock) {
-    if (!no_lock) xSemaphoreTake(lcd_mutex, portMAX_DELAY);
+void lcd_set_cursor_vis(bool cursor) {
     if (cursor) {
         lcd_cursor(&lcd);
     } else {
         lcd_no_cursor(&lcd);
     }
-    if (!no_lock) xSemaphoreGive(lcd_mutex);
 
     if (is_state_tracking()) {
         event_occured("LCD_CURSOR_VIS", cursor ? "true" : "false");
     }
 }
 
-void lcd_set_cursor_blink(bool blink, bool no_lock) {
-    if (!no_lock) xSemaphoreTake(lcd_mutex, portMAX_DELAY);
+void lcd_set_cursor_blink(bool blink) {
     if (blink) {
         lcd_blink(&lcd);
     } else {
         lcd_no_blink(&lcd);
     }
-    if (!no_lock) xSemaphoreGive(lcd_mutex);
 
     if (is_state_tracking()) {
         event_occured("LCD_CURSOR_BLINK", blink ? "true" : "false");
     }
 }
 
-void lcd_scroll_display_left(bool no_lock) {
-    if (!no_lock) xSemaphoreTake(lcd_mutex, portMAX_DELAY);
+void lcd_scroll_display_left() {
     lcd_scroll_display_left(&lcd);
-    if (!no_lock) xSemaphoreGive(lcd_mutex);
 
     if (is_state_tracking()) {
         event_occured("LCD_SCROLL_DISPLAY_LEFT", NULL);
     }
 }
-void lcd_scroll_display_right(bool no_lock) {
-    if (!no_lock) xSemaphoreTake(lcd_mutex, portMAX_DELAY);
+void lcd_scroll_display_right() {
     lcd_scroll_display_right(&lcd);
-    if (!no_lock) xSemaphoreGive(lcd_mutex);
 
     if (is_state_tracking()) {
         event_occured("LCD_SCROLL_DISPLAY_RIGHT", NULL);
     }
 }
 
-void lcd_left_to_right(bool no_lock) {
-    if (!no_lock) xSemaphoreTake(lcd_mutex, portMAX_DELAY);
+void lcd_left_to_right() {
     lcd_left_to_right(&lcd);
-    if (!no_lock) xSemaphoreGive(lcd_mutex);
 
     if (is_state_tracking()) {
         event_occured("LCD_LEFT_TO_RIGHT", NULL);
     }
 }
-void lcd_right_to_left(bool no_lock) {
-    if (!no_lock) xSemaphoreTake(lcd_mutex, portMAX_DELAY);
+void lcd_right_to_left() {
     lcd_right_to_left(&lcd);
-    if (!no_lock) xSemaphoreGive(lcd_mutex);
 
     if (is_state_tracking()) {
         event_occured("LCD_RIGHT_TO_LEFT", NULL);
     }
 }
 
-void lcd_set_autoscroll(bool autoscroll, bool no_lock) {
-    if (!no_lock) xSemaphoreTake(lcd_mutex, portMAX_DELAY);
+void lcd_set_autoscroll(bool autoscroll) {
     if (autoscroll) {
         lcd_autoscroll(&lcd);
     } else {
         lcd_no_autoscroll(&lcd);
     }
-    if (!no_lock) xSemaphoreGive(lcd_mutex);
 
     if (is_state_tracking()) {
         event_occured("LCD_AUTOSCROLL", autoscroll ? "true" : "false");
     }
 }
 
-void lcd_set_backlight(bool backlight, bool no_lock) {
-    if (!no_lock) xSemaphoreTake(lcd_mutex, portMAX_DELAY);
-    lcd_set_backlight_to(&lcd, backlight);
-    if (!no_lock) xSemaphoreGive(lcd_mutex);
+void lcd_set_backlight(bool backlight) {
+    lcd_set_backlight(&lcd, backlight);
 
     if (is_state_tracking()) {
         sprintf(buf, "%d", backlight);
@@ -229,12 +228,8 @@ void lcd_set_backlight(bool backlight, bool no_lock) {
     }
 }
 
-void lcd_create_char(uint8_t location, const uint8_t charmap[], bool no_lock) {
-    if (location == 8) location = 0;
-
-    if (!no_lock) xSemaphoreTake(lcd_mutex, portMAX_DELAY);
+void lcd_create_char(uint8_t location, const uint8_t charmap[]) {
     lcd_create_char(&lcd, location, charmap);
-    if (!no_lock) xSemaphoreGive(lcd_mutex);
 
     if (is_state_tracking()) {
         snprintf(buf, 65,
@@ -246,16 +241,13 @@ void lcd_create_char(uint8_t location, const uint8_t charmap[], bool no_lock) {
 }
 
 // TODO: switch to row, col
-void lcd_print(uint8_t col, uint8_t row, const char* str, bool no_lock) {
-    if (!no_lock) xSemaphoreTake(lcd_mutex, portMAX_DELAY);
-    lcd_set_cursor(&lcd, col, row);
+void lcd_print(uint8_t col, uint8_t row, const char* str) {
+    lcd_set_cursor_pos(col, row);
     lcd_print(&lcd, str);
-    if (!no_lock) xSemaphoreGive(lcd_mutex);
 
     if (is_state_tracking()) {
-        // TODO: handle \r and \n and others
-        snprintf(buf, sizeof(buf), "%d,%d,%s", col, row, str);
-        event_occured("LCD_PRINT", buf);
+        // TODO: handle \r and \n
+        event_occured("LCD_PRINT", str);
     }
 }
 
@@ -292,23 +284,13 @@ void lcd_do_splash() {
     };
 
     // TODO: make the lcd_lib somehow support the custom character 0 which would otherwise be a null terminator
-    xSemaphoreTake(lcd_mutex, portMAX_DELAY);
-    lcd_create_char(1, custom_char[0], true);
-    lcd_create_char(2, custom_char[1], true);
-    lcd_create_char(3, custom_char[2], true);
-    lcd_create_char(4, custom_char[3], true);
-    lcd_create_char(5, custom_char[4], true);
-    lcd_create_char(6, custom_char[5], true);
+    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", true);
-    lcd_print(5, 2, "\x03\x04\x05\x06""DEV", true);
-    xSemaphoreGive(lcd_mutex);
-}
-
-bool lcd_lock(uint32_t ticks_to_wait) {
-    return xSemaphoreTake(lcd_mutex, ticks_to_wait);
-}
-
-void lcd_unlock() {
-    xSemaphoreGive(lcd_mutex);
+    lcd_print(6, 1, "\x01\x02Marino");
+    lcd_print(5, 2, "\x03\x04\x05\x06""DEV");
 }

main/drivers/char_lcd.h

@@ -9,50 +9,51 @@
 #define LCD_COLS 20
 #define LCD_ROWS 4
 
-/// @brief Initializes the 2004 Character LCD
+/// Initializes the 2004 Character LCD
 void init_lcd();
 
-/// @brief Clear the LCD
-void lcd_clear(bool no_lock = false);
+/// Clear the LCD
+void lcd_clear();
 
-/// @brief Move cursor to home position
-void lcd_cursor_home(bool no_lock = false);
+/// Move cursor to home position
+void lcd_cursor_home();
 
-/// @brief Turn the display on/off
-void lcd_set_display(bool display, bool no_lock = false);
+/// Set cursor position
+void lcd_set_cursor_pos(uint8_t col, uint8_t row);
 
-/// @brief Turn the cursor's visibility on/off
-void lcd_set_cursor_vis(bool cursor, bool no_lock = false);
+/// Turn the display on/off
+void lcd_set_display(bool display);
 
-/// @brief Turn blinking cursor on/off
-void lcd_set_cursor_blink(bool blink, bool no_lock = false);
+/// Turn the cursor's visibility on/off
+void lcd_set_cursor_vis(bool cursor);
 
-/// @brief Scroll the display left
-void lcd_scroll_display_left(bool no_lock = false);
-/// @brief Scroll the display right
-void lcd_scroll_display_right(bool no_lock = false);
+/// Turn blinking cursor on/off
+void lcd_set_cursor_blink(bool blink);
 
-/// @brief Set the text to flows automatically left to right
-void lcd_left_to_right(bool no_lock = false);
-/// @brief Set the text to flows automatically right to left
-void lcd_right_to_left(bool no_lock = false);
+/// Scroll the display left
+void lcd_scroll_display_left();
+/// Scroll the display right
+void lcd_scroll_display_right();
 
-/// @brief Turn on/off autoscroll
-void lcd_set_autoscroll(bool autoscroll, bool no_lock = false);
+/// Set the text to flows automatically left to right
+void lcd_left_to_right();
+/// Set the text to flows automatically right to left
+void lcd_right_to_left();
 
-/// @brief Set backlight brightness
-void lcd_set_backlight(bool backlight, bool no_lock = false);
+// Turn on/off autoscroll
+void lcd_set_autoscroll(bool autoscroll);
 
-/// @brief Create a custom character. You get 8 custom characters.
-/// You can print custom characters by using escape characters in strings:
-/// use '\x01' - '\x07' for custom characters 1-7. Use '\x08' for custom char 0.
-void lcd_create_char(uint8_t location, const uint8_t charmap[], bool no_lock = false);
+// Set backlight brightness
+void lcd_set_backlight(bool backlight);
+
+// Create a custom character
+void lcd_create_char(uint8_t location, const uint8_t charmap[]);
 
 /// @brief Print a string to the LCD at a given pos. 
 /// @param col the column to print the string at.
 /// @param row the row the print the string at.
 /// @param str the string to print.
-void lcd_print(uint8_t col, uint8_t row, const char* str, bool no_lock = false);
+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.
@@ -68,15 +69,4 @@ void lcd_print_header();
 /// @brief Prints the splash screen for the BLK_BOX.
 void lcd_do_splash();
 
-/// @brief Locks the LCD to allow chaining multiple commands without interuptions.
-///
-/// Commands you call while you lock the LCD, you must call with the `no_lock` flag set to true.
-///
-/// Do not hold this lock for an extended period of time.
-/// @return `true` iff the lock was aquired.
-bool lcd_lock(uint32_t ticks_to_wait);
-
-/// @brief Unlocks the LCD to give away the mutex access to it.
-void lcd_unlock();
-
-#endif /* CHAR_LCD_H */
+#endif /* CHAR_LCD_H */

main/drivers/i2c_lcd_pcf8574.c

@@ -233,7 +233,7 @@ void lcd_no_autoscroll(i2c_lcd_pcf8574_handle_t* lcd) {
 
 // Setting the backlight: It can only be turn on or off.
 // Current backlight value is saved in the i2c_lcd_pcf8574_handle_t struct for further data transfers
-void lcd_set_backlight_to(i2c_lcd_pcf8574_handle_t* lcd, uint8_t brightness) {
+void lcd_set_backlight(i2c_lcd_pcf8574_handle_t* lcd, uint8_t brightness) {
     // Place the backlight value in the lcd struct
     lcd->backlight = brightness;
     // Send no data
@@ -258,12 +258,7 @@ void lcd_write(i2c_lcd_pcf8574_handle_t* lcd, uint8_t value) {
 // Print characters to the LCD: cursor set or clear instruction must preceded this instruction, or it will write on the current text.
 void lcd_print(i2c_lcd_pcf8574_handle_t* lcd, const char* str) {
     while (*str) {
-        if (*str == '\x08') {
-            lcd_write(lcd, '\x00');
-            str++;
-        } else {
-            lcd_write(lcd, *str++);
-        }
+        lcd_write(lcd, *str++);
     }
 }  // lcd_print()
 
@@ -301,17 +296,18 @@ void lcd_print_number(i2c_lcd_pcf8574_handle_t* lcd, uint8_t col, uint8_t row, u
 
 // Private functions: derived from the esp32 i2c_master driver
 
+
 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);
-    xSemaphoreTake(main_i2c_mutex, portMAX_DELAY);
     lcd_write_nibble(lcd, (value >> 4 & 0x0F), is_data, cmd);
     lcd_write_nibble(lcd, (value & 0x0F), is_data, cmd);
     i2c_master_stop(cmd);
     esp_err_t ret = i2c_master_cmd_begin(lcd->i2c_port, cmd, I2C_MASTER_TIMEOUT_MS / portTICK_PERIOD_MS);
-    xSemaphoreGive(main_i2c_mutex);
     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));
@@ -350,15 +346,15 @@ 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);
     i2c_master_write_byte(cmd, data, true);
     i2c_master_stop(cmd);
-    xSemaphoreTake(main_i2c_mutex, portMAX_DELAY);
     esp_err_t ret = i2c_master_cmd_begin(lcd->i2c_port, cmd, I2C_MASTER_TIMEOUT_MS / portTICK_PERIOD_MS);
-    xSemaphoreGive(main_i2c_mutex);
     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

@@ -91,7 +91,7 @@ void lcd_autoscroll(i2c_lcd_pcf8574_handle_t* lcd);
 void lcd_no_autoscroll(i2c_lcd_pcf8574_handle_t* lcd);
 
 // Set backlight brightness
-void lcd_set_backlight_to(i2c_lcd_pcf8574_handle_t* lcd, uint8_t brightness);
+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[]);

main/main.cpp

@@ -13,19 +13,102 @@
 #include "helper.h"
 
 #include "steps/step0.h"
-#include "steps/step1.h"
-#include "steps/step2.h"
-#include "steps/step3.h"
-#include "steps/step4.h"
-#include "steps/step5.h"
-#include "steps/step6.h"
+#include "steps/p001_step1.h"
+#include "steps/p001_step2.h"
+#include "steps/p001_step3.h"
+#include "steps/p001_step4.h"
+#include "steps/p001_step5.h"
+#include "steps/p001_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");
 
@@ -40,49 +123,20 @@ extern "C" void app_main(void) {
     lcd_do_splash();
     step0();
 
-    // set_recording_source(stdout, false);
-    FILE* record_file = fopen(MOUNT_POINT "/record.txt", "w");
-    if (record_file == nullptr) {
-        ESP_LOGE("main", "failed to open record.txt");
+    if (puzzle == 1) {
+        do_p001();
+    } else {
+        do_p002();
     }
-    set_recording_source(record_file, true);
-    start_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();
+    // set_recording_source(stdout, false);
+    // FILE* record_file = fopen(MOUNT_POINT "/record.txt", "w");
+    // if (record_file == nullptr) {
+        // ESP_LOGE("main", "failed to open record.txt");
+    // }
+    // set_recording_source(record_file, true);
+    // start_recording();
 
-    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();
+    // stop_recording();
 
 }

main/steps/CMakeLists.txt

@@ -1,12 +1,18 @@
 set(SOURCES 
     "setup_wires.cpp"
     "step0.cpp"
-    "step1.cpp"
-    "step2.cpp"
-    "step3.cpp"
-    "step4.cpp"
-    "step5.cpp"
-    "step6.cpp"
+    "p001_step1.cpp"
+    "p001_step2.cpp"
+    "p001_step3.cpp"
+    "p001_step4.cpp"
+    "p001_step5.cpp"
+    "p001_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.cpp

@@ -1,4 +1,4 @@
-#include "step1.h"
+#include "p001_step1.h"
 
 __attribute__((unused))
 static const char *TAG = "step1";
@@ -275,7 +275,7 @@ static bool play_part(uint32_t time) {
     return true;
 }
 
-void step1(void) {
+void p001_step1(void) {
     while (get_switch_flipped(nullptr));
 
     init_step();

main/steps/p001_step1.h

@@ -0,0 +1,10 @@
+#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.cpp

@@ -1,4 +1,4 @@
-#include "step2.h"
+#include "p001_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 step2(void) {
+void p001_step2(void) {
     KeypadKey key;
     int solved_times = 0;
 

main/steps/p001_step2.h

@@ -1,5 +1,5 @@
-#ifndef STEP_2_H
-#define STEP_2_H
+#ifndef P001_STEP_2_H
+#define P001_STEP_2_H
 
 #include "../drivers/all.h"
 #include "../helper.h"
@@ -7,6 +7,6 @@
 #include <random>
 #include <map>
 
-void step2(void);
+void p001_step2(void);
 
-#endif /* STEP_2_H */
+#endif /* P001_STEP_2_H */

main/steps/p001_step3.cpp

@@ -1,4 +1,4 @@
-#include "step3.h"
+#include "p001_step3.h"
 
 #define ONE_SECOND_TIME 90'000
 #define THREE_SECOND_TIME 90'000
@@ -72,7 +72,7 @@ static bool one_second();
 static bool three_second();
 static bool six_second();
 
-void step3(void) {
+void p001_step3(void) {
     SemaphoreHandle_t continue_sem = xSemaphoreCreateBinary();
     if (continue_sem == nullptr) {
         ESP_LOGE(TAG, "could not create semaphore");

main/steps/p001_step3.h

@@ -0,0 +1,10 @@
+#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.cpp

@@ -1,4 +1,4 @@
-#include "step4.h"
+#include "p001_step4.h"
 
 __attribute__((unused))
 static const char *TAG = "step4";
@@ -379,7 +379,7 @@ static void fail() {
     }
 }
 
-void step4() {
+void p001_step4() {
     // TODO: extract to helper function
     SemaphoreHandle_t continue_sem = xSemaphoreCreateBinary();
     if (continue_sem == nullptr) {

main/steps/p001_step4.h

@@ -1,5 +1,5 @@
-#ifndef STEP_4_H
-#define STEP_4_H
+#ifndef P001_STEP_4_H
+#define P001_STEP_4_H
 
 #include <random>
 #include "../drivers/all.h"
@@ -9,6 +9,6 @@
 #define TETRIS_USE_FLASH_IMG
 #define TETRIS_USE_FLASH_BG_IMG
 
-void step4(void);
+void p001_step4(void);
 
-#endif /* STEP_4_H */
+#endif /* P001_STEP_4_H */

main/steps/p001_step5.cpp

@@ -1,4 +1,4 @@
-#include "step5.h"
+#include "p001_step5.h"
 
 #define TIME_CLEAR   30'000
 #define TIME_PLANK   40'000
@@ -178,7 +178,7 @@ bool submit_6(bool* buttons_cycling, bool button_turned_on, int led_off) {
     return true;
 }
 
-void step5(void) {
+void p001_step5(void) {
     SemaphoreHandle_t continue_sem = xSemaphoreCreateBinary();
     if (continue_sem == nullptr) {
         ESP_LOGE(TAG, "could not create semaphore");

main/steps/p001_step5.h

@@ -1,5 +1,5 @@
-#ifndef STEP_5_H
-#define STEP_5_H
+#ifndef P001_STEP_5_H
+#define P001_STEP_5_H
 
 #include "../drivers/all.h"
 #include "../helper.h"
@@ -11,6 +11,6 @@
 #include <cmath>
 #include <array>
 
-void step5(void);
+void p001_step5(void);
 
-#endif /* STEP_5_H */
+#endif /* P001_STEP_5_H */

main/steps/p001_step6.cpp

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

main/steps/p001_step6.h

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

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

main/steps/p002_step1.h

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

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

main/steps/p002_step2.h

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

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

main/steps/p002_step3.h

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

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

main/steps/p002_step4.h

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

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

main/steps/p002_step5.h

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

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

main/steps/p002_step6.h

@@ -0,0 +1,8 @@
+#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/setup_wires.cpp

@@ -23,8 +23,7 @@ void print_wires(WireColor* wires, int editing_idx) {
     }
     lcd_print(1, 3, string_buf);
 
-    // TODO: find a way to indicate without a cursor.
-    // lcd_set_cursor_pos(editing_idx+1, 1);
+    lcd_set_cursor_pos(editing_idx+1, 1);
 }
 
 void setup_wires(void) {

main/steps/step0.cpp

@@ -5,6 +5,7 @@ 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; }
@@ -13,12 +14,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(); step1(); }
-static void try_step2() { clean_bomb(); step2(); }
-static void try_step3() { clean_bomb(); step3(); }
-static void try_step4() { clean_bomb(); step4(); }
-static void try_step5() { clean_bomb(); step5(); }
-static void try_step6() { clean_bomb(); step6(); }
+static void try_step1() { clean_bomb(); p001_step1(); }
+static void try_step2() { clean_bomb(); p001_step2(); }
+static void try_step3() { clean_bomb(); p001_step3(); }
+static void try_step4() { clean_bomb(); p001_step4(); }
+static void try_step5() { clean_bomb(); p001_step5(); }
+static void try_step6() { clean_bomb(); p001_step6(); }
 static void issue_strike() { strike("Strike Issued"); }
 static void flashbang();
 static void debug_switches();
@@ -45,6 +46,13 @@ static void replay_last() {
     start_playback();
 }
 
+static void do_p001() {
+    puzzle = 1;
+}
+
+static void do_p002() {
+    puzzle = 2;
+}
 
 void step0() {
     led_set(IndicatorLED::LED_SPEAKER, LEDColor::LED_COLOR_BLUE);
@@ -59,15 +67,22 @@ void step0() {
     StarCodeEntry star_codes[] = {
         {
             .code = "9819",
-            .display_text = "Diffusal Initiated",
+            .display_text = "Start P001",
             .delay_us = 2'000'000,
-            .callback = nullptr,
+            .callback = do_p001,
+            .triggered_sem = continue_sem,
+        },
+        {
+            .code = "3141",
+            .display_text = "Start P002",
+            .delay_us = 2'000'000,
+            .callback = do_p002,
             .triggered_sem = continue_sem,
         },
         {
             .code = "59861",
             .display_text = "Setup Wires",
-            .delay_us = 10'000'000,
+            .delay_us = 2'000'000,
             .callback = setup_wires,
             .triggered_sem = nullptr,
         },
@@ -214,8 +229,7 @@ static void _update_display(uint8_t* digits, uint8_t cursor_pos) {
     lcd_print(1, 1, str_buf);
     cursor_pos = MAX(0, MIN(4, cursor_pos));
     int mapped_cursor_pos = CURSOR_POS_MAP[cursor_pos];
-    // TODO: find some way to indicate without a cursor.
-    // lcd_set_cursor_pos(mapped_cursor_pos, 1);
+    lcd_set_cursor_pos(mapped_cursor_pos, 1);
 }
 
 static void set_game_time() {

main/steps/step0.h

@@ -4,12 +4,12 @@
 #include "../drivers/all.h"
 
 #include "setup_wires.h"
-#include "step1.h"
-#include "step2.h"
-#include "step3.h"
-#include "step4.h"
-#include "step5.h"
-#include "step6.h"
+#include "p001_step1.h"
+#include "p001_step2.h"
+#include "p001_step3.h"
+#include "p001_step4.h"
+#include "p001_step5.h"
+#include "p001_step6.h"
 
 /// Wait for "*9819"
 void step0(void);

main/steps/step1.h

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

main/steps/step3.h

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

main/steps/step6.h

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

sdkconfig

@@ -1,6 +1,6 @@
 #
 # Automatically generated file. DO NOT EDIT.
-# Espressif IoT Development Framework (ESP-IDF) 5.3.2 Project Configuration
+# Espressif IoT Development Framework (ESP-IDF) 5.3.5 Project Configuration
 #
 CONFIG_SOC_MPU_MIN_REGION_SIZE=0x20000000
 CONFIG_SOC_MPU_REGIONS_MAX_NUM=8
@@ -11,6 +11,7 @@ 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
@@ -64,6 +65,7 @@ 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
@@ -100,7 +102,8 @@ 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=64
+CONFIG_SOC_CPU_WATCHPOINT_MAX_REGION_SIZE=0x40
+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
@@ -176,7 +179,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_TX_ASYNC_STOP=y
+CONFIG_SOC_RMT_SUPPORT_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
@@ -203,7 +206,8 @@ 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_SDM_GROUPS=y
+CONFIG_SOC_LP_IO_CLOCK_IS_INDEPENDENT=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
@@ -243,6 +247,8 @@ 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
@@ -265,6 +271,7 @@ 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
@@ -350,6 +357,7 @@ 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
@@ -593,7 +601,21 @@ 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
 
 #
@@ -617,6 +639,7 @@ 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
@@ -629,42 +652,55 @@ 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
 
@@ -687,6 +723,7 @@ 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
 
 #
@@ -724,6 +761,7 @@ 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
 
@@ -807,6 +845,14 @@ 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
 #
@@ -842,6 +888,13 @@ 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
 #
@@ -1015,7 +1068,11 @@ 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
 
 #
@@ -1052,6 +1109,7 @@ CONFIG_SPIRAM_CS_IO=26
 CONFIG_SPIRAM_SPEED_40M=y
 CONFIG_SPIRAM_SPEED=40
 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
@@ -1216,9 +1274,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
@@ -1228,7 +1286,6 @@ 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
@@ -1270,7 +1327,6 @@ 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
@@ -1400,7 +1456,6 @@ 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)
 
 #
@@ -1489,6 +1544,7 @@ 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
@@ -1640,6 +1696,7 @@ 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
 
@@ -1673,6 +1730,7 @@ 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
@@ -1752,6 +1810,7 @@ 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
 
 #
@@ -1802,25 +1861,12 @@ CONFIG_STDATOMIC_S32C1I_SPIRAM_WORKAROUND=y
 # CONFIG_OPENTHREAD_ENABLED is not set
 
 #
-# Thread Operational Dataset
+# OpenThread Spinel
 #
-CONFIG_OPENTHREAD_NETWORK_NAME="OpenThread-ESP"
-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_XTAL_ACCURACY=130
 # CONFIG_OPENTHREAD_SPINEL_ONLY is not set
-CONFIG_OPENTHREAD_RX_ON_WHEN_IDLE=y
+# end of OpenThread Spinel
 
-#
-# Thread Address Query Config
-#
-# end of Thread Address Query Config
+# CONFIG_OPENTHREAD_DEBUG is not set
 # end of OpenThread
 
 #
@@ -1829,6 +1875,7 @@ CONFIG_OPENTHREAD_RX_ON_WHEN_IDLE=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
 
 #
@@ -1880,6 +1927,7 @@ 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
 
@@ -2459,7 +2507,6 @@ 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
@@ -2482,17 +2529,14 @@ 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
@@ -2513,7 +2557,6 @@ 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