fixes s60_x keyboard

53 files changed, 44 insertions, 31 deletions

diff --git a/keyboards/s60-x/s60-x.c b/keyboards/s60-x/s60-x.c
deleted file mode 100644
index f031dd770d..0000000000
--- a/keyboards/s60-x/s60-x.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "s60-x.h"
\ No newline at end of file
diff --git a/keyboards/s60-x/s60-x_precompiled.zip b/keyboards/s60-x/s60-x_precompiled.zip
deleted file mode 100644
index 00d99ca8a1..0000000000
--- a/keyboards/s60-x/s60-x_precompiled.zip
+++ /dev/null
diff --git a/keyboards/s60-x/Makefile b/keyboards/s60_x/Makefile
index 879e493a21..879e493a21 100644
--- a/keyboards/s60-x/Makefile
+++ b/keyboards/s60_x/Makefile
diff --git a/keyboards/s60-x/config.h b/keyboards/s60_x/config.h
index 8e7bc78be2..8b97b3c814 100644
--- a/keyboards/s60-x/config.h
+++ b/keyboards/s60_x/config.h
@@ -32,6 +32,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15
 
+/* number of backlight levels */
+#define BACKLIGHT_PIN B7
+#ifdef BACKLIGHT_PIN
+#define BACKLIGHT_LEVELS 3
+#endif
+
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
@@ -43,4 +49,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
 )
 
+#ifdef SUBPROJECT_default
+    #include "default/config.h"
+#endif
+#ifdef SUBPROJECT_rgb
+    #include "rgb/config.h"
+#endif
+
 #endif
