Merge remote-tracking branch 'origin/master' into develop

2 files changed, 28 insertions, 30 deletions

diff --git a/keyboards/tunks/ergo33/keymaps/default/keymap.c b/keyboards/tunks/ergo33/keymaps/default/keymap.c
index e26e556cb3..664f7b415e 100644
--- a/keyboards/tunks/ergo33/keymaps/default/keymap.c
+++ b/keyboards/tunks/ergo33/keymaps/default/keymap.c
@@ -1,17 +1,17 @@
-/* Copyright 2020 Mika Kuitunen 
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+/* Copyright 2020 Mika Kuitunen
+  *
+  * This program is free software: you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation, either version 2 of the License, or
+  * (at your option) any later version.
+  *
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
 
 #include QMK_KEYBOARD_H
@@ -60,7 +60,6 @@ void encoder_update_user(uint8_t index, bool clockwise) {
 
 #ifdef RGBLIGHT_LAYERS
 #define HUE_PRIMARY 10
-#define HSV_OFF 0, 0, 0
 #define HSV_CAPS HUE_PRIMARY, 255, 64
 #define HSV_LAYER_BASE HUE_PRIMARY, 255, 64
 #define HSV_LAYER_RGB 213, 255, 64
diff --git a/keyboards/tunks/ergo33/keymaps/prpro/keymap.c b/keyboards/tunks/ergo33/keymaps/prpro/keymap.c
index 500e5dba1c..2ccba8b1e0 100644
--- a/keyboards/tunks/ergo33/keymaps/prpro/keymap.c
+++ b/keyboards/tunks/ergo33/keymaps/prpro/keymap.c
@@ -1,17 +1,17 @@
-/* Copyright 2020 Mika Kuitunen 
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+/* Copyright 2020 Mika Kuitunen
+  *
+  * This program is free software: you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation, either version 2 of the License, or
+  * (at your option) any later version.
+  *
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
 
 #include QMK_KEYBOARD_H
@@ -105,7 +105,6 @@ void encoder_update_user(uint8_t index, bool clockwise) {
 #ifdef RGBLIGHT_LAYERS
 #define HUE_PRIMARY 10
 #define HSV_PRIMARY HUE_PRIMARY, 255, 255
-#define HSV_OFF 0, 0, 0
 #define HSV_CAPS HUE_PRIMARY, 255, 64
 #define HSV_LAYER_BASE HUE_PRIMARY, 255, 64
 #define HSV_LAYER_PRPRO 213, 255, 64