fixes s60_x keyboard

keyboards/s60-x/s60-x.c

@@ -1 +0,0 @@
-#include "s60-x.h"

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

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

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.
 

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
@@ -74,11 +74,6 @@ 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) {
-
-	}
 	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;
   }

keyboards/s60_x/keymaps/default/keymap.c

@@ -1,4 +1,4 @@
-#include "s60-x.h"
+#include "s60_x.h"
 
 /* 0: Main layer
 ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐

keyboards/s60_x/keymaps/hasu/keymap.c

@@ -1,4 +1,4 @@
-#include "s60-x.h"
+#include "s60_x.h"
 
 /*
  * Hasu

keyboards/s60_x/keymaps/hhkb/keymap.c

@@ -1,4 +1,4 @@
-#include "s60-x.h"
+#include "s60_x.h"
 
 /*
  * HHKB Layout

keyboards/s60_x/keymaps/iso/keymap.c

@@ -1,4 +1,4 @@
-#include "s60-x.h"
+#include "s60_x.h"
 
 /* 0: Main layer
 ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐

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

keyboards/s60_x/keymaps/plain/keymap.c

@@ -1,4 +1,4 @@
-#include "s60-x.h"
+#include "s60_x.h"
 
 /* Main layer:
 ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐

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

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 = `

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 = `

keyboards/s60_x/keymaps/spacefn/keymap.c

@@ -1,4 +1,4 @@
-#include "s60-x.h"
+#include "s60_x.h"
 
 /*
  * SpaceFN

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).
 

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
 

keyboards/s60_x/s60_x.c

@@ -0,0 +1 @@
+#include "s60_x.h"