Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

turn off rgb_midi in ez

Browse source
This commit is contained in:
Jack Humbert 2017-01-23 13:55:24 -05:00
parent 6d377bcc9c
commit 841d7e6a1d
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
keyboards/ergodox/ez/config.h
View file

@ -49,7 +49,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_SAT_STEP 255 #define RGBLIGHT_SAT_STEP 255
#define RGBLIGHT_VAL_STEP 12 #define RGBLIGHT_VAL_STEP 12
#define RGB_MIDI // #define RGB_MIDI
#define RGBW_BB_TWI #define RGBW_BB_TWI
#define RGBW 1 #define RGBW 1

8
keyboards/ergodox/ez/ez.c
View file

@ -52,9 +52,9 @@ uint8_t init_mcp23018(void) {
// I2C subsystem // I2C subsystem
uint8_t sreg_prev; // uint8_t sreg_prev;
sreg_prev=SREG; // sreg_prev=SREG;
cli(); // cli();
if (i2c_initialized == 0) { if (i2c_initialized == 0) {
i2c_init(); // on pins D(1,0) i2c_init(); // on pins D(1,0)
i2c_initialized++; i2c_initialized++;
@ -83,7 +83,7 @@ uint8_t init_mcp23018(void) {
out: out:
i2c_stop(); i2c_stop();
SREG=sreg_prev; // SREG=sreg_prev;
return mcp23018_status; return mcp23018_status;
} }

1
quantum/process_keycode/process_music.c
View file

@ -114,6 +114,7 @@ bool process_music(uint16_t keycode, keyrecord_t *record) {
music_sequence_interval+=10; music_sequence_interval+=10;
return false; return false;
} }
#define MUSIC_MODE_GUITAR
#ifdef MUSIC_MODE_CHROMATIC #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)); 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));