diff options
author | coderkun <olli@coderkun.de> | 2017-04-01 10:56:29 +0200 |
---|---|---|
committer | coderkun <olli@coderkun.de> | 2017-04-01 10:56:29 +0200 |
commit | 605c4129cc89e8fe647881108b0c9c79d4da1aea (patch) | |
tree | 9af55a60d567bd66b5c8572c04ab63b62abb5a02 /keyboards/ergodox/ez/ez.c | |
parent | b0ade6dc9838d4112cbc3093ac3033aa81ef172d (diff) | |
parent | 3448d5d4874a2775f85320a2be69edd241575d46 (diff) | |
download | firmware-605c4129cc89e8fe647881108b0c9c79d4da1aea.tar.gz firmware-605c4129cc89e8fe647881108b0c9c79d4da1aea.tar.bz2 firmware-605c4129cc89e8fe647881108b0c9c79d4da1aea.zip |
Merge branch 'master' into coderkun_neo2
Diffstat (limited to 'keyboards/ergodox/ez/ez.c')
-rw-r--r-- | keyboards/ergodox/ez/ez.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/keyboards/ergodox/ez/ez.c b/keyboards/ergodox/ez/ez.c index 039e4c6bb..3e19f2302 100644 --- a/keyboards/ergodox/ez/ez.c +++ b/keyboards/ergodox/ez/ez.c @@ -52,9 +52,9 @@ uint8_t init_mcp23018(void) { // I2C subsystem - uint8_t sreg_prev; - sreg_prev=SREG; - cli(); + // uint8_t sreg_prev; + // sreg_prev=SREG; + // cli(); if (i2c_initialized == 0) { i2c_init(); // on pins D(1,0) i2c_initialized++; @@ -83,7 +83,7 @@ uint8_t init_mcp23018(void) { out: i2c_stop(); - SREG=sreg_prev; + // SREG=sreg_prev; return mcp23018_status; } |