aboutsummaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox
diff options
context:
space:
mode:
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.c44
3 files changed, 44 insertions, 45 deletions
diff --git a/keyboards/ergodox/ez/ez.c b/keyboards/ergodox/ez/ez.c
index 3e19f2302..55b51f6fa 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++;
+ i2c_initialized = 1;
_delay_ms(1000);
}
diff --git a/keyboards/ergodox/ez/matrix.c b/keyboards/ergodox/ez/matrix.c
index 21b60a542..a489e5b5c 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,4 +391,3 @@ static void select_row(uint8_t row)
}
}
}
-
diff --git a/keyboards/ergodox/keymaps/familiar/keymap.c b/keyboards/ergodox/keymaps/familiar/keymap.c
index 714118d93..513bb5541 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, C_BSLS), KC_SPC
+ TG(NUMP), LT(ARRW, KC_BSLS), KC_SPC
),
/* layer 1: International symbols, etc
@@ -242,26 +242,26 @@ void matrix_init_user(void) {
// Runs constantly in the background, in a loop.
void matrix_scan_user(void) {
- uint8_t layer = biton32(layer_state);
-
- ergodox_board_led_off();
- ergodox_right_led_1_off();
- ergodox_right_led_2_off();
- ergodox_right_led_3_off();
- switch (layer) {
- case INTL:
- case INSF:
- ergodox_right_led_1_on();
- break;
- case NUMP:
- ergodox_right_led_2_on();
- break;
- case ARRW:
- ergodox_right_led_3_on();
- break;
- default:
- // none
- break;
- }
+ // uint8_t layer = biton32(layer_state);
+ //
+ // ergodox_board_led_off();
+ // ergodox_right_led_1_off();
+ // ergodox_right_led_2_off();
+ // ergodox_right_led_3_off();
+ // switch (layer) {
+ // case INTL:
+ // case INSF:
+ // ergodox_right_led_1_on();
+ // break;
+ // case NUMP:
+ // ergodox_right_led_2_on();
+ // break;
+ // case ARRW:
+ // ergodox_right_led_3_on();
+ // break;
+ // default:
+ // // none
+ // break;
+ // }
};