X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=keyboards%2Fergodox_ez%2Fergodox_ez.c;h=36eb58a3c7d7486b9e6bf1ff94ed6d4ea546f7d1;hb=682555faac8a67deff5688b956165cd1c39389cb;hp=97e6de1ee378d1f394faef03177438709c04999f;hpb=b0caf32741cf415a45333828f1661d9f6b72570f;p=qmk_firmware.git diff --git a/keyboards/ergodox_ez/ergodox_ez.c b/keyboards/ergodox_ez/ergodox_ez.c index 97e6de1ee..36eb58a3c 100644 --- a/keyboards/ergodox_ez/ergodox_ez.c +++ b/keyboards/ergodox_ez/ergodox_ez.c @@ -1,18 +1,30 @@ -#include "ergodox_ez.h" -#include "i2cmaster.h" +#include QMK_KEYBOARD_H -bool i2c_initialized = 0; -uint8_t mcp23018_status = 0x20; +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); -__attribute__ ((weak)) -void matrix_init_user(void) { +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); -__attribute__ ((weak)) -void matrix_scan_user(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; void matrix_init_kb(void) { // keyboard LEDs (see "PWM on ports OC1(A|B|C)" in "teensy-2-0.md") @@ -24,12 +36,12 @@ void matrix_init_kb(void) { PORTB &= ~(1<<4); // set B(4) internal pull-up disabled // unused pins - C7, D4, D5, D7, E6 - // set as input with internal pull-ip enabled + // set as input with internal pull-up enabled DDRC &= ~(1<<7); - DDRD &= ~(1<<7 | 1<<5 | 1<<4); + DDRD &= ~(1<<5 | 1<<4); DDRE &= ~(1<<6); PORTC |= (1<<7); - PORTD |= (1<<7 | 1<<5 | 1<<4); + PORTD |= (1<<5 | 1<<4); PORTE |= (1<<6); ergodox_blink_all_leds(); @@ -37,26 +49,56 @@ void matrix_init_kb(void) { matrix_init_user(); } -void matrix_scan_kb(void) { - matrix_scan_user(); -} - - void ergodox_blink_all_leds(void) { ergodox_led_all_off(); - ergodox_led_all_set(LED_BRIGHTNESS_HI); + ergodox_led_all_set(LED_BRIGHTNESS_DEFAULT); ergodox_right_led_1_on(); _delay_ms(50); ergodox_right_led_2_on(); _delay_ms(50); ergodox_right_led_3_on(); _delay_ms(50); +#ifdef LEFT_LEDS + ergodox_left_led_1_on(); + _delay_ms(50); + if (!mcp23018_status) { + mcp23018_status = ergodox_left_leds_update(); + } + ergodox_left_led_2_on(); + _delay_ms(50); + if (!mcp23018_status) { + mcp23018_status = ergodox_left_leds_update(); + } + ergodox_left_led_3_on(); + _delay_ms(50); + if (!mcp23018_status) { + mcp23018_status = ergodox_left_leds_update(); + } +#endif ergodox_right_led_1_off(); _delay_ms(50); ergodox_right_led_2_off(); _delay_ms(50); ergodox_right_led_3_off(); +#ifdef LEFT_LEDS + _delay_ms(50); + ergodox_left_led_1_off(); + if (!mcp23018_status) { + mcp23018_status = ergodox_left_leds_update(); + } + _delay_ms(50); + ergodox_left_led_2_off(); + if (!mcp23018_status) { + mcp23018_status = ergodox_left_leds_update(); + } + _delay_ms(50); + ergodox_left_led_3_off(); + if (!mcp23018_status) { + mcp23018_status = ergodox_left_leds_update(); + } +#endif + //ergodox_led_all_on(); //_delay_ms(333); ergodox_led_all_off(); @@ -66,9 +108,13 @@ uint8_t init_mcp23018(void) { mcp23018_status = 0x20; // I2C subsystem + + // uint8_t sreg_prev; + // sreg_prev=SREG; + // cli(); if (i2c_initialized == 0) { i2c_init(); // on pins D(1,0) - i2c_initialized++; + i2c_initialized = true; _delay_ms(1000); } @@ -94,7 +140,195 @@ uint8_t init_mcp23018(void) { out: i2c_stop(); +#ifdef LEFT_LEDS + if (!mcp23018_status) mcp23018_status = ergodox_left_leds_update(); +#endif // LEFT_LEDS + + // SREG=sreg_prev; + return mcp23018_status; } +#ifdef LEFT_LEDS +uint8_t ergodox_left_leds_update(void) { + if (mcp23018_status) { // if there was an error + return mcp23018_status; + } +#define LEFT_LED_1_SHIFT 7 // in MCP23018 port B +#define LEFT_LED_2_SHIFT 6 // in MCP23018 port B +#define LEFT_LED_3_SHIFT 7 // in MCP23018 port A + + // set logical value (doesn't matter on inputs) + // - unused : hi-Z : 1 + // - input : hi-Z : 1 + // - driving : hi-Z : 1 + mcp23018_status = i2c_start(I2C_ADDR_WRITE); + if (mcp23018_status) goto out; + mcp23018_status = i2c_write(OLATA); + if (mcp23018_status) goto out; + mcp23018_status = i2c_write(0b11111111 + & ~(ergodox_left_led_3<