summaryrefslogtreecommitdiff
path: root/keyboards/soda/pocket
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/soda/pocket')
-rw-r--r--keyboards/soda/pocket/config.h7
-rw-r--r--keyboards/soda/pocket/info.json230
-rw-r--r--keyboards/soda/pocket/pocket.c2
-rw-r--r--keyboards/soda/pocket/pocket.h39
-rw-r--r--keyboards/soda/pocket/rules.mk1
5 files changed, 57 insertions, 222 deletions
diff --git a/keyboards/soda/pocket/config.h b/keyboards/soda/pocket/config.h
index 4b6ff7b4ab..053083f230 100644
--- a/keyboards/soda/pocket/config.h
+++ b/keyboards/soda/pocket/config.h
@@ -15,11 +15,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-#define MATRIX_COL_PINS { A2, A1, B14, B4, B5, B6, B7}
-#define MATRIX_ROW_PINS { A7, B0, B1, B2, B10, B11 }
-#define DIODE_DIRECTION ROW2COL
-
#define LED_NUM_LOCK_PIN B15
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
@@ -28,8 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define LOCKING_RESYNC_ENABLE
// enable NKRO_ENABLE
#define FORCE_NKRO
-// The pin connected to the data pin of the LEDs
-#define RGB_DI_PIN C15
// The number of LEDs connected
#define RGB_MATRIX_LED_COUNT 34
diff --git a/keyboards/soda/pocket/info.json b/keyboards/soda/pocket/info.json
index b91f795b04..1c64881183 100644
--- a/keyboards/soda/pocket/info.json
+++ b/keyboards/soda/pocket/info.json
@@ -8,184 +8,66 @@
"pid": "0x4F51",
"device_version": "1.0.2"
},
+ "ws2812": {
+ "pin": "C15"
+ },
+ "rgb_matrix": {
+ "driver": "WS2812"
+ },
+ "matrix_pins": {
+ "cols": ["A2", "A1", "B14", "B4", "B5", "B6", "B7"],
+ "rows": ["A7", "B0", "B1", "B2", "B10", "B11"]
+ },
+ "diode_direction": "ROW2COL",
"processor": "STM32F072",
"bootloader": "stm32-dfu",
"layouts": {
"LAYOUT": {
- "layout": [
- {
- "label": "PrtSc",
- "x": 0,
- "y": 0.25
- },
- {
- "label": "Scroll Lock",
- "x": 1,
- "y": 0.25
- },
- {
- "label": "Pause",
- "x": 2,
- "y": 0.25
- },
- {
- "label": "Num Lock",
- "x": 3.25,
- "y": 0.25
- },
- {
- "label": "/",
- "x": 4.25,
- "y": 0.25
- },
- {
- "label": "*",
- "x": 5.25,
- "y": 0.25
- },
- {
- "label": "-",
- "x": 6.25,
- "y": 0.25
- },
- {
- "label": "Insert",
- "x": 0,
- "y": 1.5
- },
- {
- "label": "Home",
- "x": 1,
- "y": 1.5
- },
- {
- "label": "PgUp",
- "x": 2,
- "y": 1.5
- },
- {
- "label": "Num Lock",
- "x": 3.25,
- "y": 1.5
- },
- {
- "label": "/",
- "x": 4.25,
- "y": 1.5
- },
- {
- "label": "*",
- "x": 5.25,
- "y": 1.5
- },
- {
- "label": "-",
- "x": 6.25,
- "y": 1.5
- },
- {
- "label": "Delete",
- "x": 0,
- "y": 2.5
- },
- {
- "label": "End",
- "x": 1,
- "y": 2.5
- },
- {
- "label": "PgDn",
- "x": 2,
- "y": 2.5
- },
- {
- "label": "7",
- "x": 3.25,
- "y": 2.5
- },
- {
- "label": "8",
- "x": 4.25,
- "y": 2.5
- },
- {
- "label": "9",
- "x": 5.25,
- "y": 2.5
- },
- {
- "label": "+",
- "x": 6.25,
- "y": 2.5,
- "h": 2
- },
- {
- "label": "4",
- "x": 3.25,
- "y": 3.5
- },
- {
- "label": "5",
- "x": 4.25,
- "y": 3.5
- },
- {
- "label": "6",
- "x": 5.25,
- "y": 3.5
- },
- {
- "label": "\u2191",
- "x": 1,
- "y": 4.5
- },
- {
- "label": "1",
- "x": 3.25,
- "y": 4.5
- },
- {
- "label": "2",
- "x": 4.25,
- "y": 4.5
- },
- {
- "label": "3",
- "x": 5.25,
- "y": 4.5
- },
- {
- "label": "Enter",
- "x": 6.25,
- "y": 4.5,
- "h": 2
- },
- {
- "label": "\u2190",
- "x": 0,
- "y": 5.5
- },
- {
- "label": "\u2193",
- "x": 1,
- "y": 5.5
- },
- {
- "label": "\u2192",
- "x": 2,
- "y": 5.5
- },
- {
- "label": "0",
- "x": 3.25,
- "y": 5.5,
- "w": 2
- },
- {
- "label": ".",
- "x": 5.25,
- "y": 5.5
- }
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+ {"matrix": [0, 5], "x": 5.25, "y": 0},
+ {"matrix": [0, 6], "x": 6.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+
+ {"matrix": [1, 3], "x": 3.25, "y": 1.25},
+ {"matrix": [1, 4], "x": 4.25, "y": 1.25},
+ {"matrix": [1, 5], "x": 5.25, "y": 1.25},
+ {"matrix": [1, 6], "x": 6.25, "y": 1.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.25},
+ {"matrix": [2, 1], "x": 1, "y": 2.25},
+ {"matrix": [2, 2], "x": 2, "y": 2.25},
+
+ {"matrix": [2, 3], "x": 3.25, "y": 2.25},
+ {"matrix": [2, 4], "x": 4.25, "y": 2.25},
+ {"matrix": [2, 5], "x": 5.25, "y": 2.25},
+ {"matrix": [3, 3], "x": 6.25, "y": 2.25, "h": 2},
+
+ {"matrix": [3, 4], "x": 3.25, "y": 3.25},
+ {"matrix": [3, 5], "x": 4.25, "y": 3.25},
+ {"matrix": [3, 6], "x": 5.25, "y": 3.25},
+
+ {"matrix": [4, 1], "x": 1, "y": 4.25},
+
+ {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+ {"matrix": [5, 0], "x": 6.25, "y": 4.25, "h": 2},
+
+ {"matrix": [5, 1], "x": 0, "y": 5.25},
+ {"matrix": [5, 2], "x": 1, "y": 5.25},
+ {"matrix": [5, 4], "x": 2, "y": 5.25},
+
+ {"matrix": [5, 5], "x": 3.25, "y": 5.25, "w": 2},
+ {"matrix": [5, 6], "x": 5.25, "y": 5.25}
]
}
}
diff --git a/keyboards/soda/pocket/pocket.c b/keyboards/soda/pocket/pocket.c
index 18a203b8c0..8cced36866 100644
--- a/keyboards/soda/pocket/pocket.c
+++ b/keyboards/soda/pocket/pocket.c
@@ -15,7 +15,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 "pocket.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/soda/pocket/pocket.h b/keyboards/soda/pocket/pocket.h
deleted file mode 100644
index 602664107b..0000000000
--- a/keyboards/soda/pocket/pocket.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2015 Álvaro "Gondolindrim" Volpato <gondolindrim@acheronproject.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-#define LAYOUT( \
- K00, K01, K02, K03, K04, K05, K06, \
- K10, K11, K12, K13, K14, K15, K16, \
- K20, K21, K22, K23, K24, K25, \
- K33, K34, K35, K36, \
- K41, K43, K44, K45, \
- K50, K51, K52, K54, K55, K56 \
-) { \
- { K00, K01, K02, K03, K04, K05, K06 }, \
- { K10, K11, K12, K13, K14, K15, K16 }, \
- { K20, K21, K22, K23, K24, K25, KC_NO}, \
- { KC_NO, KC_NO, KC_NO, K33, K34, K35, K36 }, \
- { KC_NO, K41, KC_NO, K43, K44, K45, KC_NO}, \
- { K50, K51, K52, KC_NO, K54, K55, K56 } \
-}
-
diff --git a/keyboards/soda/pocket/rules.mk b/keyboards/soda/pocket/rules.mk
index d8724cc6e6..27092ddbc6 100644
--- a/keyboards/soda/pocket/rules.mk
+++ b/keyboards/soda/pocket/rules.mk
@@ -1,5 +1,4 @@
RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-02 23:29:07 +0000