summaryrefslogtreecommitdiff
path: root/keyboards/rmi_kb/wete
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/rmi_kb/wete')
-rw-r--r--keyboards/rmi_kb/wete/v1/config.h6
-rw-r--r--keyboards/rmi_kb/wete/v1/info.json8
-rw-r--r--keyboards/rmi_kb/wete/v1/v1.h4
-rw-r--r--keyboards/rmi_kb/wete/v2/config.h21
-rw-r--r--keyboards/rmi_kb/wete/v2/info.json8
-rw-r--r--keyboards/rmi_kb/wete/v2/keymaps/via/keymap.c14
-rw-r--r--keyboards/rmi_kb/wete/v2/v2.c17
-rw-r--r--keyboards/rmi_kb/wete/v2/v2.h6
8 files changed, 29 insertions, 55 deletions
diff --git a/keyboards/rmi_kb/wete/v1/config.h b/keyboards/rmi_kb/wete/v1/config.h
index 4fa5e6e18b..c4d0637afe 100644
--- a/keyboards/rmi_kb/wete/v1/config.h
+++ b/keyboards/rmi_kb/wete/v1/config.h
@@ -17,16 +17,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define MATRIX_COL_PINS { B13, B14, B15, A8, B0, A7, A5, A4, A3, B9, C13, C14, C15, F0, F1, A0, A1, A2, B8, B7 }
-#define MATRIX_ROW_PINS { A9, B12, B11, B10, B2, B1 }
-#define DIODE_DIRECTION COL2ROW
-
#define BACKLIGHT_PWM_DRIVER PWMD3
#define BACKLIGHT_PWM_CHANNEL 1
#define BACKLIGHT_PAL_MODE 1
-// RGB B4
-#define RGB_DI_PIN B4
#define RGBLED_NUM 24
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/rmi_kb/wete/v1/info.json b/keyboards/rmi_kb/wete/v1/info.json
index cf17e5966d..1ae2b9c993 100644
--- a/keyboards/rmi_kb/wete/v1/info.json
+++ b/keyboards/rmi_kb/wete/v1/info.json
@@ -8,11 +8,19 @@
"pid": "0x00B5",
"device_version": "0.1.2"
},
+ "matrix_pins": {
+ "cols": ["B13", "B14", "B15", "A8", "B0", "A7", "A5", "A4", "A3", "B9", "C13", "C14", "C15", "F0", "F1", "A0", "A1", "A2", "B8", "B7"],
+ "rows": ["A9", "B12", "B11", "B10", "B2", "B1"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "A6",
"levels": 24,
"breathing": true
},
+ "ws2812": {
+ "pin": "B4"
+ },
"processor": "STM32F072",
"bootloader": "stm32-dfu",
"layouts": {
diff --git a/keyboards/rmi_kb/wete/v1/v1.h b/keyboards/rmi_kb/wete/v1/v1.h
index 55bb035b8b..24250e8fb0 100644
--- a/keyboards/rmi_kb/wete/v1/v1.h
+++ b/keyboards/rmi_kb/wete/v1/v1.h
@@ -188,7 +188,7 @@
k51, k52, k54, k55, k56, k57, k5a, k5b, k5c, k5d, k5e, k5f, k5h, k5i, k5j \
) { \
{ k00, k01, k02, k03, k04, k05, k06, k07, k08, XXX, k0a, k0b, k0c, k0d, XXX, k0f, k0g, k0h, k0i, k0j }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, XXX, k1j }, \
+ { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, k1i, k1j }, \
{ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, XXX, k2i, k2j }, \
{ XXX, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, XXX, XXX, k3i, k3j }, \
{ k40, k41, k42, k43, k44, XXX, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, k4f, XXX, k4h, k4i, k4j }, \
@@ -213,7 +213,7 @@
{ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, XXX, k2i, k2j }, \
{ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, XXX, XXX, k3i, k3j }, \
{ k40, k41, k42, k43, k44, XXX, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, k4f, XXX, k4h, k4i, k4j }, \
- { k50, XXX, k52, XXX, k54, k55, k56, k57, XXX, XXX, k5a, k5b, k5c, k5d, k5e, k5f, XXX, k5h, k5i, k5j } \
+ { k50, k51, k52, k53, k54, k55, k56, k57, XXX, XXX, k5a, k5b, k5c, k5d, k5e, k5f, XXX, k5h, k5i, k5j } \
}
//////////////////////////////// EXPOSED ////////////////////////////////
diff --git a/keyboards/rmi_kb/wete/v2/config.h b/keyboards/rmi_kb/wete/v2/config.h
index baf134e5e9..bbf7d911ad 100644
--- a/keyboards/rmi_kb/wete/v2/config.h
+++ b/keyboards/rmi_kb/wete/v2/config.h
@@ -17,28 +17,9 @@ 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 { B3, B2, B6, C6, C7, E6, F7, F6, F5, F4, F1, F0, NO_PIN }
-#define MATRIX_COL_PINS { B1, B0, B7, B5, B4, D7, D6, D4, D5, D3 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
#define RGBLIGHT_LAYERS
#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
-#define RGB_DI_PIN D0
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 18
# define RGBLIGHT_HUE_STEP 32
# define RGBLIGHT_SAT_STEP 32
@@ -54,7 +35,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# define RGBLIGHT_EFFECT_STATIC_GRADIENT
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
@@ -79,4 +59,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// QoL improvements
#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/rmi_kb/wete/v2/info.json b/keyboards/rmi_kb/wete/v2/info.json
index c477304658..53d64f2696 100644
--- a/keyboards/rmi_kb/wete/v2/info.json
+++ b/keyboards/rmi_kb/wete/v2/info.json
@@ -8,11 +8,19 @@
"pid": "0x00B3",
"device_version": "35.0.0"
},
+ "matrix_pins": {
+ "cols": ["B1", "B0", "B7", "B5", "B4", "D7", "D6", "D4", "D5", "D3"],
+ "rows": ["B3", "B2", "B6", "C6", "C7", "E6", "F7", "F6", "F5", "F4", "F1", "F0", null]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "D2", "pin_b": "D1"}
]
},
+ "ws2812": {
+ "pin": "D0"
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
diff --git a/keyboards/rmi_kb/wete/v2/keymaps/via/keymap.c b/keyboards/rmi_kb/wete/v2/keymaps/via/keymap.c
index 8afc6f9c25..1feb3d4686 100644
--- a/keyboards/rmi_kb/wete/v2/keymaps/via/keymap.c
+++ b/keyboards/rmi_kb/wete/v2/keymaps/via/keymap.c
@@ -37,24 +37,26 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
keyevent_t encoder_ccw = {
.key = (keypos_t){.row = 12, .col = 0},
- .pressed = false
+ .pressed = false,
+ .type = KEY_EVENT
};
keyevent_t encoder_cw = {
.key = (keypos_t){.row = 12, .col = 1},
- .pressed = false
+ .pressed = false,
+ .type = KEY_EVENT
};
void matrix_scan_user(void) {
if (IS_PRESSED(encoder_ccw)) {
encoder_ccw.pressed = false;
- encoder_ccw.time = (timer_read() | 1);
+ encoder_ccw.time = timer_read();
action_exec(encoder_ccw);
}
if (IS_PRESSED(encoder_cw)) {
encoder_cw.pressed = false;
- encoder_cw.time = (timer_read() | 1);
+ encoder_cw.time = timer_read();
action_exec(encoder_cw);
}
}
@@ -62,11 +64,11 @@ void matrix_scan_user(void) {
bool encoder_update_user(uint8_t index, bool clockwise) {
if (clockwise) {
encoder_cw.pressed = true;
- encoder_cw.time = (timer_read() | 1);
+ encoder_cw.time = timer_read();
action_exec(encoder_cw);
} else {
encoder_ccw.pressed = true;
- encoder_ccw.time = (timer_read() | 1);
+ encoder_ccw.time = timer_read();
action_exec(encoder_ccw);
}
return true;
diff --git a/keyboards/rmi_kb/wete/v2/v2.c b/keyboards/rmi_kb/wete/v2/v2.c
deleted file mode 100644
index de5f32e3ca..0000000000
--- a/keyboards/rmi_kb/wete/v2/v2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Ramon Imbao
- *
- * 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 "v2.h"
diff --git a/keyboards/rmi_kb/wete/v2/v2.h b/keyboards/rmi_kb/wete/v2/v2.h
index 75c9430c02..0a8ceed571 100644
--- a/keyboards/rmi_kb/wete/v2/v2.h
+++ b/keyboards/rmi_kb/wete/v2/v2.h
@@ -46,7 +46,7 @@ void adjust_leds(void);
{ k70, ___, k72, k73, k74, k75, k76, k77, k78, k79 }, \
{ k80, k81, k82, k83, k84, k85, k86, k87, ___, k89 }, \
{ k90, k91, ___, k93, k94, k95, k96, k97, k98, k99 }, \
- { ka0, ___, ka2, ka3, ___, ka5, ___, ka7, ___, ka9 }, \
+ { ka0, ka1, ka2, ka3, ___, ka5, ___, ka7, ___, ka9 }, \
{ ___, ___, kb2, ___, ___, ___, ___, kb7, kb8, kb9 }, \
{ ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
}
@@ -74,7 +74,7 @@ void adjust_leds(void);
{ k70, ___, k72, k73, k74, k75, k76, k77, k78, k79 }, \
{ k80, k81, k82, k83, k84, k85, k86, k87, ___, k89 }, \
{ k90, k91, k92, k93, k94, k95, k96, k97, k98, k99 }, \
- { ka0, ___, ka2, ka3, ___, ka5, ___, ka7, ___, ka9 }, \
+ { ka0, ka1, ka2, ka3, ___, ka5, ___, ka7, ___, ka9 }, \
{ ___, ___, kb2, ___, ___, ___, ___, kb7, kb8, kb9 }, \
{ ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
}
@@ -96,7 +96,7 @@ void adjust_leds(void);
) { \
{ k00, k01, k02, k03, k04, k05, k06, ___, k08, k09 }, \
{ k10, k11, k12, k13, ___, k15, k16, k17, k18, k19 }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, ___ }, \
+ { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
{ k30 ,k31, k32, k33, k34, k35, k36, k37, k38, k39 }, \
{ k40, k41, k42, k43, k44, k45, k46, k47, k48, k49 }, \
{ k50, k51, k52, k53, k54, k55, k56, k57, ___, k59 }, \
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-12 00:46:15 +0000