aboutsummaryrefslogtreecommitdiff
path: root/keyboards/junco
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/junco')
-rw-r--r--keyboards/junco/info.json151
-rw-r--r--keyboards/junco/keymaps/default/keymap.c2
-rw-r--r--keyboards/junco/keymaps/deluxe/keymap.c2
-rw-r--r--keyboards/junco/keymaps/via/keymap.c2
-rw-r--r--keyboards/junco/rev1/config.h1
-rw-r--r--keyboards/junco/rev1/rules.mk3
6 files changed, 70 insertions, 91 deletions
diff --git a/keyboards/junco/info.json b/keyboards/junco/info.json
index 72e0d5c92a..9fd699ca49 100644
--- a/keyboards/junco/info.json
+++ b/keyboards/junco/info.json
@@ -8,99 +8,82 @@
"pid": "0x4A13",
"device_version": "1.0.0"
},
+ "ws2812": {
+ "pin": "GP15",
+ "driver": "vendor"
+ },
+ "rgb_matrix": {
+ "driver": "WS2812"
+ },
"processor": "RP2040",
"bootloader": "rp2040",
"layouts": {
"LAYOUT_split4x6_r1": {
"layout": [
- { "label": "`", "matrix": [0, 0], "x": 0, "y": 0.7 },
- { "label": "1", "matrix": [0, 1], "x": 1, "y": 0.7 },
- { "label": "2", "matrix": [0, 2], "x": 2, "y": 0.3 },
- { "label": "3", "matrix": [0, 3], "x": 3, "y": 0 },
- { "label": "4", "matrix": [0, 4], "x": 4, "y": 0.3 },
- { "label": "5", "matrix": [0, 5], "x": 5, "y": 0.45 },
- { "label": "6", "matrix": [5, 5], "x": 9, "y": 0.45 },
- { "label": "7", "matrix": [5, 4], "x": 10, "y": 0.3 },
- { "label": "8", "matrix": [5, 3], "x": 11, "y": 0 },
- { "label": "9", "matrix": [5, 2], "x": 12, "y": 0.3 },
- { "label": "0", "matrix": [5, 1], "x": 13, "y": 0.7 },
- { "label": "-", "matrix": [5, 0], "x": 14, "y": 0.7 },
+ {"label": "`", "matrix": [0, 0], "x": 0, "y": 0.7},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0.7},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0.3},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0.3},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0.45},
+ {"label": "6", "matrix": [5, 5], "x": 9, "y": 0.45},
+ {"label": "7", "matrix": [5, 4], "x": 10, "y": 0.3},
+ {"label": "8", "matrix": [5, 3], "x": 11, "y": 0},
+ {"label": "9", "matrix": [5, 2], "x": 12, "y": 0.3},
+ {"label": "0", "matrix": [5, 1], "x": 13, "y": 0.7},
+ {"label": "-", "matrix": [5, 0], "x": 14, "y": 0.7},
- { "label": "Tab", "matrix": [1, 0], "x": 0, "y": 1.7 },
- { "label": "Q", "matrix": [1, 1], "x": 1, "y": 1.7 },
- { "label": "W", "matrix": [1, 2], "x": 2, "y": 1.3 },
- { "label": "E", "matrix": [1, 3], "x": 3, "y": 1 },
- { "label": "R", "matrix": [1, 4], "x": 4, "y": 1.3 },
- { "label": "T", "matrix": [1, 5], "x": 5, "y": 1.45 },
- { "label": "Y", "matrix": [6, 5], "x": 9, "y": 1.45 },
- { "label": "U", "matrix": [6, 4], "x": 10, "y": 1.3 },
- { "label": "I", "matrix": [6, 3], "x": 11, "y": 1 },
- { "label": "O", "matrix": [6, 2], "x": 12, "y": 1.3 },
- { "label": "P", "matrix": [6, 1], "x": 13, "y": 1.7 },
- { "label": "Enter", "matrix": [6, 0], "x": 14, "y": 1.7 },
+ {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1.7},
+ {"label": "Q", "matrix": [1, 1], "x": 1, "y": 1.7},
+ {"label": "W", "matrix": [1, 2], "x": 2, "y": 1.3},
+ {"label": "E", "matrix": [1, 3], "x": 3, "y": 1},
+ {"label": "R", "matrix": [1, 4], "x": 4, "y": 1.3},
+ {"label": "T", "matrix": [1, 5], "x": 5, "y": 1.45},
+ {"label": "Y", "matrix": [6, 5], "x": 9, "y": 1.45},
+ {"label": "U", "matrix": [6, 4], "x": 10, "y": 1.3},
+ {"label": "I", "matrix": [6, 3], "x": 11, "y": 1},
+ {"label": "O", "matrix": [6, 2], "x": 12, "y": 1.3},
+ {"label": "P", "matrix": [6, 1], "x": 13, "y": 1.7},
+ {"label": "Enter", "matrix": [6, 0], "x": 14, "y": 1.7},
- { "label": "Esc", "matrix": [2, 0], "x": 0, "y": 2.7 },
- { "label": "A", "matrix": [2, 1], "x": 1, "y": 2.7 },
- { "label": "S", "matrix": [2, 2], "x": 2, "y": 2.3 },
- { "label": "D", "matrix": [2, 3], "x": 3, "y": 2 },
- { "label": "F", "matrix": [2, 4], "x": 4, "y": 2.3 },
- { "label": "G", "matrix": [2, 5], "x": 5, "y": 2.45 },
- { "label": "H", "matrix": [7, 5], "x": 9, "y": 2.45 },
- { "label": "J", "matrix": [7, 4], "x": 10, "y": 2.3 },
- { "label": "K", "matrix": [7, 3], "x": 11, "y": 2 },
- { "label": "L", "matrix": [7, 2], "x": 12, "y": 2.3 },
- { "label": ";", "matrix": [7, 1], "x": 13, "y": 2.7 },
- { "label": "'", "matrix": [7, 0], "x": 14, "y": 2.7 },
+ {"label": "Esc", "matrix": [2, 0], "x": 0, "y": 2.7},
+ {"label": "A", "matrix": [2, 1], "x": 1, "y": 2.7},
+ {"label": "S", "matrix": [2, 2], "x": 2, "y": 2.3},
+ {"label": "D", "matrix": [2, 3], "x": 3, "y": 2},
+ {"label": "F", "matrix": [2, 4], "x": 4, "y": 2.3},
+ {"label": "G", "matrix": [2, 5], "x": 5, "y": 2.45},
+ {"label": "H", "matrix": [7, 5], "x": 9, "y": 2.45},
+ {"label": "J", "matrix": [7, 4], "x": 10, "y": 2.3},
+ {"label": "K", "matrix": [7, 3], "x": 11, "y": 2},
+ {"label": "L", "matrix": [7, 2], "x": 12, "y": 2.3},
+ {"label": ";", "matrix": [7, 1], "x": 13, "y": 2.7},
+ {"label": "'", "matrix": [7, 0], "x": 14, "y": 2.7},
- { "label": "Shift", "matrix": [3, 0], "x": 0, "y": 3.7 },
- { "label": "Z", "matrix": [3, 1], "x": 1, "y": 3.7 },
- { "label": "X", "matrix": [3, 2], "x": 2, "y": 3.3 },
- { "label": "C", "matrix": [3, 3], "x": 3, "y": 3 },
- { "label": "V", "matrix": [3, 4], "x": 4, "y": 3.3 },
- { "label": "B", "matrix": [3, 5], "x": 5, "y": 3.45 },
- { "label": "Mute", "matrix": [4, 5], "x": 6.2, "y": 3.45 },
- { "label": "XXX", "matrix": [9, 5], "x": 7.8, "y": 3.45 },
- { "label": "N", "matrix": [8, 5], "x": 9, "y": 3.45 },
- { "label": "M", "matrix": [8, 4], "x": 10, "y": 3.3 },
- { "label": ",", "matrix": [8, 3], "x": 11, "y": 3 },
- { "label": ".", "matrix": [8, 2], "x": 12, "y": 3.3 },
- { "label": "/", "matrix": [8, 1], "x": 13, "y": 3.7 },
- { "label": "Shift", "matrix": [8, 0], "x": 14, "y": 3.7 },
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3.7},
+ {"label": "Z", "matrix": [3, 1], "x": 1, "y": 3.7},
+ {"label": "X", "matrix": [3, 2], "x": 2, "y": 3.3},
+ {"label": "C", "matrix": [3, 3], "x": 3, "y": 3},
+ {"label": "V", "matrix": [3, 4], "x": 4, "y": 3.3},
+ {"label": "B", "matrix": [3, 5], "x": 5, "y": 3.45},
+ {"label": "Mute", "matrix": [4, 5], "x": 6.2, "y": 3.45},
+ {"label": "XXX", "matrix": [9, 5], "x": 7.8, "y": 3.45},
+ {"label": "N", "matrix": [8, 5], "x": 9, "y": 3.45},
+ {"label": "M", "matrix": [8, 4], "x": 10, "y": 3.3},
+ {"label": ",", "matrix": [8, 3], "x": 11, "y": 3},
+ {"label": ".", "matrix": [8, 2], "x": 12, "y": 3.3},
+ {"label": "/", "matrix": [8, 1], "x": 13, "y": 3.7},
+ {"label": "Shift", "matrix": [8, 0], "x": 14, "y": 3.7},
- { "label": "Ctrl", "matrix": [4, 0], "x": 2, "y": 4.3 },
- { "label": "Win", "matrix": [4, 1], "x": 3, "y": 4 },
- { "label": "Alt", "matrix": [4, 2], "x": 4, "y": 4.3 },
- {
- "label": "Del",
- "matrix": [4, 3],
- "x": 5.1,
- "y": 4.5,
- "h": 1.5
- },
- {
- "label": "Spc",
- "matrix": [4, 4],
- "x": 6.1,
- "y": 4.5,
- "h": 1.5
- },
- {
- "label": "Shift",
- "matrix": [9, 3],
- "x": 7.9,
- "y": 4.5,
- "h": 1.5
- },
- {
- "label": "Bspc",
- "matrix": [9, 4],
- "x": 8.9,
- "y": 4.5,
- "h": 1.5
- },
- { "label": "Alt", "matrix": [9, 2], "x": 10, "y": 4.3 },
- { "label": "Win", "matrix": [9, 1], "x": 11, "y": 4 },
- { "label": "Ctrl", "matrix": [9, 0], "x": 12, "y": 4.3 }
+ {"label": "Ctrl", "matrix": [4, 0], "x": 2, "y": 4.3},
+ {"label": "Win", "matrix": [4, 1], "x": 3, "y": 4},
+ {"label": "Alt", "matrix": [4, 2], "x": 4, "y": 4.3},
+ {"label": "Del", "matrix": [4, 3], "x": 5.1, "y": 4.5, "h": 1.5},
+ {"label": "Spc", "matrix": [4, 4], "x": 6.1, "y": 4.5, "h": 1.5},
+ {"label": "Shift", "matrix": [9, 3], "x": 7.9, "y": 4.5, "h": 1.5},
+ {"label": "Bspc", "matrix": [9, 4], "x": 8.9, "y": 4.5, "h": 1.5},
+ {"label": "Alt", "matrix": [9, 2], "x": 10, "y": 4.3},
+ {"label": "Win", "matrix": [9, 1], "x": 11, "y": 4},
+ {"label": "Ctrl", "matrix": [9, 0], "x": 12, "y": 4.3}
]
}
}
diff --git a/keyboards/junco/keymaps/default/keymap.c b/keyboards/junco/keymaps/default/keymap.c
index dc607477e2..8ff3513891 100644
--- a/keyboards/junco/keymaps/default/keymap.c
+++ b/keyboards/junco/keymaps/default/keymap.c
@@ -143,7 +143,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
#ifdef ENCODER_MAP_ENABLE
// clang-format off
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
// Base layer encoder mappings:
// index 0: mouse wheel up (CCW)/down (CW) index 1: volume down/up index 2: mouse wheel up/down index 3: mouse wheel left/right
[_QWERTY] = { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(KC_WH_L, KC_WH_R) },
diff --git a/keyboards/junco/keymaps/deluxe/keymap.c b/keyboards/junco/keymaps/deluxe/keymap.c
index e4dcb97fae..42b6429b97 100644
--- a/keyboards/junco/keymaps/deluxe/keymap.c
+++ b/keyboards/junco/keymaps/deluxe/keymap.c
@@ -193,7 +193,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// clang-format off
// Base layer encoder mappings:
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
// Base layers
// index 0: mouse wheel up (CCW)/down (CW) index 1: volume up/down index 2: media prev/next index 3: mouse wheel left/right
[_QWERTY] = { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_WH_L, KC_WH_R) },
diff --git a/keyboards/junco/keymaps/via/keymap.c b/keyboards/junco/keymaps/via/keymap.c
index b50332be28..65fe2a67de 100644
--- a/keyboards/junco/keymaps/via/keymap.c
+++ b/keyboards/junco/keymaps/via/keymap.c
@@ -143,7 +143,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
#ifdef ENCODER_MAP_ENABLE
// clang-format off
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
// Base layer encoder mappings:
// index 0: mouse wheel up (CCW)/down (CW) index 1: volume down/up index 2: mouse wheel up/down index 3: mouse wheel left/right
[_QWERTY] = { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(KC_WH_L, KC_WH_R) },
diff --git a/keyboards/junco/rev1/config.h b/keyboards/junco/rev1/config.h
index d9c0556cdf..95731fde01 100644
--- a/keyboards/junco/rev1/config.h
+++ b/keyboards/junco/rev1/config.h
@@ -19,7 +19,6 @@
/* RGB Stuff */
#ifdef RGB_MATRIX_ENABLE
-# define RGB_DI_PIN GP15 // Pin for RGB logic
# define RGB_MATRIX_LED_COUNT 74
# define RGB_MATRIX_SPLIT \
{ 37, 37 } // 37 LEDs on each side
diff --git a/keyboards/junco/rev1/rules.mk b/keyboards/junco/rev1/rules.mk
index feb836dbe1..e69de29bb2 100644
--- a/keyboards/junco/rev1/rules.mk
+++ b/keyboards/junco/rev1/rules.mk
@@ -1,3 +0,0 @@
-# RGB Stuff
-RGB_MATRIX_DRIVER = WS2812
-WS2812_DRIVER = vendor