diff options
| author | Erez Zukerman <bulk@ezuk.org> | 2017-11-27 08:25:24 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-27 08:25:24 -0500 |
| commit | 0bd453b5276714b9a33c6a2060851ea5184c52b2 (patch) | |
| tree | 24908474e53b54211e9b6eeb027dc4221c2f71bf | |
| parent | b697e1bff3f0f3182970e4ba9f9284e1bc9651d5 (diff) | |
| parent | 534cd9d45e66b4750d7790fa7230b2108ab3966d (diff) | |
| download | qmk_firmware-0bd453b5276714b9a33c6a2060851ea5184c52b2.tar.gz qmk_firmware-0bd453b5276714b9a33c6a2060851ea5184c52b2.zip | |
Merge pull request #2047 from seebs/seebs/ergodox_brightness
Make brightness easier to change
| -rw-r--r-- | keyboards/ergodox_ez/config.h | 5 | ||||
| -rw-r--r-- | keyboards/ergodox_ez/ergodox_ez.c | 2 | ||||
| -rw-r--r-- | keyboards/ergodox_ez/ergodox_ez.h | 4 |
3 files changed, 10 insertions, 1 deletions
diff --git a/keyboards/ergodox_ez/config.h b/keyboards/ergodox_ez/config.h index cbe615c09..ae70c4f2e 100644 --- a/keyboards/ergodox_ez/config.h +++ b/keyboards/ergodox_ez/config.h | |||
| @@ -62,8 +62,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 62 | /* number of backlight levels */ | 62 | /* number of backlight levels */ |
| 63 | #define BACKLIGHT_LEVELS 3 | 63 | #define BACKLIGHT_LEVELS 3 |
| 64 | 64 | ||
| 65 | #ifndef LED_BRIGHTNESS_LO | ||
| 65 | #define LED_BRIGHTNESS_LO 15 | 66 | #define LED_BRIGHTNESS_LO 15 |
| 67 | #endif | ||
| 68 | #ifndef LED_BRIGHTNESS_HI | ||
| 66 | #define LED_BRIGHTNESS_HI 255 | 69 | #define LED_BRIGHTNESS_HI 255 |
| 70 | #endif | ||
| 71 | #define LED_BRIGHTNESS_DEFAULT (LED_BRIGHTNESS_HI) | ||
| 67 | 72 | ||
| 68 | /* ws2812 RGB LED */ | 73 | /* ws2812 RGB LED */ |
| 69 | #define RGB_DI_PIN D7 | 74 | #define RGB_DI_PIN D7 |
diff --git a/keyboards/ergodox_ez/ergodox_ez.c b/keyboards/ergodox_ez/ergodox_ez.c index 862312cd5..5f197cb2d 100644 --- a/keyboards/ergodox_ez/ergodox_ez.c +++ b/keyboards/ergodox_ez/ergodox_ez.c | |||
| @@ -54,7 +54,7 @@ void matrix_init_kb(void) { | |||
| 54 | void ergodox_blink_all_leds(void) | 54 | void ergodox_blink_all_leds(void) |
| 55 | { | 55 | { |
| 56 | ergodox_led_all_off(); | 56 | ergodox_led_all_off(); |
| 57 | ergodox_led_all_set(LED_BRIGHTNESS_HI); | 57 | ergodox_led_all_set(LED_BRIGHTNESS_DEFAULT); |
| 58 | ergodox_right_led_1_on(); | 58 | ergodox_right_led_1_on(); |
| 59 | _delay_ms(50); | 59 | _delay_ms(50); |
| 60 | ergodox_right_led_2_on(); | 60 | ergodox_right_led_2_on(); |
diff --git a/keyboards/ergodox_ez/ergodox_ez.h b/keyboards/ergodox_ez/ergodox_ez.h index a6890a70c..4433dbe6d 100644 --- a/keyboards/ergodox_ez/ergodox_ez.h +++ b/keyboards/ergodox_ez/ergodox_ez.h | |||
| @@ -30,8 +30,12 @@ void ergodox_blink_all_leds(void); | |||
| 30 | uint8_t init_mcp23018(void); | 30 | uint8_t init_mcp23018(void); |
| 31 | uint8_t ergodox_left_leds_update(void); | 31 | uint8_t ergodox_left_leds_update(void); |
| 32 | 32 | ||
| 33 | #ifndef LED_BRIGHTNESS_LO | ||
| 33 | #define LED_BRIGHTNESS_LO 15 | 34 | #define LED_BRIGHTNESS_LO 15 |
| 35 | #endif | ||
| 36 | #ifndef LED_BRIGHTNESS_LO | ||
| 34 | #define LED_BRIGHTNESS_HI 255 | 37 | #define LED_BRIGHTNESS_HI 255 |
| 38 | #endif | ||
| 35 | 39 | ||
| 36 | 40 | ||
| 37 | inline void ergodox_board_led_on(void) { DDRD |= (1<<6); PORTD |= (1<<6); } | 41 | inline void ergodox_board_led_on(void) { DDRD |= (1<<6); PORTD |= (1<<6); } |
