From 2cebac6f2f7f5a49adf7f2ce8a94c8ba1dbef707 Mon Sep 17 00:00:00 2001 From: MechMerlin <30334081+mechmerlin@users.noreply.github.com> Date: Thu, 23 Jul 2020 20:17:38 -0700 Subject: [PATCH] [Keyboard] VIA Support: DO60 (#9622) * fix up that vendor ID * add a VIA enabled keymap * use pragma once * clean up indicator leds code * remove unused header --- keyboards/do60/config.h | 2 +- keyboards/do60/do60.c | 37 +++++-------------------- keyboards/do60/do60.h | 5 +--- keyboards/do60/keymaps/default/keymap.c | 5 ---- keyboards/do60/keymaps/via/keymap.c | 35 +++++++++++++++++++++++ keyboards/do60/keymaps/via/readme.md | 5 ++++ keyboards/do60/keymaps/via/rules.mk | 2 ++ 7 files changed, 51 insertions(+), 40 deletions(-) create mode 100644 keyboards/do60/keymaps/via/keymap.c create mode 100644 keyboards/do60/keymaps/via/readme.md create mode 100644 keyboards/do60/keymaps/via/rules.mk diff --git a/keyboards/do60/config.h b/keyboards/do60/config.h index 82e818328c..acaa64646f 100644 --- a/keyboards/do60/config.h +++ b/keyboards/do60/config.h @@ -21,7 +21,7 @@ along with this program. If not, see . #include "config_common.h" /* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED +#define VENDOR_ID 0x4453 // DS for Doyu Studios #define PRODUCT_ID 0x6060 #define DEVICE_VER 0x0001 #define MANUFACTURER Shopkey by Doyu Studio diff --git a/keyboards/do60/do60.c b/keyboards/do60/do60.c index c1e509c5db..3dba9b5359 100644 --- a/keyboards/do60/do60.c +++ b/keyboards/do60/do60.c @@ -1,11 +1,4 @@ #include "do60.h" -#include "led.h" - -//extern inline void do60_caps_led_on(void); -//extern inline void do60_bl_led_on(void); - -//extern inline void do60_caps_led_off(void); -//extern inline void do60_bl_led_off(void); extern inline void setdefaultrgb(void); @@ -18,33 +11,17 @@ void matrix_init_kb(void) { setdefaultrgb(); }; -void matrix_scan_kb(void) { - // Looping keyboard code goes here - // This runs every cycle (a lot) - matrix_scan_user(); -}; - void led_init_ports(void) { // Set caps lock LED pin as output - DDRB |= (1 << 2); + setPinOutput(B2); // Default to off - PORTB |= (1 << 2); + writePinHigh(B2); } -void led_set_kb(uint8_t usb_led) { - //if (usb_led & (1<