summaryrefslogtreecommitdiff
path: root/keyboards/pearlboards
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/pearlboards')
-rw-r--r--keyboards/pearlboards/atlas/atlas.c14
-rw-r--r--keyboards/pearlboards/atlas/config.h20
-rw-r--r--keyboards/pearlboards/atlas/info.json8
-rw-r--r--keyboards/pearlboards/pandora/config.h20
-rw-r--r--keyboards/pearlboards/pandora/info.json8
-rw-r--r--keyboards/pearlboards/pandora/pandora.c18
-rw-r--r--keyboards/pearlboards/pearl/config.h20
-rw-r--r--keyboards/pearlboards/pearl/info.json8
-rw-r--r--keyboards/pearlboards/pearl/pearl.c17
-rw-r--r--keyboards/pearlboards/zeus/config.h20
-rw-r--r--keyboards/pearlboards/zeus/info.json8
-rw-r--r--keyboards/pearlboards/zeus/zeus.c17
-rw-r--r--keyboards/pearlboards/zeuspad/config.h20
-rw-r--r--keyboards/pearlboards/zeuspad/info.json8
-rw-r--r--keyboards/pearlboards/zeuspad/zeuspad.c18
15 files changed, 40 insertions, 184 deletions
diff --git a/keyboards/pearlboards/atlas/atlas.c b/keyboards/pearlboards/atlas/atlas.c
index ff8577bde1..d8fcc8abb9 100644
--- a/keyboards/pearlboards/atlas/atlas.c
+++ b/keyboards/pearlboards/atlas/atlas.c
@@ -15,17 +15,3 @@
*/
#include "atlas.h"
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
- if (!encoder_update_user(index, clockwise)) { return false; }
- if (index == 0) {
- if (clockwise) {
- tap_code_delay(KC_VOLU, 10);
- } else {
- tap_code_delay(KC_VOLD, 10);
- }
- }
- return true;
-}
-#endif
diff --git a/keyboards/pearlboards/atlas/config.h b/keyboards/pearlboards/atlas/config.h
index 92cef2fde0..009f810b0c 100644
--- a/keyboards/pearlboards/atlas/config.h
+++ b/keyboards/pearlboards/atlas/config.h
@@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D6, E1, C0, C4, E3 }
-#define MATRIX_COL_PINS { D5, D4, C1, C2, C3, C5, C7, A7, A6, A5, A4, A3, A2, A1, A0, F7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
/* Audio Function */
#define AUDIO_CLICKY
#define AUDIO_PIN C6
@@ -48,8 +31,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/*== all animations enabled ==*/
/* If RGBLIGHT_SLEEP defined, the RGB lighting will be switched off when the host goes to sleep */
-#define RGB_DI_PIN B6
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_CHRISTMAS
@@ -64,7 +45,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_SLEEP
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/pearlboards/atlas/info.json b/keyboards/pearlboards/atlas/info.json
index 77c129e79f..11967be065 100644
--- a/keyboards/pearlboards/atlas/info.json
+++ b/keyboards/pearlboards/atlas/info.json
@@ -8,6 +8,11 @@
"pid": "0x6964",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D5", "D4", "C1", "C2", "C3", "C5", "C7", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "F7"],
+ "rows": ["D6", "E1", "C0", "C4", "E3"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "E0", "pin_b": "D7", "resolution": 1}
@@ -19,6 +24,9 @@
"scroll_lock": "F6",
"on_state": 0
},
+ "ws2812": {
+ "pin": "B6"
+ },
"processor": "at90usb1286",
"bootloader": "atmel-dfu",
"layouts": {
diff --git a/keyboards/pearlboards/pandora/config.h b/keyboards/pearlboards/pandora/config.h
index c039db9a15..02fc30db97 100644
--- a/keyboards/pearlboards/pandora/config.h
+++ b/keyboards/pearlboards/pandora/config.h
@@ -17,29 +17,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B4, D7, D6, B3, B0 }
-#define MATRIX_COL_PINS { D2, D1, D0, D3, D5, B5, B6, B7, D4, C6, C7, F0, F1, F4, F7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
#define DIP_SWITCH_PINS { B2, B5 }
/*== all animations enabled ==*/
/* If RGBLIGHT_SLEEP defined, the RGB lighting will be switched off when the host goes to sleep */
-#define RGB_DI_PIN B1
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_CHRISTMAS
@@ -54,7 +35,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_SLEEP
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/pearlboards/pandora/info.json b/keyboards/pearlboards/pandora/info.json
index 0114fb8e78..b3d80109fe 100644
--- a/keyboards/pearlboards/pandora/info.json
+++ b/keyboards/pearlboards/pandora/info.json
@@ -8,6 +8,11 @@
"pid": "0x6963",
"device_version": "0.0.2"
},
+ "matrix_pins": {
+ "cols": ["D2", "D1", "D0", "D3", "D5", "B5", "B6", "B7", "D4", "C6", "C7", "F0", "F1", "F4", "F7"],
+ "rows": ["B4", "D7", "D6", "B3", "B0"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "F6", "pin_b": "F5", "resolution": 1}
@@ -17,6 +22,9 @@
"caps_lock": "E6",
"on_state": 0
},
+ "ws2812": {
+ "pin": "B1"
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
diff --git a/keyboards/pearlboards/pandora/pandora.c b/keyboards/pearlboards/pandora/pandora.c
index 608ee00edf..927f29f2f3 100644
--- a/keyboards/pearlboards/pandora/pandora.c
+++ b/keyboards/pearlboards/pandora/pandora.c
@@ -16,24 +16,6 @@
#include "pandora.h"
-// Encoder rotate function
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
- if (!encoder_update_user(index, clockwise)) {
- return false;
- }
- /* First encoder */
- if (index == 0) {
- if (clockwise) {
- tap_code(KC_AUDIO_VOL_UP);
- } else {
- tap_code(KC_AUDIO_VOL_DOWN);
- }
- }
- return true;
-}
-#endif
-
// Encoder click function
#ifdef DIP_SWITCH_ENABLE
bool dip_switch_update_kb(uint8_t index, bool active) {
diff --git a/keyboards/pearlboards/pearl/config.h b/keyboards/pearlboards/pearl/config.h
index 3faaca26a0..361c315929 100644
--- a/keyboards/pearlboards/pearl/config.h
+++ b/keyboards/pearlboards/pearl/config.h
@@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D3, F7, F0, E6 }
-#define MATRIX_COL_PINS { D2, F1, F4, F5, F6, C7, B6, B5, B4, D7, D6, D4, D5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
/* Audio Function */
#define AUDIO_CLICKY
#define AUDIO_PIN C6
@@ -48,8 +31,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/*== all animations enabled ==*/
/* If RGBLIGHT_SLEEP defined, the RGB lighting will be switched off when the host goes to sleep */
-#define RGB_DI_PIN B3
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_CHRISTMAS
@@ -65,7 +46,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
# define RGBLIGHT_SLEEP
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/pearlboards/pearl/info.json b/keyboards/pearlboards/pearl/info.json
index f6082c1d37..1a4b7f301c 100644
--- a/keyboards/pearlboards/pearl/info.json
+++ b/keyboards/pearlboards/pearl/info.json
@@ -8,12 +8,20 @@
"pid": "0x6965",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D2", "F1", "F4", "F5", "F6", "C7", "B6", "B5", "B4", "D7", "D6", "D4", "D5"],
+ "rows": ["D3", "F7", "F0", "E6"]
+ },
+ "diode_direction": "COL2ROW",
"indicators": {
"caps_lock": "B0",
"num_lock": "B1",
"scroll_lock": "B2",
"on_state": 0
},
+ "ws2812": {
+ "pin": "B3"
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"debounce": 4,
diff --git a/keyboards/pearlboards/pearl/pearl.c b/keyboards/pearlboards/pearl/pearl.c
deleted file mode 100644
index f1ccf3fd9a..0000000000
--- a/keyboards/pearlboards/pearl/pearl.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Koobaczech
- *
- * 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/>.
- */
-
-#include "pearl.h"
diff --git a/keyboards/pearlboards/zeus/config.h b/keyboards/pearlboards/zeus/config.h
index deb979dd06..102c43e168 100644
--- a/keyboards/pearlboards/zeus/config.h
+++ b/keyboards/pearlboards/zeus/config.h
@@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F0, C1, E1, E0, D7, D6 }
-#define MATRIX_COL_PINS { F1, F2, F3, F4, F5, F6, F7, A0, A1, A2, A3, A4, A5, A6, A7, C7, C2, C0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
/* Audio Function */
#define AUDIO_CLICKY
#define AUDIO_PIN C6
@@ -52,8 +35,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/*== all animations enabled ==*/
/* If RGBLIGHT_SLEEP defined, the RGB lighting will be switched off when the host goes to sleep */
-#define RGB_DI_PIN D5
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_CHRISTMAS
@@ -68,7 +49,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_SLEEP
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/pearlboards/zeus/info.json b/keyboards/pearlboards/zeus/info.json
index 3d2f44a892..6fbe41611e 100644
--- a/keyboards/pearlboards/zeus/info.json
+++ b/keyboards/pearlboards/zeus/info.json
@@ -8,6 +8,11 @@
"pid": "0x6966",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F1", "F2", "F3", "F4", "F5", "F6", "F7", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C2", "C0"],
+ "rows": ["F0", "C1", "E1", "E0", "D7", "D6"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "E7", "pin_b": "E6", "resolution": 1}
@@ -19,6 +24,9 @@
"scroll_lock": "C3",
"on_state": 0
},
+ "ws2812": {
+ "pin": "D5"
+ },
"processor": "at90usb1286",
"bootloader": "atmel-dfu",
"layouts": {
diff --git a/keyboards/pearlboards/zeus/zeus.c b/keyboards/pearlboards/zeus/zeus.c
index cdb8d6125d..b6a7fe1f8e 100644
--- a/keyboards/pearlboards/zeus/zeus.c
+++ b/keyboards/pearlboards/zeus/zeus.c
@@ -15,20 +15,3 @@
*/
#include "zeus.h"
-
-// Encoder rotate function
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
- if (!encoder_update_user(index, clockwise)) {
- return false;
- } /* First encoder */
- if (index == 0) {
- if (clockwise) {
- tap_code(KC_AUDIO_VOL_UP);
- } else {
- tap_code(KC_AUDIO_VOL_DOWN);
- }
- }
- return true;
-}
-#endif
diff --git a/keyboards/pearlboards/zeuspad/config.h b/keyboards/pearlboards/zeuspad/config.h
index f61e11fca9..205cad6e32 100644
--- a/keyboards/pearlboards/zeuspad/config.h
+++ b/keyboards/pearlboards/zeuspad/config.h
@@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D2, D3, D5, F7, F4, F1 }
-#define MATRIX_COL_PINS { B0, F0, F5, F6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
/* OLED Settings */
#define OLED_TIMEOUT 120000
#define OLED_FADE_OUT
@@ -43,8 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/*== all animations enabled ==*/
/* If RGBLIGHT_SLEEP defined, the RGB lighting will be switched off when the host goes to sleep */
-#define RGB_DI_PIN B7
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_CHRISTMAS
@@ -59,7 +40,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_SLEEP
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/pearlboards/zeuspad/info.json b/keyboards/pearlboards/zeuspad/info.json
index 3258e758a8..c062ce5442 100644
--- a/keyboards/pearlboards/zeuspad/info.json
+++ b/keyboards/pearlboards/zeuspad/info.json
@@ -8,11 +8,19 @@
"pid": "0x6967",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B0", "F0", "F5", "F6"],
+ "rows": ["D2", "D3", "D5", "F7", "F4", "F1"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "D6", "pin_b": "D4", "resolution": 1}
]
},
+ "ws2812": {
+ "pin": "B7"
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"debounce": 0,
diff --git a/keyboards/pearlboards/zeuspad/zeuspad.c b/keyboards/pearlboards/zeuspad/zeuspad.c
index 3f7367fb49..ffa504fa63 100644
--- a/keyboards/pearlboards/zeuspad/zeuspad.c
+++ b/keyboards/pearlboards/zeuspad/zeuspad.c
@@ -16,24 +16,6 @@
#include "zeuspad.h"
-// Encoder rotate function
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
- if (!encoder_update_user(index, clockwise)) {
- return false;
- }
- /* First encoder */
- if (index == 0) {
- if (clockwise) {
- tap_code_delay(KC_AUDIO_VOL_UP, 10);
- } else {
- tap_code_delay(KC_AUDIO_VOL_DOWN, 10);
- }
- }
- return true;
-}
-#endif
-
// 21 characters max
#ifdef OLED_ENABLE
bool oled_task_kb(void) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 00:14:57 +0000