summaryrefslogtreecommitdiff
path: root/keyboards/ergodox
diff options
context:
space:
mode:
authorStick <nstickney@gmail.com>2017-06-08 08:59:33 -0500
committerStick <nstickney@gmail.com>2017-06-08 08:59:33 -0500
commit4b50ab029d49830cf0efd0e5e0606cb39c8dabae (patch)
treed5e1890a6e908d2f3cd91ec7851e979719945fc5 /keyboards/ergodox
parent5a70cb30eecc8b76410e4b21a225b10c344e12c7 (diff)
Revert "ugly workaround for ErgoDoxEZ LED bugs: turn 'em all off"
This reverts commit f397402e101774eedd1748b1e31c7386f927d4ed.
Diffstat (limited to 'keyboards/ergodox')
-rw-r--r--keyboards/ergodox/ez/ez.c42
-rw-r--r--keyboards/ergodox/ez/matrix.c3
-rw-r--r--keyboards/ergodox/keymaps/familiar/keymap.c2
3 files changed, 24 insertions, 23 deletions
diff --git a/keyboards/ergodox/ez/ez.c b/keyboards/ergodox/ez/ez.c
index 55b51f6fa8..3e19f23028 100644
--- 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 a489e5b5cc..21b60a542e 100644
--- 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 1dd1d5cbc1..714118d93e 100644
--- 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