diff options
| author | Stick <nstickney@gmail.com> | 2017-06-22 13:06:30 -0500 |
|---|---|---|
| committer | Stick <nstickney@gmail.com> | 2017-06-22 13:06:30 -0500 |
| commit | fa96d64f3761e6cd0661c63a3fc257b58c669be0 (patch) | |
| tree | 85a7b88c4b1f3898c606af013a478db39dc392b5 /keyboards/ergodox/ez | |
| parent | 4b50ab029d49830cf0efd0e5e0606cb39c8dabae (diff) | |
| parent | 2b98ec67f3c2e0e408275ea6b2c90be2dbeada23 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'keyboards/ergodox/ez')
| -rw-r--r-- | keyboards/ergodox/ez/ez.c | 26 | ||||
| -rw-r--r-- | keyboards/ergodox/ez/keymaps/profet_80/ergodox80.png | bin | 20663 -> 0 bytes | |||
| -rw-r--r-- | keyboards/ergodox/ez/keymaps/profet_80/readme.md | 2 |
3 files changed, 26 insertions, 2 deletions
diff --git a/keyboards/ergodox/ez/ez.c b/keyboards/ergodox/ez/ez.c index 3e19f23028..d502249543 100644 --- a/keyboards/ergodox/ez/ez.c +++ b/keyboards/ergodox/ez/ez.c @@ -1,6 +1,30 @@ #include "ez.h" #include "i2cmaster.h" + +extern inline void ergodox_board_led_on(void); +extern inline void ergodox_right_led_1_on(void); +extern inline void ergodox_right_led_2_on(void); +extern inline void ergodox_right_led_3_on(void); +extern inline void ergodox_right_led_on(uint8_t led); + +extern inline void ergodox_board_led_off(void); +extern inline void ergodox_right_led_1_off(void); +extern inline void ergodox_right_led_2_off(void); +extern inline void ergodox_right_led_3_off(void); +extern inline void ergodox_right_led_off(uint8_t led); + +extern inline void ergodox_led_all_on(void); +extern inline void ergodox_led_all_off(void); + +extern inline void ergodox_right_led_1_set(uint8_t n); +extern inline void ergodox_right_led_2_set(uint8_t n); +extern inline void ergodox_right_led_3_set(uint8_t n); +extern inline void ergodox_right_led_set(uint8_t led, uint8_t n); + +extern inline void ergodox_led_all_set(uint8_t n); + + bool i2c_initialized = 0; uint8_t mcp23018_status = 0x20; @@ -57,7 +81,7 @@ uint8_t init_mcp23018(void) { // cli(); if (i2c_initialized == 0) { i2c_init(); // on pins D(1,0) - i2c_initialized++; + i2c_initialized = true; _delay_ms(1000); } diff --git a/keyboards/ergodox/ez/keymaps/profet_80/ergodox80.png b/keyboards/ergodox/ez/keymaps/profet_80/ergodox80.png Binary files differdeleted file mode 100644 index 66b9752ebc..0000000000 --- a/keyboards/ergodox/ez/keymaps/profet_80/ergodox80.png +++ /dev/null diff --git a/keyboards/ergodox/ez/keymaps/profet_80/readme.md b/keyboards/ergodox/ez/keymaps/profet_80/readme.md index b6bbb86d2c..7380e3465f 100644 --- a/keyboards/ergodox/ez/keymaps/profet_80/readme.md +++ b/keyboards/ergodox/ez/keymaps/profet_80/readme.md @@ -7,4 +7,4 @@ If you own an 80 key Ergodox, use this as an example to get your desired keymap. **NOTE:** This layout is not physically supported by the Ergodox EZ. - + |
