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

2 files changed, 6 insertions, 6 deletions

diff --git a/keyboards/hineybush/h87a/config.h b/keyboards/hineybush/h87a/config.h
index 2e6c37e33f..245e6eda83 100644
--- a/keyboards/hineybush/h87a/config.h
+++ b/keyboards/hineybush/h87a/config.h
@@ -53,7 +53,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_LEVELS 3
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCING_DELAY 5
+#define DEBOUNCE 5
 
 /* define if matrix has ghost (lacks anti-ghosting diodes) */
 //#define MATRIX_HAS_GHOST
diff --git a/keyboards/hineybush/h87a/keymaps/gam3cat/keymap.c b/keyboards/hineybush/h87a/keymaps/gam3cat/keymap.c
index 2a4e5ca410..fde2637154 100644
--- a/keyboards/hineybush/h87a/keymaps/gam3cat/keymap.c
+++ b/keyboards/hineybush/h87a/keymaps/gam3cat/keymap.c
@@ -12,10 +12,10 @@ enum layers {
 };
 
 enum custom_keycodes {
-    DYNAMIC_MACRO_RANGE = SAFE_RANGE,
-    QMK_REV,
+    QMK_REV = SAFE_RANGE,
     KC_WEB,
-    KC_SP4
+    KC_SP4,
+    DYNAMIC_MACRO_RANGE
 };
 
 extern backlight_config_t backlight_config;
@@ -259,11 +259,11 @@ uint32_t layer_state_set_user(uint32_t state) {
             break;
         case _FL:
             custom_backlight_level(2);
-            rgblight_sethsv_noeeprom(280,255,255);
+            rgblight_sethsv_noeeprom(240,255,255);
             break;
         case _AL:
             custom_backlight_level(3);
-            rgblight_sethsv_noeeprom(350,255,255);
+            rgblight_sethsv_noeeprom(255,255,255);
             break;
         default:
             custom_backlight_level(0);