diff --git a/keyboards/s60-x/default/Makefile b/keyboards/s60_x/default/Makefile
index 191c6bb664..191c6bb664 100644
--- a/keyboards/s60-x/default/Makefile
+++ b/keyboards/s60_x/default/Makefile
diff --git a/keyboards/s60-x/default/config.h b/keyboards/s60_x/default/config.h
index 436c6fa8b6..436c6fa8b6 100644
--- a/keyboards/s60-x/default/config.h
+++ b/keyboards/s60_x/default/config.h
diff --git a/keyboards/s60-x/default/default.c b/keyboards/s60_x/default/default.c
index 253f5495c2..253f5495c2 100644
--- a/keyboards/s60-x/default/default.c
+++ b/keyboards/s60_x/default/default.c
diff --git a/keyboards/s60-x/default/default.h b/keyboards/s60_x/default/default.h
index 86233ef7e0..86233ef7e0 100644
--- a/keyboards/s60-x/default/default.h
+++ b/keyboards/s60_x/default/default.h
diff --git a/keyboards/s60-x/default/rules.mk b/keyboards/s60_x/default/rules.mk
index aaa3764df6..aaa3764df6 100644
--- a/keyboards/s60-x/default/rules.mk
+++ b/keyboards/s60_x/default/rules.mk
diff --git a/keyboards/s60-x/keymaps/ansi_qwertz/Makefile b/keyboards/s60_x/keymaps/ansi_qwertz/Makefile
index 6a078bcc3f..6a078bcc3f 100644
--- a/keyboards/s60-x/keymaps/ansi_qwertz/Makefile
+++ b/keyboards/s60_x/keymaps/ansi_qwertz/Makefile
diff --git a/keyboards/s60-x/keymaps/ansi_qwertz/config.h b/keyboards/s60_x/keymaps/ansi_qwertz/config.h
index 6c01d579f8..6c01d579f8 100644
--- a/keyboards/s60-x/keymaps/ansi_qwertz/config.h
+++ b/keyboards/s60_x/keymaps/ansi_qwertz/config.h
diff --git a/keyboards/s60-x/keymaps/ansi_qwertz/docs/KB_US-International-Alternative.png b/keyboards/s60_x/keymaps/ansi_qwertz/docs/KB_US-International-Alternative.png
index 168780c824..168780c824 100644
--- a/keyboards/s60-x/keymaps/ansi_qwertz/docs/KB_US-International-Alternative.png
+++ b/keyboards/s60_x/keymaps/ansi_qwertz/docs/KB_US-International-Alternative.png
diff --git a/keyboards/s60-x/keymaps/ansi_qwertz/docs/KB_US-International-Alternative.svg b/keyboards/s60_x/keymaps/ansi_qwertz/docs/KB_US-International-Alternative.svg
index f03858993e..f03858993e 100644
--- a/keyboards/s60-x/keymaps/ansi_qwertz/docs/KB_US-International-Alternative.svg
+++ b/keyboards/s60_x/keymaps/ansi_qwertz/docs/KB_US-International-Alternative.svg
diff --git a/keyboards/s60-x/keymaps/ansi_qwertz/docs/KB_US-International-Alternative.svg.2016_08_18_09_06_36.0.svg b/keyboards/s60_x/keymaps/ansi_qwertz/docs/KB_US-International-Alternative.svg.2016_08_18_09_06_36.0.svg
index 2304b2a4c3..2304b2a4c3 100644
--- a/keyboards/s60-x/keymaps/ansi_qwertz/docs/KB_US-International-Alternative.svg.2016_08_18_09_06_36.0.svg
+++ b/keyboards/s60_x/keymaps/ansi_qwertz/docs/KB_US-International-Alternative.svg.2016_08_18_09_06_36.0.svg
diff --git a/keyboards/s60-x/keymaps/ansi_qwertz/docs/KB_US-International.png b/keyboards/s60_x/keymaps/ansi_qwertz/docs/KB_US-International.png
index 875eb3652f..875eb3652f 100644
--- a/keyboards/s60-x/keymaps/ansi_qwertz/docs/KB_US-International.png
+++ b/keyboards/s60_x/keymaps/ansi_qwertz/docs/KB_US-International.png
diff --git a/keyboards/s60-x/keymaps/ansi_qwertz/docs/KB_US-International.svg b/keyboards/s60_x/keymaps/ansi_qwertz/docs/KB_US-International.svg
index 1ca6a9c872..1ca6a9c872 100644
--- a/keyboards/s60-x/keymaps/ansi_qwertz/docs/KB_US-International.svg
+++ b/keyboards/s60_x/keymaps/ansi_qwertz/docs/KB_US-International.svg
diff --git a/keyboards/s60-x/keymaps/ansi_qwertz/docs/base_layer.PNG b/keyboards/s60_x/keymaps/ansi_qwertz/docs/base_layer.PNG
index c730c2d65a..c730c2d65a 100644
--- a/keyboards/s60-x/keymaps/ansi_qwertz/docs/base_layer.PNG
+++ b/keyboards/s60_x/keymaps/ansi_qwertz/docs/base_layer.PNG
diff --git a/keyboards/s60-x/keymaps/ansi_qwertz/docs/function_layer.PNG b/keyboards/s60_x/keymaps/ansi_qwertz/docs/function_layer.PNG
index fae2439cab..fae2439cab 100644
--- a/keyboards/s60-x/keymaps/ansi_qwertz/docs/function_layer.PNG
+++ b/keyboards/s60_x/keymaps/ansi_qwertz/docs/function_layer.PNG
diff --git a/keyboards/s60-x/keymaps/ansi_qwertz/docs/gaming_layer.PNG b/keyboards/s60_x/keymaps/ansi_qwertz/docs/gaming_layer.PNG
index 59b202be2b..59b202be2b 100644
--- a/keyboards/s60-x/keymaps/ansi_qwertz/docs/gaming_layer.PNG
+++ b/keyboards/s60_x/keymaps/ansi_qwertz/docs/gaming_layer.PNG
diff --git a/keyboards/s60-x/keymaps/ansi_qwertz/keymap.c b/keyboards/s60_x/keymaps/ansi_qwertz/keymap.c
index 317a245bef..ebb3aece34 100644
--- a/keyboards/s60-x/keymaps/ansi_qwertz/keymap.c
+++ b/keyboards/s60_x/keymaps/ansi_qwertz/keymap.c
@@ -14,7 +14,7 @@ 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 "s60-x.h"
+#include "s60_x.h"
 
 //make keymap a little easier to read
 #define _______ KC_TRNS
