Revert "ugly workaround for ErgoDoxEZ LED bugs: turn 'em all off"

This reverts commit f397402e101774eedd1748b1e31c7386f927d4ed.

diff --git a/keyboards/ergodox/ez/ez.c b/keyboards/ergodox/ez/ez.c
index 55b51f6fa809d8d81be7fa5532a17d2ab6b57eb0..3e19f23028076a38d309734457987ac9a104aa56 100644 (file)
--- a/keyboards/ergodox/ez/ez.c
+++ b/keyboards/ergodox/ez/ez.c
@@ -22,30 +22,30 @@ void matrix_init_kb(void) {
     PORTD |=  (1<<5 | 1<<4);
     PORTE |=  (1<<6);
 
-    //ergodox_blink_all_leds();
+    ergodox_blink_all_leds();
 
     matrix_init_user();
 }
 
-// void ergodox_blink_all_leds(void)
-// {
-//     ergodox_led_all_off();
-//     ergodox_led_all_set(LED_BRIGHTNESS_HI);
-//     ergodox_right_led_1_on();
-//     _delay_ms(50);
-//     ergodox_right_led_2_on();
-//     _delay_ms(50);
-//     ergodox_right_led_3_on();
-//     _delay_ms(50);
-//     ergodox_right_led_1_off();
-//     _delay_ms(50);
-//     ergodox_right_led_2_off();
-//     _delay_ms(50);
-//     ergodox_right_led_3_off();
-//     //ergodox_led_all_on();
-//     //_delay_ms(333);
-//     ergodox_led_all_off();
-// }
+void ergodox_blink_all_leds(void)
+{
+    ergodox_led_all_off();
+    ergodox_led_all_set(LED_BRIGHTNESS_HI);
+    ergodox_right_led_1_on();
+    _delay_ms(50);
+    ergodox_right_led_2_on();
+    _delay_ms(50);
+    ergodox_right_led_3_on();
+    _delay_ms(50);
+    ergodox_right_led_1_off();
+    _delay_ms(50);
+    ergodox_right_led_2_off();
+    _delay_ms(50);
+    ergodox_right_led_3_off();
+    //ergodox_led_all_on();
+    //_delay_ms(333);
+    ergodox_led_all_off();
+}
 
 uint8_t init_mcp23018(void) {
     mcp23018_status = 0x20;
@@ -57,7 +57,7 @@ uint8_t init_mcp23018(void) {
     // cli();
     if (i2c_initialized == 0) {
         i2c_init();  // on pins D(1,0)
-        i2c_initialized = 1;
+        i2c_initialized++;
         _delay_ms(1000);
     }
 

diff --git a/keyboards/ergodox/ez/matrix.c b/keyboards/ergodox/ez/matrix.c
index a489e5b5cc7199b5b2e326d6ef7c60cc4494083c..21b60a542e3cac2bdcea26ffed03dc7f1c537812 100644 (file)
--- a/keyboards/ergodox/ez/matrix.c
+++ b/keyboards/ergodox/ez/matrix.c
@@ -183,7 +183,7 @@ uint8_t matrix_scan(void)
                 print("left side not responding\n");
             } else {
                 print("left side attached\n");
-//                ergodox_blink_all_leds();
+                ergodox_blink_all_leds();
             }
         }
     }
@@ -391,3 +391,4 @@ static void select_row(uint8_t row)
         }
     }
 }
+

diff --git a/keyboards/ergodox/keymaps/familiar/keymap.c b/keyboards/ergodox/keymaps/familiar/keymap.c
index 1dd1d5cbc1f94b8985acd7ed71f7043d566997e7..714118d93ea118e3ce6d84c5d57eeeb49977ef3a 100644 (file)
--- a/keyboards/ergodox/keymaps/familiar/keymap.c
+++ b/keyboards/ergodox/keymaps/familiar/keymap.c
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                         MT(MOD_RALT, KC_LBRC),  KC_RBRC,    KC_LEFT,    KC_DOWN,    KC_RGHT,
             KC_PSCR,     _______,
             KC_NLCK,
-            TG(NUMP),   LT(ARRW, KC_BSLS),  KC_SPC
+            TG(NUMP),   LT(ARRW, C_BSLS),   KC_SPC
     ),
 
 /* layer 1: International symbols, etc