summaryrefslogtreecommitdiff
path: root/keyboards/s_ol
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/s_ol')
-rw-r--r--keyboards/s_ol/0xc_pad/0xc_pad.h12
-rw-r--r--keyboards/s_ol/0xc_pad/config.h1
-rw-r--r--keyboards/s_ol/0xc_pad/info.json33
-rw-r--r--keyboards/s_ol/0xc_pad/rules.mk2
4 files changed, 21 insertions, 27 deletions
diff --git a/keyboards/s_ol/0xc_pad/0xc_pad.h b/keyboards/s_ol/0xc_pad/0xc_pad.h
index 52c9c3adfd..013f4c89dc 100644
--- a/keyboards/s_ol/0xc_pad/0xc_pad.h
+++ b/keyboards/s_ol/0xc_pad/0xc_pad.h
@@ -17,18 +17,6 @@
#include "quantum.h"
-#define LAYOUT( \
- k01, k05, \
- k02, k06, k10, \
- k03, k07, k11, k15, \
- k08, k12, k16 \
-) { \
- { k01, k05, KC_NO, KC_NO }, \
- { k02, k06, k10, KC_NO }, \
- { k03, k07, k11, k15 }, \
- { KC_NO, k08, k12, k16 } \
-}
-
#define LED_LAYOUT( \
\
k01, k05, k02, k06, k10, k03, k07, k11, k15, k08, k12, k16) \
diff --git a/keyboards/s_ol/0xc_pad/config.h b/keyboards/s_ol/0xc_pad/config.h
index d99a5188bf..865ab45d31 100644
--- a/keyboards/s_ol/0xc_pad/config.h
+++ b/keyboards/s_ol/0xc_pad/config.h
@@ -17,7 +17,6 @@
/* ws2812 RGB LED */
-#define RGB_DI_PIN C7
#define RGB_MATRIX_LED_COUNT 12
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255
#define RGB_MATRIX_CENTER \
diff --git a/keyboards/s_ol/0xc_pad/info.json b/keyboards/s_ol/0xc_pad/info.json
index decf0ae1cb..a35c054900 100644
--- a/keyboards/s_ol/0xc_pad/info.json
+++ b/keyboards/s_ol/0xc_pad/info.json
@@ -6,21 +6,30 @@
"rows": ["B7", "B6", "B5", "B4"],
"cols": ["D4", "D3", "D2", "D1"]
},
+ "ws2812": {
+ "pin": "C7"
+ },
+ "rgb_matrix": {
+ "driver": "WS2812"
+ },
"layouts": {
"LAYOUT": {
"layout": [
- {"x":1, "y":0},
- {"x":2, "y":0},
- {"x":0.5, "y":1},
- {"x":1.5, "y":1},
- {"x":2.5, "y":1},
- {"x":0, "y":2},
- {"x":1, "y":2},
- {"x":2, "y":2},
- {"x":3, "y":2},
- {"x":0.5, "y":3},
- {"x":1.5, "y":3},
- {"x":2.5, "y":3}
+ {"matrix": [0, 0], "x": 1, "y": 0},
+ {"matrix": [0, 1], "x": 2, "y": 0},
+
+ {"matrix": [1, 0], "x": 0.5, "y": 1},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+
+ {"matrix": [3, 1], "x": 0.5, "y": 3},
+ {"matrix": [3, 2], "x": 1.5, "y": 3},
+ {"matrix": [3, 3], "x": 2.5, "y": 3}
]
}
},
diff --git a/keyboards/s_ol/0xc_pad/rules.mk b/keyboards/s_ol/0xc_pad/rules.mk
index d17272fe99..972d696cec 100644
--- a/keyboards/s_ol/0xc_pad/rules.mk
+++ b/keyboards/s_ol/0xc_pad/rules.mk
@@ -12,5 +12,3 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
LTO_ENABLE = yes
RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
-WS2812_DRIVER = bitbang