summaryrefslogtreecommitdiffstats
path: root/keyboards/atlantis/ps17
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/atlantis/ps17')
-rw-r--r--keyboards/atlantis/ps17/config.h1
-rw-r--r--keyboards/atlantis/ps17/info.json102
-rw-r--r--keyboards/atlantis/ps17/keymaps/default/keymap.c2
-rw-r--r--keyboards/atlantis/ps17/keymaps/multimedia/keymap.c2
-rw-r--r--keyboards/atlantis/ps17/keymaps/via/keymap.c2
-rw-r--r--keyboards/atlantis/ps17/ps17.c17
6 files changed, 55 insertions, 71 deletions
diff --git a/keyboards/atlantis/ps17/config.h b/keyboards/atlantis/ps17/config.h
index 5638e334bd..a41720aeb5 100644
--- a/keyboards/atlantis/ps17/config.h
+++ b/keyboards/atlantis/ps17/config.h
@@ -9,7 +9,6 @@
#define LED_INDICATOR_2_PIN D4
/* RGB matrix */
-#define RGB_DI_PIN B7
#define RGB_MATRIX_LED_COUNT 28
#define RGB_MATRIX_KEYPRESSES
#define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/atlantis/ps17/info.json b/keyboards/atlantis/ps17/info.json
index 5b025c83f7..1b7ffa7785 100644
--- a/keyboards/atlantis/ps17/info.json
+++ b/keyboards/atlantis/ps17/info.json
@@ -26,38 +26,40 @@
"cols": ["F6", "F7", "D3", "D6"],
"rows": ["F0", "B4", "B5", "B6", "C6", "C7", "NO_PIN", "NO_PIN", "NO_PIN", "NO_PIN", "NO_PIN"]
},
+ "ws2812": {
+ "pin": "B7"
+ },
"encoder": {
- "rotary": [{
- "pin_a": "D2",
- "pin_b": "D1"
- }]
+ "rotary": [
+ {"pin_a": "D2", "pin_b": "D1"}
+ ]
},
"layouts": {
"LAYOUT": {
"layout": [
- { "matrix": [0, 1], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 0, "y": 0},
- { "matrix": [1, 0], "x": 0, "y": 1.5},
- { "matrix": [1, 1], "x": 1, "y": 1.5},
- { "matrix": [1, 2], "x": 2, "y": 1.5},
- { "matrix": [1, 3], "x": 3, "y": 1.5},
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1.5},
+ {"matrix": [1, 3], "x": 3, "y": 1.5},
- { "matrix": [2, 0], "x": 0, "y": 2.5},
- { "matrix": [2, 1], "x": 1, "y": 2.5},
- { "matrix": [2, 2], "x": 2, "y": 2.5},
- { "matrix": [2, 3], "x": 3, "y": 2.5, "h": 2},
+ {"matrix": [2, 0], "x": 0, "y": 2.5},
+ {"matrix": [2, 1], "x": 1, "y": 2.5},
+ {"matrix": [2, 2], "x": 2, "y": 2.5},
+ {"matrix": [2, 3], "x": 3, "y": 2.5, "h": 2},
- { "matrix": [3, 0], "x": 0, "y": 3.5},
- { "matrix": [3, 1], "x": 1, "y": 3.5},
- { "matrix": [3, 2], "x": 2, "y": 3.5},
+ {"matrix": [3, 0], "x": 0, "y": 3.5},
+ {"matrix": [3, 1], "x": 1, "y": 3.5},
+ {"matrix": [3, 2], "x": 2, "y": 3.5},
- { "matrix": [4, 0], "x": 0, "y": 4.5},
- { "matrix": [4, 1], "x": 1, "y": 4.5},
- { "matrix": [4, 2], "x": 2, "y": 4.5},
- { "matrix": [4, 3], "x": 3, "y": 4.5, "h": 2},
+ {"matrix": [4, 0], "x": 0, "y": 4.5},
+ {"matrix": [4, 1], "x": 1, "y": 4.5},
+ {"matrix": [4, 2], "x": 2, "y": 4.5},
+ {"matrix": [4, 3], "x": 3, "y": 4.5, "h": 2},
- { "matrix": [5, 0], "x": 0, "y": 5.5, "w": 2},
- { "matrix": [5, 2], "x": 2, "y": 5.5}
+ {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 2},
+ {"matrix": [5, 2], "x": 2, "y": 5.5}
]
}
},
@@ -65,35 +67,35 @@
"driver": "WS2812",
"center_point": [126, 126],
"layout": [
- { "flags": 4, "matrix": [1, 0], "x": 74, "y": 165 },
- { "flags": 4, "matrix": [1, 1], "x": 108, "y": 165 },
- { "flags": 4, "matrix": [1, 2], "x": 144, "y": 165 },
- { "flags": 4, "matrix": [1, 3], "x": 179, "y": 165 },
- { "flags": 4, "matrix": [2, 0], "x": 74, "y": 129 },
- { "flags": 4, "matrix": [2, 1], "x": 109, "y": 129 },
- { "flags": 4, "matrix": [2, 2], "x": 143, "y": 129 },
- { "flags": 4, "matrix": [2, 3], "x": 188, "y": 121 },
- { "flags": 4, "matrix": [3, 0], "x": 74, "y": 95 },
- { "flags": 4, "matrix": [3, 1], "x": 109, "y": 95 },
- { "flags": 4, "matrix": [3, 2], "x": 143, "y": 95 },
- { "flags": 4, "matrix": [4, 0], "x": 73, "y": 60 },
- { "flags": 4, "matrix": [4, 1], "x": 109, "y": 60 },
- { "flags": 4, "matrix": [4, 2], "x": 144, "y": 60 },
- { "flags": 4, "matrix": [4, 3], "x": 188, "y": 51 },
- { "flags": 4, "matrix": [5, 0], "x": 91, "y": 25 },
- { "flags": 4, "matrix": [5, 2], "x": 144, "y": 25 },
+ {"flags": 4, "matrix": [1, 0], "x": 74, "y": 165},
+ {"flags": 4, "matrix": [1, 1], "x": 108, "y": 165},
+ {"flags": 4, "matrix": [1, 2], "x": 144, "y": 165},
+ {"flags": 4, "matrix": [1, 3], "x": 179, "y": 165},
+ {"flags": 4, "matrix": [2, 0], "x": 74, "y": 129},
+ {"flags": 4, "matrix": [2, 1], "x": 109, "y": 129},
+ {"flags": 4, "matrix": [2, 2], "x": 143, "y": 129},
+ {"flags": 4, "matrix": [2, 3], "x": 188, "y": 121},
+ {"flags": 4, "matrix": [3, 0], "x": 74, "y": 95},
+ {"flags": 4, "matrix": [3, 1], "x": 109, "y": 95},
+ {"flags": 4, "matrix": [3, 2], "x": 143, "y": 95},
+ {"flags": 4, "matrix": [4, 0], "x": 73, "y": 60},
+ {"flags": 4, "matrix": [4, 1], "x": 109, "y": 60},
+ {"flags": 4, "matrix": [4, 2], "x": 144, "y": 60},
+ {"flags": 4, "matrix": [4, 3], "x": 188, "y": 51},
+ {"flags": 4, "matrix": [5, 0], "x": 91, "y": 25},
+ {"flags": 4, "matrix": [5, 2], "x": 144, "y": 25},
- { "flags": 2, "x": 61, "y": 26},
- { "flags": 2, "x": 61, "y": 88},
- { "flags": 2, "x": 61, "y": 158},
- { "flags": 2, "x": 61, "y": 197},
- { "flags": 2, "x": 61, "y": 232},
- { "flags": 2, "x": 192, "y": 232},
- { "flags": 2, "x": 192, "y": 196},
- { "flags": 2, "x": 192, "y": 158},
- { "flags": 2, "x": 192, "y": 87},
- { "flags": 2, "x": 183, "y": 26},
- { "flags": 2, "x": 127, "y": 24}
+ {"flags": 2, "x": 61, "y": 26},
+ {"flags": 2, "x": 61, "y": 88},
+ {"flags": 2, "x": 61, "y": 158},
+ {"flags": 2, "x": 61, "y": 197},
+ {"flags": 2, "x": 61, "y": 232},
+ {"flags": 2, "x": 192, "y": 232},
+ {"flags": 2, "x": 192, "y": 196},
+ {"flags": 2, "x": 192, "y": 158},
+ {"flags": 2, "x": 192, "y": 87},
+ {"flags": 2, "x": 183, "y": 26},
+ {"flags": 2, "x": 127, "y": 24}
]
}
}
diff --git a/keyboards/atlantis/ps17/keymaps/default/keymap.c b/keyboards/atlantis/ps17/keymaps/default/keymap.c
index b5d36f02a7..36042fbb18 100644
--- a/keyboards/atlantis/ps17/keymaps/default/keymap.c
+++ b/keyboards/atlantis/ps17/keymaps/default/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
#if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[1] = { ENCODER_CCW_CW(RGB_HUI, RGB_HUD) },
[2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
diff --git a/keyboards/atlantis/ps17/keymaps/multimedia/keymap.c b/keyboards/atlantis/ps17/keymaps/multimedia/keymap.c
index 32d20ef86c..8546cfb71f 100644
--- a/keyboards/atlantis/ps17/keymaps/multimedia/keymap.c
+++ b/keyboards/atlantis/ps17/keymaps/multimedia/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
#if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[2] = { ENCODER_CCW_CW(RGB_HUI, RGB_HUD) },
diff --git a/keyboards/atlantis/ps17/keymaps/via/keymap.c b/keyboards/atlantis/ps17/keymaps/via/keymap.c
index 93a158172d..ff4bfdb336 100644
--- a/keyboards/atlantis/ps17/keymaps/via/keymap.c
+++ b/keyboards/atlantis/ps17/keymaps/via/keymap.c
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
#if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[1] = { ENCODER_CCW_CW(RGB_HUI, RGB_HUD) },
[2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
diff --git a/keyboards/atlantis/ps17/ps17.c b/keyboards/atlantis/ps17/ps17.c
index ccac1ce923..d660bdee6a 100644
--- a/keyboards/atlantis/ps17/ps17.c
+++ b/keyboards/atlantis/ps17/ps17.c
@@ -19,23 +19,6 @@ void keyboard_pre_init_kb(void) {
keyboard_pre_init_user();
}
-#if defined(ENCODER_ENABLE)
-bool encoder_update_kb(uint8_t index, bool clockwise) {
- if (!encoder_update_user(index, clockwise)) {
- /* Don't process further events if user function exists and returns false */
- return false;
- }
-
- /* Ignore index - only one encoder on this board */
- if (clockwise) {
- tap_code_delay(KC_VOLU, 10);
- } else {
- tap_code_delay(KC_VOLD, 10);
- }
- return false;
-}
-#endif
-
#ifdef RGB_MATRIX_ENABLE
void suspend_power_down_kb(void) {
/* Disable indicator LEDs when going to sleep */
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 07:44:30 +0000