summaryrefslogtreecommitdiff
path: root/keyboards/atlantis
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/atlantis')
-rw-r--r--keyboards/atlantis/ak81_ve/ak81_ve.c2
-rw-r--r--keyboards/atlantis/ak81_ve/ak81_ve.h34
-rw-r--r--keyboards/atlantis/ak81_ve/config.h13
-rw-r--r--keyboards/atlantis/ak81_ve/info.json188
-rw-r--r--keyboards/atlantis/ak81_ve/rules.mk1
-rw-r--r--keyboards/atlantis/encoder_actions.c6
-rw-r--r--keyboards/atlantis/ps17/config.h1
-rw-r--r--keyboards/atlantis/ps17/info.json3
-rw-r--r--keyboards/atlantis/ps17/ps17.c17
9 files changed, 115 insertions, 150 deletions
diff --git a/keyboards/atlantis/ak81_ve/ak81_ve.c b/keyboards/atlantis/ak81_ve/ak81_ve.c
index 2426d70fe8..2eda87b5b0 100644
--- a/keyboards/atlantis/ak81_ve/ak81_ve.c
+++ b/keyboards/atlantis/ak81_ve/ak81_ve.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "ak81_ve.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
led_config_t g_led_config = { {
diff --git a/keyboards/atlantis/ak81_ve/ak81_ve.h b/keyboards/atlantis/ak81_ve/ak81_ve.h
deleted file mode 100644
index d295320689..0000000000
--- a/keyboards/atlantis/ak81_ve/ak81_ve.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2022 @fOmey
- *
- * 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 LAYOUT( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K010, K011, K012, K013, K014, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, \
- K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K314, \
- K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K413, K414, \
- K500, K501, K502, K506, K510, K511, K512, K513, K514 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, KC_NO, K010, K011, K012, K013, K014 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, KC_NO, K314 }, \
- { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, KC_NO, K413, K414 }, \
- { K500, K501, K502, KC_NO, KC_NO, KC_NO, K506, KC_NO, KC_NO, KC_NO, K510, K511, K512, K513, K514 } \
-}
diff --git a/keyboards/atlantis/ak81_ve/config.h b/keyboards/atlantis/ak81_ve/config.h
index 7379856a4f..994c0fd82f 100644
--- a/keyboards/atlantis/ak81_ve/config.h
+++ b/keyboards/atlantis/ak81_ve/config.h
@@ -16,17 +16,9 @@
#pragma once
-
-/* Key matrix pins */
-#define MATRIX_ROW_PINS { F1, F7, F6, F5, F4, D5 }
-#define MATRIX_COL_PINS { F0, C7, C6, B6, B5, B4, D7, D6, B2, B7, D3, D2, D1, D0, B3 }
-
#define ENCODERS_CCW_KEY { { 4, 5 } } // Note: array is { col, row )
#define ENCODERS_CW_KEY { { 3, 5 } } // Note: array is { col, row )
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
@@ -34,9 +26,6 @@
#define LOCKING_RESYNC_ENABLE
#define FORCE_NKRO
-#define RGB_DI_PIN B1
-#ifdef RGB_DI_PIN
-
#define RGB_MATRIX_KEYPRESSES
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
#define RGB_DISABLE_WHEN_USB_SUSPENDED true
@@ -88,5 +77,3 @@
#define ENABLE_RGB_MATRIX_MULTISPLASH // Full gradient & value pulse away from multiple key hits then fades value out
#define ENABLE_RGB_MATRIX_SOLID_SPLASH // Hue & value pulse away from a single key hit then fades value out
#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH // Hue & value pulse away from multiple key hits then fades value out
-
-#endif \ No newline at end of file
diff --git a/keyboards/atlantis/ak81_ve/info.json b/keyboards/atlantis/ak81_ve/info.json
index 0269bd1e27..b5ef4538d8 100644
--- a/keyboards/atlantis/ak81_ve/info.json
+++ b/keyboards/atlantis/ak81_ve/info.json
@@ -7,6 +7,14 @@
"pid": "0x0081",
"device_version": "0.0.1"
},
+ "rgb_matrix": {
+ "driver": "WS2812"
+ },
+ "matrix_pins": {
+ "cols": ["F0", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "B2", "B7", "D3", "D2", "D1", "D0", "B3"],
+ "rows": ["F1", "F7", "F6", "F5", "F4", "D5"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "E6", "pin_b": "B0"}
@@ -16,92 +24,110 @@
"caps_lock": "D4",
"on_state": 0
},
+ "ws2812": {
+ "pin": "B1"
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
"layout": [
- { "label": "Esc", "x": 0, "y": 0 },
- { "label": "F1", "x": 2, "y": 0 },
- { "label": "F2", "x": 3, "y": 0 },
- { "label": "F3", "x": 4, "y": 0 },
- { "label": "F4", "x": 5, "y": 0 },
- { "label": "F5", "x": 6.5, "y": 0 },
- { "label": "F6", "x": 7.5, "y": 0 },
- { "label": "F7", "x": 8.5, "y": 0 },
- { "label": "F8", "x": 9.5, "y": 0 },
- { "label": "F9", "x": 11, "y": 0 },
- { "label": "F10", "x": 12, "y": 0 },
- { "label": "F11", "x": 13, "y": 0 },
- { "label": "F12", "x": 14, "y": 0 },
- { "label": "Del", "x": 16.25, "y": 0 },
- { "label": "~", "x": 0, "y": 1 },
- { "label": "!", "x": 1, "y": 1 },
- { "label": "@", "x": 2, "y": 1 },
- { "label": "#", "x": 3, "y": 1 },
- { "label": "$", "x": 4, "y": 1 },
- { "label": "%", "x": 5, "y": 1 },
- { "label": "^", "x": 6, "y": 1 },
- { "label": "&", "x": 7, "y": 1 },
- { "label": "*", "x": 8, "y": 1 },
- { "label": "(", "x": 9, "y": 1 },
- { "label": ")", "x": 10, "y": 1 },
- { "label": "_", "x": 11, "y": 1 },
- { "label": "+", "x": 12, "y": 1 },
- { "label": "Backspace", "w": 2, "x": 13, "y": 1 },
- { "label": "Home", "x": 16.25, "y": 1 },
- { "label": "Tab", "w": 1.5, "x": 0, "y": 2 },
- { "label": "Q", "x": 1.5, "y": 2 },
- { "label": "W", "x": 2.5, "y": 2 },
- { "label": "E", "x": 3.5, "y": 2 },
- { "label": "R", "x": 4.5, "y": 2 },
- { "label": "T", "x": 5.5, "y": 2 },
- { "label": "Y", "x": 6.5, "y": 2 },
- { "label": "U", "x": 7.5, "y": 2 },
- { "label": "I", "x": 8.5, "y": 2 },
- { "label": "O", "x": 9.5, "y": 2 },
- { "label": "P", "x": 10.5, "y": 2 },
- { "label": "{", "x": 11.5, "y": 2 },
- { "label": "}", "x": 12.5, "y": 2 },
- { "label": "|", "w": 1.5, "x": 13.5, "y": 2 },
- { "label": "PageUp", "x": 16.25, "y": 2 },
- { "label": "Capslock", "w": 1.75, "x": 0, "y": 3 },
- { "label": "A", "x": 1.75, "y": 3 },
- { "label": "S", "x": 2.75, "y": 3 },
- { "label": "D", "x": 3.75, "y": 3 },
- { "label": "F", "x": 4.75, "y": 3 },
- { "label": "G", "x": 5.75, "y": 3 },
- { "label": "H", "x": 6.75, "y": 3 },
- { "label": "J", "x": 7.75, "y": 3 },
- { "label": "K", "x": 8.75, "y": 3 },
- { "label": "L", "x": 9.75, "y": 3 },
- { "label": ":", "x": 10.75, "y": 3 },
- { "label": "\"", "x": 11.75, "y": 3 },
- { "label": "Enter", "w": 2.25, "x": 12.75, "y": 3 },
- { "label": "PageDown", "x": 16.25, "y": 3 },
- { "label": "Shift", "w": 2.25, "x": 0, "y": 4 },
- { "label": "Z", "x": 2.25, "y": 4 },
- { "label": "X", "x": 3.25, "y": 4 },
- { "label": "C", "x": 4.25, "y": 4 },
- { "label": "V", "x": 5.25, "y": 4 },
- { "label": "B", "x": 6.25, "y": 4 },
- { "label": "N", "x": 7.25, "y": 4 },
- { "label": "M", "x": 8.25, "y": 4 },
- { "label": ",", "x": 9.25, "y": 4 },
- { "label": ".", "x": 10.25, "y": 4 },
- { "label": "?", "x": 11.25, "y": 4 },
- { "label": "Shift", "w": 1.75, "x": 12.25, "y": 4 },
- { "label": "Up", "x": 14.25, "y": 4.25 },
- { "label": "End", "x": 16.25, "y": 4 },
- { "label": "Ctrl", "w": 1.25, "x": 0, "y": 5 },
- { "label": "Win", "w": 1.25, "x": 1.25, "y": 5 },
- { "label": "Alt", "w": 1.25, "x": 2.5, "y": 5 },
- { "w": 6.25, "x": 3.75, "y": 5 },
- { "label": "Alt", "w": 1.25, "x": 10, "y": 5 },
- { "label": "Fn", "w": 1.25, "x": 11.25, "y": 5 },
- { "label": "Left", "x": 13.25, "y": 5.25 },
- { "label": "Down", "x": 14.25, "y": 5.25 },
- { "label": "Right", "x": 15.25, "y": 5.25 }
+ {"matrix": [0, 0], "x": 0, "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": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+ {"matrix": [0, 7], "x": 8.5, "y": 0},
+ {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+ {"matrix": [0, 10], "x": 11, "y": 0},
+ {"matrix": [0, 11], "x": 12, "y": 0},
+ {"matrix": [0, 12], "x": 13, "y": 0},
+ {"matrix": [0, 13], "x": 14, "y": 0},
+
+ {"matrix": [0, 14], "x": 16.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 9], "x": 9, "y": 1},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+ {"matrix": [1, 11], "x": 11, "y": 1},
+ {"matrix": [1, 12], "x": 12, "y": 1},
+ {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+
+ {"matrix": [1, 14], "x": 16.25, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2},
+ {"matrix": [2, 2], "x": 2.5, "y": 2},
+ {"matrix": [2, 3], "x": 3.5, "y": 2},
+ {"matrix": [2, 4], "x": 4.5, "y": 2},
+ {"matrix": [2, 5], "x": 5.5, "y": 2},
+ {"matrix": [2, 6], "x": 6.5, "y": 2},
+ {"matrix": [2, 7], "x": 7.5, "y": 2},
+ {"matrix": [2, 8], "x": 8.5, "y": 2},
+ {"matrix": [2, 9], "x": 9.5, "y": 2},
+ {"matrix": [2, 10], "x": 10.5, "y": 2},
+ {"matrix": [2, 11], "x": 11.5, "y": 2},
+ {"matrix": [2, 12], "x": 12.5, "y": 2},
+ {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+
+ {"matrix": [2, 14], "x": 16.25, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3},
+ {"matrix": [3, 2], "x": 2.75, "y": 3},
+ {"matrix": [3, 3], "x": 3.75, "y": 3},
+ {"matrix": [3, 4], "x": 4.75, "y": 3},
+ {"matrix": [3, 5], "x": 5.75, "y": 3},
+ {"matrix": [3, 6], "x": 6.75, "y": 3},
+ {"matrix": [3, 7], "x": 7.75, "y": 3},
+ {"matrix": [3, 8], "x": 8.75, "y": 3},
+ {"matrix": [3, 9], "x": 9.75, "y": 3},
+ {"matrix": [3, 10], "x": 10.75, "y": 3},
+ {"matrix": [3, 11], "x": 11.75, "y": 3},
+ {"matrix": [3, 12], "x": 12.75, "y": 3, "w": 2.25},
+
+ {"matrix": [3, 14], "x": 16.25, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+ {"matrix": [4, 1], "x": 2.25, "y": 4},
+ {"matrix": [4, 2], "x": 3.25, "y": 4},
+ {"matrix": [4, 3], "x": 4.25, "y": 4},
+ {"matrix": [4, 4], "x": 5.25, "y": 4},
+ {"matrix": [4, 5], "x": 6.25, "y": 4},
+ {"matrix": [4, 6], "x": 7.25, "y": 4},
+ {"matrix": [4, 7], "x": 8.25, "y": 4},
+ {"matrix": [4, 8], "x": 9.25, "y": 4},
+ {"matrix": [4, 9], "x": 10.25, "y": 4},
+ {"matrix": [4, 10], "x": 11.25, "y": 4},
+ {"matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.75},
+
+ {"matrix": [4, 13], "x": 14.25, "y": 4.25},
+
+ {"matrix": [4, 14], "x": 16.25, "y": 4},
+
+ {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+ {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+ {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.25},
+ {"matrix": [5, 11], "x": 11.25, "y": 5, "w": 1.25},
+
+ {"matrix": [5, 12], "x": 13.25, "y": 5.25},
+ {"matrix": [5, 13], "x": 14.25, "y": 5.25},
+ {"matrix": [5, 14], "x": 15.25, "y": 5.25}
]
}
}
diff --git a/keyboards/atlantis/ak81_ve/rules.mk b/keyboards/atlantis/ak81_ve/rules.mk
index 3a7c70a102..aaaf913b96 100644
--- a/keyboards/atlantis/ak81_ve/rules.mk
+++ b/keyboards/atlantis/ak81_ve/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no # Keyboard backlight functionality
RGBLIGHT_ENABLE = no # Keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
LTO_ENABLE = yes
DYNAMIC_MACRO_ENABLE = yes
ENCODER_ENABLE = yes \ No newline at end of file
diff --git a/keyboards/atlantis/encoder_actions.c b/keyboards/atlantis/encoder_actions.c
index 5bfba6d99f..126b665a8e 100644
--- a/keyboards/atlantis/encoder_actions.c
+++ b/keyboards/atlantis/encoder_actions.c
@@ -28,7 +28,8 @@ void encoder_action_unregister(void) {
keyevent_t encoder_event = (keyevent_t) {
.key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index],
.pressed = false,
- .time = (timer_read() | 1)
+ .time = timer_read(),
+ .type = KEY_EVENT
};
encoder_state[index] = 0;
action_exec(encoder_event);
@@ -40,7 +41,8 @@ void encoder_action_register(uint8_t index, bool clockwise) {
keyevent_t encoder_event = (keyevent_t) {
.key = clockwise ? encoder_cw[index] : encoder_ccw[index],
.pressed = true,
- .time = (timer_read() | 1)
+ .time = timer_read(),
+ .type = KEY_EVENT
};
encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
action_exec(encoder_event);
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..a4c505ce5a 100644
--- a/keyboards/atlantis/ps17/info.json
+++ b/keyboards/atlantis/ps17/info.json
@@ -26,6 +26,9 @@
"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",
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-09-03 02:47:23 +0000