From 5bb6b050021e7e17fb6885d3c73721ab97661215 Mon Sep 17 00:00:00 2001
From: Mitchell Marino <mitchoah@gmail.com>
Date: Tue, 25 Mar 2025 19:27:20 -0500
Subject: [PATCH] updates to bottom half code and "debug switches" helper

---
 main/drivers/CMakeLists.txt  |   1 +
 main/drivers/all.cpp         |   5 +-
 main/drivers/bottom_half.cpp | 261 +++++++++++++++++++----------------
 main/drivers/bottom_half.h   |  10 +-
 main/drivers/char_lcd.cpp    |   2 +-
 main/steps/step0.cpp         |  59 ++++++--
 main/steps/step3.cpp         |  12 +-
 main/steps/wires_puzzle.cpp  |  72 +++++-----
 main/steps/wires_puzzle.h    |  12 +-
 9 files changed, 243 insertions(+), 191 deletions(-)

diff --git a/main/drivers/CMakeLists.txt b/main/drivers/CMakeLists.txt
index b3eb6a9..fb5c43a 100644
--- a/main/drivers/CMakeLists.txt
+++ b/main/drivers/CMakeLists.txt
@@ -1,4 +1,5 @@
 set(SOURCES 
+    "all.cpp"
     "TM1640/TM16xx.cpp"
     "TM1640/TM1640.cpp"
     "SparkFunBQ27441/SparkFunBQ27441.cpp"
diff --git a/main/drivers/all.cpp b/main/drivers/all.cpp
index df11ed4..9c7d5fa 100644
--- a/main/drivers/all.cpp
+++ b/main/drivers/all.cpp
@@ -5,7 +5,7 @@ static void init_i2c();
 void init_drivers() {
     init_i2c();
     // init char_lcd so we can use it to report other initialization errors.
-    init_char_lcd();
+    init_lcd();
     // init the bottom half so that we can get user input.
     init_bottom_half();
     init_sd();
@@ -31,7 +31,8 @@ static void init_i2c() {
         // .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));
diff --git a/main/drivers/bottom_half.cpp b/main/drivers/bottom_half.cpp
index 66b8fc3..eee9ec5 100644
--- a/main/drivers/bottom_half.cpp
+++ b/main/drivers/bottom_half.cpp
@@ -3,27 +3,145 @@
 static const char *TAG = "bottom_half";
 
 static uint16_t keypad_state;
-static uint16_t button_state;
+static uint8_t button_state;
+static uint8_t switch_state;
 static uint8_t touch_state;
 
 static uint16_t keypad_pressed;
-static uint16_t button_pressed;
+static uint8_t button_pressed;
+static uint8_t switch_flipped_up;
 static uint8_t touch_pressed;
 
 static uint16_t keypad_released;
-static uint16_t button_released;
+static uint8_t button_released;
+static uint8_t switch_flipped_down;
 static uint8_t touch_released;
 
 /// read buffer
 static uint8_t buf[8];
 
+static void poll_bottom_task(void *arg);
+static void receive_keypad();
+static void receive_button_switch();
+static void receive_touch();
+
+// TODO: add intrupt on bottom half delta pin
+// static void IRAM_ATTR gpio_isr_handler(void* arg)
+// {
+//     // TODO: do somthing
+//     ESP_LOGI("BOTTOM_HALF", "Hit");
+// }
+
+void init_bottom_half() {
+    ESP_ERROR_CHECK(gpio_set_direction(BOTTOM_PIN_INTERUPT, GPIO_MODE_INPUT));
+    ESP_ERROR_CHECK(gpio_set_pull_mode(BOTTOM_PIN_INTERUPT, GPIO_PULLUP_ONLY));
+
+    // TODO: do interupt stuff.
+    // ESP_ERROR_CHECK(gpio_intr_enable(BOTTOM_PIN_INTERUPT));
+    // ESP_ERROR_CHECK(gpio_install_isr_service(ESP_INTR_FLAG))
+    //install gpio isr service
+    // gpio_install_isr_service(0);
+    //hook isr handler for specific gpio pin
+    // gpio_isr_handler_add(BOTTOM_INTERUPT_PIN, gpio_isr_handler, NULL);
+
+    receive_keypad();
+    receive_button_switch();
+    receive_touch();
+
+    xTaskCreate(poll_bottom_task, "poll_bottom", 4096, NULL, 10, NULL);
+}
+
+static uint8_t receive_delta(void) {
+    uint8_t reg = 1;
+    buf[0] = 0;
+    ESP_ERROR_CHECK_WITHOUT_ABORT(i2c_master_write_read_device(BOTTOM_I2C_NUM, BOTTOM_I2C_ADDR, &reg, 1, buf, 1, (100 / portTICK_PERIOD_MS)));
+    return buf[0];
+}
+
+static void receive_keypad(void) {
+    uint8_t reg = 2;
+    buf[0] = 0;
+    buf[1] = 0;
+    ESP_ERROR_CHECK_WITHOUT_ABORT(i2c_master_write_read_device(BOTTOM_I2C_NUM, BOTTOM_I2C_ADDR, &reg, 1, buf, 2, (100 / portTICK_PERIOD_MS)));
+    uint16_t new_keypad_state = buf[0] | (buf[1] << 8);
+
+    uint16_t just_pressed = new_keypad_state & ~keypad_state;
+    keypad_pressed |= just_pressed;
+
+    uint16_t just_released = ~new_keypad_state & keypad_state;
+    keypad_released |= just_released;
+
+    keypad_state = new_keypad_state;
+}
+
+static void receive_button_switch(void) {
+    uint8_t reg = 3;
+    ESP_ERROR_CHECK_WITHOUT_ABORT(i2c_master_write_read_device(BOTTOM_I2C_NUM, BOTTOM_I2C_ADDR, &reg, 1, buf, 2, (100 / portTICK_PERIOD_MS)));
+    uint8_t new_button_state = buf[1];
+    uint8_t new_switch_state = buf[0];
+
+    // button
+    uint8_t just_pressed = new_button_state & ~button_state;
+    button_pressed |= just_pressed;
+
+    uint8_t just_released = ~new_button_state & button_state;
+    button_released |= just_released;
+
+    button_state = new_button_state;
+
+    // switch
+    uint8_t just_flipped_down = new_switch_state & ~switch_state;
+    switch_flipped_down |= just_flipped_down;
+
+    uint8_t just_flipped_up = ~new_switch_state & switch_state;
+    switch_flipped_up |= just_flipped_up;
+    
+    switch_state = new_switch_state;
+}
+
+static void receive_touch(void) {
+    uint8_t reg = 4;
+    buf[0] = 0;
+    ESP_ERROR_CHECK_WITHOUT_ABORT(i2c_master_write_read_device(BOTTOM_I2C_NUM, BOTTOM_I2C_ADDR, &reg, 1, buf, 1, (100 / portTICK_PERIOD_MS)));
+    bool new_touch_state = buf[0] != 0;
+
+    bool just_pressed = new_touch_state & !touch_state;
+    touch_pressed |= just_pressed;
+
+    bool just_released = (!new_touch_state) & touch_state;
+    touch_released |= just_released;
+    
+    touch_state = new_touch_state;
+}
+
+static void poll_bottom_task(void *arg) {
+    // TODO: if using an interupt, switch this to use a queue
+    while (1) {
+        bool new_data = gpio_get_level(BOTTOM_PIN_INTERUPT) == 0;
+        if (new_data) {
+            uint8_t delta = receive_delta();
+            // ESP_LOGI(_TAG, "delta: %d", delta);
+            if (delta == 0) ESP_LOGW(TAG, "delta pin was low, but delta register returned 0");
+
+            if (delta & (1 << DELTA_BIT_KP)) receive_keypad();
+            if (delta & (1 << DELTA_BIT_BUTTON_SWITCH)) receive_button_switch();
+            if (delta & (1 << DELTA_BIT_TOUCH)) receive_touch();
+        }
+        vTaskDelay(pdMS_TO_TICKS(10));
+    }
+
+    vTaskDelete(NULL);
+}
+
 void clear_all_pressed_released(void) {
     keypad_pressed = 0;
     button_pressed = 0;
+    switch_flipped_up = 0;
     touch_pressed = 0;
     
     keypad_released = 0;
     button_released = 0;
+    switch_flipped_down = 0;
     touch_released = 0;
 }
 
@@ -88,9 +206,12 @@ char char_of_keypad_key(KeypadKey kp) {
     }
 }
 
-static bool _take_button(ButtonKey* button, uint16_t* button_bitfield) {
+static bool _take_button(ButtonKey* button, uint8_t* button_bitfield) {
+    if (((*button_bitfield) & 0xF) == 0) return false;
+
+    // scan the 4 button bits for one that is set
     for (int i = 0; i < 4; i++) {
-        int bit_selector = (1 << (i+8));
+        int bit_selector = (1 << i);
         if ((*button_bitfield) & bit_selector) {
             if (button != nullptr) {
                 *button = (ButtonKey) i;
@@ -102,15 +223,18 @@ static bool _take_button(ButtonKey* button, uint16_t* button_bitfield) {
     }
     return false;
 }
-static bool _take_switch(SwitchKey* switch_, uint16_t* button_bitfield) {
+static bool _take_switch(SwitchKey* switch_, uint8_t* switch_bitfield) {
+    if (((*switch_bitfield) & 0xF) == 0) return false;
+
+    // scan the 4 switch bits for one that is set
     for (int i = 0; i < 4; i++) {
         int bit_selector = (1 << i);
-        if ((*button_bitfield) & bit_selector) {
+        if ((*switch_bitfield) & bit_selector) {
             if (switch_ != nullptr) {
                 *switch_ = (SwitchKey) i;
             }
             // clear bit
-            *button_bitfield &= ~bit_selector;
+            *switch_bitfield &= ~bit_selector;
             return true;
         }
     }
@@ -123,21 +247,23 @@ bool get_pressed_button(ButtonKey* button) {
 bool get_released_button(ButtonKey* button) {
     return _take_button(button, &button_released);
 }
-
 uint8_t get_button_state() {
-    return (uint8_t)((button_state >> 8) & 0xF);
+    return button_state;
 }
 
 bool get_flipped_up_switch(SwitchKey* switch_) {
-    return _take_switch(switch_, &button_released);
+    return _take_switch(switch_, &switch_flipped_up);
 }
 bool get_flipped_down_switch(SwitchKey* switch_) {
-    return _take_switch(switch_, &button_released);
+    return _take_switch(switch_, &switch_flipped_down);
 }
 bool get_flipped_switch(SwitchKey* switch_) {
     for (int i = 0; i < 4; i++) {
-        int bit_selector = (1 << (i+4));
-        if (button_pressed & bit_selector || button_released & bit_selector) {
+        int bit_selector = (1 << i);
+        if (
+            ((switch_flipped_up & bit_selector) != 0) || 
+            ((switch_flipped_down & bit_selector) != 0)
+        ) {
             if (switch_ != nullptr) {
                 *switch_ = (SwitchKey) i;
             }
@@ -151,7 +277,7 @@ bool get_flipped_switch(SwitchKey* switch_) {
 }
 
 uint8_t get_switch_state() {
-    return (uint8_t)(~button_state & 0xF);
+    return (uint8_t)(~switch_state & 0xF);
 }
 
 bool get_touch_state(void) {
@@ -167,108 +293,3 @@ bool get_touch_released(void) {
     touch_released = false;
     return return_;
 }
-
-static void poll_bottom_task(void *arg);
-static void receive_keypad(void);
-static void receive_button(void);
-static void receive_touch(void);
-
-// TODO: add intrupt on bottom half delta pin
-// static void IRAM_ATTR gpio_isr_handler(void* arg)
-// {
-//     // TODO: do somthing
-//     ESP_LOGI("BOTTOM_HALF", "Hit");
-// }
-
-void init_bottom_half() {
-    gpio_config_t delta_pin_conf = {};
-    // delta_pin_conf.intr_type = GPIO_INTR_LOW_LEVEL;
-    delta_pin_conf.mode = GPIO_MODE_INPUT;
-    // GPIO 0
-    delta_pin_conf.pin_bit_mask = (1ULL<<BOTTOM_PIN_INTERUPT);
-    delta_pin_conf.pull_up_en = GPIO_PULLUP_ENABLE;
-    gpio_config(&delta_pin_conf);
-
-    //install gpio isr service
-    // gpio_install_isr_service(0);
-    //hook isr handler for specific gpio pin
-    // gpio_isr_handler_add(BOTTOM_INTERUPT_PIN, gpio_isr_handler, NULL);
-
-    receive_keypad();
-    receive_button();
-    receive_touch();
-
-    xTaskCreate(poll_bottom_task, "poll_bottom", 4096, NULL, 10, NULL);
-}
-
-static uint8_t receive_delta(void) {
-    uint8_t reg = 1;
-    buf[0] = 0;
-    ESP_ERROR_CHECK_WITHOUT_ABORT(i2c_master_write_read_device(BOTTOM_I2C_NUM, BOTTOM_I2C_ADDR, &reg, 1, buf, 1, (100 / portTICK_PERIOD_MS)));
-    return buf[0];
-}
-
-static void receive_keypad(void) {
-    uint8_t reg = 2;
-    buf[0] = 0;
-    buf[1] = 0;
-    ESP_ERROR_CHECK_WITHOUT_ABORT(i2c_master_write_read_device(BOTTOM_I2C_NUM, BOTTOM_I2C_ADDR, &reg, 1, buf, 2, (100 / portTICK_PERIOD_MS)));
-    uint16_t new_keypad_state = buf[0] | (buf[1] << 8);
-
-    uint16_t just_pressed = new_keypad_state & ~keypad_state;
-    keypad_pressed |= just_pressed;
-
-    uint16_t just_released = ~new_keypad_state & keypad_state;
-    keypad_released |= just_released;
-
-    keypad_state = new_keypad_state;
-}
-
-static void receive_button(void) {
-    uint8_t reg = 3;
-    buf[0] = 0;
-    buf[1] = 0;
-    ESP_ERROR_CHECK_WITHOUT_ABORT(i2c_master_write_read_device(BOTTOM_I2C_NUM, BOTTOM_I2C_ADDR, &reg, 1, buf, 2, (100 / portTICK_PERIOD_MS)));
-    uint16_t new_button_state = buf[0] | (buf[1] << 8);
-
-    uint16_t just_pressed = new_button_state & ~button_state;
-    button_pressed |= just_pressed;
-
-    uint16_t just_released = ~new_button_state & button_state;
-    button_released |= just_released;
-    
-    button_state = new_button_state;
-}
-
-static void receive_touch(void) {
-    uint8_t reg = 4;
-    buf[0] = 0;
-    ESP_ERROR_CHECK_WITHOUT_ABORT(i2c_master_write_read_device(BOTTOM_I2C_NUM, BOTTOM_I2C_ADDR, &reg, 1, buf, 1, (100 / portTICK_PERIOD_MS)));
-    bool new_touch_state = buf[0] != 0;
-
-    bool just_pressed = new_touch_state & !touch_state;
-    touch_pressed |= just_pressed;
-
-    bool just_released = (!new_touch_state) & touch_state;
-    touch_released |= just_released;
-    
-    touch_state = new_touch_state;
-}
-
-static void poll_bottom_task(void *arg) {
-    while (1) {
-        bool new_data = gpio_get_level(BOTTOM_PIN_INTERUPT) == 0;
-        if (new_data) {
-            uint8_t delta = receive_delta();
-            // ESP_LOGI(_TAG, "delta: %d", delta);
-            if (delta == 0) ESP_LOGW(TAG, "delta pin was low, but delta register returned 0");
-
-            if (delta & (1 << DELTA_BIT_KP)) receive_keypad();
-            if (delta & (1 << DELTA_BIT_BUTTON)) receive_button();
-            if (delta & (1 << DELTA_BIT_TOUCH)) receive_touch();
-        }
-        vTaskDelay(pdMS_TO_TICKS(10));
-    }
-
-    vTaskDelete(NULL);
-}
\ No newline at end of file
diff --git a/main/drivers/bottom_half.h b/main/drivers/bottom_half.h
index 5a21ae4..6f5e7d7 100644
--- a/main/drivers/bottom_half.h
+++ b/main/drivers/bottom_half.h
@@ -10,7 +10,7 @@
 #define BOTTOM_PIN_INTERUPT GPIO_NUM_0
 
 #define DELTA_BIT_KP 0
-#define DELTA_BIT_BUTTON 1
+#define DELTA_BIT_BUTTON_SWITCH 1
 #define DELTA_BIT_TOUCH 2
 
 /// @brief An enum for the possible keypad buttons.
@@ -39,10 +39,10 @@ typedef enum {
     b2 = 1,
     b3 = 2,
     b4 = 3,
-    green = 0,
-    red = 1,
-    yellow = 2,
-    blue = 3,
+    button_green = 0,
+    button_red = 1,
+    button_yellow = 2,
+    button_blue = 3,
 } ButtonKey;
 
 /// @brief An enum for the possible switches.
diff --git a/main/drivers/char_lcd.cpp b/main/drivers/char_lcd.cpp
index cf8e3b5..c3ed246 100644
--- a/main/drivers/char_lcd.cpp
+++ b/main/drivers/char_lcd.cpp
@@ -7,7 +7,7 @@ i2c_lcd_pcf8574_handle_t lcd;
 
 static const char *TAG = "char_lcd";
 
-void init_char_lcd() {
+void init_lcd() {
     ESP_LOGI(TAG, "Initializing LCD");
 
     lcd_init(&lcd, LCD_ADDR, CHAR_LCD_I2C_NUM);
diff --git a/main/steps/step0.cpp b/main/steps/step0.cpp
index 1ecab0c..50de5f7 100644
--- a/main/steps/step0.cpp
+++ b/main/steps/step0.cpp
@@ -258,34 +258,63 @@ static void set_game_time(void) {
 }
 
 
-static void print_bin(char* out_str, uint8_t n) {
-    out_str[0] = ((n & 0b1000) ? '1' : '0');
-    out_str[1] = ((n & 0b0100) ? '1' : '0');
-    out_str[2] = ((n & 0b0010) ? '1' : '0');
-    out_str[3] = ((n & 0b0001) ? '1' : '0');
+static void print_4bin_rev(char* out_str, uint8_t n) {
+    out_str[0] = ((n & 0b0001) ? '1' : '0');
+    out_str[1] = ((n & 0b0010) ? '1' : '0');
+    out_str[2] = ((n & 0b0100) ? '1' : '0');
+    out_str[3] = ((n & 0b1000) ? '1' : '0');
+    out_str[4] = '\0';
 }
 
 static void debug_switches(void) {
     clean_bomb();
-    uint8_t switch_state = 0;
-    uint8_t button_state = 0;
+    uint8_t switch_state = 0xFF;
+    uint8_t button_state = 0xFF;
 
-    char buff[5] = {0};
+    char bin_buf[5] = {0};
+    char buf[21] = {0};
 
     KeypadKey key;
+    ButtonKey button;
+    SwitchKey switch_;
     while (1) {
-        uint8_t new_button_state = get_button_state();
-        if (new_button_state != button_state) {
-            button_state = new_button_state;
-            print_bin(buff, button_state);
-            ESP_LOGI("main", "b: 0b%s", buff);
+        if (get_pressed_button(&button)) {
+            sprintf(buf, "Button Pressed: %d  ", button);
+            lcd_print(0, 3, buf);
+            ESP_LOGI(TAG, "%s", buf);
+        }
+        if (get_released_button(&button)) {
+            sprintf(buf, "Button Released: %d ", button);
+            lcd_print(0, 3, buf);
+            ESP_LOGI(TAG, "%s", buf);
+        }
+        if (get_flipped_down_switch(&switch_)) {
+            sprintf(buf, "Switch Down: %d     ", switch_);
+            lcd_print(0, 3, buf);
+            ESP_LOGI(TAG, "%s", buf);
+        }
+        if (get_flipped_up_switch(&switch_)) {
+            sprintf(buf, "Switch Up: %d       ", switch_);
+            lcd_print(0, 3, buf);
+            ESP_LOGI(TAG, "%s", buf);
         }
 
         uint8_t new_switch_state = get_switch_state();
         if (new_switch_state != switch_state) {
             switch_state = new_switch_state;
-            print_bin(buff, switch_state);
-            ESP_LOGI("main", "s: 0b%s", buff);
+            print_4bin_rev(bin_buf, switch_state);
+            sprintf(buf, "s: %s", bin_buf);
+            lcd_print(1, 0, buf);
+            ESP_LOGI(TAG, "%s", buf);
+        }
+
+        uint8_t new_button_state = get_button_state();
+        if (new_button_state != button_state) {
+            button_state = new_button_state;
+            print_4bin_rev(bin_buf, button_state);
+            sprintf(buf, "b: %s", bin_buf);
+            lcd_print(1, 1, buf);
+            ESP_LOGI(TAG, "%s", buf);
         }
 
         if (get_pressed_keypad(&key) && key == KeypadKey::pound) {
diff --git a/main/steps/step3.cpp b/main/steps/step3.cpp
index 71dcf5e..99686b1 100644
--- a/main/steps/step3.cpp
+++ b/main/steps/step3.cpp
@@ -149,7 +149,7 @@ static uint8_t four_bit_flag(bool b0, bool b1, bool b2, bool b3) {
     ;
 }
 
-static void print_bin(char* out_str, uint8_t n) {
+static void print_4bin(char* out_str, uint8_t n) {
     out_str[0] = ((n & 0b1000) ? '1' : '0');
     out_str[1] = ((n & 0b0100) ? '1' : '0');
     out_str[2] = ((n & 0b0010) ? '1' : '0');
@@ -173,19 +173,19 @@ static void print_bin(char* out_str, uint8_t n) {
 
 static void debug_correct_values(uint8_t correct_buttons, uint8_t button_mask, uint8_t correct_switches) {
     char buf[20] = {0};
-    print_bin(buf, correct_switches);
+    print_4bin(buf, correct_switches);
     ESP_LOGI(TAG, "Expected Switch State: 0b%s", buf);
-    print_bin(buf, correct_buttons);
+    print_4bin(buf, correct_buttons);
     ESP_LOGI(TAG, "Expected Button State: 0b%s", buf);
-    print_bin(buf, button_mask);
+    print_4bin(buf, button_mask);
     ESP_LOGI(TAG, "Button Mask:           0b%s", buf);
 }
 
 static void debug_actual_values(uint8_t buttons, uint8_t switch_) {
     char buf[20] = {0};
-    print_bin(buf, switch_);
+    print_4bin(buf, switch_);
     ESP_LOGI(TAG, "Actual Switch State:  0b%s", buf);
-    print_bin(buf, buttons);
+    print_4bin(buf, buttons);
     ESP_LOGI(TAG, "Actual Button State:  0b%s", buf);
     ESP_LOGI(TAG, "");
 }
diff --git a/main/steps/wires_puzzle.cpp b/main/steps/wires_puzzle.cpp
index ad36b73..df0f4c6 100644
--- a/main/steps/wires_puzzle.cpp
+++ b/main/steps/wires_puzzle.cpp
@@ -17,22 +17,22 @@ static int max(int n0, int n1, int n2, int n3, int n4, int n5);
 void wires_to_string(WireColor* wires, char* out_wires_string) {
     for (int i = 0; i < NUM_WIRES; i++) {
         switch (wires[i]) {
-            case WireColor::red:
+            case WireColor::wire_red:
                 out_wires_string[i] = 'r';
                 break;
-            case WireColor::yellow:
+            case WireColor::wire_yellow:
                 out_wires_string[i] = 'y';
                 break;
-            case WireColor::green:
+            case WireColor::wire_green:
                 out_wires_string[i] = 'g';
                 break;
-            case WireColor::blue:
+            case WireColor::wire_blue:
                 out_wires_string[i] = 'b';
                 break;
-            case WireColor::black:
+            case WireColor::wire_black:
                 out_wires_string[i] = 'k';
                 break;
-            case WireColor::white:
+            case WireColor::wire_white:
                 out_wires_string[i] = 'w';
                 break;
         }
@@ -52,22 +52,22 @@ void string_to_wires(char* wires_string, WireColor* out_wires) {
     for (int i = 0; i < NUM_WIRES; i++) {
         switch (wires_string[i]) {
             case 'r':
-                out_wires[i] = WireColor::red;
+                out_wires[i] = WireColor::wire_red;
                 break;
             case 'y':
-                out_wires[i] = WireColor::yellow;
+                out_wires[i] = WireColor::wire_yellow;
                 break;
             case 'g':
-                out_wires[i] = WireColor::green;
+                out_wires[i] = WireColor::wire_green;
                 break;
             case 'b':
-                out_wires[i] = WireColor::blue;
+                out_wires[i] = WireColor::wire_blue;
                 break;
             case 'k':
-                out_wires[i] = WireColor::black;
+                out_wires[i] = WireColor::wire_black;
                 break;
             case 'w':
-                out_wires[i] = WireColor::white;
+                out_wires[i] = WireColor::wire_white;
                 break;
         }
     }
@@ -144,17 +144,17 @@ void solve_wires(WireColor* wires, bool* out_cut) {
     int white_pos_len = 0;
 
     for (int i = 0; i < NUM_WIRES; i++) {
-        if (wires[i] == WireColor::red) {
+        if (wires[i] == WireColor::wire_red) {
             red_pos[red_pos_len++] = i;
-        } else if (wires[i] == WireColor::yellow) {
+        } else if (wires[i] == WireColor::wire_yellow) {
             yellow_pos[yellow_pos_len++] = i;
-        } else if (wires[i] == WireColor::green) {
+        } else if (wires[i] == WireColor::wire_green) {
             green_pos[green_pos_len++] = i;
-        } else if (wires[i] == WireColor::blue) {
+        } else if (wires[i] == WireColor::wire_blue) {
             blue_pos[blue_pos_len++] = i;
-        } else if (wires[i] == WireColor::black) {
+        } else if (wires[i] == WireColor::wire_black) {
             black_pos[black_pos_len++] = i;
-        } else if (wires[i] == WireColor::white) {
+        } else if (wires[i] == WireColor::wire_white) {
             white_pos[white_pos_len++] = i;
         }
     }
@@ -193,7 +193,7 @@ void solve_wires(WireColor* wires, bool* out_cut) {
     }
 
     // 2. cut the first wire if it is green or white
-    if (wires[0] == WireColor::green || wires[0] == WireColor::white) {
+    if (wires[0] == WireColor::wire_green || wires[0] == WireColor::wire_white) {
         out_cut[0] = true;
         if (debug) {
             printf("C2. cutting %d\n", 0);
@@ -202,7 +202,7 @@ void solve_wires(WireColor* wires, bool* out_cut) {
 
     // 3. cut blue wires in even positions (odd indexes)
     for (int i = 1; i < NUM_WIRES; i += 2) {
-        if (wires[i] == WireColor::blue) {
+        if (wires[i] == WireColor::wire_blue) {
             out_cut[i] = true;
             if (debug) {
                 printf("C3. cutting %d\n", i);
@@ -213,8 +213,8 @@ void solve_wires(WireColor* wires, bool* out_cut) {
     // 4. cut black and yellow wires next to black and yellow wires
     for (int i = 0; i < NUM_WIRES-1; i++) {
         if (
-            (wires[i] == WireColor::yellow || wires[i] == WireColor::black) &&
-            (wires[i+1] == WireColor::yellow || wires[i+1] == WireColor::black)
+            (wires[i] == WireColor::wire_yellow || wires[i] == WireColor::wire_black) &&
+            (wires[i+1] == WireColor::wire_yellow || wires[i+1] == WireColor::wire_black)
         ) {
             out_cut[i] = true;
             out_cut[i+1] = true;
@@ -228,10 +228,10 @@ void solve_wires(WireColor* wires, bool* out_cut) {
     for (int green_idx = green_pos_len-1; green_idx >= 0; green_idx--) {
         int pos = green_pos[green_idx];
         if (
-            wires[pos-1] == WireColor::yellow ||
-            wires[pos-1] == WireColor::white ||
-            wires[pos+1] == WireColor::yellow ||
-            wires[pos+1] == WireColor::white
+            wires[pos-1] == WireColor::wire_yellow ||
+            wires[pos-1] == WireColor::wire_white ||
+            wires[pos+1] == WireColor::wire_yellow ||
+            wires[pos+1] == WireColor::wire_white
         ) {
             out_cut[pos] = true;
             if (debug) {
@@ -242,7 +242,7 @@ void solve_wires(WireColor* wires, bool* out_cut) {
     }
 
     // 6. cut all white wires if there is a red wire in the 5th position
-    if (wires[4] == WireColor::red) {
+    if (wires[4] == WireColor::wire_red) {
         for (int white_idx = 0; white_idx < white_pos_len; white_idx++) {
             out_cut[white_pos[white_idx]] = true;
             if (debug) {
@@ -307,8 +307,8 @@ void solve_wires(WireColor* wires, bool* out_cut) {
     // 12. cut any wire adjacent to both a yellow and blue wire
     for (int i = 0; i < NUM_WIRES-2; i++) {
         if (
-            (wires[i] == WireColor::yellow && wires[i+2] == WireColor::blue) || 
-            (wires[i] == WireColor::blue && wires[i+2] == WireColor::yellow)
+            (wires[i] == WireColor::wire_yellow && wires[i+2] == WireColor::wire_blue) || 
+            (wires[i] == WireColor::wire_blue && wires[i+2] == WireColor::wire_yellow)
         ) {
             out_cut[i+1] = true;
             if (debug) {
@@ -323,10 +323,10 @@ void solve_wires(WireColor* wires, bool* out_cut) {
     for (int i = 0; i < blue_pos_len; i++) {
         int pos = blue_pos[i];
         if (
-            wires[pos-1] == WireColor::red ||
-            wires[pos-1] == WireColor::green ||
-            wires[pos+1] == WireColor::red ||
-            wires[pos+1] == WireColor::green
+            wires[pos-1] == WireColor::wire_red ||
+            wires[pos-1] == WireColor::wire_green ||
+            wires[pos+1] == WireColor::wire_red ||
+            wires[pos+1] == WireColor::wire_green
         ) {
             out_cut[pos] = false;
             if (debug) {
@@ -346,13 +346,13 @@ void solve_wires(WireColor* wires, bool* out_cut) {
     }
 
     // 3. never cut red or black wires in the 4th or 7th positions
-    if (wires[3] == WireColor::red || wires[3] == WireColor::black) {
+    if (wires[3] == WireColor::wire_red || wires[3] == WireColor::wire_black) {
         out_cut[3] = false;
         if (debug) {
             printf("N3. Never cutting %d\n", 3);
         }
     }
-    if (wires[6] == WireColor::red || wires[6] == WireColor::black) {
+    if (wires[6] == WireColor::wire_red || wires[6] == WireColor::wire_black) {
         out_cut[6] = false;
         if (debug) {
             printf("N3. Never cutting %d\n", 6);
@@ -390,7 +390,7 @@ void solve_wires(WireColor* wires, bool* out_cut) {
     }
 
     // 6. never cut a blue or green wire in the 8th postion
-    if (wires[7] == WireColor::blue || wires[7] == WireColor::green) {
+    if (wires[7] == WireColor::wire_blue || wires[7] == WireColor::wire_green) {
         out_cut[7] = false;
         if (debug) {
             printf("N6. Never cutting %d\n", 7);
diff --git a/main/steps/wires_puzzle.h b/main/steps/wires_puzzle.h
index 836ab20..ddf2b95 100644
--- a/main/steps/wires_puzzle.h
+++ b/main/steps/wires_puzzle.h
@@ -10,12 +10,12 @@
 #define NUM_WIRES 8
 
 typedef enum {
-    red = 0,
-    yellow = 1,
-    green = 2,
-    blue = 3,
-    black = 4,
-    white = 5,
+    wire_red = 0,
+    wire_yellow = 1,
+    wire_green = 2,
+    wire_blue = 3,
+    wire_black = 4,
+    wire_white = 5,
 } WireColor;
 
 void solve_wires(WireColor* wires, bool* out_cut);