summaryrefslogtreecommitdiff
path: root/keyboards/pica40
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/pica40')
-rw-r--r--keyboards/pica40/info.json80
-rw-r--r--keyboards/pica40/keymaps/zzeneg/config.h1
-rw-r--r--keyboards/pica40/keymaps/zzeneg/keymap.c2
-rw-r--r--keyboards/pica40/rev1/info.json8
-rw-r--r--keyboards/pica40/rev1/rev1.c14
-rw-r--r--keyboards/pica40/rev1/rev1.h6
-rw-r--r--keyboards/pica40/rev2/info.json9
-rw-r--r--keyboards/pica40/rev2/rules.mk1
8 files changed, 55 insertions, 66 deletions
diff --git a/keyboards/pica40/info.json b/keyboards/pica40/info.json
index 6c9dbb76d9..dc4263fb68 100644
--- a/keyboards/pica40/info.json
+++ b/keyboards/pica40/info.json
@@ -6,46 +6,46 @@
"layouts": {
"LAYOUT": {
"layout": [
- { "matrix": [0, 0], "x": 1, "y": 0 },
- { "matrix": [0, 1], "x": 2, "y": 0 },
- { "matrix": [0, 2], "x": 3, "y": 0 },
- { "matrix": [0, 3], "x": 4, "y": 0 },
- { "matrix": [0, 4], "x": 5, "y": 0 },
- { "matrix": [4, 4], "x": 6, "y": 0 },
- { "matrix": [4, 3], "x": 7, "y": 0 },
- { "matrix": [4, 2], "x": 8, "y": 0 },
- { "matrix": [4, 1], "x": 9, "y": 0 },
- { "matrix": [4, 0], "x": 10, "y": 0 },
- { "matrix": [3, 0], "x": 0, "y": 1 },
- { "matrix": [1, 0], "x": 1, "y": 1 },
- { "matrix": [1, 1], "x": 2, "y": 1 },
- { "matrix": [1, 2], "x": 3, "y": 1 },
- { "matrix": [1, 3], "x": 4, "y": 1 },
- { "matrix": [1, 4], "x": 5, "y": 1 },
- { "matrix": [5, 4], "x": 6, "y": 1 },
- { "matrix": [5, 3], "x": 7, "y": 1 },
- { "matrix": [5, 2], "x": 8, "y": 1 },
- { "matrix": [5, 1], "x": 9, "y": 1 },
- { "matrix": [5, 0], "x": 10, "y": 1 },
- { "matrix": [7, 0], "x": 11, "y": 1 },
- { "matrix": [3, 1], "x": 0, "y": 2 },
- { "matrix": [2, 0], "x": 1, "y": 2 },
- { "matrix": [2, 1], "x": 2, "y": 2 },
- { "matrix": [2, 2], "x": 3, "y": 2 },
- { "matrix": [2, 3], "x": 4, "y": 2 },
- { "matrix": [2, 4], "x": 5, "y": 2 },
- { "matrix": [6, 4], "x": 6, "y": 2 },
- { "matrix": [6, 3], "x": 7, "y": 2 },
- { "matrix": [6, 2], "x": 8, "y": 2 },
- { "matrix": [6, 1], "x": 9, "y": 2 },
- { "matrix": [6, 0], "x": 10, "y": 2 },
- { "matrix": [7, 1], "x": 11, "y": 2 },
- { "matrix": [3, 2], "x": 3, "y": 3 },
- { "matrix": [3, 3], "x": 4, "y": 3 },
- { "matrix": [3, 4], "x": 5, "y": 3 },
- { "matrix": [7, 4], "x": 6, "y": 3 },
- { "matrix": [7, 3], "x": 7, "y": 3 },
- { "matrix": [7, 2], "x": 8, "y": 3 }
+ {"matrix": [0, 0], "x": 1, "y": 0},
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [0, 2], "x": 3, "y": 0},
+ {"matrix": [0, 3], "x": 4, "y": 0},
+ {"matrix": [0, 4], "x": 5, "y": 0},
+ {"matrix": [4, 4], "x": 6, "y": 0},
+ {"matrix": [4, 3], "x": 7, "y": 0},
+ {"matrix": [4, 2], "x": 8, "y": 0},
+ {"matrix": [4, 1], "x": 9, "y": 0},
+ {"matrix": [4, 0], "x": 10, "y": 0},
+ {"matrix": [3, 0], "x": 0, "y": 1},
+ {"matrix": [1, 0], "x": 1, "y": 1},
+ {"matrix": [1, 1], "x": 2, "y": 1},
+ {"matrix": [1, 2], "x": 3, "y": 1},
+ {"matrix": [1, 3], "x": 4, "y": 1},
+ {"matrix": [1, 4], "x": 5, "y": 1},
+ {"matrix": [5, 4], "x": 6, "y": 1},
+ {"matrix": [5, 3], "x": 7, "y": 1},
+ {"matrix": [5, 2], "x": 8, "y": 1},
+ {"matrix": [5, 1], "x": 9, "y": 1},
+ {"matrix": [5, 0], "x": 10, "y": 1},
+ {"matrix": [7, 0], "x": 11, "y": 1},
+ {"matrix": [3, 1], "x": 0, "y": 2},
+ {"matrix": [2, 0], "x": 1, "y": 2},
+ {"matrix": [2, 1], "x": 2, "y": 2},
+ {"matrix": [2, 2], "x": 3, "y": 2},
+ {"matrix": [2, 3], "x": 4, "y": 2},
+ {"matrix": [2, 4], "x": 5, "y": 2},
+ {"matrix": [6, 4], "x": 6, "y": 2},
+ {"matrix": [6, 3], "x": 7, "y": 2},
+ {"matrix": [6, 2], "x": 8, "y": 2},
+ {"matrix": [6, 1], "x": 9, "y": 2},
+ {"matrix": [6, 0], "x": 10, "y": 2},
+ {"matrix": [7, 1], "x": 11, "y": 2},
+ {"matrix": [3, 2], "x": 3, "y": 3},
+ {"matrix": [3, 3], "x": 4, "y": 3},
+ {"matrix": [3, 4], "x": 5, "y": 3},
+ {"matrix": [7, 4], "x": 6, "y": 3},
+ {"matrix": [7, 3], "x": 7, "y": 3},
+ {"matrix": [7, 2], "x": 8, "y": 3}
]
}
}
diff --git a/keyboards/pica40/keymaps/zzeneg/config.h b/keyboards/pica40/keymaps/zzeneg/config.h
index ec422c4d8e..f29f5ba1a7 100644
--- a/keyboards/pica40/keymaps/zzeneg/config.h
+++ b/keyboards/pica40/keymaps/zzeneg/config.h
@@ -3,7 +3,6 @@
#pragma once
-#define IGNORE_MOD_TAP_INTERRUPT
#define TAPPING_FORCE_HOLD
#define TAPPING_FORCE_HOLD_PER_KEY
#define TAPPING_TERM 150
diff --git a/keyboards/pica40/keymaps/zzeneg/keymap.c b/keyboards/pica40/keymaps/zzeneg/keymap.c
index 6cff7cfa27..ea73ef0e21 100644
--- a/keyboards/pica40/keymaps/zzeneg/keymap.c
+++ b/keyboards/pica40/keymaps/zzeneg/keymap.c
@@ -128,7 +128,7 @@ uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
}
#ifdef ENCODER_MAP_ENABLE
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[_QWERTY] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[_GAME] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[_NAV] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT) },
diff --git a/keyboards/pica40/rev1/info.json b/keyboards/pica40/rev1/info.json
index 8e4e64618d..fdb4cb09b3 100644
--- a/keyboards/pica40/rev1/info.json
+++ b/keyboards/pica40/rev1/info.json
@@ -19,14 +19,18 @@
},
"rgblight": {
"led_count": 1,
- "pin": "D3",
"layers": {
"enabled": true,
"max": 3
}
},
+ "ws2812": {
+ "pin": "D3"
+ },
"encoder": {
- "rotary": [{ "pin_a": "C6", "pin_b": "D4" }]
+ "rotary": [
+ {"pin_a": "C6", "pin_b": "D4"}
+ ]
},
"usb": {
"device_version": "1.0.0",
diff --git a/keyboards/pica40/rev1/rev1.c b/keyboards/pica40/rev1/rev1.c
index f008e4857a..fff89d48f2 100644
--- a/keyboards/pica40/rev1/rev1.c
+++ b/keyboards/pica40/rev1/rev1.c
@@ -1,7 +1,7 @@
// Copyright 2022 zzeneg (@zzeneg)
// SPDX-License-Identifier: GPL-2.0-or-later
-#include "rev1.h"
+#include "quantum.h"
#ifdef PICA40_RGBLIGHT_TIMEOUT
@@ -77,15 +77,3 @@ bool oled_task_kb(void) {
}
#endif // OLED_ENABLE
-
-#ifdef ENCODER_ENABLE
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
- if (!encoder_update_user(index, clockwise)) return false;
-
- tap_code(clockwise ? KC_VOLU : KC_VOLD);
-
- return false;
-}
-
-#endif // ENCODER_ENABLE
diff --git a/keyboards/pica40/rev1/rev1.h b/keyboards/pica40/rev1/rev1.h
deleted file mode 100644
index 964038eefb..0000000000
--- a/keyboards/pica40/rev1/rev1.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2022 zzeneg (@zzeneg)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/pica40/rev2/info.json b/keyboards/pica40/rev2/info.json
index dbef8254ef..630d6da467 100644
--- a/keyboards/pica40/rev2/info.json
+++ b/keyboards/pica40/rev2/info.json
@@ -24,13 +24,16 @@
},
"rgblight": {
"led_count": 1,
- "pin": "GP12",
"split": true,
"layers": {
"enabled": true,
"max": 3
}
},
+ "ws2812": {
+ "pin": "GP12",
+ "driver": "vendor"
+ },
"split": {
"enabled": true,
"encoder": {
@@ -40,7 +43,9 @@
}
},
"encoder": {
- "rotary": [{ "pin_a": "GP7", "pin_b": "GP7", "resolution": 4 }]
+ "rotary": [
+ {"pin_a": "GP7", "pin_b": "GP7", "resolution": 4}
+ ]
},
"usb": {
"device_version": "1.0.0",
diff --git a/keyboards/pica40/rev2/rules.mk b/keyboards/pica40/rev2/rules.mk
index 8fb51ec82d..161ec22b16 100644
--- a/keyboards/pica40/rev2/rules.mk
+++ b/keyboards/pica40/rev2/rules.mk
@@ -1,2 +1 @@
SERIAL_DRIVER = vendor
-WS2812_DRIVER = vendor
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 09:07:52 +0000