aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--keyboards/s60-x-rgb/config.h58
-rw-r--r--keyboards/s60-x-rgb/keymaps/default/keymap.c48
-rw-r--r--keyboards/s60-x-rgb/keymaps/default/readme.md27
-rw-r--r--keyboards/s60-x-rgb/s60-x-rgb.c1
-rw-r--r--keyboards/s60-x/Makefile2
-rw-r--r--keyboards/s60-x/config.h120
-rw-r--r--keyboards/s60-x/default/Makefile3
-rw-r--r--keyboards/s60-x/default/config.h25
-rw-r--r--keyboards/s60-x/default/default.c28
-rw-r--r--keyboards/s60-x/default/default.h69
-rw-r--r--keyboards/s60-x/default/rules.mk1
-rw-r--r--keyboards/s60-x/keymaps/dbroqua/keymap.c (renamed from keyboards/s60-x-rgb/keymaps/dbroqua/keymap.c)2
-rw-r--r--keyboards/s60-x/rgb/Makefile (renamed from keyboards/s60-x-rgb/Makefile)2
-rw-r--r--keyboards/s60-x/rgb/config.h31
-rw-r--r--keyboards/s60-x/rgb/rgb.c1
-rw-r--r--keyboards/s60-x/rgb/rgb.h (renamed from keyboards/s60-x-rgb/s60-x-rgb.h)0
-rw-r--r--keyboards/s60-x/rgb/rules.mk (renamed from keyboards/s60-x-rgb/rules.mk)0
-rw-r--r--keyboards/s60-x/s60-x.c29
-rw-r--r--keyboards/s60-x/s60-x.h68
19 files changed, 170 insertions, 345 deletions
diff --git a/keyboards/s60-x-rgb/config.h b/keyboards/s60-x-rgb/config.h
deleted file mode 100644
index 1b98a51d6..000000000
--- a/keyboards/s60-x-rgb/config.h
+++ /dev/null
@@ -1,58 +0,0 @@
1#ifndef CONFIG_H
2#define CONFIG_H
3
4#include "config_common.h"
5
6/* USB Device descriptor parameter */
7#define VENDOR_ID 0xFEED
8#define PRODUCT_ID 0x6060
9#define DEVICE_VER 0x0001
10#define MANUFACTURER Massdrop
11#define PRODUCT S60-X RGB
12#define DESCRIPTION q.m.k. keyboard firmware for S60-X RGB
13
14/* key matrix size */
15#define MATRIX_ROWS 5
16#define MATRIX_COLS 15
17
18/* key matrix pins */
19#define MATRIX_ROW_PINS { B5, B4, D7, D6, D4 }
20#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, B6, C6, C7, F1, F0, E6, B3, B2, B1, B0 }
21#define UNUSED_PINS
22
23/* COL2ROW or ROW2COL */
24#define DIODE_DIRECTION COL2ROW
25
26/* number of backlight levels */
27#define BACKLIGHT_PIN B7
28#ifdef BACKLIGHT_PIN
29#define BACKLIGHT_LEVELS 3
30#endif
31
32/* Set 0 if debouncing isn't needed */
33#define DEBOUNCING_DELAY 5
34
35/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
36#define LOCKING_SUPPORT_ENABLE
37
38/* Locking resynchronize hack */
39#define LOCKING_RESYNC_ENABLE
40
41/* key combination for command */
42#define IS_COMMAND() ( \
43 keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
44)
45
46/* prevent stuck modifiers */
47#define PREVENT_STUCK_MODIFIERS
48
49#define RGB_DI_PIN F6
50#ifdef RGB_DI_PIN
51#define RGBLIGHT_ANIMATIONS
52#define RGBLED_NUM 10
53#define RGBLIGHT_HUE_STEP 8
54#define RGBLIGHT_SAT_STEP 8
55#define RGBLIGHT_VAL_STEP 8
56#endif
57
58#endif \ No newline at end of file
diff --git a/keyboards/s60-x-rgb/keymaps/default/keymap.c b/keyboards/s60-x-rgb/keymaps/default/keymap.c
deleted file mode 100644
index 303f07638..000000000
--- a/keyboards/s60-x-rgb/keymaps/default/keymap.c
+++ /dev/null
@@ -1,48 +0,0 @@
1#include "s60-x-rgb.h"
2
3/* 0: Main layer
4┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
5│ ESC │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │▒▒▒▒▒│BKSPC│
6├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
7│ TAB │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ \ │█████│
8├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
9│CAPSL│ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │▒▒▒▒▒│ENTER│█████│
10├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
11│LSHFT│▒▒▒▒▒│ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │▒▒▒▒▒│RSHFT│▒▒▒▒▒│
12├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
13│LCTRL│L_GUI│L_ALT│█████│█████│█████│ SPC │█████│█████│█████│R_ALT│ FN0 │ APP │RCTRL│█████│
14└─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
15*/
16
17const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
18 /* 0: ANSI qwerty */
19 LEGACY_KEYMAP(ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS, EQL, NO, BSPC, \
20 TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC, RBRC, BSLS, \
21 CAPS, A, S, D, F, G, H, J, K, L, SCLN, QUOT, NO, ENT , \
22 LSFT, NO, Z, X, C, V, B, N, M, COMM, DOT, SLSH, NO, RSFT, NO, \
23 LCTL, LGUI, LALT, SPC, RALT, FN0, APP, RCTL),
24
25/* 1: Fn layer
26┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
27│GRAVE│ F1 │ F2 │ F3 │ F4 │ F5 │ F6 │ F7 │ F8 │ F9 │ F10 │ F11 │ F12 │▒▒▒▒▒│ │
28├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
29│ │ │ Up │ │ │ │ │ │PGUP │PGDWN│PRTSC│SCLCK│PAUSE│ │█████│
30├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
31│ │Left │Down │Right│ │ │ │ │ │ │ │ │▒▒▒▒▒│ │█████│
32├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
33│ │▒▒▒▒▒│ │ │ │ │ │ │ │ │ │ │▒▒▒▒▒│ │▒▒▒▒▒│
34├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
35│ │ │ │█████│█████│█████│ │█████│█████│█████│ │ │ │ │█████│
36└─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
37*/
38 LEGACY_KEYMAP(
39 GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, TRNS, TRNS, \
40 TRNS, TRNS, UP, TRNS, TRNS, TRNS, TRNS, TRNS, PGUP, PGDN, PSCR, SLCK, PAUS, TRNS, \
41 TRNS, LEFT, DOWN, RGHT, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
42 TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, \
43 TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS),
44};
45
46const uint16_t PROGMEM fn_actions[] = {
47 [0] = ACTION_LAYER_MOMENTARY(1), // to Fn overlay
48};
diff --git a/keyboards/s60-x-rgb/keymaps/default/readme.md b/keyboards/s60-x-rgb/keymaps/default/readme.md
deleted file mode 100644
index 01cda9df9..000000000
--- a/keyboards/s60-x-rgb/keymaps/default/readme.md
+++ /dev/null
@@ -1,27 +0,0 @@
1### 1 Standard - ANSI
2The standard keymap is the one that is pre-flashed on the S60-X.
3
4#### 1.0 Default layer
5 ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
6 │ ESC │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │▒▒▒▒▒│BKSPC│
7 ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
8 │ TAB │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ \ │█████│
9 ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
10 │CAPSL│ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │▒▒▒▒▒│ENTER│█████│
11 ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
12 │LSHFT│▒▒▒▒▒│ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │▒▒▒▒▒│RSHFT│▒▒▒▒▒│
13 ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
14 │LCTRL│L_GUI│L_ALT│█████│█████│█████│ SPC │█████│█████│█████│R_ALT│ FN0 │ APP │RCTRL│█████│
15 └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
16#### 1.1 Fn layer
17 ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐
18 │GRAVE│ F1 │ F2 │ F3 │ F4 │ F5 │ F6 │ F7 │ F8 │ F9 │ F10 │ F11 │ F12 │▒▒▒▒▒│ │
19 ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
20 │ │ │ Up │ │ │ │ │ │PGUP │PGDWN│PRTSC│SCLCK│PAUSE│ │█████│
21 ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
22 │ │Left │Down │Right│ │ │ │ │ │ │ │ │▒▒▒▒▒│ │█████│
23 ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
24 │ │▒▒▒▒▒│ │ │ │ │ │ │ │ │ │ │▒▒▒▒▒│ │▒▒▒▒▒│
25 ├─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┼─────┤
26 │ │ │ │█████│█████│█████│ │█████│█████│█████│ │ │ │ │█████│
27 └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘
diff --git a/keyboards/s60-x-rgb/s60-x-rgb.c b/keyboards/s60-x-rgb/s60-x-rgb.c
deleted file mode 100644
index 39d3a70e8..000000000
--- a/keyboards/s60-x-rgb/s60-x-rgb.c
+++ /dev/null
@@ -1 +0,0 @@
1#include "s60-x-rgb.h"
diff --git a/keyboards/s60-x/Makefile b/keyboards/s60-x/Makefile
index 4e2a6f00f..879e493a2 100644
--- a/keyboards/s60-x/Makefile
+++ b/keyboards/s60-x/Makefile
@@ -1,3 +1,5 @@
1SUBPROJECT_DEFAULT = default
2
1ifndef MAKEFILE_INCLUDED 3ifndef MAKEFILE_INCLUDED
2 include ../../Makefile 4 include ../../Makefile
3endif \ No newline at end of file 5endif \ No newline at end of file
diff --git a/keyboards/s60-x/config.h b/keyboards/s60-x/config.h
index ac7951c24..8e7bc78be 100644
--- a/keyboards/s60-x/config.h
+++ b/keyboards/s60-x/config.h
@@ -27,138 +27,20 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
27#define PRODUCT_ID 0x6060 27#define PRODUCT_ID 0x6060
28#define DEVICE_VER 0x0001 28#define DEVICE_VER 0x0001
29#define MANUFACTURER Massdrop 29#define MANUFACTURER Massdrop
30#define PRODUCT S60-X
31#define DESCRIPTION q.m.k. keyboard firmware for S60-X
32 30
33/* key matrix size */ 31/* key matrix size */
34#define MATRIX_ROWS 5 32#define MATRIX_ROWS 5
35#define MATRIX_COLS 15 33#define MATRIX_COLS 15
36 34
37/*
38 * Keyboard Matrix Assignments
39 *
40 * Change this to how you wired your keyboard
41 * COLS: AVR pins used for columns, left to right
42 * ROWS: AVR pins used for rows, top to bottom
43 * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
44 * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
45 *
46*/
47#define MATRIX_ROW_PINS { B7, B3, B2, B1, B0 }
48#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, E6, F1 }
49#define UNUSED_PINS { F0 }
50
51/* COL2ROW or ROW2COL */ 35/* COL2ROW or ROW2COL */
52#define DIODE_DIRECTION COL2ROW 36#define DIODE_DIRECTION COL2ROW
53
54// #define BACKLIGHT_PIN B7
55// #define BACKLIGHT_BREATHING
56// #define BACKLIGHT_LEVELS 3
57
58 37
59/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ 38/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
60#define DEBOUNCING_DELAY 5 39#define DEBOUNCING_DELAY 5
61 40
62/* define if matrix has ghost (lacks anti-ghosting diodes) */ 41/* key combination for command */
63//#define MATRIX_HAS_GHOST
64
65/* number of backlight levels */
66
67/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
68#define LOCKING_SUPPORT_ENABLE
69/* Locking resynchronize hack */
70#define LOCKING_RESYNC_ENABLE
71
72/*
73 * Force NKRO
74 *
75 * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
76 * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
77 * makefile for this to work.)
78 *
79 * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
80 * until the next keyboard reset.
81 *
82 * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
83 * fully operational during normal computer usage.
84 *
85 * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
86 * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
87 * bootmagic, NKRO mode will always be enabled until it is toggled again during a
88 * power-up.
89 *
90 */
91//#define FORCE_NKRO
92
93/*
94 * Magic Key Options
95 *
96 * Magic keys are hotkey commands that allow control over firmware functions of
97 * the keyboard. They are best used in combination with the HID Listen program,
98 * found here: https://www.pjrc.com/teensy/hid_listen.html
99 *
100 * The options below allow the magic key functionality to be changed. This is
101 * useful if your keyboard/keypad is missing keys and you want magic key support.
102 *
103 */
104
105/* key combination for magic key command */
106#define IS_COMMAND() ( \ 42#define IS_COMMAND() ( \
107 keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ 43 keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
108) 44)
109 45
110/* control how magic key switches layers */
111//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS true
112//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS true
113//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false
114
115/* override magic key keymap */
116//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS
117//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS
118//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM
119//#define MAGIC_KEY_HELP1 H
120//#define MAGIC_KEY_HELP2 SLASH
121//#define MAGIC_KEY_DEBUG D
122//#define MAGIC_KEY_DEBUG_MATRIX X
123//#define MAGIC_KEY_DEBUG_KBD K
124//#define MAGIC_KEY_DEBUG_MOUSE M
125//#define MAGIC_KEY_VERSION V
126//#define MAGIC_KEY_STATUS S
127//#define MAGIC_KEY_CONSOLE C
128//#define MAGIC_KEY_LAYER0_ALT1 ESC
129//#define MAGIC_KEY_LAYER0_ALT2 GRAVE
130//#define MAGIC_KEY_LAYER0 0
131//#define MAGIC_KEY_LAYER1 1
132//#define MAGIC_KEY_LAYER2 2
133//#define MAGIC_KEY_LAYER3 3
134//#define MAGIC_KEY_LAYER4 4
135//#define MAGIC_KEY_LAYER5 5
136//#define MAGIC_KEY_LAYER6 6
137//#define MAGIC_KEY_LAYER7 7
138//#define MAGIC_KEY_LAYER8 8
139//#define MAGIC_KEY_LAYER9 9
140//#define MAGIC_KEY_BOOTLOADER PAUSE
141//#define MAGIC_KEY_LOCK CAPS
142//#define MAGIC_KEY_EEPROM E
143//#define MAGIC_KEY_NKRO N
144//#define MAGIC_KEY_SLEEP_LED Z
145
146/*
147 * Feature disable options
148 * These options are also useful to firmware size reduction.
149 */
150
151/* disable debug print */
152//#define NO_DEBUG
153
154/* disable print */
155//#define NO_PRINT
156
157/* disable action features */
158//#define NO_ACTION_LAYER
159//#define NO_ACTION_TAPPING
160#define NO_ACTION_ONESHOT
161#define NO_ACTION_MACRO
162#define NO_ACTION_FUNCTION
163
164#endif 46#endif
diff --git a/keyboards/s60-x/default/Makefile b/keyboards/s60-x/default/Makefile
new file mode 100644
index 000000000..191c6bb66
--- /dev/null
+++ b/keyboards/s60-x/default/Makefile
@@ -0,0 +1,3 @@
1ifndef MAKEFILE_INCLUDED
2 include ../../../Makefile
3endif \ No newline at end of file
diff --git a/keyboards/s60-x/default/config.h b/keyboards/s60-x/default/config.h
new file mode 100644
index 000000000..436c6fa8b
--- /dev/null
+++ b/keyboards/s60-x/default/config.h
@@ -0,0 +1,25 @@
1#ifndef DEFAULT_CONFIG_H
2#define DEFAULT_CONFIG_H
3
4#include "../config.h"
5
6#define PRODUCT S60-X
7#define DESCRIPTION q.m.k. keyboard firmware for S60-X
8
9#define MATRIX_ROW_PINS { B7, B3, B2, B1, B0 }
10#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, E6, F1 }
11#define UNUSED_PINS { F0 }
12
13#define LOCKING_SUPPORT_ENABLE
14#define LOCKING_RESYNC_ENABLE
15
16/* key combination for magic key command */
17#define IS_COMMAND() ( \
18 keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
19)
20
21#define NO_ACTION_ONESHOT
22#define NO_ACTION_MACRO
23#define NO_ACTION_FUNCTION
24
25#endif
diff --git a/keyboards/s60-x/default/default.c b/keyboards/s60-x/default/default.c
new file mode 100644
index 000000000..253f5495c
--- /dev/null
+++ b/keyboards/s60-x/default/default.c
@@ -0,0 +1,28 @@
1#include "default.h"
2
3void matrix_init_kb(void) {
4 // put your keyboard start-up code here
5 // runs once when the firmware starts up
6
7 matrix_init_user();
8}
9
10void matrix_scan_kb(void) {
11 // put your looping keyboard code here
12 // runs every cycle (a lot)
13
14 matrix_scan_user();
15}
16
17bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
18 // put your per-action keyboard code here
19 // runs for every action, just before processing by the firmware
20
21 return process_record_user(keycode, record);
22}
23
24void led_set_kb(uint8_t usb_led) {
25 // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
26
27 led_set_user(usb_led);
28}
diff --git a/keyboards/s60-x/default/default.h b/keyboards/s60-x/default/default.h
new file mode 100644
index 000000000..86233ef7e
--- /dev/null
+++ b/keyboards/s60-x/default/default.h
@@ -0,0 +1,69 @@
1/*
2Copyright 2012,2013 Jun Wako <wakojun@gmail.com>
3Copyright 2015 Vin�cius Nery Cordeiro <vinicius.nery.cordeiro@gmail.com>
4Copyright 2016 Felix Uhl <ifreilicht@gmail.com>
5
6This program is free software: you can redistribute it and/or modify
7it under the terms of the GNU General Public License as published by
8the Free Software Foundation, either version 2 of the License, or
9(at your option) any later version.
10
11This program is distributed in the hope that it will be useful,
12but WITHOUT ANY WARRANTY; without even the implied warranty of
13MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14GNU General Public License for more details.
15
16You should have received a copy of the GNU General Public License
17along with this program. If not, see <http://www.gnu.org/licenses/>.
18*/
19
20#ifndef DEFAULT_H
21#define DEFAULT_H
22
23#include "quantum.h"
24
25#ifdef __INTELLISENSE__
26#define PROGMEM
27#include "../config.h"
28#endif
29
30/* S60-X keymap definition macro
31* K31 is the extra key next to short left ISO shift
32* K2C is the moved key next to enter on ISO boards
33* K3C is the extra key next to short right JIS shift
34* K0D is extra key from split backspace
35* K3E is extra key from HHKB-style split right shift
36*/
37
38#define KEYMAP( \
39 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
40 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
41 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
42 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
43 K40, K41, K42, K46, K4A, K4B, K4C, K4D \
44) { \
45 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
46 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, KC_NO }, \
47 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, KC_NO }, \
48 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
49 { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D, KC_NO } \
50}
51
52/*This special definition is used for S60-X keymaps that were ported from TMK
53 * QMK has a lot of keycodes that don't start with KC_, so using the regular KEYMAP macro is recommended
54 */
55#define LEGACY_KEYMAP( \
56 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
57 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
58 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
59 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
60 K40, K41, K42, K46, K4A, K4B, K4C, K4D \
61) { \
62 { KC_##K00, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07, KC_##K08, KC_##K09, KC_##K0A, KC_##K0B, KC_##K0C, KC_##K0D, KC_##K0E }, \
63 { KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_##K17, KC_##K18, KC_##K19, KC_##K1A, KC_##K1B, KC_##K1C, KC_##K1D, KC_NO }, \
64 { KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_##K26, KC_##K27, KC_##K28, KC_##K29, KC_##K2A, KC_##K2B, KC_##K2C, KC_##K2D, KC_NO }, \
65 { KC_##K30, KC_##K31, KC_##K32, KC_##K33, KC_##K34, KC_##K35, KC_##K36, KC_##K37, KC_##K38, KC_##K39, KC_##K3A, KC_##K3B, KC_##K3C, KC_##K3D, KC_##K3E }, \
66 { KC_##K40, KC_##K41, KC_##K42, KC_NO, KC_NO, KC_NO, KC_##K46, KC_NO, KC_NO, KC_NO, KC_##K4A, KC_##K4B, KC_##K4C, KC_##K4D, KC_NO } \
67}
68
69#endif \ No newline at end of file
diff --git a/keyboards/s60-x/default/rules.mk b/keyboards/s60-x/default/rules.mk
new file mode 100644
index 000000000..b8ff76260
--- /dev/null
+++ b/keyboards/s60-x/default/rules.mk
@@ -0,0 +1 @@
RGBLIGHT_ENABLE ?= no \ No newline at end of file
diff --git a/keyboards/s60-x-rgb/keymaps/dbroqua/keymap.c b/keyboards/s60-x/keymaps/dbroqua/keymap.c
index 210e28462..940119e52 100644
--- a/keyboards/s60-x-rgb/keymaps/dbroqua/keymap.c
+++ b/keyboards/s60-x/keymaps/dbroqua/keymap.c
@@ -1,4 +1,4 @@
1#include "s60-x-rgb.h" 1#include "s60-x.h"
2 2
3#define _DEFAULT 0 3#define _DEFAULT 0
4#define _FN 1 4#define _FN 1
diff --git a/keyboards/s60-x-rgb/Makefile b/keyboards/s60-x/rgb/Makefile
index 57b2ef62e..bd09e5885 100644
--- a/keyboards/s60-x-rgb/Makefile
+++ b/keyboards/s60-x/rgb/Makefile
@@ -1,3 +1,3 @@
1ifndef MAKEFILE_INCLUDED 1ifndef MAKEFILE_INCLUDED
2 include ../../Makefile 2 include ../../../Makefile
3endif 3endif
diff --git a/keyboards/s60-x/rgb/config.h b/keyboards/s60-x/rgb/config.h
new file mode 100644
index 000000000..26b246e57
--- /dev/null
+++ b/keyboards/s60-x/rgb/config.h
@@ -0,0 +1,31 @@
1#ifndef RBG_CONFIG_H
2#define RBG_CONFIG_H
3
4#include "../config.h"
5
6#define PRODUCT S60-X-RGB
7#define DESCRIPTION q.m.k. keyboard firmware for S60-X RGB
8
9/* key matrix pins */
10#define MATRIX_ROW_PINS { B5, B4, D7, D6, D4 }
11#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, B6, C6, C7, F1, F0, E6, B3, B2, B1, B0 }
12
13/* number of backlight levels */
14#define BACKLIGHT_PIN B7
15#ifdef BACKLIGHT_PIN
16#define BACKLIGHT_LEVELS 3
17#endif
18
19/* prevent stuck modifiers */
20#define PREVENT_STUCK_MODIFIERS
21
22#define RGB_DI_PIN F6
23#ifdef RGB_DI_PIN
24#define RGBLIGHT_ANIMATIONS
25#define RGBLED_NUM 10
26#define RGBLIGHT_HUE_STEP 8
27#define RGBLIGHT_SAT_STEP 8
28#define RGBLIGHT_VAL_STEP 8
29#endif
30
31#endif \ No newline at end of file
diff --git a/keyboards/s60-x/rgb/rgb.c b/keyboards/s60-x/rgb/rgb.c
new file mode 100644
index 000000000..0117e14ae
--- /dev/null
+++ b/keyboards/s60-x/rgb/rgb.c
@@ -0,0 +1 @@
#include "rgb.h"
diff --git a/keyboards/s60-x-rgb/s60-x-rgb.h b/keyboards/s60-x/rgb/rgb.h
index cb7a5f567..cb7a5f567 100644
--- a/keyboards/s60-x-rgb/s60-x-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 c303af4bc..c303af4bc 100644
--- a/keyboards/s60-x-rgb/rules.mk
+++ b/keyboards/s60-x/rgb/rules.mk
diff --git a/keyboards/s60-x/s60-x.c b/keyboards/s60-x/s60-x.c
index 417358140..f031dd770 100644
--- a/keyboards/s60-x/s60-x.c
+++ b/keyboards/s60-x/s60-x.c
@@ -1,28 +1 @@
1#include "s60-x.h" #include "s60-x.h" \ No newline at end of file
2
3void matrix_init_kb(void) {
4 // put your keyboard start-up code here
5 // runs once when the firmware starts up
6
7 matrix_init_user();
8}
9
10void matrix_scan_kb(void) {
11 // put your looping keyboard code here
12 // runs every cycle (a lot)
13
14 matrix_scan_user();
15}
16
17bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
18 // put your per-action keyboard code here
19 // runs for every action, just before processing by the firmware
20
21 return process_record_user(keycode, record);
22}
23
24void led_set_kb(uint8_t usb_led) {
25 // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
26
27 led_set_user(usb_led);
28}
diff --git a/keyboards/s60-x/s60-x.h b/keyboards/s60-x/s60-x.h
index 29a2a27b2..5bf8cfcef 100644
--- a/keyboards/s60-x/s60-x.h
+++ b/keyboards/s60-x/s60-x.h
@@ -1,69 +1,13 @@
1/*
2Copyright 2012,2013 Jun Wako <wakojun@gmail.com>
3Copyright 2015 Vincius Nery Cordeiro <vinicius.nery.cordeiro@gmail.com>
4Copyright 2016 Felix Uhl <ifreilicht@gmail.com>
5
6This program is free software: you can redistribute it and/or modify
7it under the terms of the GNU General Public License as published by
8the Free Software Foundation, either version 2 of the License, or
9(at your option) any later version.
10
11This program is distributed in the hope that it will be useful,
12but WITHOUT ANY WARRANTY; without even the implied warranty of
13MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14GNU General Public License for more details.
15
16You should have received a copy of the GNU General Public License
17along with this program. If not, see <http://www.gnu.org/licenses/>.
18*/
19
20#ifndef S60X_H 1#ifndef S60X_H
21#define S60X_H 2#define S60X_H
22 3
23#include "quantum.h" 4#ifdef SUBPROJECT_default
24 5 #include "default.h"
25#ifdef __INTELLISENSE__ 6#endif
26#define PROGMEM 7#ifdef SUBPROJECT_rgb
27#include "config.h" 8 #include "rgb.h"
28#endif 9#endif
29 10
30/* S60-X keymap definition macro 11#include "quantum.h"
31* K31 is the extra key next to short left ISO shift
32* K2C is the moved key next to enter on ISO boards
33* K3C is the extra key next to short right JIS shift
34* K0D is extra key from split backspace
35* K3E is extra key from HHKB-style split right shift
36*/
37
38#define KEYMAP( \
39 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
40 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
41 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
42 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
43 K40, K41, K42, K46, K4A, K4B, K4C, K4D \
44) { \
45 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
46 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, KC_NO }, \
47 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, KC_NO }, \
48 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
49 { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D, KC_NO } \
50}
51
52/*This special definition is used for S60-X keymaps that were ported from TMK
53 * QMK has a lot of keycodes that don't start with KC_, so using the regular KEYMAP macro is recommended
54 */
55#define LEGACY_KEYMAP( \
56 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
57 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
58 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
59 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
60 K40, K41, K42, K46, K4A, K4B, K4C, K4D \
61) { \
62 { KC_##K00, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07, KC_##K08, KC_##K09, KC_##K0A, KC_##K0B, KC_##K0C, KC_##K0D, KC_##K0E }, \
63 { KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_##K17, KC_##K18, KC_##K19, KC_##K1A, KC_##K1B, KC_##K1C, KC_##K1D, KC_NO }, \
64 { KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_##K26, KC_##K27, KC_##K28, KC_##K29, KC_##K2A, KC_##K2B, KC_##K2C, KC_##K2D, KC_NO }, \
65 { KC_##K30, KC_##K31, KC_##K32, KC_##K33, KC_##K34, KC_##K35, KC_##K36, KC_##K37, KC_##K38, KC_##K39, KC_##K3A, KC_##K3B, KC_##K3C, KC_##K3D, KC_##K3E }, \
66 { KC_##K40, KC_##K41, KC_##K42, KC_NO, KC_NO, KC_NO, KC_##K46, KC_NO, KC_NO, KC_NO, KC_##K4A, KC_##K4B, KC_##K4C, KC_##K4D, KC_NO } \
67}
68 12
69#endif 13#endif
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-14 01:49:28 +0000