From 50c686587ed49d8079ba1b11d45ceb6a55d6cd4b Mon Sep 17 00:00:00 2001
From: TerryMathews <terry@terrymathews.net>
Date: Thu, 7 Jul 2016 23:34:33 -0400
Subject: Create keycodes for RGB control functions

Moves RGB controls out of the macro function and assigns them their own
keycodes:
RGB_TOG (toggle on/off)
RGB_MOD (mode step)
RGB_HUI (increase hue)
RGB_HUD (decrease hue)
RGB_SAI (increase saturation)
RGB_SAD (decrease saturation)
RGB_VAI (increase brightness)
RGB_VAD (decrease brightness)
---
 quantum/keymap.h  | 10 ++++++++++
 quantum/quantum.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+)

(limited to 'quantum')

diff --git a/quantum/keymap.h b/quantum/keymap.h
index 73f99f8211..a158651839 100644
--- a/quantum/keymap.h
+++ b/quantum/keymap.h
@@ -156,6 +156,16 @@ enum quantum_keycodes {
     BL_INC,
     BL_TOGG,
     BL_STEP,
+	
+	// RGB functionality
+	RGB_TOG,
+	RGB_MOD,
+	RGB_HUI,
+	RGB_HUD,
+	RGB_SAI,
+	RGB_SAD,
+	RGB_VAI,
+	RGB_VAD,
 
     // Left shift, open paren
     KC_LSPO,
diff --git a/quantum/quantum.c b/quantum/quantum.c
index d8e43a4655..5c0b53e221 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -103,6 +103,56 @@ bool process_record_quantum(keyrecord_t *record) {
           return false;
       }
       break;
+	#ifdef RGBLIGHT_ENABLE
+	case RGB_TOG:
+		if (record->event.pressed) {
+			rgblight_toggle();
+			return false;
+		}
+		break;
+	case RGB_MOD:
+		if (record->event.pressed) {
+			rgblight_step();
+			return false;
+		}
+		break;
+	case RGB_HUI:
+		if (record->event.pressed) {
+			rgblight_increase_hue();
+			return false;
+		}
+		break;
+	case RGB_HUD:
+		if (record->event.pressed) {
+			rgblight_decrease_hue();
+			return false;
+		}
+		break;
+	case RGB_SAI:
+		if (record->event.pressed) {
+			rgblight_increase_sat();
+			return false;
+		}
+		break;
+	case RGB_SAD:
+		if (record->event.pressed) {
+			rgblight_decrease_sat();
+			return false;
+		}
+		break;
+	case RGB_VAI:
+		if (record->event.pressed) {
+			rgblight_increase_val();
+			return false;
+		}
+		break;
+	case RGB_VAD:
+		if (record->event.pressed) {
+			rgblight_decrease_val();
+			return false;
+		}
+		break;
+	#endif
     case MAGIC_SWAP_CONTROL_CAPSLOCK ... MAGIC_UNSWAP_ALT_GUI:
       if (record->event.pressed) {
         // MAGIC actions (BOOTMAGIC without the boot)
-- 
cgit v1.2.3


From f7a86822266603b8ffd21e9f89ec1de8d4950791 Mon Sep 17 00:00:00 2001
From: TerryMathews <terry@terrymathews.net>
Date: Fri, 8 Jul 2016 03:32:28 -0400
Subject: Move return out of event if block

According to Jack, this makes the return case not be processed. Doesn't
break anything in the firmware.
---
 quantum/quantum.c | 52 ++++++++++++++++++++++++++--------------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

(limited to 'quantum')

diff --git a/quantum/quantum.c b/quantum/quantum.c
index 5c0b53e221..09daa47127 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -93,65 +93,65 @@ bool process_record_quantum(keyrecord_t *record) {
             *(uint16_t *)0x0800 = 0x7777; // these two are a-star-specific
         #endif
         bootloader_jump();
-        return false;
       }
+	  return false;
       break;
     case DEBUG:
       if (record->event.pressed) {
           print("\nDEBUG: enabled.\n");
           debug_enable = true;
-          return false;
       }
+	  return false;
       break;
 	#ifdef RGBLIGHT_ENABLE
 	case RGB_TOG:
 		if (record->event.pressed) {
 			rgblight_toggle();
-			return false;
-		}
-		break;
+      }
+	  return false;
+      break;
 	case RGB_MOD:
 		if (record->event.pressed) {
 			rgblight_step();
-			return false;
-		}
-		break;
+      }
+	  return false;
+      break;
 	case RGB_HUI:
 		if (record->event.pressed) {
 			rgblight_increase_hue();
-			return false;
-		}
-		break;
+      }
+	  return false;
+      break;
 	case RGB_HUD:
 		if (record->event.pressed) {
 			rgblight_decrease_hue();
-			return false;
-		}
-		break;
+      }
+	  return false;
+      break;
 	case RGB_SAI:
 		if (record->event.pressed) {
 			rgblight_increase_sat();
-			return false;
-		}
-		break;
+      }
+	  return false;
+      break;
 	case RGB_SAD:
 		if (record->event.pressed) {
 			rgblight_decrease_sat();
-			return false;
-		}
-		break;
+      }
+	  return false;
+      break;
 	case RGB_VAI:
 		if (record->event.pressed) {
 			rgblight_increase_val();
-			return false;
-		}
-		break;
+      }
+	  return false;
+      break;
 	case RGB_VAD:
 		if (record->event.pressed) {
 			rgblight_decrease_val();
-			return false;
-		}
-		break;
+      }
+	  return false;
+      break;
 	#endif
     case MAGIC_SWAP_CONTROL_CAPSLOCK ... MAGIC_UNSWAP_ALT_GUI:
       if (record->event.pressed) {
-- 
cgit v1.2.3