aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDon Armstrong <don@donarmstrong.com>2017-04-30 20:47:40 -0700
committerDon Armstrong <don@donarmstrong.com>2017-10-27 13:24:30 -0700
commitbcfba27101cb649dd61ef470ed46ab93e28534e5 (patch)
treeb91aeffe9c69ce29e54ae931a6899cad9a79ebac
parentb45b22338925a48354b611d21c3cf3359e008e1e (diff)
downloadqmk_firmware-bcfba27101cb649dd61ef470ed46ab93e28534e5.tar.gz
qmk_firmware-bcfba27101cb649dd61ef470ed46ab93e28534e5.zip
add initial support for left leds on an ergodox ez
-rw-r--r--keyboards/ergodox_ez/ergodox_ez.c39
-rw-r--r--keyboards/ergodox_ez/ergodox_ez.h24
2 files changed, 63 insertions, 0 deletions
diff --git a/keyboards/ergodox_ez/ergodox_ez.c b/keyboards/ergodox_ez/ergodox_ez.c
index 3609f6f81..8337db666 100644
--- a/keyboards/ergodox_ez/ergodox_ez.c
+++ b/keyboards/ergodox_ez/ergodox_ez.c
@@ -61,11 +61,46 @@ void ergodox_blink_all_leds(void)
61 _delay_ms(50); 61 _delay_ms(50);
62 ergodox_right_led_3_on(); 62 ergodox_right_led_3_on();
63 _delay_ms(50); 63 _delay_ms(50);
64#ifdef LEFT_LEDS
65 ergodox_left_led_1_on();
66 _delay_ms(50);
67 if (!mcp23018_status) {
68 mcp23018_status = ergodox_left_leds_update();
69 }
70 ergodox_left_led_2_on();
71 _delay_ms(50);
72 if (!mcp23018_status) {
73 mcp23018_status = ergodox_left_leds_update();
74 }
75 ergodox_left_led_3_on();
76 _delay_ms(50);
77 if (!mcp23018_status) {
78 mcp23018_status = ergodox_left_leds_update();
79 }
80#endif
64 ergodox_right_led_1_off(); 81 ergodox_right_led_1_off();
65 _delay_ms(50); 82 _delay_ms(50);
66 ergodox_right_led_2_off(); 83 ergodox_right_led_2_off();
67 _delay_ms(50); 84 _delay_ms(50);
68 ergodox_right_led_3_off(); 85 ergodox_right_led_3_off();
86#ifdef LEFT_LEDS
87 _delay_ms(50);
88 ergodox_left_led_1_off();
89 if (!mcp23018_status) {
90 mcp23018_status = ergodox_left_leds_update();
91 }
92 _delay_ms(50);
93 ergodox_left_led_2_off();
94 if (!mcp23018_status) {
95 mcp23018_status = ergodox_left_leds_update();
96 }
97 _delay_ms(50);
98 ergodox_left_led_3_off();
99 if (!mcp23018_status) {
100 mcp23018_status = ergodox_left_leds_update();
101 }
102#endif
103
69 //ergodox_led_all_on(); 104 //ergodox_led_all_on();
70 //_delay_ms(333); 105 //_delay_ms(333);
71 ergodox_led_all_off(); 106 ergodox_led_all_off();
@@ -107,6 +142,10 @@ uint8_t init_mcp23018(void) {
107out: 142out:
108 i2c_stop(); 143 i2c_stop();
109 144
145#ifdef LEFT_LEDS
146 if (!mcp23018_status) mcp23018_status = ergodox_left_leds_update();
147#endif // LEFT_LEDS
148
110 // SREG=sreg_prev; 149 // SREG=sreg_prev;
111 150
112 return mcp23018_status; 151 return mcp23018_status;
diff --git a/keyboards/ergodox_ez/ergodox_ez.h b/keyboards/ergodox_ez/ergodox_ez.h
index 1f8d59751..a6890a70c 100644
--- a/keyboards/ergodox_ez/ergodox_ez.h
+++ b/keyboards/ergodox_ez/ergodox_ez.h
@@ -46,12 +46,31 @@ inline void ergodox_right_led_2_off(void) { DDRB &= ~(1<<6); PORTB &= ~(1<<6);
46inline void ergodox_right_led_3_off(void) { DDRB &= ~(1<<7); PORTB &= ~(1<<7); } 46inline void ergodox_right_led_3_off(void) { DDRB &= ~(1<<7); PORTB &= ~(1<<7); }
47inline void ergodox_right_led_off(uint8_t led) { DDRB &= ~(1<<(led+4)); PORTB &= ~(1<<(led+4)); } 47inline void ergodox_right_led_off(uint8_t led) { DDRB &= ~(1<<(led+4)); PORTB &= ~(1<<(led+4)); }
48 48
49#ifdef LEFT_LEDS
50bool ergodox_left_led_1;
51bool ergodox_left_led_2;
52bool ergodox_left_led_3;
53
54inline void ergodox_left_led_1_on(void) { ergodox_left_led_1 = 1; }
55inline void ergodox_left_led_2_on(void) { ergodox_left_led_2 = 1; }
56inline void ergodox_left_led_3_on(void) { ergodox_left_led_3 = 1; }
57
58inline void ergodox_left_led_1_off(void) { ergodox_left_led_1 = 0; }
59inline void ergodox_left_led_2_off(void) { ergodox_left_led_2 = 0; }
60inline void ergodox_left_led_3_off(void) { ergodox_left_led_3 = 0; }
61#endif // LEFT_LEDS
62
49inline void ergodox_led_all_on(void) 63inline void ergodox_led_all_on(void)
50{ 64{
51 ergodox_board_led_on(); 65 ergodox_board_led_on();
52 ergodox_right_led_1_on(); 66 ergodox_right_led_1_on();
53 ergodox_right_led_2_on(); 67 ergodox_right_led_2_on();
54 ergodox_right_led_3_on(); 68 ergodox_right_led_3_on();
69#ifdef LEFT_LEDS
70 ergodox_left_led_1_on();
71 ergodox_left_led_2_on();
72 ergodox_left_led_3_on();
73#endif // LEFT_LEDS
55} 74}
56 75
57inline void ergodox_led_all_off(void) 76inline void ergodox_led_all_off(void)
@@ -60,6 +79,11 @@ inline void ergodox_led_all_off(void)
60 ergodox_right_led_1_off(); 79 ergodox_right_led_1_off();
61 ergodox_right_led_2_off(); 80 ergodox_right_led_2_off();
62 ergodox_right_led_3_off(); 81 ergodox_right_led_3_off();
82#ifdef LEFT_LEDS
83 ergodox_left_led_1_off();
84 ergodox_left_led_2_off();
85 ergodox_left_led_3_off();
86#endif // LEFT_LEDS
63} 87}
64 88
65inline void ergodox_right_led_1_set(uint8_t n) { OCR1A = n; } 89inline void ergodox_right_led_1_set(uint8_t n) { OCR1A = n; }