diff --git a/keyboards/s60-x/keymaps/ansi_qwertz/readme.md b/keyboards/s60_x/keymaps/ansi_qwertz/readme.md
index b220106121..b220106121 100644
--- a/keyboards/s60-x/keymaps/ansi_qwertz/readme.md
+++ b/keyboards/s60_x/keymaps/ansi_qwertz/readme.md
diff --git a/keyboards/s60-x/keymaps/custom/keymap.c b/keyboards/s60_x/keymaps/custom/keymap.c
index fb2a40b85e..66eac33356 100644
--- a/keyboards/s60-x/keymaps/custom/keymap.c
+++ b/keyboards/s60_x/keymaps/custom/keymap.c
@@ -1,4 +1,4 @@
-#include "s60-x.h"
+#include "s60_x.h"
 
 /* Main layer: Test layout, using all keys.
 
diff --git a/keyboards/s60-x/keymaps/custom/readme.md b/keyboards/s60_x/keymaps/custom/readme.md
index cf87bd915f..cf87bd915f 100644
--- a/keyboards/s60-x/keymaps/custom/readme.md
+++ b/keyboards/s60_x/keymaps/custom/readme.md
diff --git a/keyboards/s60-x/keymaps/dbroqua/keymap.c b/keyboards/s60_x/keymaps/dbroqua/keymap.c
index 0a714445ce..8d1887e75a 100644
--- a/keyboards/s60-x/keymaps/dbroqua/keymap.c
+++ b/keyboards/s60_x/keymaps/dbroqua/keymap.c
@@ -1,4 +1,4 @@
-#include "s60-x.h"
+#include "s60_x.h"
 
 #define _DEFAULT 0
 #define _FN 1
@@ -73,12 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       )
 };
 
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
-	keyevent_t event = record->event;
-
-	switch (id) {
-
-	}
+const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { 
 	return MACRO_NONE;
 }
 
@@ -108,42 +103,58 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) {
   switch (id) {
     case RGBLED_TOGGLE:
       if (record->event.pressed) {
+        #ifdef RGB_ENABLE
         rgblight_toggle();
+        #endif
       }
       break;
     case RGBLED_INCREASE_HUE:
       if (record->event.pressed) {
+        #ifdef RGB_ENABLE
         rgblight_increase_hue();
+        #endif
       }
       break;
     case RGBLED_DECREASE_HUE:
       if (record->event.pressed) {
+        #ifdef RGB_ENABLE
         rgblight_decrease_hue();
+        #endif
       }
       break;
     case RGBLED_INCREASE_SAT:
       if (record->event.pressed) {
+        #ifdef RGB_ENABLE
         rgblight_increase_sat();
+        #endif
       }
       break;
     case RGBLED_DECREASE_SAT:
       if (record->event.pressed) {
+        #ifdef RGB_ENABLE
         rgblight_decrease_sat();
+        #endif
       }
       break;
     case RGBLED_INCREASE_VAL:
       if (record->event.pressed) {
+        #ifdef RGB_ENABLE
         rgblight_increase_val();
+        #endif
       }
       break;
     case RGBLED_DECREASE_VAL:
       if (record->event.pressed) {
+        #ifdef RGB_ENABLE
         rgblight_decrease_val();
+        #endif
       }
       break;
     case RGBLED_STEP_MODE:
       if (record->event.pressed) {
+        #ifdef RGB_ENABLE
         rgblight_step();
+        #endif
       }
       break;
   }
diff --git a/keyboards/s60-x/keymaps/default/keymap.c b/keyboards/s60_x/keymaps/default/keymap.c
index eb0c6b056e..a616e79b34 100644
--- a/keyboards/s60-x/keymaps/default/keymap.c
+++ b/keyboards/s60_x/keymaps/default/keymap.c
@@ -1,4 +1,4 @@
-#include "s60-x.h"
+#include "s60_x.h"
 
 /* 0: Main layer
 ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
diff --git a/keyboards/s60-x/keymaps/default/readme.md b/keyboards/s60_x/keymaps/default/readme.md
index 01cda9df9b..01cda9df9b 100644
--- a/keyboards/s60-x/keymaps/default/readme.md
+++ b/keyboards/s60_x/keymaps/default/readme.md
diff --git a/keyboards/s60-x/keymaps/hasu/keymap.c b/keyboards/s60_x/keymaps/hasu/keymap.c
index cbeaae0281..ac90dc6b20 100644
--- a/keyboards/s60-x/keymaps/hasu/keymap.c
+++ b/keyboards/s60_x/keymaps/hasu/keymap.c
@@ -1,4 +1,4 @@
-#include "s60-x.h"
+#include "s60_x.h"
 
 /*
  * Hasu
diff --git a/keyboards/s60-x/keymaps/hasu/readme.md b/keyboards/s60_x/keymaps/hasu/readme.md
index 64969b616d..64969b616d 100644
--- a/keyboards/s60-x/keymaps/hasu/readme.md
+++ b/keyboards/s60_x/keymaps/hasu/readme.md
diff --git a/keyboards/s60-x/keymaps/hhkb/keymap.c b/keyboards/s60_x/keymaps/hhkb/keymap.c
index 9afd1247f8..dc1bfffc47 100644
--- a/keyboards/s60-x/keymaps/hhkb/keymap.c
+++ b/keyboards/s60_x/keymaps/hhkb/keymap.c
@@ -1,4 +1,4 @@
-#include "s60-x.h"
+#include "s60_x.h"
 
 /*
  * HHKB Layout
diff --git a/keyboards/s60-x/keymaps/hhkb/readme.md b/keyboards/s60_x/keymaps/hhkb/readme.md
index 2bceb26dd5..2bceb26dd5 100644
--- a/keyboards/s60-x/keymaps/hhkb/readme.md
+++ b/keyboards/s60_x/keymaps/hhkb/readme.md
diff --git a/keyboards/s60-x/keymaps/iso/keymap.c b/keyboards/s60_x/keymaps/iso/keymap.c
index 43a9c48b05..f6fc741728 100644
--- a/keyboards/s60-x/keymaps/iso/keymap.c
+++ b/keyboards/s60_x/keymaps/iso/keymap.c
@@ -1,4 +1,4 @@
-#include "s60-x.h"
+#include "s60_x.h"
 
 /* 0: Main layer
 ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
diff --git a/keyboards/s60-x/keymaps/iso/readme.md b/keyboards/s60_x/keymaps/iso/readme.md
index 2c06bf86f0..2c06bf86f0 100644
--- a/keyboards/s60-x/keymaps/iso/readme.md
+++ b/keyboards/s60_x/keymaps/iso/readme.md
diff --git a/keyboards/s60-x/keymaps/jpec/keymap.c b/keyboards/s60_x/keymaps/jpec/keymap.c
index c8fc133288..21e77c10b2 100644
--- a/keyboards/s60-x/keymaps/jpec/keymap.c
+++ b/keyboards/s60_x/keymaps/jpec/keymap.c
@@ -14,7 +14,7 @@ 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 "s60-x.h"
+#include "s60_x.h"
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	/* Layout 0: Default Layer
diff --git a/keyboards/s60-x/keymaps/jpec/readme.md b/keyboards/s60_x/keymaps/jpec/readme.md
index 73318dad72..73318dad72 100644
--- a/keyboards/s60-x/keymaps/jpec/readme.md
+++ b/keyboards/s60_x/keymaps/jpec/readme.md
diff --git a/keyboards/s60-x/keymaps/plain/keymap.c b/keyboards/s60_x/keymaps/plain/keymap.c
index 790ac88e73..d5075a07b9 100644
--- a/keyboards/s60-x/keymaps/plain/keymap.c
+++ b/keyboards/s60_x/keymaps/plain/keymap.c
@@ -1,4 +1,4 @@
-#include "s60-x.h"
+#include "s60_x.h"
 
 /* Main layer:
 ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
diff --git a/keyboards/s60-x/keymaps/plain/readme.md b/keyboards/s60_x/keymaps/plain/readme.md
index ab13323e3b..ab13323e3b 100644
--- a/keyboards/s60-x/keymaps/plain/readme.md
+++ b/keyboards/s60_x/keymaps/plain/readme.md
diff --git a/keyboards/s60-x/keymaps/poker/keymap.c b/keyboards/s60_x/keymaps/poker/keymap.c
index 0a8691792a..5b917704e4 100644
--- a/keyboards/s60-x/keymaps/poker/keymap.c
+++ b/keyboards/s60_x/keymaps/poker/keymap.c
@@ -1,4 +1,4 @@
-#include "s60-x.h"
+#include "s60_x.h"
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* 0: qwerty
diff --git a/keyboards/s60-x/keymaps/poker/readme.md b/keyboards/s60_x/keymaps/poker/readme.md
index 0d8be9d0f8..0d8be9d0f8 100644
--- a/keyboards/s60-x/keymaps/poker/readme.md
+++ b/keyboards/s60_x/keymaps/poker/readme.md
diff --git a/keyboards/s60-x/keymaps/poker_bit/keymap.c b/keyboards/s60_x/keymaps/poker_bit/keymap.c
index 7626038f42..1f7b1b633d 100644
--- a/keyboards/s60-x/keymaps/poker_bit/keymap.c
+++ b/keyboards/s60_x/keymaps/poker_bit/keymap.c
@@ -1,4 +1,4 @@
-#include "s60-x.h"
+#include "s60_x.h"
 
 // Poker fix with toggle and bit operation
 // Fn + Esc = `
diff --git a/keyboards/s60-x/keymaps/poker_bit/readme.md b/keyboards/s60_x/keymaps/poker_bit/readme.md
index 0d8be9d0f8..0d8be9d0f8 100644
--- a/keyboards/s60-x/keymaps/poker_bit/readme.md
+++ b/keyboards/s60_x/keymaps/poker_bit/readme.md
diff --git a/keyboards/s60-x/keymaps/poker_set/keymap.c b/keyboards/s60_x/keymaps/poker_set/keymap.c
index 09423e75b3..52eee53218 100644
--- a/keyboards/s60-x/keymaps/poker_set/keymap.c
+++ b/keyboards/s60_x/keymaps/poker_set/keymap.c
@@ -1,4 +1,4 @@
-#include "s60-x.h"
+#include "s60_x.h"
 
 // Poker fix with set(state transition)
 // Fn + Esc = `
diff --git a/keyboards/s60-x/keymaps/poker_set/readme.md b/keyboards/s60_x/keymaps/poker_set/readme.md
index 0d8be9d0f8..0d8be9d0f8 100644
--- a/keyboards/s60-x/keymaps/poker_set/readme.md
+++ b/keyboards/s60_x/keymaps/poker_set/readme.md
diff --git a/keyboards/s60-x/keymaps/spacefn/keymap.c b/keyboards/s60_x/keymaps/spacefn/keymap.c
index b6dc7ca7eb..28369580ed 100644
--- a/keyboards/s60-x/keymaps/spacefn/keymap.c
+++ b/keyboards/s60_x/keymaps/spacefn/keymap.c
@@ -1,4 +1,4 @@
-#include "s60-x.h"
+#include "s60_x.h"
 
 /*
  * SpaceFN
diff --git a/keyboards/s60-x/keymaps/spacefn/readme.md b/keyboards/s60_x/keymaps/spacefn/readme.md
index d04bd94865..d04bd94865 100644
--- a/keyboards/s60-x/keymaps/spacefn/readme.md
+++ b/keyboards/s60_x/keymaps/spacefn/readme.md
diff --git a/keyboards/s60-x/readme.md b/keyboards/s60_x/readme.md
index 408ad13ac2..e30b2f76ce 100644
--- a/keyboards/s60-x/readme.md
+++ b/keyboards/s60_x/readme.md
@@ -5,11 +5,6 @@ DIY compact keyboard designed by VinnyCordeiro for Sentraq. Most of the keymaps
 ## S60X Resources
 - [Massdrop page](https://www.massdrop.com/buy/sentraq-60-diy-keyboard-kit?mode=guest_open)
 
-## Quickstart
-
-If you just want to test a few layouts, the archive [s60-x_precompiled.zip](s60-x_precompiled.zip) contains pre-compiled .hex-files for all available keymaps. Not all of them are tested.
-You only need to flash them onto your keyboard, which is explained below, there's no need to setup a build environment. For a full list 
-
 ## Flashing your keyboard
 The recommended programs for flashing your keyboard are [Atmel FLIP](http://www.atmel.com/tools/FLIP.aspx) (Windows) and [dfu-programmer](http://dfu-programmer.sourceforge.net/) (Linux/Windows).
 
diff --git a/keyboards/s60-x/rgb/Makefile b/keyboards/s60_x/rgb/Makefile
index bd09e5885d..bd09e5885d 100644
--- a/keyboards/s60-x/rgb/Makefile
+++ b/keyboards/s60_x/rgb/Makefile
diff --git a/keyboards/s60-x/rgb/config.h b/keyboards/s60_x/rgb/config.h
index fbc143487e..81efc87d54 100644
--- a/keyboards/s60-x/rgb/config.h
+++ b/keyboards/s60_x/rgb/config.h
@@ -11,12 +11,6 @@
 #define MATRIX_COL_PINS { D0, D1, D2, D3, D5, B6, C6, C7, F1, F0, E6, B3, B2, B1, B0 }
 #define UNUSED_PINS
 
-/* number of backlight levels */
-#define BACKLIGHT_PIN B7
-#ifdef BACKLIGHT_PIN
-#define BACKLIGHT_LEVELS 3
-#endif
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
diff --git a/keyboards/s60-x/rgb/rgb.c b/keyboards/s60_x/rgb/rgb.c
index 0117e14ae5..0117e14ae5 100644
--- a/keyboards/s60-x/rgb/rgb.c
+++ b/keyboards/s60_x/rgb/rgb.c
diff --git a/keyboards/s60-x/rgb/rgb.h b/keyboards/s60_x/rgb/rgb.h
index cb7a5f567f..cb7a5f567f 100644
--- a/keyboards/s60-x/rgb/rgb.h
+++ b/keyboards/s60_x/rgb/rgb.h
diff --git a/keyboards/s60-x/rgb/rules.mk b/keyboards/s60_x/rgb/rules.mk
index 6953cc6d6d..6953cc6d6d 100644
--- a/keyboards/s60-x/rgb/rules.mk
+++ b/keyboards/s60_x/rgb/rules.mk
diff --git a/keyboards/s60-x/rules.mk b/keyboards/s60_x/rules.mk
index 0c568efe95..0c568efe95 100644
--- a/keyboards/s60-x/rules.mk
+++ b/keyboards/s60_x/rules.mk
diff --git a/keyboards/s60_x/s60_x.c b/keyboards/s60_x/s60_x.c
new file mode 100644
index 0000000000..595418bfac
--- /dev/null
+++ b/keyboards/s60_x/s60_x.c
@@ -0,0 +1 @@
+#include "s60_x.h"
\ No newline at end of file
diff --git a/keyboards/s60-x/s60-x.h b/keyboards/s60_x/s60_x.h
index 5bf8cfcefa..5bf8cfcefa 100644
--- a/keyboards/s60-x/s60-x.h
+++ b/keyboards/s60_x/s60_x.h