diff options
| author | milestogo <milestogo@users.noreply.github.com> | 2017-02-04 20:08:07 -0800 |
|---|---|---|
| committer | milestogo <milestogo@users.noreply.github.com> | 2017-02-04 20:08:07 -0800 |
| commit | b0dfb037dc0b8b20fd87b3c88449a2ce20ff80e1 (patch) | |
| tree | df9fb78b55c4a9b8262e35ac7bd26ec0ebdb64db /keyboards/ergodox/ez | |
| parent | e8ba4838d30ef3af6d8e69ebc1d00a1910806ac2 (diff) | |
| parent | f0633f2540be3ba86797522a2075a9f5ba2ad5c6 (diff) | |
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'keyboards/ergodox/ez')
| -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; } |