summaryrefslogtreecommitdiff
path: root/keyboards/rmi_kb/squishytkl
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/rmi_kb/squishytkl')
-rw-r--r--keyboards/rmi_kb/squishytkl/config.h5
-rw-r--r--keyboards/rmi_kb/squishytkl/info.json222
-rw-r--r--keyboards/rmi_kb/squishytkl/keymaps/via/keymap.c46
-rw-r--r--keyboards/rmi_kb/squishytkl/keymaps/via/rules.mk1
-rw-r--r--keyboards/rmi_kb/squishytkl/rules.mk3
5 files changed, 118 insertions, 159 deletions
diff --git a/keyboards/rmi_kb/squishytkl/config.h b/keyboards/rmi_kb/squishytkl/config.h
index 1433de8106..bb7b14c3cd 100644
--- a/keyboards/rmi_kb/squishytkl/config.h
+++ b/keyboards/rmi_kb/squishytkl/config.h
@@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-# define RGBLED_NUM 16
-//# define RGBLIGHT_HUE_STEP 8
-//# define RGBLIGHT_SAT_STEP 8
-//# define RGBLIGHT_VAL_STEP 8
-//# define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/rmi_kb/squishytkl/info.json b/keyboards/rmi_kb/squishytkl/info.json
index b49d72c829..724394485c 100644
--- a/keyboards/rmi_kb/squishytkl/info.json
+++ b/keyboards/rmi_kb/squishytkl/info.json
@@ -8,6 +8,9 @@
"pid": "0x00B1",
"device_version": "1.0.0"
},
+ "rgblight": {
+ "led_count": 16
+ },
"ws2812": {
"pin": "C15"
},
@@ -350,117 +353,114 @@
},
"LAYOUT_all": {
"layout": [
- {"matrix": [0, 0], "x": 0, "y": 0.5},
-
- {"matrix": [0, 1], "x": 1.25, "y": 0.5},
- {"matrix": [0, 2], "x": 2.25, "y": 0.5},
- {"matrix": [0, 3], "x": 3.25, "y": 0.5},
- {"matrix": [0, 4], "x": 4.25, "y": 0.5},
-
- {"matrix": [1, 0], "x": 5.5, "y": 0.5},
- {"matrix": [1, 1], "x": 6.5, "y": 0.5},
- {"matrix": [1, 2], "x": 7.5, "y": 0.5},
- {"matrix": [1, 3], "x": 8.5, "y": 0.5},
-
- {"matrix": [2, 0], "x": 9.75, "y": 0.5},
- {"matrix": [2, 1], "x": 10.75, "y": 0.5},
- {"matrix": [2, 2], "x": 11.75, "y": 0.5},
- {"matrix": [2, 3], "x": 12.75, "y": 0.5},
-
- {"matrix": [2, 4], "x": 14, "y": 0.5},
-
- {"matrix": [3, 20], "x": 15.25, "y": 0.5},
- {"matrix": [3, 21], "x": 16.25, "y": 0.5},
- {"matrix": [3, 22], "x": 17.25, "y": 0.5},
-
- {"matrix": [8, 5], "x": 0, "y": 1.75},
- {"matrix": [8, 6], "x": 1, "y": 1.75},
- {"matrix": [8, 7], "x": 2, "y": 1.75},
- {"matrix": [8, 8], "x": 3, "y": 1.75},
- {"matrix": [8, 9], "x": 4, "y": 1.75},
- {"matrix": [8, 10], "x": 5, "y": 1.75},
- {"matrix": [8, 11], "x": 6, "y": 1.75},
- {"matrix": [8, 12], "x": 7, "y": 1.75},
- {"matrix": [8, 13], "x": 8, "y": 1.75},
- {"matrix": [8, 14], "x": 9, "y": 1.75},
- {"matrix": [8, 15], "x": 10, "y": 1.75},
- {"matrix": [8, 16], "x": 11, "y": 1.75},
- {"matrix": [8, 17], "x": 12, "y": 1.75},
- {"matrix": [8, 18], "x": 13, "y": 1.75},
- {"matrix": [8, 19], "x": 14, "y": 1.75},
-
- {"matrix": [4, 20], "x": 15.25, "y": 1.75},
- {"matrix": [4, 21], "x": 16.25, "y": 1.75},
- {"matrix": [4, 22], "x": 17.25, "y": 1.75},
-
- {"matrix": [9, 5], "x": 0, "y": 2.75, "w": 1.5},
- {"matrix": [9, 6], "x": 1.5, "y": 2.75},
- {"matrix": [9, 7], "x": 2.5, "y": 2.75},
- {"matrix": [9, 8], "x": 3.5, "y": 2.75},
- {"matrix": [9, 9], "x": 4.5, "y": 2.75},
- {"matrix": [9, 10], "x": 5.5, "y": 2.75},
- {"matrix": [9, 11], "x": 6.5, "y": 2.75},
- {"matrix": [9, 12], "x": 7.5, "y": 2.75},
- {"matrix": [9, 13], "x": 8.5, "y": 2.75},
- {"matrix": [9, 14], "x": 9.5, "y": 2.75},
- {"matrix": [9, 15], "x": 10.5, "y": 2.75},
- {"matrix": [9, 16], "x": 11.5, "y": 2.75},
- {"matrix": [9, 17], "x": 12.5, "y": 2.75},
- {"matrix": [9, 19], "x": 13.5, "y": 2.75, "w": 1.5},
-
- {"matrix": [5, 20], "x": 15.25, "y": 2.75},
- {"matrix": [5, 21], "x": 16.25, "y": 2.75},
- {"matrix": [5, 22], "x": 17.25, "y": 2.75},
-
- {"matrix": [10, 5], "x": 0, "y": 3.75, "w": 1.75},
- {"matrix": [10, 6], "x": 1.75, "y": 3.75},
- {"matrix": [10, 7], "x": 2.75, "y": 3.75},
- {"matrix": [10, 8], "x": 3.75, "y": 3.75},
- {"matrix": [10, 9], "x": 4.75, "y": 3.75},
- {"matrix": [10, 10], "x": 5.75, "y": 3.75},
- {"matrix": [10, 11], "x": 6.75, "y": 3.75},
- {"matrix": [10, 12], "x": 7.75, "y": 3.75},
- {"matrix": [10, 13], "x": 8.75, "y": 3.75},
- {"matrix": [10, 14], "x": 9.75, "y": 3.75},
- {"matrix": [10, 15], "x": 10.75, "y": 3.75},
- {"matrix": [10, 16], "x": 11.75, "y": 3.75},
- {"matrix": [10, 18], "x": 12.75, "y": 3.75, "w": 2.25},
-
- {"matrix": [11, 5], "x": 0, "y": 4.75, "w": 1.25},
- {"matrix": [11, 6], "x": 1.25, "y": 4.75},
- {"matrix": [11, 7], "x": 2.25, "y": 4.75},
- {"matrix": [11, 8], "x": 3.25, "y": 4.75},
- {"matrix": [11, 9], "x": 4.25, "y": 4.75},
- {"matrix": [11, 10], "x": 5.25, "y": 4.75},
- {"matrix": [11, 11], "x": 6.25, "y": 4.75},
- {"matrix": [11, 12], "x": 7.25, "y": 4.75},
- {"matrix": [11, 13], "x": 8.25, "y": 4.75},
- {"matrix": [11, 14], "x": 9.25, "y": 4.75},
- {"matrix": [11, 15], "x": 10.25, "y": 4.75},
- {"matrix": [11, 16], "x": 11.25, "y": 4.75},
- {"matrix": [11, 18], "x": 12.25, "y": 4.75, "w": 1.75},
- {"matrix": [11, 19], "x": 14, "y": 4.75},
-
- {"matrix": [6, 24], "x": 16.25, "y": 4.75},
-
- {"matrix": [12, 5], "x": 0, "y": 5.75, "w": 1.25},
- {"matrix": [12, 6], "x": 1.25, "y": 5.75, "w": 1.25},
- {"matrix": [12, 7], "x": 2.5, "y": 5.75, "w": 1.25},
- {"matrix": [12, 8], "x": 3.75, "y": 5.75},
- {"matrix": [12, 9], "x": 4.75, "y": 5.75, "w": 1.5},
- {"matrix": [12, 13], "x": 6.25, "y": 5.75},
- {"matrix": [12, 14], "x": 7.25, "y": 5.75, "w": 2.75},
- {"matrix": [12, 15], "x": 10, "y": 5.75, "w": 1.25},
- {"matrix": [12, 16], "x": 11.25, "y": 5.75, "w": 1.25},
- {"matrix": [12, 18], "x": 12.5, "y": 5.75, "w": 1.25},
- {"matrix": [12, 19], "x": 13.75, "y": 5.75, "w": 1.25},
-
- {"matrix": [7, 23], "x": 15.25, "y": 5.75},
- {"matrix": [7, 24], "x": 16.25, "y": 5.75},
- {"matrix": [7, 25], "x": 17.25, "y": 5.75},
-
- {"matrix": [13, 0], "x": 18.5, "y": 0},
- {"matrix": [13, 1], "x": 18.5, "y": 1}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.25, "y": 0},
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 5.5, "y": 0},
+ {"matrix": [1, 1], "x": 6.5, "y": 0},
+ {"matrix": [1, 2], "x": 7.5, "y": 0},
+ {"matrix": [1, 3], "x": 8.5, "y": 0},
+
+ {"matrix": [2, 0], "x": 9.75, "y": 0},
+ {"matrix": [2, 1], "x": 10.75, "y": 0},
+ {"matrix": [2, 2], "x": 11.75, "y": 0},
+ {"matrix": [2, 3], "x": 12.75, "y": 0},
+
+ {"matrix": [2, 4], "x": 14, "y": 0},
+
+ {"matrix": [3, 20], "x": 15.25, "y": 0},
+ {"matrix": [3, 21], "x": 16.25, "y": 0},
+ {"matrix": [3, 22], "x": 17.25, "y": 0},
+
+ {"matrix": [8, 5], "x": 0, "y": 1.25},
+ {"matrix": [8, 6], "x": 1, "y": 1.25},
+ {"matrix": [8, 7], "x": 2, "y": 1.25},
+ {"matrix": [8, 8], "x": 3, "y": 1.25},
+ {"matrix": [8, 9], "x": 4, "y": 1.25},
+ {"matrix": [8, 10], "x": 5, "y": 1.25},
+ {"matrix": [8, 11], "x": 6, "y": 1.25},
+ {"matrix": [8, 12], "x": 7, "y": 1.25},
+ {"matrix": [8, 13], "x": 8, "y": 1.25},
+ {"matrix": [8, 14], "x": 9, "y": 1.25},
+ {"matrix": [8, 15], "x": 10, "y": 1.25},
+ {"matrix": [8, 16], "x": 11, "y": 1.25},
+ {"matrix": [8, 17], "x": 12, "y": 1.25},
+ {"matrix": [8, 18], "x": 13, "y": 1.25},
+ {"matrix": [8, 19], "x": 14, "y": 1.25},
+
+ {"matrix": [4, 20], "x": 15.25, "y": 1.25},
+ {"matrix": [4, 21], "x": 16.25, "y": 1.25},
+ {"matrix": [4, 22], "x": 17.25, "y": 1.25},
+
+ {"matrix": [9, 5], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [9, 6], "x": 1.5, "y": 2.25},
+ {"matrix": [9, 7], "x": 2.5, "y": 2.25},
+ {"matrix": [9, 8], "x": 3.5, "y": 2.25},
+ {"matrix": [9, 9], "x": 4.5, "y": 2.25},
+ {"matrix": [9, 10], "x": 5.5, "y": 2.25},
+ {"matrix": [9, 11], "x": 6.5, "y": 2.25},
+ {"matrix": [9, 12], "x": 7.5, "y": 2.25},
+ {"matrix": [9, 13], "x": 8.5, "y": 2.25},
+ {"matrix": [9, 14], "x": 9.5, "y": 2.25},
+ {"matrix": [9, 15], "x": 10.5, "y": 2.25},
+ {"matrix": [9, 16], "x": 11.5, "y": 2.25},
+ {"matrix": [9, 17], "x": 12.5, "y": 2.25},
+ {"matrix": [9, 19], "x": 13.5, "y": 2.25, "w": 1.5},
+
+ {"matrix": [5, 20], "x": 15.25, "y": 2.25},
+ {"matrix": [5, 21], "x": 16.25, "y": 2.25},
+ {"matrix": [5, 22], "x": 17.25, "y": 2.25},
+
+ {"matrix": [10, 5], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [10, 6], "x": 1.75, "y": 3.25},
+ {"matrix": [10, 7], "x": 2.75, "y": 3.25},
+ {"matrix": [10, 8], "x": 3.75, "y": 3.25},
+ {"matrix": [10, 9], "x": 4.75, "y": 3.25},
+ {"matrix": [10, 10], "x": 5.75, "y": 3.25},
+ {"matrix": [10, 11], "x": 6.75, "y": 3.25},
+ {"matrix": [10, 12], "x": 7.75, "y": 3.25},
+ {"matrix": [10, 13], "x": 8.75, "y": 3.25},
+ {"matrix": [10, 14], "x": 9.75, "y": 3.25},
+ {"matrix": [10, 15], "x": 10.75, "y": 3.25},
+ {"matrix": [10, 16], "x": 11.75, "y": 3.25},
+ {"matrix": [10, 18], "x": 12.75, "y": 3.25, "w": 2.25},
+
+ {"matrix": [11, 5], "x": 0, "y": 4.25, "w": 1.25},
+ {"matrix": [11, 6], "x": 1.25, "y": 4.25},
+ {"matrix": [11, 7], "x": 2.25, "y": 4.25},
+ {"matrix": [11, 8], "x": 3.25, "y": 4.25},
+ {"matrix": [11, 9], "x": 4.25, "y": 4.25},
+ {"matrix": [11, 10], "x": 5.25, "y": 4.25},
+ {"matrix": [11, 11], "x": 6.25, "y": 4.25},
+ {"matrix": [11, 12], "x": 7.25, "y": 4.25},
+ {"matrix": [11, 13], "x": 8.25, "y": 4.25},
+ {"matrix": [11, 14], "x": 9.25, "y": 4.25},
+ {"matrix": [11, 15], "x": 10.25, "y": 4.25},
+ {"matrix": [11, 16], "x": 11.25, "y": 4.25},
+ {"matrix": [11, 18], "x": 12.25, "y": 4.25, "w": 1.75},
+ {"matrix": [11, 19], "x": 14, "y": 4.25},
+
+ {"matrix": [6, 24], "x": 16.25, "y": 4.25},
+
+ {"matrix": [12, 5], "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [12, 6], "x": 1.25, "y": 5.25, "w": 1.25},
+ {"matrix": [12, 7], "x": 2.5, "y": 5.25, "w": 1.25},
+ {"matrix": [12, 8], "x": 3.75, "y": 5.25},
+ {"matrix": [12, 9], "x": 4.75, "y": 5.25, "w": 1.5},
+ {"matrix": [12, 13], "x": 6.25, "y": 5.25},
+ {"matrix": [12, 14], "x": 7.25, "y": 5.25, "w": 2.75},
+ {"matrix": [12, 15], "x": 10, "y": 5.25, "w": 1.25},
+ {"matrix": [12, 16], "x": 11.25, "y": 5.25, "w": 1.25},
+ {"matrix": [12, 18], "x": 12.5, "y": 5.25, "w": 1.25},
+ {"matrix": [12, 19], "x": 13.75, "y": 5.25, "w": 1.25},
+
+ {"matrix": [7, 23], "x": 15.25, "y": 5.25},
+ {"matrix": [7, 24], "x": 16.25, "y": 5.25},
+ {"matrix": [7, 25], "x": 17.25, "y": 5.25}
]
}
}
diff --git a/keyboards/rmi_kb/squishytkl/keymaps/via/keymap.c b/keyboards/rmi_kb/squishytkl/keymaps/via/keymap.c
index 2c33b4869c..ea11eadd08 100644
--- a/keyboards/rmi_kb/squishytkl/keymaps/via/keymap.c
+++ b/keyboards/rmi_kb/squishytkl/keymaps/via/keymap.c
@@ -22,46 +22,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_NO, KC_UP,
- KC_LCTL, KC_LGUI, KC_LALT, KC_NO, KC_NO, KC_SPC, KC_NO, KC_RALT, KC_RGUI, KC_MENU, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT,
- KC_VOLU, KC_VOLD
- ),
+ KC_LCTL, KC_LGUI, KC_LALT, KC_NO, KC_NO, KC_SPC, KC_NO, KC_RALT, KC_RGUI, KC_MENU, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ )
};
-keyevent_t encoder_ccw = {
- .key = (keypos_t){.row = 13, .col = 0},
- .pressed = false,
- .type = KEY_EVENT
+#ifdef ENCODER_MAP_ENABLE
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+ [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }
};
-
-keyevent_t encoder_cw = {
- .key = (keypos_t){.row = 13, .col = 1},
- .pressed = false,
- .type = KEY_EVENT
-};
-
-void matrix_scan_user(void) {
- if (encoder_ccw.pressed) {
- encoder_ccw.pressed = false;
- encoder_ccw.time = timer_read();
- action_exec(encoder_ccw);
- }
-
- if (encoder_cw.pressed) {
- encoder_cw.pressed = false;
- encoder_cw.time = timer_read();
- action_exec(encoder_cw);
- }
-}
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
- if (clockwise) {
- encoder_cw.pressed = true;
- encoder_cw.time = timer_read();
- action_exec(encoder_cw);
- } else {
- encoder_ccw.pressed = true;
- encoder_ccw.time = timer_read();
- action_exec(encoder_ccw);
- }
- return true;
-}
+#endif
diff --git a/keyboards/rmi_kb/squishytkl/keymaps/via/rules.mk b/keyboards/rmi_kb/squishytkl/keymaps/via/rules.mk
index 1e5b99807c..f1adcab005 100644
--- a/keyboards/rmi_kb/squishytkl/keymaps/via/rules.mk
+++ b/keyboards/rmi_kb/squishytkl/keymaps/via/rules.mk
@@ -1 +1,2 @@
VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/rmi_kb/squishytkl/rules.mk b/keyboards/rmi_kb/squishytkl/rules.mk
index ae292c0a5a..a84e51ab51 100644
--- a/keyboards/rmi_kb/squishytkl/rules.mk
+++ b/keyboards/rmi_kb/squishytkl/rules.mk
@@ -11,6 +11,3 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
ENCODER_ENABLE = yes # Enable rotary encoder fuctionality
-
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-28 05:02:26 +0000