diff options
| author | Brendan Johan Lee <deadcyclo@vanntett.net> | 2017-01-24 21:56:18 +0100 |
|---|---|---|
| committer | Brendan Johan Lee <deadcyclo@vanntett.net> | 2017-01-24 21:56:18 +0100 |
| commit | d0db04416459394a631aad8fe16d55f3d6373b2d (patch) | |
| tree | fcc426f81c093101494feaaa8d564d7ff7df15fd /keyboards | |
| parent | 37ed3d13a4d99c9880f713de497f84efbe937bdf (diff) | |
| parent | 71137deba21bfc392d60cffb1b76216c362beb9a (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'keyboards')
| -rw-r--r-- | keyboards/ergodox/ez/config.h | 2 | ||||
| -rw-r--r-- | keyboards/ergodox/ez/ez.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/keyboards/ergodox/ez/config.h b/keyboards/ergodox/ez/config.h index 6a8c66d7d4..e4f95c302c 100644 --- a/keyboards/ergodox/ez/config.h +++ b/keyboards/ergodox/ez/config.h @@ -49,7 +49,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_SAT_STEP 255 #define RGBLIGHT_VAL_STEP 12 -#define RGB_MIDI +// #define RGB_MIDI #define RGBW_BB_TWI #define RGBW 1 diff --git a/keyboards/ergodox/ez/ez.c b/keyboards/ergodox/ez/ez.c index 039e4c6bb1..3e19f23028 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; } |