Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware

3 files changed, 6 insertions, 44 deletions

diff --git a/quantum/keymap.h b/quantum/keymap.h
index 979ab2da10..43efab7f3f 100644
--- a/quantum/keymap.h
+++ b/quantum/keymap.h
@@ -154,7 +154,7 @@ enum quantum_keycodes {
     KC_LSPO,
 
     // Right shift, close paren
-    KC_RSPC,
+    KC_RSPC
 };
 
 // Ability to use mods in layouts
diff --git a/quantum/quantum.c b/quantum/quantum.c
index a310608e00..49ac20d61f 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -504,14 +504,14 @@ bool process_record_quantum(keyrecord_t *record) {
     case KC_LSPO: {
       if (record->event.pressed) {
         shift_interrupted[0] = false;
-        register_mods(MOD_LSFT);
+        register_mods(MOD_BIT(KC_LSFT));
       }
       else {
         if (!shift_interrupted[0]) {
           register_code(LSPO_KEY);
           unregister_code(LSPO_KEY);
         }
-        unregister_mods(MOD_LSFT);
+        unregister_mods(MOD_BIT(KC_LSFT));
       }
       return false;
       break;
@@ -520,14 +520,14 @@ bool process_record_quantum(keyrecord_t *record) {
     case KC_RSPC: {
       if (record->event.pressed) {
         shift_interrupted[1] = false;
-        register_mods(MOD_RSFT);
+        register_mods(MOD_BIT(KC_RSFT));
       }
       else {
         if (!shift_interrupted[1]) {
           register_code(RSPC_KEY);
           unregister_code(RSPC_KEY);
         }
-        unregister_mods(MOD_RSFT);
+        unregister_mods(MOD_BIT(KC_RSFT));
       }
       return false;
       break;
diff --git a/quantum/template/Makefile b/quantum/template/Makefile
index 8772b09200..87e4c2d2bb 100644
--- a/quantum/template/Makefile
+++ b/quantum/template/Makefile
@@ -1,42 +1,4 @@
-#----------------------------------------------------------------------------
-# On command line:
-#
-# make all = Make software.
-#
-# make clean = Clean out built project files.
-#
-# make coff = Convert ELF to AVR COFF.
-#
-# make extcoff = Convert ELF to AVR Extended COFF.
-#
-# make program = Download the hex file to the device.
-#                Please customize your programmer settings(PROGRAM_CMD)
-#
-# make teensy = Download the hex file to the device, using teensy_loader_cli.
-#               (must have teensy_loader_cli installed).
-#
-# make dfu = Download the hex file to the device, using dfu-programmer (must
-#            have dfu-programmer installed).
-#
-# make flip = Download the hex file to the device, using Atmel FLIP (must
-#             have Atmel FLIP installed).
-#
-# make dfu-ee = Download the eeprom file to the device, using dfu-programmer
-#               (must have dfu-programmer installed).
-#
-# make flip-ee = Download the eeprom file to the device, using Atmel FLIP
-#                (must have Atmel FLIP installed).
-#
-# make debug = Start either simulavr or avarice as specified for debugging, 
-#              with avr-gdb or avr-insight as the front end for debugging.
-#
-# make filename.s = Just compile filename.c into the assembler code only.
-#
-# make filename.i = Create a preprocessed source file for use in submitting
-#                   bug reports to the GCC project.
-#
-# To rebuild project do "make clean" then "make all".
-#----------------------------------------------------------------------------
+
 
 # MCU name
 #MCU = at90usb1287