summaryrefslogtreecommitdiff
path: root/keyboards/ergodox/ez/ez.c
diff options
context:
space:
mode:
authorclimbalima <climbalima@gmail.com>2016-12-10 23:15:47 -0500
committerclimbalima <climbalima@gmail.com>2016-12-10 23:15:47 -0500
commit73d60182969023984ff275117d49a4824c6987d0 (patch)
treefdac811b117c49f78de04c407d4bef76e6df5772 /keyboards/ergodox/ez/ez.c
parent56515ba5034e83c598891686cfdc43c186e5d487 (diff)
parent985a091a739c99736d5b17de5161831488dbc219 (diff)
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'keyboards/ergodox/ez/ez.c')
-rw-r--r--keyboards/ergodox/ez/ez.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/keyboards/ergodox/ez/ez.c b/keyboards/ergodox/ez/ez.c
index ddb8ff0cf7..039e4c6bb1 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;
}