summaryrefslogtreecommitdiff
path: root/keyboards/owlab/voice65
diff options
context:
space:
mode:
authorkb-elmo <lorwel@mailbox.org>2021-08-19 20:12:34 +0200
committerGitHub <noreply@github.com>2021-08-19 11:12:34 -0700
commit8200804e96d1914ebad1948b52d6e1cec2e3ffcc (patch)
tree7438b6f02889fd5847341b9c023923a20080e055 /keyboards/owlab/voice65
parentc039796d9d6d341f16600b7032df056c0959df06 (diff)
downloadqmk_firmware-8200804e96d1914ebad1948b52d6e1cec2e3ffcc.tar.gz
qmk_firmware-8200804e96d1914ebad1948b52d6e1cec2e3ffcc.zip
[Keyboard] Add Voice65 (#13744)
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
Diffstat (limited to 'keyboards/owlab/voice65')
-rw-r--r--keyboards/owlab/voice65/hotswap/config.h90
-rw-r--r--keyboards/owlab/voice65/hotswap/halconf.h21
-rw-r--r--keyboards/owlab/voice65/hotswap/hotswap.c451
-rw-r--r--keyboards/owlab/voice65/hotswap/hotswap.h46
-rw-r--r--keyboards/owlab/voice65/hotswap/info.json80
-rw-r--r--keyboards/owlab/voice65/hotswap/keymaps/default/keymap.c36
-rw-r--r--keyboards/owlab/voice65/hotswap/keymaps/via/keymap.c51
-rw-r--r--keyboards/owlab/voice65/hotswap/keymaps/via/rules.mk2
-rw-r--r--keyboards/owlab/voice65/hotswap/mcuconf.h22
-rw-r--r--keyboards/owlab/voice65/hotswap/readme.md21
-rw-r--r--keyboards/owlab/voice65/hotswap/rules.mk26
-rw-r--r--keyboards/owlab/voice65/soldered/config.h89
-rw-r--r--keyboards/owlab/voice65/soldered/halconf.h21
-rw-r--r--keyboards/owlab/voice65/soldered/info.json442
-rw-r--r--keyboards/owlab/voice65/soldered/keymaps/default/keymap.c36
-rw-r--r--keyboards/owlab/voice65/soldered/keymaps/via/keymap.c50
-rw-r--r--keyboards/owlab/voice65/soldered/keymaps/via/rules.mk2
-rw-r--r--keyboards/owlab/voice65/soldered/mcuconf.h22
-rw-r--r--keyboards/owlab/voice65/soldered/readme.md21
-rw-r--r--keyboards/owlab/voice65/soldered/rules.mk28
-rw-r--r--keyboards/owlab/voice65/soldered/soldered.c455
-rw-r--r--keyboards/owlab/voice65/soldered/soldered.h116
22 files changed, 2128 insertions, 0 deletions
diff --git a/keyboards/owlab/voice65/hotswap/config.h b/keyboards/owlab/voice65/hotswap/config.h
new file mode 100644
index 0000000000..4b6e8d8b83
--- /dev/null
+++ b/keyboards/owlab/voice65/hotswap/config.h
@@ -0,0 +1,90 @@
+/*
+Copyright 2021 kb-elmo<mail@elmo.space>
+
+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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID 0x4F53
+#define PRODUCT_ID 0x564F
+#define DEVICE_VER 0x0001
+#define MANUFACTURER Owl Studio
+#define PRODUCT Voice65 Hotswap
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+/* Keyboard Matrix Assignments */
+#define MATRIX_ROW_PINS { B0, B1, B2, B10, B11 }
+#define MATRIX_COL_PINS { A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A15, B8, B9, B12, B13 }
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* NKRO */
+#ifdef NKRO_ENABLE
+# define FORCE_NKRO
+#endif
+
+/* RGB stripe */
+#define RGB_DI_PIN B15
+#ifdef RGB_DI_PIN
+# define RGBLIGHT_EFFECT_ALTERNATING
+# define RGBLIGHT_EFFECT_BREATHING
+# define RGBLIGHT_EFFECT_CHRISTMAS
+# define RGBLIGHT_EFFECT_KNIGHT
+# define RGBLIGHT_EFFECT_RAINBOW_MOOD
+# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+# define RGBLIGHT_EFFECT_SNAKE
+# define RGBLIGHT_EFFECT_STATIC_GRADIENT
+# define RGBLIGHT_EFFECT_TWINKLE
+# define RGBLED_NUM 20
+# define RGBLIGHT_HUE_STEP 8
+# define RGBLIGHT_SAT_STEP 8
+# define RGBLIGHT_VAL_STEP 10
+# define RGBLIGHT_LIMIT_VAL 180
+# define OWL_VOLUME_RANGE 50
+#endif
+
+/* RGB matrix */
+#ifdef RGB_MATRIX_ENABLE
+# define USE_I2CV2
+# define RGB_MATRIX_DISABLE_KEYCODES
+# define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
+# define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
+# define RGB_MATRIX_KEYPRESSES
+# define RGB_MATRIX_LED_PROCESS_LIMIT 4
+# define RGB_MATRIX_LED_FLUSH_LIMIT 26
+# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
+# define RGB_MATRIX_STARTUP_VAL 128
+# define DRIVER_ADDR_1 0b0110000
+# define DRIVER_ADDR_2 0b0110000
+# define DRIVER_COUNT 2
+# define DRIVER_1_LED_TOTAL 67
+# define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL
+#endif
+
+/* Encoder */
+#define ENCODERS_PAD_A { B4 }
+#define ENCODERS_PAD_B { B5 }
+#define ENCODER_RESOLUTION 4
+#define TAP_CODE_DELAY 10
diff --git a/keyboards/owlab/voice65/hotswap/halconf.h b/keyboards/owlab/voice65/hotswap/halconf.h
new file mode 100644
index 0000000000..f88be48211
--- /dev/null
+++ b/keyboards/owlab/voice65/hotswap/halconf.h
@@ -0,0 +1,21 @@
+/* Copyright 2021 kb-elmo<mail@elmo.space>
+ *
+ * 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
+
+#define HAL_USE_I2C TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/owlab/voice65/hotswap/hotswap.c b/keyboards/owlab/voice65/hotswap/hotswap.c
new file mode 100644
index 0000000000..343daafeb2
--- /dev/null
+++ b/keyboards/owlab/voice65/hotswap/hotswap.c
@@ -0,0 +1,451 @@
+/* Copyright 2021 kb-elmo<mail@elmo.space>
+ *
+ * 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 "hotswap.h"
+
+#ifdef RGB_MATRIX_ENABLE
+const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
+ {0, CS3_SW1, CS2_SW1, CS1_SW1}, /* RGB0-ESC ROW0*/
+ {0, CS6_SW1, CS5_SW1, CS4_SW1}, /* RGB1-1 */
+ {0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB2-2 */
+ {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB3-3 */
+ {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB4-4 */
+ {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB5-5 */
+ {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB6-6 */
+ {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB7-7 */
+ {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB8-8 */
+ {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB9-9 */
+ {0, CS33_SW1, CS32_SW1, CS31_SW1}, /* RGB10-0 */
+ {0, CS36_SW1, CS35_SW1, CS34_SW1}, /* RGB11--- */
+ {0, CS39_SW1, CS38_SW1, CS37_SW1}, /* RGB12-+= */
+ {0, CS36_SW6, CS35_SW6, CS34_SW6}, /* RGB13-BS */
+ {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB14-DEL */
+ {0, CS3_SW2, CS2_SW2, CS1_SW2}, /* RGB15-TAB ----ROW1*/
+ {0, CS6_SW2, CS5_SW2, CS4_SW2}, /* RGB16-Q */
+ {0, CS9_SW2, CS8_SW2, CS7_SW2}, /* RGB17-W */
+ {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB18-E */
+ {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB19-R */
+ {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB20-T */
+ {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB21-Y */
+ {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB22-U */
+ {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB23-I */
+ {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB24-O */
+ {0, CS33_SW2, CS32_SW2, CS31_SW2}, /* RGB25-P */
+ {0, CS36_SW2, CS35_SW2, CS34_SW2}, /* RGB26-[ */
+ {0, CS39_SW2, CS38_SW2, CS37_SW2}, /* RGB27-] */
+ {0, CS39_SW6, CS38_SW6, CS37_SW6}, /* RGB28-\ */
+ {0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB29-PGUP */
+ {0, CS3_SW3, CS2_SW3, CS1_SW3}, /* RGB30-CAPS---ROW2*/
+ {0, CS6_SW3, CS5_SW3, CS4_SW3}, /* RGB31-A-- */
+ {0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB32-S-- */
+ {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB33-D-- */
+ {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB34-F-- */
+ {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB35-G-- */
+ {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB36-H-- */
+ {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB37-J-- */
+ {0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB38-K-- */
+ {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB39-L-- */
+ {0, CS33_SW3, CS32_SW3, CS31_SW3}, /* RGB40-;:- */
+ {0, CS36_SW3, CS35_SW3, CS34_SW3}, /* RGB41-''- */
+ {0, CS39_SW3, CS38_SW3, CS37_SW3}, /* RGB42-ENTER- */
+ {0, CS33_SW7, CS32_SW7, CS31_SW7}, /* RGB43-PGDN */
+ {0, CS3_SW4, CS2_SW4, CS1_SW4}, /* RGB44-LSF --ROW3*/
+ {0, CS6_SW4, CS5_SW4, CS4_SW4}, /* RGB45-Z -*/
+ {0, CS9_SW4, CS8_SW4, CS7_SW4}, /* RGB46-X -*/
+ {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB47-C -*/
+ {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB48-V -*/
+ {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB49-B -*/
+ {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB50-N -*/
+ {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB51-M -*/
+ {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB52-,< -*/
+ {0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB53->. -*/
+ {0, CS33_SW4, CS32_SW4, CS31_SW4}, /* RGB54-? -*/
+ {0, CS36_SW4, CS35_SW4, CS34_SW4}, /* RGB55-RSF -*/
+ {0, CS39_SW4, CS38_SW4, CS37_SW4}, /* RGB56-UP -*/
+ {0, CS36_SW7, CS35_SW7, CS34_SW7}, /* RGB57--MO-- */
+ {0, CS3_SW5, CS2_SW5, CS1_SW5}, /* RGB58-lct-- row4*/
+ {0, CS6_SW5, CS5_SW5, CS4_SW5}, /* RGB59-lwin- */
+ {0, CS9_SW5, CS8_SW5, CS7_SW5}, /* RGB60-lalt- */
+ {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB61-sp- */
+ {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB62-ralt- */
+ {0, CS33_SW5, CS32_SW5, CS31_SW5}, /* RGB63-rct- */
+ {0, CS36_SW5, CS35_SW5, CS34_SW5}, /* RGB64-left- */
+ {0, CS39_SW5, CS38_SW5, CS37_SW5}, /* RGB65-dn- */
+ {0, CS39_SW7, CS38_SW7, CS37_SW7}, /* RGB66-right- */
+};
+
+led_config_t g_led_config = { {
+ { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 },
+ { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 },
+ { 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, NO_LED, 43 },
+ { 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, NO_LED, 56, 57 },
+ { 58, 59, 60, NO_LED, NO_LED, 61, NO_LED, NO_LED, NO_LED, 62, 63, 64, NO_LED, 65, 66 }
+}, {
+ { 0, 0 }, { 16, 0 }, { 32, 0 }, { 48, 0 }, { 64, 0 }, { 80, 0 }, { 96, 0 }, { 112, 0 }, { 128, 0 }, { 144, 0 }, { 160, 0 }, { 176, 0 }, { 192, 0 }, { 208, 0 }, { 224, 0 },
+ { 2, 16 }, { 18, 16 }, { 34, 16 }, { 50, 16 }, { 66, 16 }, { 82, 16 }, { 98, 16 }, { 114, 16 }, { 130, 16 }, { 146, 16 }, { 162, 16 }, { 178, 16 }, { 194, 16 }, { 210, 16 }, { 224, 16 },
+ { 4, 32 }, { 20, 32 }, { 36, 32 }, { 52, 32 }, { 68, 32 }, { 84, 32 }, { 100, 32 }, { 116, 32 }, { 132, 32 }, { 148, 32 }, { 164, 32 }, { 180, 32 }, { 196, 32 }, { 224, 32 },
+ { 8, 48 }, { 24, 48 }, { 40, 48 }, { 56, 48 }, { 72, 48 }, { 88, 48 }, { 104, 48 }, { 120, 48 }, { 136, 48 }, { 152, 48 }, { 168, 48 }, { 184, 48 }, { 208, 48 }, { 224, 48 },
+ { 2, 64 }, { 18, 64 }, { 34, 64 }, { 82, 64 }, { 146, 64 }, { 162, 64 }, { 178, 64 }, { 210, 64 }, { 224, 64 }
+}, {
+ 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
+ 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+ 0, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
+ 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ }
+};
+
+
+#endif
+
+__attribute__ ((weak))
+void rgb_matrix_indicators_user(void)
+{
+ if (host_keyboard_led_state().caps_lock)
+ {
+ rgb_matrix_set_color(31, 255, 255, 255);
+ } else {
+ rgb_matrix_set_color(31, 0, 0, 0);
+ }
+}
+
+enum encoder_modes{
+ ENCODER_MODE_ONE = 0,
+ ENCODER_MODE_TWO,
+ ENCODER_MODE_THREE,
+};
+
+keyboard_config_t keyboard_config;
+rgblight_config_t rgblight_config;
+
+uint8_t pre_hue, pre_sat, pre_val;
+uint8_t previous_rgb_mode = 0;
+uint8_t dir_hue, dir_sat;
+
+bool encoder_in = false;
+uint32_t encoder_timer;
+
+bool encoder_ani_start= false;
+uint32_t encoder_ani_timer = 0;
+
+bool encoder_direction_start = false;
+uint32_t encoder_direction_timer = 0;
+
+
+bool lizm_restart_snake = false;
+void rgblight_snake_restart(uint8_t hue, uint8_t sat, uint8_t val){
+ lizm_restart_snake = true; // restart signal to local each effect
+ rgblight_config.hue = hue;
+ rgblight_config.sat = sat;
+ rgblight_config.val = val;
+}
+
+
+void keyboard_post_init_kb(void){
+ keyboard_config.raw = eeconfig_read_kb();
+ if( keyboard_config.encoder_mode_index > ENCODER_MODE_THREE ){
+ keyboard_config.encoder_mode_index = ENCODER_MODE_ONE;
+ eeconfig_update_kb(keyboard_config.raw);
+ }
+}
+
+void switch_encoder_mode(uint8_t mode){
+ switch(mode){
+ case ENCODER_MODE_ONE:
+ dir_hue = 88;
+ dir_sat = 255;
+ break;
+
+ case ENCODER_MODE_TWO:
+ dir_hue = 0;
+ dir_sat = 240;
+ break;
+
+ case ENCODER_MODE_THREE:
+ dir_hue = 176;
+ dir_sat = 255;
+ break;
+ }
+ rgblight_sethsv_noeeprom(dir_hue,dir_sat,pre_val);
+}
+
+
+void init_encoder_mode(uint8_t mode){
+ previous_rgb_mode = rgblight_get_mode();
+ pre_hue = rgblight_get_hue();
+ pre_sat = rgblight_get_sat();
+ pre_val = rgblight_get_val();
+ encoder_in = true;
+
+ rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
+
+ switch_encoder_mode(mode);
+}
+
+
+void set_encoder_mode(uint8_t mode){
+ if(encoder_in == false){
+ init_encoder_mode(mode);
+ }else{
+ switch_encoder_mode(mode);
+ }
+ eeconfig_update_kb(keyboard_config.raw);
+ encoder_timer = timer_read32();
+}
+
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+ if (record->event.pressed) {
+ switch(keycode) {
+ case RGB_MOD:
+ case RGB_RMOD:
+ case RGB_HUI:
+ case RGB_HUD:
+ case RGB_SAI:
+ case RGB_SAD:
+ case RGB_VAI:
+ case RGB_VAD:
+
+ if(encoder_in){
+ return false;
+ }
+ break;
+
+ case KC_F13:
+ rgb_matrix_toggle();
+ break;
+
+ case KC_F14:
+ rgb_matrix_step();
+ break;
+
+ case KC_F15:
+ rgb_matrix_step_reverse();
+ break;
+
+ case KC_F16:
+ rgb_matrix_increase_hue(); //Increase the hue for effect range LEDs
+ break;
+
+ case KC_F17:
+ rgb_matrix_decrease_hue(); //Decrease the hue for effect range LEDs
+ break;
+
+ case KC_F18:
+ rgb_matrix_increase_sat(); //Increase the saturation for effect range LEDs
+ break;
+
+ case KC_F19:
+ rgb_matrix_decrease_sat(); //Decrease the saturation for effect range LEDs
+ break;
+
+ case KC_F20:
+ rgb_matrix_increase_val(); //Increase the value for effect range LEDs
+ break;
+
+ case KC_F21:
+ rgb_matrix_decrease_val();//Decrease the value for effect range LEDs
+ break;
+
+ case KC_F22: //change encoder mode upward
+
+ if(!encoder_direction_start){
+ if(keyboard_config.encoder_mode_index < ENCODER_MODE_THREE){
+ keyboard_config.encoder_mode_index++;
+ }
+ else{
+ keyboard_config.encoder_mode_index = ENCODER_MODE_ONE;
+ }
+ set_encoder_mode(keyboard_config.encoder_mode_index);
+ }
+ return false;
+
+ case KC_F23:
+ if(!encoder_direction_start){
+ if(keyboard_config.encoder_mode_index > ENCODER_MODE_ONE){
+ keyboard_config.encoder_mode_index--;
+ }
+ else{
+ keyboard_config.encoder_mode_index = ENCODER_MODE_THREE;
+ }
+ set_encoder_mode(keyboard_config.encoder_mode_index);
+ }
+ return false;
+
+ default:
+ break;
+ }
+ }
+ return process_record_user(keycode, record);
+}
+
+
+void matrix_scan_kb(void) {
+ if(encoder_in){
+ if(timer_elapsed32(encoder_timer) > 5000){
+ rgblight_mode(previous_rgb_mode);
+ rgblight_sethsv(pre_hue, pre_sat, pre_val);
+ encoder_in = false;
+ }
+ }
+
+ if(encoder_ani_start){
+ if(timer_elapsed32(encoder_ani_timer) > VOLUME_ANIMATION_TIMER){
+ encoder_ani_start = false;
+ rgblight_sethsv_noeeprom(0,0,0);
+ }
+ }
+
+ if(encoder_direction_start){
+ if(timer_elapsed32(encoder_direction_timer) > (VOLUME_ANIMATION_TIMER+1500)){
+ rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
+ rgblight_sethsv_noeeprom(dir_hue, dir_sat, pre_val);
+ encoder_direction_start = false;
+ }
+ }
+ matrix_scan_user();
+}
+
+
+void set_volume_animation(bool increase){
+ if(!encoder_ani_start){
+ rgblight_snake_restart(dir_hue, dir_sat, pre_val);
+ }
+
+ if(increase){
+ rgblight_mode_noeeprom(17);
+ } else {
+ rgblight_mode_noeeprom(18);
+ }
+
+ encoder_ani_timer = timer_read32();
+ encoder_direction_timer = encoder_ani_timer;
+ encoder_ani_start = true;
+ encoder_direction_start = true;
+}
+
+
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+ uint8_t layer_now = keyboard_config.encoder_mode_index +1;
+ uint16_t encoder_cw_keycode = keymap_key_to_keycode(layer_now, (keypos_t){.row=2, .col=1 });
+ uint16_t encoder_ccw_keycode = keymap_key_to_keycode(layer_now, (keypos_t){.row=2, .col=2 });
+ if (index == 0) { /* First encoder */
+ if(encoder_in == false){
+ init_encoder_mode(keyboard_config.encoder_mode_index);
+ }
+
+ if (!clockwise) {
+ switch(encoder_cw_keycode) {
+
+ case KC_F13:
+ rgb_matrix_toggle();
+ break;
+
+ case KC_F14:
+ rgb_matrix_step();
+ break;
+
+ case KC_F15:
+ rgb_matrix_step_reverse();
+ break;
+
+ case KC_F16:
+ rgb_matrix_increase_hue(); //Increase the hue for effect range LEDs
+ break;
+
+ case KC_F17:
+ rgb_matrix_decrease_hue(); //Decrease the hue for effect range LEDs
+ break;
+
+ case KC_F18:
+ rgb_matrix_increase_sat(); //Increase the saturation for effect range LEDs
+ break;
+
+ case KC_F19:
+ rgb_matrix_decrease_sat(); //Decrease the saturation for effect range LEDs
+ break;
+
+ case KC_F20:
+ rgb_matrix_increase_val(); //Increase the value for effect range LEDs
+ break;
+
+ case KC_F21:
+ rgb_matrix_decrease_val();//Decrease the value for effect range LEDs
+ break;
+
+ case KC_VOLU:
+ case KC_VOLD:
+ tap_code(encoder_cw_keycode);
+ break;
+
+ default:
+ tap_code(encoder_cw_keycode);
+ break;
+ }
+ set_volume_animation(true);
+ } else {
+ switch(encoder_ccw_keycode) {
+
+ case KC_F13:
+ rgb_matrix_toggle();
+ break;
+
+ case KC_F14:
+ rgb_matrix_step();
+ break;
+
+ case KC_F15:
+ rgb_matrix_step_reverse();
+ break;
+
+ case KC_F16:
+ rgb_matrix_increase_hue(); //Increase the hue for effect range LEDs
+ break;
+
+ case KC_F17:
+ rgb_matrix_decrease_hue(); //Decrease the hue for effect range LEDs
+ break;
+
+ case KC_F18:
+ rgb_matrix_increase_sat(); //Increase the saturation for effect range LEDs
+ break;
+
+ case KC_F19:
+ rgb_matrix_decrease_sat(); //Decrease the saturation for effect range LEDs
+ break;
+
+ case KC_F20:
+ rgb_matrix_increase_val(); //Increase the value for effect range LEDs
+ break;
+
+ case KC_F21:
+ rgb_matrix_decrease_val();//Decrease the value for effect range LEDs
+ break;
+
+ case KC_VOLU:
+ case KC_VOLD:
+ tap_code(encoder_ccw_keycode);
+ break;
+
+ default:
+ tap_code(encoder_ccw_keycode);
+ break;
+ }
+ set_volume_animation(false);
+ }
+ encoder_timer = timer_read32();
+ }
+ return true;
+}
diff --git a/keyboards/owlab/voice65/hotswap/hotswap.h b/keyboards/owlab/voice65/hotswap/hotswap.h
new file mode 100644
index 0000000000..cae25af596
--- /dev/null
+++ b/keyboards/owlab/voice65/hotswap/hotswap.h
@@ -0,0 +1,46 @@
+/* Copyright 2021 kb-elmo<mail@elmo.space>
+ *
+ * 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 ____ KC_NO
+
+#define LAYOUT( \
+ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, 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, K214, \
+ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K314, \
+ K400, K401, K402, K405, K409, K410, K411, K413, K414 \
+) { \
+ { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, 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, ____, K214 }, \
+ { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, ____, K313, K314 }, \
+ { K400, K401, K402, ____, ____, K405, ____, ____, ____, K409, K410, K411, ____, K413, K414 } \
+}
+
+typedef union {
+ uint32_t raw;
+ struct {
+ uint8_t encoder_mode_index :8;
+ };
+} keyboard_config_t;
+
+extern keyboard_config_t keyboard_config;
+
+#define VOLUME_ANIMATION_TIMER 580
diff --git a/keyboards/owlab/voice65/hotswap/info.json b/keyboards/owlab/voice65/hotswap/info.json
new file mode 100644
index 0000000000..93cc3521c4
--- /dev/null
+++ b/keyboards/owlab/voice65/hotswap/info.json
@@ -0,0 +1,80 @@
+{
+ "keyboard_name": "voice65 hotswap",
+ "url": "https://www.popkeyboard.com/products/67968vn00mzx",
+ "maintainer": "kb-elmo",
+ "width": 16,
+ "height": 5,
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"x":0, "y":0},
+ {"x":1, "y":0},
+ {"x":2, "y":0},
+ {"x":3, "y":0},
+ {"x":4, "y":0},
+ {"x":5, "y":0},
+ {"x":6, "y":0},
+ {"x":7, "y":0},
+ {"x":8, "y":0},
+ {"x":9, "y":0},
+ {"x":10, "y":0},
+ {"x":11, "y":0},
+ {"x":12, "y":0},
+ {"x":13, "y":0, "w":2},
+ {"x":15, "y":0},
+ {"x":0, "y":1, "w":1.5},
+ {"x":1.5, "y":1},
+ {"x":2.5, "y":1},
+ {"x":3.5, "y":1},
+ {"x":4.5, "y":1},
+ {"x":5.5, "y":1},
+ {"x":6.5, "y":1},
+ {"x":7.5, "y":1},
+ {"x":8.5, "y":1},
+ {"x":9.5, "y":1},
+ {"x":10.5, "y":1},
+ {"x":11.5, "y":1},
+ {"x":12.5, "y":1},
+ {"x":13.5, "y":1, "w":1.5},
+ {"x":15, "y":1},
+ {"x":0, "y":2, "w":1.75},
+ {"x":1.75, "y":2},
+ {"x":2.75, "y":2},
+ {"x":3.75, "y":2},
+ {"x":4.75, "y":2},
+ {"x":5.75, "y":2},
+ {"x":6.75, "y":2},
+ {"x":7.75, "y":2},
+ {"x":8.75, "y":2},
+ {"x":9.75, "y":2},
+ {"x":10.75, "y":2},
+ {"x":11.75, "y":2},
+ {"x":12.75, "y":2, "w":2.25},
+ {"x":15, "y":2},
+ {"x":0, "y":3, "w":2.25},
+ {"x":2.25, "y":3},
+ {"x":3.25, "y":3},
+ {"x":4.25, "y":3},
+ {"x":5.25, "y":3},
+ {"x":6.25, "y":3},
+ {"x":7.25, "y":3},
+ {"x":8.25, "y":3},
+ {"x":9.25, "y":3},
+ {"x":10.25, "y":3},
+ {"x":11.25, "y":3},
+ {"x":12.25, "y":3, "w":1.75},
+ {"x":14, "y":3},
+ {"x":15, "y":3},
+ {"x":0, "y":4, "w":1.25},
+ {"x":1.25, "y":4, "w":1.25},
+ {"x":2.5, "y":4, "w":1.25},
+ {"x":3.75, "y":4, "w":6.25},
+ {"x":10, "y":4, "w":1.25},
+ {"x":11.25, "y":4, "w":1.25},
+ {"x":13, "y":4},
+ {"x":14, "y":4},
+ {"x":15, "y":4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/owlab/voice65/hotswap/keymaps/default/keymap.c b/keyboards/owlab/voice65/hotswap/keymaps/default/keymap.c
new file mode 100644
index 0000000000..406da3d701
--- /dev/null
+++ b/keyboards/owlab/voice65/hotswap/keymaps/default/keymap.c
@@ -0,0 +1,36 @@
+/* Copyright 2021 kb-elmo<mail@elmo.space>
+ *
+ * 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 QMK_KEYBOARD_H
+
+// How long (in ms) to wait between animation steps for the snake mode
+const uint8_t RGBLED_SNAKE_INTERVALS[] PROGMEM = {100, 35, 20};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT(
+ KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, MO(1),
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+ [1] = LAYOUT(
+ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, RESET,
+ KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_HOME,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,
+ KC_TRNS, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_TRNS, KC_TRNS, KC_F22, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F23, KC_TRNS
+ )
+};
diff --git a/keyboards/owlab/voice65/hotswap/keymaps/via/keymap.c b/keyboards/owlab/voice65/hotswap/keymaps/via/keymap.c
new file mode 100644
index 0000000000..c058aad5e5
--- /dev/null
+++ b/keyboards/owlab/voice65/hotswap/keymaps/via/keymap.c
@@ -0,0 +1,51 @@
+/* Copyright 2021 kb-elmo<mail@elmo.space>
+ *
+ * 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 QMK_KEYBOARD_H
+
+// How long (in ms) to wait between animation steps for the snake mode
+const uint8_t RGBLED_SNAKE_INTERVALS[] PROGMEM = {100, 35, 20};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT(
+ KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, MO(1),
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+ [1] = LAYOUT(
+ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, RESET,
+ KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_HOME,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,
+ KC_TRNS, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_TRNS, KC_TRNS, KC_F22, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F23, KC_TRNS
+ ),
+ [2] = LAYOUT(
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ ),
+ [3] = LAYOUT(
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ )
+};
+
diff --git a/keyboards/owlab/voice65/hotswap/keymaps/via/rules.mk b/keyboards/owlab/voice65/hotswap/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/owlab/voice65/hotswap/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/owlab/voice65/hotswap/mcuconf.h b/keyboards/owlab/voice65/hotswap/mcuconf.h
new file mode 100644
index 0000000000..808ff76540
--- /dev/null
+++ b/keyboards/owlab/voice65/hotswap/mcuconf.h
@@ -0,0 +1,22 @@
+/* Copyright 2021 kb-elmo<mail@elmo.space>
+ *
+ * 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_next <mcuconf.h>
+
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 TRUE
diff --git a/keyboards/owlab/voice65/hotswap/readme.md b/keyboards/owlab/voice65/hotswap/readme.md
new file mode 100644
index 0000000000..3eb26792e3
--- /dev/null
+++ b/keyboards/owlab/voice65/hotswap/readme.md
@@ -0,0 +1,21 @@
+# Voice65 - hotswap PCB
+
+![voice65](https://i.imgur.com/okI07scl.jpg)
+
+A 65% with an LED strip and a scroll wheel
+
+* Keyboard Maintainer: [kb-elmo](https://github.com/kb-elmo)
+* Hardware Supported: Voice65 hotswap PCB
+* Hardware Availability: Ended groupbuy: https://www.popkeyboard.com/products/67968vn00mzx
+
+Make example for this keyboard (after setting up your build environment):
+
+ make owlab/voice65/hotswap:default
+
+Flashing example for this keyboard:
+
+ make owlab/voice65/hotswap:default:flash
+
+**Bootloader:** Press the physical reset button on the bottom side of the PCB (labeled SW1) or hold down ESC while plugging in the board.
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/owlab/voice65/hotswap/rules.mk b/keyboards/owlab/voice65/hotswap/rules.mk
new file mode 100644
index 0000000000..7f1bc2ed9d
--- /dev/null
+++ b/keyboards/owlab/voice65/hotswap/rules.mk
@@ -0,0 +1,26 @@
+# MCU name
+MCU = STM32F303
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+# change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = yes # Mouse keys
+EXTRAKEY_ENABLE = yes # Audio control and System control
+CONSOLE_ENABLE = no # Console for debug
+COMMAND_ENABLE = no # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = no # USB Nkey Rollover
+BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no # Enable Bluetooth
+AUDIO_ENABLE = no # Audio output
+ENCODER_ENABLE = yes # Rotary encoder
+
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = IS31FL3741
diff --git a/keyboards/owlab/voice65/soldered/config.h b/keyboards/owlab/voice65/soldered/config.h
new file mode 100644
index 0000000000..bb7ec6102c
--- /dev/null
+++ b/keyboards/owlab/voice65/soldered/config.h
@@ -0,0 +1,89 @@
+/*
+Copyright 2021 kb-elmo<mail@elmo.space>
+
+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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID 0x4F53
+#define PRODUCT_ID 0x5657
+#define DEVICE_VER 0x0001
+#define MANUFACTURER Owl Studio
+#define PRODUCT Voice65
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+/* Keyboard Matrix Assignments */
+#define MATRIX_ROW_PINS { B0, B1, B2, B10, B11 }
+#define MATRIX_COL_PINS { A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A15, B8, B9, B12, B13 }
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+/* NKRO */
+#ifdef NKRO_ENABLE
+# define FORCE_NKRO
+#endif
+
+/* RGB stripe */
+#define RGB_DI_PIN B15
+#ifdef RGB_DI_PIN
+# define RGBLIGHT_EFFECT_ALTERNATING
+# define RGBLIGHT_EFFECT_BREATHING
+# define RGBLIGHT_EFFECT_CHRISTMAS
+# define RGBLIGHT_EFFECT_KNIGHT
+# define RGBLIGHT_EFFECT_RAINBOW_MOOD
+# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+# define RGBLIGHT_EFFECT_SNAKE
+# define RGBLIGHT_EFFECT_STATIC_GRADIENT
+# define RGBLIGHT_EFFECT_TWINKLE
+# define RGBLED_NUM 20
+# define RGBLIGHT_HUE_STEP 8
+# define RGBLIGHT_SAT_STEP 8
+# define RGBLIGHT_VAL_STEP 10
+# define RGBLIGHT_LIMIT_VAL 180
+# define OWL_VOLUME_RANGE 50
+#endif
+
+/* RGB matrix*/
+#ifdef RGB_MATRIX_ENABLE
+# define USE_I2CV2
+# define RGB_MATRIX_DISABLE_KEYCODES
+# define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
+# define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
+# define RGB_MATRIX_KEYPRESSES
+# define RGB_MATRIX_LED_PROCESS_LIMIT 4
+# define RGB_MATRIX_LED_FLUSH_LIMIT 26
+# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
+# define RGB_MATRIX_STARTUP_VAL 128
+# define DRIVER_ADDR_1 0b0110000
+# define DRIVER_ADDR_2 0b0110000
+# define DRIVER_COUNT 2
+# define DRIVER_1_LED_TOTAL 71
+# define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL
+#endif
+
+/* Encoder */
+#define ENCODERS_PAD_A { B4 }
+#define ENCODERS_PAD_B { B5 }
+#define ENCODER_RESOLUTION 4
+#define TAP_CODE_DELAY 10
diff --git a/keyboards/owlab/voice65/soldered/halconf.h b/keyboards/owlab/voice65/soldered/halconf.h
new file mode 100644
index 0000000000..f88be48211
--- /dev/null
+++ b/keyboards/owlab/voice65/soldered/halconf.h
@@ -0,0 +1,21 @@
+/* Copyright 2021 kb-elmo<mail@elmo.space>
+ *
+ * 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
+
+#define HAL_USE_I2C TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/owlab/voice65/soldered/info.json b/keyboards/owlab/voice65/soldered/info.json
new file mode 100644
index 0000000000..40d49a7a99
--- /dev/null
+++ b/keyboards/owlab/voice65/soldered/info.json
@@ -0,0 +1,442 @@
+{
+ "keyboard_name": "voice65 soldered",
+ "url": "https://www.popkeyboard.com/products/67968vn00mzx",
+ "maintainer": "kb-elmo",
+ "width": 16,
+ "height": 5,
+ "layouts": {
+ "LAYOUT_all": {
+ "layout": [
+ {"x":0, "y":0},
+ {"x":1, "y":0},
+ {"x":2, "y":0},
+ {"x":3, "y":0},
+ {"x":4, "y":0},
+ {"x":5, "y":0},
+ {"x":6, "y":0},
+ {"x":7, "y":0},
+ {"x":8, "y":0},
+ {"x":9, "y":0},
+ {"x":10, "y":0},
+ {"x":11, "y":0},
+ {"x":12, "y":0},
+ {"x":13, "y":0},
+ {"x":14, "y":0},
+ {"x":15, "y":0},
+ {"x":0, "y":1, "w":1.5},
+ {"x":1.5, "y":1},
+ {"x":2.5, "y":1},
+ {"x":3.5, "y":1},
+ {"x":4.5, "y":1},
+ {"x":5.5, "y":1},
+ {"x":6.5, "y":1},
+ {"x":7.5, "y":1},
+ {"x":8.5, "y":1},
+ {"x":9.5, "y":1},
+ {"x":10.5, "y":1},
+ {"x":11.5, "y":1},
+ {"x":12.5, "y":1},
+ {"x":13.5, "y":1, "w":1.5},
+ {"x":15, "y":1},
+ {"x":0, "y":2, "w":1.75},
+ {"x":1.75, "y":2},
+ {"x":2.75, "y":2},
+ {"x":3.75, "y":2},
+ {"x":4.75, "y":2},
+ {"x":5.75, "y":2},
+ {"x":6.75, "y":2},
+ {"x":7.75, "y":2},
+ {"x":8.75, "y":2},
+ {"x":9.75, "y":2},
+ {"x":10.75, "y":2},
+ {"x":11.75, "y":2},
+ {"x":12.75, "y":2, "w":2.25},
+ {"x":15, "y":2},
+ {"x":0, "y":3, "w":1.25},
+ {"x":1.25, "y":3},
+ {"x":2.25, "y":3},
+ {"x":3.25, "y":3},
+ {"x":4.25, "y":3},
+ {"x":5.25, "y":3},
+ {"x":6.25, "y":3},
+ {"x":7.25, "y":3},
+ {"x":8.25, "y":3},
+ {"x":9.25, "y":3},
+ {"x":10.25, "y":3},
+ {"x":11.25, "y":3},
+ {"x":12.25, "y":3, "w":1.75},
+ {"x":14, "y":3},
+ {"x":15, "y":3},
+ {"x":0, "y":4, "w":1.25},
+ {"x":1.25, "y":4, "w":1.25},
+ {"x":2.5, "y":4, "w":1.25},
+ {"x":3.75, "y":4, "w":2.25},
+ {"x":6, "y":4, "w":1.25},
+ {"x":7.25, "y":4, "w":2.75},
+ {"x":10, "y":4, "w":1.25},
+ {"x":11.25, "y":4, "w":1.25},
+ {"x":13, "y":4},
+ {"x":14, "y":4},
+ {"x":15, "y":4}
+ ]
+ },
+ "LAYOUT_65_ansi_blocker": {
+ "layout": [
+ {"x":0, "y":0},
+ {"x":1, "y":0},
+ {"x":2, "y":0},
+ {"x":3, "y":0},
+ {"x":4, "y":0},
+ {"x":5, "y":0},
+ {"x":6, "y":0},
+ {"x":7, "y":0},
+ {"x":8, "y":0},
+ {"x":9, "y":0},
+ {"x":10, "y":0},
+ {"x":11, "y":0},
+ {"x":12, "y":0},
+ {"x":13, "y":0, "w":2},
+ {"x":15, "y":0},
+ {"x":0, "y":1, "w":1.5},
+ {"x":1.5, "y":1},
+ {"x":2.5, "y":1},
+ {"x":3.5, "y":1},
+ {"x":4.5, "y":1},
+ {"x":5.5, "y":1},
+ {"x":6.5, "y":1},
+ {"x":7.5, "y":1},
+ {"x":8.5, "y":1},
+ {"x":9.5, "y":1},
+ {"x":10.5, "y":1},
+ {"x":11.5, "y":1},
+ {"x":12.5, "y":1},
+ {"x":13.5, "y":1, "w":1.5},
+ {"x":15, "y":1},
+ {"x":0, "y":2, "w":1.75},
+ {"x":1.75, "y":2},
+ {"x":2.75, "y":2},
+ {"x":3.75, "y":2},
+ {"x":4.75, "y":2},
+ {"x":5.75, "y":2},
+ {"x":6.75, "y":2},
+ {"x":7.75, "y":2},
+ {"x":8.75, "y":2},
+ {"x":9.75, "y":2},
+ {"x":10.75, "y":2},
+ {"x":11.75, "y":2},
+ {"x":12.75, "y":2, "w":2.25},
+ {"x":15, "y":2},
+ {"x":0, "y":3, "w":2.25},
+ {"x":2.25, "y":3},
+ {"x":3.25, "y":3},
+ {"x":4.25, "y":3},
+ {"x":5.25, "y":3},
+ {"x":6.25, "y":3},
+ {"x":7.25, "y":3},
+ {"x":8.25, "y":3},
+ {"x":9.25, "y":3},
+ {"x":10.25, "y":3},
+ {"x":11.25, "y":3},
+ {"x":12.25, "y":3, "w":1.75},
+ {"x":14, "y":3},
+ {"x":15, "y":3},
+ {"x":0, "y":4, "w":1.25},
+ {"x":1.25, "y":4, "w":1.25},
+ {"x":2.5, "y":4, "w":1.25},
+ {"x":3.75, "y":4, "w":6.25},
+ {"x":10, "y":4, "w":1.25},
+ {"x":11.25, "y":4, "w":1.25},
+ {"x":13, "y":4},
+ {"x":14, "y":4},
+ {"x":15, "y":4}
+ ]
+ },
+ "LAYOUT_65_ansi_blocker_split_bs": {
+ "layout": [
+ {"x":0, "y":0},
+ {"x":1, "y":0},
+ {"x":2, "y":0},
+ {"x":3, "y":0},
+ {"x":4, "y":0},
+ {"x":5, "y":0},
+ {"x":6, "y":0},
+ {"x":7, "y":0},
+ {"x":8, "y":0},
+ {"x":9, "y":0},
+ {"x":10, "y":0},
+ {"x":11, "y":0},
+ {"x":12, "y":0},
+ {"x":13, "y":0},
+ {"x":14, "y":0},
+ {"x":15, "y":0},
+ {"x":0, "y":1, "w":1.5},
+ {"x":1.5, "y":1},
+ {"x":2.5, "y":1},
+ {"x":3.5, "y":1},
+ {"x":4.5, "y":1},
+ {"x":5.5, "y":1},
+ {"x":6.5, "y":1},
+ {"x":7.5, "y":1},
+ {"x":8.5, "y":1},
+ {"x":9.5, "y":1},
+ {"x":10.5, "y":1},
+ {"x":11.5, "y":1},
+ {"x":12.5, "y":1},
+ {"x":13.5, "y":1, "w":1.5},
+ {"x":15, "y":1},
+ {"x":0, "y":2, "w":1.75},
+ {"x":1.75, "y":2},
+ {"x":2.75, "y":2},
+ {"x":3.75, "y":2},
+ {"x":4.75, "y":2},
+ {"x":5.75, "y":2},
+ {"x":6.75, "y":2},
+ {"x":7.75, "y":2},
+ {"x":8.75, "y":2},
+ {"x":9.75, "y":2},
+ {"x":10.75, "y":2},
+ {"x":11.75, "y":2},
+ {"x":12.75, "y":2, "w":2.25},
+ {"x":15, "y":2},
+ {"x":0, "y":3, "w":2.25},
+ {"x":2.25, "y":3},
+ {"x":3.25, "y":3},
+ {"x":4.25, "y":3},
+ {"x":5.25, "y":3},
+ {"x":6.25, "y":3},
+ {"x":7.25, "y":3},
+ {"x":8.25, "y":3},
+ {"x":9.25, "y":3},
+ {"x":10.25, "y":3},
+ {"x":11.25, "y":3},
+ {"x":12.25, "y":3, "w":1.75},
+ {"x":14, "y":3},
+ {"x":15, "y":3},
+ {"x":0, "y":4, "w":1.25},
+ {"x":1.25, "y":4, "w":1.25},
+ {"x":2.5, "y":4, "w":1.25},
+ {"x":3.75, "y":4, "w":6.25},
+ {"x":10, "y":4, "w":1.25},
+ {"x":11.25, "y":4, "w":1.25},
+ {"x":13, "y":4},
+ {"x":14, "y":4},
+ {"x":15, "y":4}
+ ]
+ },
+ "LAYOUT_65_ansi_blocker_tsangan": {
+ "layout": [
+ {"x":0, "y":0},
+ {"x":1, "y":0},
+ {"x":2, "y":0},
+ {"x":3, "y":0},
+ {"x":4, "y":0},
+ {"x":5, "y":0},
+ {"x":6, "y":0},
+ {"x":7, "y":0},
+ {"x":8, "y":0},
+ {"x":9, "y":0},
+ {"x":10, "y":0},
+ {"x":11, "y":0},
+ {"x":12, "y":0},
+ {"x":13, "y":0, "w":2},
+ {"x":15, "y":0},
+ {"x":0, "y":1, "w":1.5},
+ {"x":1.5, "y":1},
+ {"x":2.5, "y":1},
+ {"x":3.5, "y":1},
+ {"x":4.5, "y":1},
+ {"x":5.5, "y":1},
+ {"x":6.5, "y":1},
+ {"x":7.5, "y":1},
+ {"x":8.5, "y":1},
+ {"x":9.5, "y":1},
+ {"x":10.5, "y":1},
+ {"x":11.5, "y":1},
+ {"x":12.5, "y":1},
+ {"x":13.5, "y":1, "w":1.5},
+ {"x":15, "y":1},
+ {"x":0, "y":2, "w":1.75},
+ {"x":1.75, "y":2},
+ {"x":2.75, "y":2},
+ {"x":3.75, "y":2},
+ {"x":4.75, "y":2},
+ {"x":5.75, "y":2},
+ {"x":6.75, "y":2},
+ {"x":7.75, "y":2},
+ {"x":8.75, "y":2},
+ {"x":9.75, "y":2},
+ {"x":10.75, "y":2},
+ {"x":11.75, "y":2},
+ {"x":12.75, "y":2, "w":2.25},
+ {"x":15, "y":2},
+ {"x":0, "y":3, "w":2.25},
+ {"x":2.25, "y":3},
+ {"x":3.25, "y":3},
+ {"x":4.25, "y":3},
+ {"x":5.25, "y":3},
+ {"x":6.25, "y":3},
+ {"x":7.25, "y":3},
+ {"x":8.25, "y":3},
+ {"x":9.25, "y":3},
+ {"x":10.25, "y":3},
+ {"x":11.25, "y":3},
+ {"x":12.25, "y":3, "w":1.75},
+ {"x":14, "y":3},
+ {"x":15, "y":3},
+ {"x":0, "y":4, "w":1.5},
+ {"x":1.5, "y":4},
+ {"x":2.5, "y":4, "w":1.5},
+ {"x":4, "y":4, "w":7},
+ {"x":11, "y":4, "w":1.5},
+ {"x":13, "y":4},
+ {"x":14, "y":4},
+ {"x":15, "y":4}
+ ]
+ },
+ "LAYOUT_65_iso_blocker": {
+ "layout": [
+ {"x":0, "y":0},
+ {"x":1, "y":0},
+ {"x":2, "y":0},
+ {"x":3, "y":0},
+ {"x":4, "y":0},
+ {"x":5, "y":0},
+ {"x":6, "y":0},
+ {"x":7, "y":0},
+ {"x":8, "y":0},
+ {"x":9, "y":0},
+ {"x":10, "y":0},
+ {"x":11, "y":0},
+ {"x":12, "y":0},
+ {"x":13, "y":0, "w":2},
+ {"x":15, "y":0},
+ {"x":0, "y":1, "w":1.5},
+ {"x":1.5, "y":1},
+ {"x":2.5, "y":1},
+ {"x":3.5, "y":1},
+ {"x":4.5, "y":1},
+ {"x":5.5, "y":1},
+ {"x":6.5, "y":1},
+ {"x":7.5, "y":1},
+ {"x":8.5, "y":1},
+ {"x":9.5, "y":1},
+ {"x":10.5, "y":1},
+ {"x":11.5, "y":1},
+ {"x":12.5, "y":1},
+ {"x":15, "y":1},
+ {"x":0, "y":2, "w":1.75},
+ {"x":1.75, "y":2},
+ {"x":2.75, "y":2},
+ {"x":3.75, "y":2},
+ {"x":4.75, "y":2},
+ {"x":5.75, "y":2},
+ {"x":6.75, "y":2},
+ {"x":7.75, "y":2},
+ {"x":8.75, "y":2},
+ {"x":9.75, "y":2},
+ {"x":10.75, "y":2},
+ {"x":11.75, "y":2},
+ {"x":12.75, "y":2},
+ {"x":13.75, "y":1, "w":1.25, "h":2},
+ {"x":15, "y":2},
+ {"x":0, "y":3, "w":1.25},
+ {"x":1.25, "y":3},
+ {"x":2.25, "y":3},
+ {"x":3.25, "y":3},
+ {"x":4.25, "y":3},
+ {"x":5.25, "y":3},
+ {"x":6.25, "y":3},
+ {"x":7.25, "y":3},
+ {"x":8.25, "y":3},
+ {"x":9.25, "y":3},
+ {"x":10.25, "y":3},
+ {"x":11.25, "y":3},
+ {"x":12.25, "y":3, "w":1.75},
+ {"x":14, "y":3},
+ {"x":15, "y":3},
+ {"x":0, "y":4, "w":1.25},
+ {"x":1.25, "y":4, "w":1.25},
+ {"x":2.5, "y":4, "w":1.25},
+ {"x":3.75, "y":4, "w":6.25},
+ {"x":10, "y":4, "w":1.25},
+ {"x":11.25, "y":4, "w":1.25},
+ {"x":13, "y":4},
+ {"x":14, "y":4},
+ {"x":15, "y":4}
+ ]
+ },
+ "LAYOUT_65_iso_blocker_split_bs": {
+ "layout": [
+ {"x":0, "y":0},
+ {"x":1, "y":0},
+ {"x":2, "y":0},
+ {"x":3, "y":0},
+ {"x":4, "y":0},
+ {"x":5, "y":0},
+ {"x":6, "y":0},
+ {"x":7, "y":0},
+ {"x":8, "y":0},
+ {"x":9, "y":0},
+ {"x":10, "y":0},
+ {"x":11, "y":0},
+ {"x":12, "y":0},
+ {"x":13, "y":0},
+ {"x":14, "y":0},
+ {"x":15, "y":0},
+ {"x":0, "y":1, "w":1.5},
+ {"x":1.5, "y":1},
+ {"x":2.5, "y":1},
+ {"x":3.5, "y":1},
+ {"x":4.5, "y":1},
+ {"x":5.5, "y":1},
+ {"x":6.5, "y":1},
+ {"x":7.5, "y":1},
+ {"x":8.5, "y":1},
+ {"x":9.5, "y":1},
+ {"x":10.5, "y":1},
+ {"x":11.5, "y":1},
+ {"x":12.5, "y":1},
+ {"x":15, "y":1},
+ {"x":0, "y":2, "w":1.75},
+ {"x":1.75, "y":2},
+ {"x":2.75, "y":2},
+ {"x":3.75, "y":2},
+ {"x":4.75, "y":2},
+ {"x":5.75, "y":2},
+ {"x":6.75, "y":2},
+ {"x":7.75, "y":2},
+ {"x":8.75, "y":2},
+ {"x":9.75, "y":2},
+ {"x":10.75, "y":2},
+ {"x":11.75, "y":2},
+ {"x":12.75, "y":2},
+ {"x":13.75, "y":1, "w":1.25, "h":2},
+ {"x":15, "y":2},
+ {"x":0, "y":3, "w":1.25},
+ {"x":1.25, "y":3},
+ {"x":2.25, "y":3},
+ {"x":3.25, "y":3},
+ {"x":4.25, "y":3},
+ {"x":5.25, "y":3},
+ {"x":6.25, "y":3},
+ {"x":7.25, "y":3},
+ {"x":8.25, "y":3},
+ {"x":9.25, "y":3},
+ {"x":10.25, "y":3},
+ {"x":11.25, "y":3},
+ {"x":12.25, "y":3, "w":1.75},
+ {"x":14, "y":3},
+ {"x":15, "y":3},
+ {"x":0, "y":4, "w":1.25},
+ {"x":1.25, "y":4, "w":1.25},
+ {"x":2.5, "y":4, "w":1.25},
+ {"x":3.75, "y":4, "w":6.25},
+ {"x":10, "y":4, "w":1.25},
+ {"x":11.25, "y":4, "w":1.25},
+ {"x":13, "y":4},
+ {"x":14, "y":4},
+ {"x":15, "y":4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/owlab/voice65/soldered/keymaps/default/keymap.c b/keyboards/owlab/voice65/soldered/keymaps/default/keymap.c
new file mode 100644
index 0000000000..617b60dcf7
--- /dev/null
+++ b/keyboards/owlab/voice65/soldered/keymaps/default/keymap.c
@@ -0,0 +1,36 @@
+/* Copyright 2021 kb-elmo<mail@elmo.space>
+ *
+ * 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 QMK_KEYBOARD_H
+
+// How long (in ms) to wait between animation steps for the snake mode
+const uint8_t RGBLED_SNAKE_INTERVALS[] PROGMEM = {100, 35, 20};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_65_ansi_blocker(
+ KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, MO(1),
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+ [1] = LAYOUT_65_ansi_blocker(
+ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, RESET,
+ KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_HOME,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,
+ KC_TRNS, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_TRNS, KC_TRNS, KC_F22, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F23, KC_TRNS
+ )
+};
diff --git a/keyboards/owlab/voice65/soldered/keymaps/via/keymap.c b/keyboards/owlab/voice65/soldered/keymaps/via/keymap.c
new file mode 100644
index 0000000000..9b3715e113
--- /dev/null
+++ b/keyboards/owlab/voice65/soldered/keymaps/via/keymap.c
@@ -0,0 +1,50 @@
+/* Copyright 2021 kb-elmo<mail@elmo.space>
+ *
+ * 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 QMK_KEYBOARD_H
+
+// How long (in ms) to wait between animation steps for the snake mode
+const uint8_t RGBLED_SNAKE_INTERVALS[] PROGMEM = {100, 35, 20};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_all(
+ KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_DEL,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN,
+ KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, MO(1),
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+ [1] = LAYOUT_all(
+ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, RESET,
+ KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_HOME,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,
+ KC_TRNS, KC_TRNS, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_TRNS, KC_TRNS, KC_F22, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F23, KC_TRNS
+ ),
+ [2] = LAYOUT_all(
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ ),
+ [3] = LAYOUT_all(
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ )
+};
diff --git a/keyboards/owlab/voice65/soldered/keymaps/via/rules.mk b/keyboards/owlab/voice65/soldered/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/owlab/voice65/soldered/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/owlab/voice65/soldered/mcuconf.h b/keyboards/owlab/voice65/soldered/mcuconf.h
new file mode 100644
index 0000000000..808ff76540
--- /dev/null
+++ b/keyboards/owlab/voice65/soldered/mcuconf.h
@@ -0,0 +1,22 @@
+/* Copyright 2021 kb-elmo<mail@elmo.space>
+ *
+ * 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_next <mcuconf.h>
+
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 TRUE
diff --git a/keyboards/owlab/voice65/soldered/readme.md b/keyboards/owlab/voice65/soldered/readme.md
new file mode 100644
index 0000000000..6299c905ea
--- /dev/null
+++ b/keyboards/owlab/voice65/soldered/readme.md
@@ -0,0 +1,21 @@
+# Voice65 - soldered PCB
+
+![voice65](https://i.imgur.com/okI07scl.jpg)
+
+A 65% with an LED strip and a scroll wheel
+
+* Keyboard Maintainer: [kb-elmo](https://github.com/kb-elmo)
+* Hardware Supported: Voice65 soldered PCB
+* Hardware Availability: Ended groupbuy: https://www.popkeyboard.com/products/67968vn00mzx
+
+Make example for this keyboard (after setting up your build environment):
+
+ make owlab/voice65/soldered:default
+
+Flashing example for this keyboard:
+
+ make owlab/voice65/soldered:default:flash
+
+**Bootloader:** Press the physical reset button on the bottom side of the PCB (labeled SW1) or hold down ESC while plugging in the board.
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/owlab/voice65/soldered/rules.mk b/keyboards/owlab/voice65/soldered/rules.mk
new file mode 100644
index 0000000000..dba1a7a650
--- /dev/null
+++ b/keyboards/owlab/voice65/soldered/rules.mk
@@ -0,0 +1,28 @@
+# MCU name
+MCU = STM32F303
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+# change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = yes # Mouse keys
+EXTRAKEY_ENABLE = yes # Audio control and System control
+CONSOLE_ENABLE = no # Console for debug
+COMMAND_ENABLE = no # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = no # USB Nkey Rollover
+BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no # Enable Bluetooth
+AUDIO_ENABLE = no # Audio output
+ENCODER_ENABLE = yes # Rotary encoder
+
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = IS31FL3741
+
+LAYOUTS = 65_ansi_blocker 65_ansi_blocker_split_bs 65_ansi_blocker_tsangan 65_iso_blocker 65_iso_blocker_split_bs
diff --git a/keyboards/owlab/voice65/soldered/soldered.c b/keyboards/owlab/voice65/soldered/soldered.c
new file mode 100644
index 0000000000..06288eb0a8
--- /dev/null
+++ b/keyboards/owlab/voice65/soldered/soldered.c
@@ -0,0 +1,455 @@
+/* Copyright 2021 kb-elmo<mail@elmo.space>
+ *
+ * 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 "soldered.h"
+
+#ifdef RGB_MATRIX_ENABLE
+const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
+ {0, CS3_SW1, CS2_SW1, CS1_SW1}, /* RGB0-ESC ROW0*/
+ {0, CS6_SW1, CS5_SW1, CS4_SW1}, /* RGB1-1 */
+ {0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB2-2 */
+ {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB3-3 */
+ {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB4-4 */
+ {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB5-5 */
+ {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB6-6 */
+ {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB7-7 */
+ {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB8-8 */
+ {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB9-9 */
+ {0, CS33_SW1, CS32_SW1, CS31_SW1}, /* RGB10-0 */
+ {0, CS36_SW1, CS35_SW1, CS34_SW1}, /* RGB11--- */
+ {0, CS39_SW6, CS38_SW6, CS37_SW6}, /* RGB12-+= */
+ {0, CS36_SW6, CS35_SW6, CS34_SW6}, /* RGB13-BS */
+ {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB14-BACKSPACE SPLIT */
+ {0, CS36_SW8, CS35_SW8, CS34_SW8}, /* RGB15-DEL */
+ {0, CS3_SW2, CS2_SW2, CS1_SW2}, /* RGB16-TAB ----ROW1*/
+ {0, CS6_SW2, CS5_SW2, CS4_SW2}, /* RGB17-Q */
+ {0, CS9_SW2, CS8_SW2, CS7_SW2}, /* RGB18-W */
+ {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB19-E */
+ {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB20-R */
+ {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB21-T */
+ {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB22-Y */
+ {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB23-U */
+ {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB24-I */
+ {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB25-O */
+ {0, CS33_SW2, CS32_SW2, CS31_SW2}, /* RGB26-P */
+ {0, CS36_SW2, CS35_SW2, CS34_SW2}, /* RGB27-[ */
+ {0, CS39_SW7, CS38_SW7, CS37_SW7}, /* RGB28-] */
+ {0, CS36_SW7, CS35_SW7, CS34_SW7}, /* RGB29-\ */
+ {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB30-PGUP */
+ {0, CS3_SW3, CS2_SW3, CS1_SW3}, /* RGB31-CAPS---ROW2*/
+ {0, CS6_SW3, CS5_SW3, CS4_SW3}, /* RGB32-A-- */
+ {0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB33-S-- */
+ {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB34-D-- */
+ {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB35-F-- */
+ {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB36-G-- */
+ {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB37-H-- */
+ {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB38-J-- */
+ {0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB39-K-- */
+ {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB40-L-- */
+ {0, CS33_SW3, CS32_SW3, CS31_SW3}, /* RGB41-;:- */
+ {0, CS36_SW3, CS35_SW3, CS34_SW3}, /* RGB42-''- */
+ {0, CS39_SW8, CS38_SW8, CS37_SW8}, /* RGB43-ENTER- */
+ {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB44-PGDN */
+ {0, CS3_SW4, CS2_SW4, CS1_SW4}, /* RGB45-LSF --ROW3*/
+ {0, CS6_SW4, CS5_SW4, CS4_SW4}, /* RGB46-LSF split -*/
+ {0, CS9_SW4, CS8_SW4, CS7_SW4}, /* RGB47-Z -*/
+ {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB48-X -*/
+ {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB49-C -*/
+ {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB50-V -*/
+ {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB51-B -*/
+ {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB52-N -*/
+ {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB53-M -*/
+ {0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB54-<, -*/
+ {0, CS33_SW4, CS32_SW4, CS31_SW4}, /* RGB55->. -*/
+ {0, CS36_SW4, CS35_SW4, CS34_SW4}, /* RGB56-?/ -*/
+ {0, CS39_SW9, CS38_SW9, CS37_SW9}, /* RGB57-RSF -*/
+ {0, CS36_SW9, CS35_SW9, CS34_SW9}, /* RGB58-UP -*/
+ {0, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB59--MO-- */
+ {0, CS3_SW5, CS2_SW5, CS1_SW5}, /* RGB60-lct-- row4*/
+ {0, CS6_SW5, CS5_SW5, CS4_SW5}, /* RGB61-lwin- */
+ {0, CS9_SW5, CS8_SW5, CS7_SW5}, /* RGB62-lalt- */
+ {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB63-sp2.25- */
+ {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB64-sp7U6.25U1.25U- */
+ {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB65-sp2.75U- */
+ {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB66-ralt- */
+ {0, CS33_SW5, CS32_SW5, CS31_SW5}, /* RGB67-rctrl- */
+ {0, CS36_SW5, CS35_SW5, CS34_SW5}, /* RGB68-left- */
+ {0, CS39_SW5, CS38_SW5, CS37_SW5}, /* RGB69-dn- */
+ {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB70-right- */
+};
+
+led_config_t g_led_config = { {
+ { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 },
+ { 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30 },
+ { 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 15, 44 },
+ { 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59 },
+ { 60, 61, 62, 63, 64, NO_LED, 65, NO_LED, NO_LED, 66, 67, 68, 69, NO_LED, 70 }
+}, {
+ { 0, 0 }, { 15, 0 }, { 30, 0 }, { 45, 0 }, { 60, 0 }, { 75, 0 }, { 90, 0 }, { 105, 0 }, { 120, 0 }, { 135, 0 }, { 150, 0 }, { 165, 0}, { 180, 0}, { 195, 0 }, { 209, 0 }, { 224, 0 },
+ { 2, 16 }, { 18, 16 }, { 34, 16 }, { 50, 16 }, { 66, 16 }, { 82, 16 }, { 98, 16 }, { 114, 16 }, { 130, 16 }, { 146, 16 }, { 162, 16 }, { 178, 16 }, { 194, 16 }, { 208, 16 }, { 224, 16 },
+ { 2, 32 }, { 20, 32 }, { 36, 32 }, { 52, 32 }, { 68, 32 }, { 84, 32 }, { 100, 32 }, { 116, 32 }, { 132, 32 }, { 148, 32 }, { 164, 32 }, { 180, 32 }, { 202, 32 }, { 224, 32 },
+ { 0, 48 }, { 16, 48 }, { 32, 48 }, { 48, 48 }, { 64, 48 }, { 80, 48 }, { 96, 48 }, { 112, 48 }, { 128, 48 }, { 144, 48 }, { 160, 48 }, { 176, 48 }, { 192, 48 }, { 208, 48 }, { 224, 48 },
+ { 0, 64 }, { 20, 64 }, { 40, 64 }, { 60, 64 }, { 95, 64 }, { 132, 64 }, { 152, 64 }, { 172, 64 }, { 192, 64 }, { 208, 64 }, { 224, 64 }
+}, {
+ 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+ 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+ 0, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
+ 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
+ }
+};
+
+
+#endif
+
+__attribute__ ((weak))
+void rgb_matrix_indicators_user(void)
+{
+ if (host_keyboard_led_state().caps_lock)
+ {
+ rgb_matrix_set_color(31, 255, 255, 255);
+ } else {
+ rgb_matrix_set_color(31, 0, 0, 0);
+ }
+}
+
+enum encoder_modes{
+ ENCODER_MODE_ONE = 0,
+ ENCODER_MODE_TWO,
+ ENCODER_MODE_THREE,
+};
+
+keyboard_config_t keyboard_config;
+rgblight_config_t rgblight_config;
+
+uint8_t pre_hue, pre_sat, pre_val;
+uint8_t previous_rgb_mode = 0;
+uint8_t dir_hue, dir_sat;
+
+bool encoder_in = false;
+uint32_t encoder_timer;
+
+bool encoder_ani_start= false;
+uint32_t encoder_ani_timer = 0;
+
+bool encoder_direction_start = false;
+uint32_t encoder_direction_timer = 0;
+
+
+bool lizm_restart_snake = false;
+void rgblight_snake_restart(uint8_t hue, uint8_t sat, uint8_t val){
+ lizm_restart_snake = true; // restart signal to local each effect
+ rgblight_config.hue = hue;
+ rgblight_config.sat = sat;
+ rgblight_config.val = val;
+}
+
+
+void keyboard_post_init_kb(void){
+ keyboard_config.raw = eeconfig_read_kb();
+ if( keyboard_config.encoder_mode_index > ENCODER_MODE_THREE ){
+ keyboard_config.encoder_mode_index = ENCODER_MODE_ONE;
+ eeconfig_update_kb(keyboard_config.raw);
+ }
+}
+
+void switch_encoder_mode(uint8_t mode){
+ switch(mode){
+ case ENCODER_MODE_ONE:
+ dir_hue = 88;
+ dir_sat = 255;
+ break;
+
+ case ENCODER_MODE_TWO:
+ dir_hue = 0;
+ dir_sat = 240;
+ break;
+
+ case ENCODER_MODE_THREE:
+ dir_hue = 176;
+ dir_sat = 255;
+ break;
+ }
+ rgblight_sethsv_noeeprom(dir_hue,dir_sat,pre_val);
+}
+
+
+void init_encoder_mode(uint8_t mode){
+ previous_rgb_mode = rgblight_get_mode();
+ pre_hue = rgblight_get_hue();
+ pre_sat = rgblight_get_sat();
+ pre_val = rgblight_get_val();
+ encoder_in = true;
+
+ rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
+
+ switch_encoder_mode(mode);
+}
+
+
+void set_encoder_mode(uint8_t mode){
+ if(encoder_in == false){
+ init_encoder_mode(mode);
+ }else{
+ switch_encoder_mode(mode);
+ }
+ eeconfig_update_kb(keyboard_config.raw);
+ encoder_timer = timer_read32();
+}
+
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+ if (record->event.pressed) {
+ switch(keycode) {
+ case RGB_MOD:
+ case RGB_RMOD:
+ case RGB_HUI:
+ case RGB_HUD:
+ case RGB_SAI:
+ case RGB_SAD:
+ case RGB_VAI:
+ case RGB_VAD:
+
+ if(encoder_in){
+ return false;
+ }
+ break;
+
+ case KC_F13:
+ rgb_matrix_toggle();
+ break;
+
+ case KC_F14:
+ rgb_matrix_step();
+ break;
+
+ case KC_F15:
+ rgb_matrix_step_reverse();
+ break;
+
+ case KC_F16:
+ rgb_matrix_increase_hue(); //Increase the hue for effect range LEDs
+ break;
+
+ case KC_F17:
+ rgb_matrix_decrease_hue(); //Decrease the hue for effect range LEDs
+ break;
+
+ case KC_F18:
+ rgb_matrix_increase_sat(); //Increase the saturation for effect range LEDs
+ break;
+
+ case KC_F19:
+ rgb_matrix_decrease_sat(); //Decrease the saturation for effect range LEDs
+ break;
+
+ case KC_F20:
+ rgb_matrix_increase_val(); //Increase the value for effect range LEDs
+ break;
+
+ case KC_F21:
+ rgb_matrix_decrease_val();//Decrease the value for effect range LEDs
+ break;
+
+ case KC_F22: //change encoder mode upward
+
+ if(!encoder_direction_start){
+ if(keyboard_config.encoder_mode_index < ENCODER_MODE_THREE){
+ keyboard_config.encoder_mode_index++;
+ }
+ else{
+ keyboard_config.encoder_mode_index = ENCODER_MODE_ONE;
+ }
+ set_encoder_mode(keyboard_config.encoder_mode_index);
+ }
+ return false;
+
+ case KC_F23:
+ if(!encoder_direction_start){
+ if(keyboard_config.encoder_mode_index > ENCODER_MODE_ONE){
+ keyboard_config.encoder_mode_index--;
+ }
+ else{
+ keyboard_config.encoder_mode_index = ENCODER_MODE_THREE;
+ }
+ set_encoder_mode(keyboard_config.encoder_mode_index);
+ }
+ return false;
+
+ default:
+ break;
+ }
+ }
+ return process_record_user(keycode, record);
+}
+
+
+void matrix_scan_kb(void) {
+ if(encoder_in){
+ if(timer_elapsed32(encoder_timer) > 5000){
+ rgblight_mode(previous_rgb_mode);
+ rgblight_sethsv(pre_hue, pre_sat, pre_val);
+ encoder_in = false;
+ }
+ }
+
+ if(encoder_ani_start){
+ if(timer_elapsed32(encoder_ani_timer) > VOLUME_ANIMATION_TIMER){
+ encoder_ani_start = false;
+ rgblight_sethsv_noeeprom(0,0,0);
+ }
+ }
+
+ if(encoder_direction_start){
+ if(timer_elapsed32(encoder_direction_timer) > (VOLUME_ANIMATION_TIMER+1500)){
+ rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
+ rgblight_sethsv_noeeprom(dir_hue, dir_sat, pre_val);
+ encoder_direction_start = false;
+ }
+ }
+ matrix_scan_user();
+}
+
+
+void set_volume_animation(bool increase){
+ if(!encoder_ani_start){
+ rgblight_snake_restart(dir_hue, dir_sat, pre_val);
+ }
+
+ if(increase){
+ rgblight_mode_noeeprom(17);
+ } else {
+ rgblight_mode_noeeprom(18);
+ }
+
+ encoder_ani_timer = timer_read32();
+ encoder_direction_timer = encoder_ani_timer;
+ encoder_ani_start = true;
+ encoder_direction_start = true;
+}
+
+
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+ uint8_t layer_now = keyboard_config.encoder_mode_index +1;
+ uint16_t encoder_cw_keycode = keymap_key_to_keycode(layer_now, (keypos_t){.row=2, .col=1 });
+ uint16_t encoder_ccw_keycode = keymap_key_to_keycode(layer_now, (keypos_t){.row=2, .col=2 });
+ if (index == 0) { /* First encoder */
+ if(encoder_in == false){
+ init_encoder_mode(keyboard_config.encoder_mode_index);
+ }
+
+ if (!clockwise) {
+ switch(encoder_cw_keycode) {
+
+ case KC_F13:
+ rgb_matrix_toggle();
+ break;
+
+ case KC_F14:
+ rgb_matrix_step();
+ break;
+
+ case KC_F15:
+ rgb_matrix_step_reverse();
+ break;
+
+ case KC_F16:
+ rgb_matrix_increase_hue(); //Increase the hue for effect range LEDs
+ break;
+
+ case KC_F17:
+ rgb_matrix_decrease_hue(); //Decrease the hue for effect range LEDs
+ break;
+
+ case KC_F18:
+ rgb_matrix_increase_sat(); //Increase the saturation for effect range LEDs
+ break;
+
+ case KC_F19:
+ rgb_matrix_decrease_sat(); //Decrease the saturation for effect range LEDs
+ break;
+
+ case KC_F20:
+ rgb_matrix_increase_val(); //Increase the value for effect range LEDs
+ break;
+
+ case KC_F21:
+ rgb_matrix_decrease_val();//Decrease the value for effect range LEDs
+ break;
+
+ case KC_VOLU:
+ case KC_VOLD:
+ tap_code(encoder_cw_keycode);
+ break;
+
+ default:
+ tap_code(encoder_cw_keycode);
+ break;
+ }
+ set_volume_animation(true);
+ } else {
+ switch(encoder_ccw_keycode) {
+
+ case KC_F13:
+ rgb_matrix_toggle();
+ break;
+
+ case KC_F14:
+ rgb_matrix_step();
+ break;
+
+ case KC_F15:
+ rgb_matrix_step_reverse();
+ break;
+
+ case KC_F16:
+ rgb_matrix_increase_hue(); //Increase the hue for effect range LEDs
+ break;
+
+ case KC_F17:
+ rgb_matrix_decrease_hue(); //Decrease the hue for effect range LEDs
+ break;
+
+ case KC_F18:
+ rgb_matrix_increase_sat(); //Increase the saturation for effect range LEDs
+ break;
+
+ case KC_F19:
+ rgb_matrix_decrease_sat(); //Decrease the saturation for effect range LEDs
+ break;
+
+ case KC_F20:
+ rgb_matrix_increase_val(); //Increase the value for effect range LEDs
+ break;
+
+ case KC_F21:
+ rgb_matrix_decrease_val();//Decrease the value for effect range LEDs
+ break;
+
+ case KC_VOLU:
+ case KC_VOLD:
+ tap_code(encoder_ccw_keycode);
+ break;
+
+ default:
+ tap_code(encoder_ccw_keycode);
+ break;
+ }
+ set_volume_animation(false);
+ }
+ encoder_timer = timer_read32();
+ }
+ return true;
+}
diff --git a/keyboards/owlab/voice65/soldered/soldered.h b/keyboards/owlab/voice65/soldered/soldered.h
new file mode 100644
index 0000000000..0d50056002
--- /dev/null
+++ b/keyboards/owlab/voice65/soldered/soldered.h
@@ -0,0 +1,116 @@
+/* Copyright 2021 kb-elmo<mail@elmo.space>
+ *
+ * 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 ____ KC_NO
+
+#define LAYOUT_all( \
+ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K213, \
+ 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, K214, \
+ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \
+ K400, K401, K402, K403, K404, K406, K409, K410, K411, K412, K414 \
+) { \
+ { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, 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, K313, K314 }, \
+ { K400, K401, K402, K403, K404, ____, K406, ____, ____, K409, K410, K411, K412, ____, K414 } \
+}
+
+#define LAYOUT_65_ansi_blocker( \
+ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K213, \
+ 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, K214, \
+ K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \
+ K400, K401, K402, K404, K409, K410, K411, K412, K414 \
+) { \
+ { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, ____ }, \
+ { 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, ____, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \
+ { K400, K401, K402, ____, K404, ____, ____, ____, ____, K409, K410, K411, K412, ____, K414 } \
+}
+
+#define LAYOUT_65_ansi_blocker_split_bs( \
+ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K213, \
+ 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, K214, \
+ K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \
+ K400, K401, K402, K404, K409, K410, K411, K412, K414 \
+) { \
+ { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, 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, ____, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \
+ { K400, K401, K402, ____, K404, ____, ____, ____, ____, K409, K410, K411, K412, ____, K414 } \
+}
+
+#define LAYOUT_65_ansi_blocker_tsangan( \
+ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K213, \
+ 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, K214, \
+ K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \
+ K400, K401, K402, K404, K410, K411, K412, K414 \
+) { \
+ { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, 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, ____, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \
+ { K400, K401, K402, ____, K404, ____, ____, ____, ____, ____, K410, K411, K412, ____, K414 } \
+}
+
+#define LAYOUT_65_iso_blocker( \
+ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K213, \
+ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K114, \
+ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K113, K212, K214, \
+ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \
+ K400, K401, K402, K404, K409, K410, K411, K412, K414 \
+) { \
+ { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, ____ }, \
+ { 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, K313, K314 }, \
+ { K400, K401, K402, ____, K404, ____, ____, ____, ____, K409, K410, K411, K412, ____, K414 } \
+}
+
+#define LAYOUT_65_iso_blocker_split_bs( \
+ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K213, \
+ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K114, \
+ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K113, K212, K214, \
+ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \
+ K400, K401, K402, K404, K409, K410, K411, K412, K414 \
+) { \
+ { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, 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, K313, K314 }, \
+ { K400, K401, K402, ____, K404, ____, ____, ____, ____, K409, K410, K411, K412, ____, K414 } \
+}
+
+typedef union {
+ uint32_t raw;
+ struct {
+ uint8_t encoder_mode_index :8;
+ };
+} keyboard_config_t;
+
+extern keyboard_config_t keyboard_config;
+
+#define VOLUME_ANIMATION_TIMER 580