diff options
| author | lucwastiaux <luc.wastiaux@airpost.net> | 2016-12-10 12:49:47 +0800 |
|---|---|---|
| committer | lucwastiaux <luc.wastiaux@airpost.net> | 2016-12-10 12:49:47 +0800 |
| commit | 9240f27ba909aece233bda59e4ec15f7666fdece (patch) | |
| tree | 7b6e2b05a0722734e4739dd7b52817d82fae51c6 /keyboards/ergodox/ez/ez.c | |
| parent | dc4c8875ba2b961deb5d9712f422b00ce7c90979 (diff) | |
| parent | 985a091a739c99736d5b17de5161831488dbc219 (diff) | |
| download | firmware-9240f27ba909aece233bda59e4ec15f7666fdece.tar.gz firmware-9240f27ba909aece233bda59e4ec15f7666fdece.tar.bz2 firmware-9240f27ba909aece233bda59e4ec15f7666fdece.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'keyboards/ergodox/ez/ez.c')
| -rw-r--r-- | keyboards/ergodox/ez/ez.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/keyboards/ergodox/ez/ez.c b/keyboards/ergodox/ez/ez.c index ddb8ff0cf..039e4c6bb 100644 --- a/keyboards/ergodox/ez/ez.c +++ b/keyboards/ergodox/ez/ez.c @@ -16,10 +16,10 @@ void matrix_init_kb(void) { // unused pins - C7, D4, D5, D7, E6 // set as input with internal pull-ip 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(); @@ -51,6 +51,10 @@ 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++; @@ -79,6 +83,8 @@ uint8_t init_mcp23018(void) { out: i2c_stop(); + SREG=sreg_prev; + return mcp23018_status; } |