diff options
| author | Drashna Jaelre <drashna@live.com> | 2020-05-28 01:26:53 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-28 10:26:53 +0200 |
| commit | 5263dfd46520bd40af1d2b39364436df1c96a111 (patch) | |
| tree | bcc3493df4c88541aaff25af2b7b3f8105c40d7a /keyboards/ergodox_ez/ergodox_ez.h | |
| parent | 13206b2f87b1bce87d58cdfdddb1bcc7b58e4a24 (diff) | |
| download | firmware-5263dfd46520bd40af1d2b39364436df1c96a111.tar.gz firmware-5263dfd46520bd40af1d2b39364436df1c96a111.tar.bz2 firmware-5263dfd46520bd40af1d2b39364436df1c96a111.zip | |
Keyboards/zsa updates (#9214)
Diffstat (limited to 'keyboards/ergodox_ez/ergodox_ez.h')
| -rw-r--r-- | keyboards/ergodox_ez/ergodox_ez.h | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/keyboards/ergodox_ez/ergodox_ez.h b/keyboards/ergodox_ez/ergodox_ez.h index 7ff62d38a..88a0a2ee9 100644 --- a/keyboards/ergodox_ez/ergodox_ez.h +++ b/keyboards/ergodox_ez/ergodox_ez.h @@ -1,5 +1,4 @@ -#ifndef ERGODOX_EZ_H -#define ERGODOX_EZ_H +#pragma once #include "quantum.h" #include <stdint.h> @@ -65,8 +64,7 @@ inline void ergodox_left_led_2_off(void) { ergodox_left_led_2 = 0; } inline void ergodox_left_led_3_off(void) { ergodox_left_led_3 = 0; } #endif // LEFT_LEDS -inline void ergodox_led_all_on(void) -{ +inline void ergodox_led_all_on(void) { ergodox_board_led_on(); ergodox_right_led_1_on(); ergodox_right_led_2_on(); @@ -100,19 +98,20 @@ inline void ergodox_right_led_set(uint8_t led, uint8_t n) { (OCR1C = n); } -inline void ergodox_led_all_set(uint8_t n) -{ +inline void ergodox_led_all_set(uint8_t n) { ergodox_right_led_1_set(n); ergodox_right_led_2_set(n); ergodox_right_led_3_set(n); } -#ifdef ORYX_CONFIGURATOR enum ergodox_ez_keycodes { LED_LEVEL = SAFE_RANGE, TOGGLE_LAYER_COLOR, EZ_SAFE_RANGE, }; + +#ifndef WEBUSB_ENABLE +# define WEBUSB_PAIR KC_NO #endif typedef union { @@ -271,5 +270,3 @@ extern keyboard_config_t keyboard_config; { R05, R15, R25, R35, R45, R55 }, \ { R06, R16, R26, R36, R46, KC_NO } \ } - -#endif |