Skip to content

Commit 4ae6ea9

Browse files
drashnadrashna
authored
Fix Ergodox Indicator LEDs (#402)
* Revert "fix: shine led indicator brightness" This reverts commit 0b6f7f9. * Cleanup leds * Confirm working on AVR and ARM
1 parent 0b6f7f9 commit 4ae6ea9

File tree

3 files changed

+43
-64
lines changed

3 files changed

+43
-64
lines changed

‎keyboards/zsa/ergodox_ez/ergodox_ez.c

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,20 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
2020

2121
#include "ergodox_ez.h"
2222
#include "bootmagic.h"
23+
#include "gpio.h"
2324

2425
keyboard_config_t keyboard_config;
2526

2627
__attribute__((weak)) void keyboard_post_init_sub(void) {
27-
setPinOutput(ERGODOX_LED_1_PIN);
28-
setPinOutput(ERGODOX_LED_2_PIN);
29-
setPinOutput(ERGODOX_LED_3_PIN);
28+
gpio_set_pin_output(ERGODOX_LED_1_PIN);
29+
gpio_set_pin_output(ERGODOX_LED_2_PIN);
30+
gpio_set_pin_output(ERGODOX_LED_3_PIN);
3031
}
3132

3233
void keyboard_post_init_kb(void) {
3334
keyboard_post_init_sub();
3435
#ifdef ERGODOX_LED_SHUTOFF_PIN
35-
setPinOutput(ERGODOX_LED_SHUTOFF_PIN);
36+
gpio_set_pin_output(ERGODOX_LED_SHUTOFF_PIN);
3637
#endif
3738

3839
keyboard_config.raw = eeconfig_read_kb();
@@ -49,25 +50,28 @@ void keyboard_post_init_kb(void) {
4950

5051
void ergodox_board_led_on(void) {
5152
#ifdef ERGODOX_LED_SHUTOFF_PIN
52-
writePinHigh(ERGODOX_LED_SHUTOFF_PIN);
53+
gpio_write_pin_high(ERGODOX_LED_SHUTOFF_PIN);
5354
#endif
5455
}
5556

5657
__attribute__((weak)) void ergodox_right_led_1_on(void) {
57-
writePinHigh(ERGODOX_LED_1_PIN);
58+
gpio_set_pin_output(ERGODOX_LED_1_PIN);
59+
gpio_write_pin_high(ERGODOX_LED_1_PIN);
5860
}
5961

6062
__attribute__((weak)) void ergodox_right_led_2_on(void) {
61-
writePinHigh(ERGODOX_LED_2_PIN);
63+
gpio_set_pin_output(ERGODOX_LED_2_PIN);
64+
gpio_write_pin_high(ERGODOX_LED_2_PIN);
6265
}
6366

6467
__attribute__((weak)) void ergodox_right_led_3_on(void) {
65-
writePinHigh(ERGODOX_LED_3_PIN);
68+
gpio_set_pin_output(ERGODOX_LED_3_PIN);
69+
gpio_write_pin_high(ERGODOX_LED_3_PIN);
6670
}
6771

6872
void ergodox_board_led_off(void) {
6973
#ifdef ERGODOX_LED_SHUTOFF_PIN
70-
writePinLow(ERGODOX_LED_SHUTOFF_PIN);
74+
gpio_write_pin_low(ERGODOX_LED_SHUTOFF_PIN);
7175
#else
7276
ergodox_right_led_1_off();
7377
ergodox_right_led_2_off();
@@ -76,15 +80,18 @@ void ergodox_board_led_off(void) {
7680
}
7781

7882
__attribute__((weak)) void ergodox_right_led_1_off(void) {
79-
setPinInput(ERGODOX_LED_1_PIN);
83+
gpio_set_pin_input(ERGODOX_LED_1_PIN);
84+
gpio_write_pin_low(ERGODOX_LED_1_PIN);
8085
}
8186

8287
__attribute__((weak)) void ergodox_right_led_2_off(void) {
83-
setPinInput(ERGODOX_LED_2_PIN);
88+
gpio_set_pin_input(ERGODOX_LED_2_PIN);
89+
gpio_write_pin_low(ERGODOX_LED_2_PIN);
8490
}
8591

8692
__attribute__((weak)) void ergodox_right_led_3_off(void) {
87-
setPinInput(ERGODOX_LED_3_PIN);
93+
gpio_set_pin_input(ERGODOX_LED_3_PIN);
94+
gpio_write_pin_low(ERGODOX_LED_3_PIN);
8895
}
8996

9097
void ergodox_right_led_on(uint8_t led) {

‎keyboards/zsa/ergodox_ez/keymaps/default/keymap.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
4040
KC_DEL, KC_Q, KC_W, KC_E, KC_R, KC_T, TG(SYMB), TG(SYMB), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
4141
KC_BSPC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, LT(MDIA, KC_SCLN), GUI_T(KC_QUOT),
4242
KC_LSFT, CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, ALL_T(KC_NO), MEH_T(KC_NO), KC_N, KC_M, KC_COMM, KC_DOT, CTL_T(KC_SLSH), KC_RSFT,
43-
LT(SYMB,KC_GRV), KC_QUOT, LALT(KC_LSFT), KC_LEFT, KC_RGHT, KC_UP, KC_DOWN, KC_LBRC, KC_RBRC, TT(SYMB),
43+
LT(SYMB,KC_GRV), KC_QUOT, LALT(KC_LSFT), KC_LEFT, KC_RGHT, KC_UP, KC_DOWN, KC_LBRC, LED_LEVEL, TT(SYMB),
4444
ALT_T(KC_APP), KC_LGUI, KC_LALT, CTL_T(KC_ESC),
4545
KC_HOME, KC_PGUP,
4646
KC_SPC, KC_BSPC, KC_END, KC_PGDN, KC_TAB, KC_ENT
@@ -72,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
7272
KC_TRNS, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE, KC_TRNS, KC_TRNS, KC_UP, KC_7, KC_8, KC_9, KC_ASTR, KC_F12,
7373
KC_TRNS, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_GRV, KC_DOWN, KC_4, KC_5, KC_6, KC_PLUS, KC_TRNS,
7474
QK_BOOT, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD, KC_TRNS, KC_TRNS, KC_AMPR, KC_1, KC_2, KC_3, KC_BSLS, KC_TRNS,
75-
EE_CLR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DOT, KC_0, KC_EQL, KC_TRNS,
75+
EE_CLR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DOT, KC_0, KC_TRNS, KC_TRNS,
7676
RGB_MOD, KC_TRNS, RGB_TOG, RGB_M_P,
7777
KC_TRNS, KC_TRNS,
7878
RGB_VAD, RGB_VAI, KC_TRNS, KC_TRNS, RGB_HUD, RGB_HUI

‎keyboards/zsa/ergodox_ez/m32u4/m32u4.c

Lines changed: 22 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,55 @@
11
// Copyright 2023 Christopher Courtney, aka Drashna Jael're (@drashna) <drashna@live.com>
22
// SPDX-License-Identifier: GPL-3.0-or-later
33

4-
#include <stdint.h>
54
#include "ergodox_ez.h"
65

7-
static uint8_t ergodox_right_led_1_duty;
8-
static uint8_t ergodox_right_led_2_duty;
9-
static uint8_t ergodox_right_led_3_duty;
10-
116
void ergodox_right_led_1_set(uint8_t n) {
12-
ergodox_right_led_1_duty = n;
13-
if (ergodox_right_led_1_duty == 0) {
14-
ergodox_right_led_1_off();
15-
} else {
16-
ergodox_right_led_1_on();
17-
}
7+
OCR1A = n;
188
}
19-
20-
void ergodox_right_led_1_on(void) {
21-
OCR1A = ergodox_right_led_1_duty;
9+
void ergodox_right_led_2_set(uint8_t n) {
10+
OCR1B = n;
2211
}
23-
24-
void ergodox_right_led_1_off(void) {
25-
OCR1A = 0;
12+
void ergodox_right_led_3_set(uint8_t n) {
13+
OCR1C = n;
2614
}
2715

28-
void ergodox_right_led_2_set(uint8_t n) {
29-
ergodox_right_led_2_duty = n;
30-
if (ergodox_right_led_2_duty == 0) {
31-
ergodox_right_led_2_off();
32-
} else {
33-
ergodox_right_led_2_on();
34-
}
16+
__attribute__((weak)) void ergodox_right_led_1_on(void) {
17+
gpio_write_pin_high(ERGODOX_LED_1_PIN);
3518
}
3619

37-
void ergodox_right_led_2_on(void) {
38-
OCR1B = ergodox_right_led_2_duty;
20+
__attribute__((weak)) void ergodox_right_led_2_on(void) {
21+
gpio_write_pin_high(ERGODOX_LED_2_PIN);
3922
}
4023

41-
void ergodox_right_led_2_off(void) {
42-
OCR1B = 0;
24+
__attribute__((weak)) void ergodox_right_led_3_on(void) {
25+
gpio_write_pin_high(ERGODOX_LED_3_PIN);
4326
}
44-
45-
void ergodox_right_led_3_set(uint8_t n) {
46-
ergodox_right_led_3_duty = n;
47-
if (ergodox_right_led_3_duty == 0) {
48-
ergodox_right_led_3_off();
49-
} else {
50-
ergodox_right_led_3_on();
51-
}
27+
__attribute__((weak)) void ergodox_right_led_1_off(void) {
28+
gpio_write_pin_low(ERGODOX_LED_1_PIN);
5229
}
5330

54-
void ergodox_right_led_3_off(void) {
55-
OCR1C = 0;
31+
__attribute__((weak)) void ergodox_right_led_2_off(void) {
32+
gpio_write_pin_low(ERGODOX_LED_2_PIN);
5633
}
5734

58-
void ergodox_right_led_3_on(void) {
59-
OCR1C = ergodox_right_led_3_duty;
35+
__attribute__((weak)) void ergodox_right_led_3_off(void) {
36+
gpio_write_pin_low(ERGODOX_LED_3_PIN);
6037
}
6138

62-
6339
void keyboard_post_init_sub(void) {
6440
// keyboard LEDs (see "PWM on ports OC1(A|B|C)" in "teensy-2-0.md")
6541
TCCR1A = 0b10101001; // set and configure fast PWM
6642
TCCR1B = 0b00001001; // set and configure fast PWM
6743

6844
// (tied to Vcc for hardware convenience)
69-
setPinInput(B4);
45+
gpio_set_pin_input(B4);
7046

7147
// unused pins - C7, D4, D5, E6
7248
// set as input with internal pull-up enabled
73-
setPinInputHigh(C7);
74-
setPinInputHigh(D4);
75-
setPinInputHigh(D5);
76-
setPinInputHigh(E6);
77-
78-
setPinOutput(ERGODOX_LED_1_PIN);
79-
setPinOutput(ERGODOX_LED_2_PIN);
80-
setPinOutput(ERGODOX_LED_3_PIN);
49+
gpio_set_pin_input_high(C7);
50+
gpio_set_pin_input_high(D4);
51+
gpio_set_pin_input_high(D5);
52+
gpio_set_pin_input_high(E6);
8153
}
8254

8355
#ifdef RGB_MATRIX_ENABLE

0 commit comments

Comments
 (0)