diff options
| author | TerryMathews <terry@terrymathews.net> | 2017-04-08 00:30:54 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-08 00:30:54 -0400 |
| commit | 3899bec4b603a0880055c60df534c5a86ad44a52 (patch) | |
| tree | dd3ac70f403290fafff4bf8005925a3d5eed69cd /keyboards/ergodox/ez | |
| parent | 2a2be010d9d8c10d872c01637f4b4cd263f9bc1b (diff) | |
| parent | 154305ce1be16b2c8abce5e5d4dee421f295d6b3 (diff) | |
Merge pull request #1 from qmk/master
Catchup
Diffstat (limited to 'keyboards/ergodox/ez')
| -rw-r--r-- | keyboards/ergodox/ez/config.h | 5 | ||||
| -rw-r--r-- | keyboards/ergodox/ez/ez.c | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/keyboards/ergodox/ez/config.h b/keyboards/ergodox/ez/config.h index 6a8c66d7d4..a3347de45e 100644 --- a/keyboards/ergodox/ez/config.h +++ b/keyboards/ergodox/ez/config.h @@ -49,7 +49,10 @@ 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 +/* fix space cadet rollover issue */ +#define DISABLE_SPACE_CADET_ROLLOVER + +// #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; } |