summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2017-01-23 13:55:24 -0500
committerJack Humbert <jack.humb@gmail.com>2017-01-23 13:55:24 -0500
commit841d7e6a1d74b1fc45575ed551132ec27353ebf3 (patch)
tree24f59f81823f36e76c01f6f36e8216b5d3531257
parent6d377bcc9cb417158a71cd78656ca2e1743885b2 (diff)
turn off rgb_midi in ez
-rw-r--r--keyboards/ergodox/ez/config.h2
-rw-r--r--keyboards/ergodox/ez/ez.c8
-rw-r--r--quantum/process_keycode/process_music.c1
3 files changed, 6 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;
}
diff --git a/quantum/process_keycode/process_music.c b/quantum/process_keycode/process_music.c
index ca68bef6c8..1e2648bff5 100644
--- a/quantum/process_keycode/process_music.c
+++ b/quantum/process_keycode/process_music.c
@@ -114,6 +114,7 @@ bool process_music(uint16_t keycode, keyrecord_t *record) {
music_sequence_interval+=10;
return false;
}
+ #define MUSIC_MODE_GUITAR
#ifdef MUSIC_MODE_CHROMATIC
float freq = ((float)220.0)*pow(2.0, -5.0)*pow(2.0,(music_starting_note + record->event.key.col + music_offset)/12.0+(MATRIX_ROWS - record->event.key.row));