aboutsummaryrefslogtreecommitdiff
path: root/keyboards/do60
diff options
context:
space:
mode:
authorMechMerlin <30334081+mechmerlin@users.noreply.github.com>2020-07-23 20:17:38 -0700
committerGitHub <noreply@github.com>2020-07-23 20:17:38 -0700
commit2cebac6f2f7f5a49adf7f2ce8a94c8ba1dbef707 (patch)
tree7e68356fadbb097569db90a1859c04f0294b3836 /keyboards/do60
parenta50c0049f68f666d1fe49d895743b27d1036ccb3 (diff)
downloadqmk_firmware-2cebac6f2f7f5a49adf7f2ce8a94c8ba1dbef707.tar.gz
qmk_firmware-2cebac6f2f7f5a49adf7f2ce8a94c8ba1dbef707.zip
[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
Diffstat (limited to 'keyboards/do60')
-rw-r--r--keyboards/do60/config.h2
-rw-r--r--keyboards/do60/do60.c37
-rw-r--r--keyboards/do60/do60.h5
-rw-r--r--keyboards/do60/keymaps/default/keymap.c5
-rw-r--r--keyboards/do60/keymaps/via/keymap.c35
-rw-r--r--keyboards/do60/keymaps/via/readme.md5
-rw-r--r--keyboards/do60/keymaps/via/rules.mk2
7 files changed, 51 insertions, 40 deletions
diff --git a/keyboards/do60/config.h b/keyboards/do60/config.h
index 82e818328..acaa64646 100644
--- a/keyboards/do60/config.h
+++ b/keyboards/do60/config.h
@@ -21,7 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
21#include "config_common.h" 21#include "config_common.h"
22 22
23/* USB Device descriptor parameter */ 23/* USB Device descriptor parameter */
24#define VENDOR_ID 0xFEED 24#define VENDOR_ID 0x4453 // DS for Doyu Studios
25#define PRODUCT_ID 0x6060 25#define PRODUCT_ID 0x6060
26#define DEVICE_VER 0x0001 26#define DEVICE_VER 0x0001
27#define MANUFACTURER Shopkey by Doyu Studio 27#define MANUFACTURER Shopkey by Doyu Studio
diff --git a/keyboards/do60/do60.c b/keyboards/do60/do60.c
index c1e509c5d..3dba9b535 100644
--- a/keyboards/do60/do60.c
+++ b/keyboards/do60/do60.c
@@ -1,11 +1,4 @@
1#include "do60.h" 1#include "do60.h"
2#include "led.h"
3
4//extern inline void do60_caps_led_on(void);
5//extern inline void do60_bl_led_on(void);
6
7//extern inline void do60_caps_led_off(void);
8//extern inline void do60_bl_led_off(void);
9 2
10extern inline void setdefaultrgb(void); 3extern inline void setdefaultrgb(void);
11 4
@@ -18,33 +11,17 @@ void matrix_init_kb(void) {
18 setdefaultrgb(); 11 setdefaultrgb();
19}; 12};
20 13
21void matrix_scan_kb(void) {
22 // Looping keyboard code goes here
23 // This runs every cycle (a lot)
24 matrix_scan_user();
25};
26
27void led_init_ports(void) { 14void led_init_ports(void) {
28 // Set caps lock LED pin as output 15 // Set caps lock LED pin as output
29 DDRB |= (1 << 2); 16 setPinOutput(B2);
30 // Default to off 17 // Default to off
31 PORTB |= (1 << 2); 18 writePinHigh(B2);
32} 19}
33 20
34void led_set_kb(uint8_t usb_led) { 21bool led_update_kb(led_t led_state) {
35 //if (usb_led & (1<<USB_LED_CAPS_LOCK)) { 22 if(led_update_user(led_state)) {
36 // do60_caps_led_on(); 23 writePin(B2, !led_state.caps_lock);
37 //} else { 24 }
38 // do60_caps_led_off();
39 //}
40
41 //led_set_user(usb_led);
42 25
43 if (usb_led & (1<<USB_LED_CAPS_LOCK)) { 26 return true;
44 // Turn capslock on
45 PORTB &= ~(1<<2);
46 } else {
47 // Turn capslock off
48 PORTB |= (1<<2);
49 }
50} 27}
diff --git a/keyboards/do60/do60.h b/keyboards/do60/do60.h
index 8ee902204..8a4b6037d 100644
--- a/keyboards/do60/do60.h
+++ b/keyboards/do60/do60.h
@@ -1,8 +1,6 @@
1#ifndef DO60_H 1#pragma once
2#define DO60_H
3 2
4#include "quantum.h" 3#include "quantum.h"
5#include "led.h"
6 4
7/* DO60 LEDs 5/* DO60 LEDs
8 * GPIO pads 6 * GPIO pads
@@ -94,4 +92,3 @@ inline void setdefaultrgb(void){ rgblight_sethsv(100,100,100); }
94 { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, K3E }, \ 92 { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, K3E }, \
95 { K40, K41, K42, KC_NO, KC_NO, K45, KC_NO, K47, KC_NO, KC_NO, K4A, K4B, K4C, K4D, K4E } \ 93 { K40, K41, K42, KC_NO, KC_NO, K45, KC_NO, K47, KC_NO, KC_NO, K4A, K4B, K4C, K4D, K4E } \
96} 94}
97#endif
diff --git a/keyboards/do60/keymaps/default/keymap.c b/keyboards/do60/keymaps/default/keymap.c
index 8ade985b3..8b76b0462 100644
--- a/keyboards/do60/keymaps/default/keymap.c
+++ b/keyboards/do60/keymaps/default/keymap.c
@@ -19,8 +19,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
19 KC_LCTL, KC_LGUI, KC_LALT, KC_BSPC,KC_SPC, KC_DEL, KC_RGUI, MO(1), KC_HOME, KC_PGDOWN,KC_END), 19 KC_LCTL, KC_LGUI, KC_LALT, KC_BSPC,KC_SPC, KC_DEL, KC_RGUI, MO(1), KC_HOME, KC_PGDOWN,KC_END),
20 20
21}; 21};
22
23// Loop
24void matrix_scan_user(void) {
25 // Empty
26};
diff --git a/keyboards/do60/keymaps/via/keymap.c b/keyboards/do60/keymaps/via/keymap.c
new file mode 100644
index 000000000..57f8e3b93
--- /dev/null
+++ b/keyboards/do60/keymaps/via/keymap.c
@@ -0,0 +1,35 @@
1#include QMK_KEYBOARD_H
2
3const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
4
5 // 0: Base Layer
6 [0] = LAYOUT_all(
7 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_GRV, KC_BSPC, \
8 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, \
9 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_NO, KC_ENT, \
10 KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSFT, KC_SLSH, KC_UP, KC_SLSH, \
11 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_NO, KC_BSPC, KC_RGUI, MO(1), KC_LEFT, KC_DOWN, KC_RIGHT),
12
13 // 1: Function Layer
14 [1] = LAYOUT_all(
15 RESET, 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_NO, KC_NO, \
16 KC_NO, RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD, BL_TOGG,BL_ON, BL_INC, KC_INS, KC_NO, KC_PSCR, KC_SLCK, KC_PAUS, KC_DEL, \
17 KC_NO, RGB_HUD, RGB_SAD, RGB_VAD, RGB_RMOD, BL_STEP,BL_OFF, BL_DEC, KC_NO, KC_NO, KC_HOME, KC_PGUP, KC_NO, KC_ENT, \
18 KC_LSFT, KC_NO, KC_NO, KC_APP, BL_STEP, KC_NO, KC_NO, KC_VOLD,KC_VOLU,KC_MUTE, KC_END, KC_RSFT, KC_NO , KC_PGUP, KC_INS, \
19 KC_LCTL, KC_LGUI, KC_LALT, KC_BSPC,KC_SPC, KC_DEL, KC_RGUI, MO(1), KC_HOME, KC_PGDOWN,KC_END),
20
21 [2] = LAYOUT_all(
22 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, \
23 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, \
24 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, \
25 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, \
26 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS),
27
28 [3] = LAYOUT_all(
29 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, \
30 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, \
31 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, \
32 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, \
33 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS),
34
35};
diff --git a/keyboards/do60/keymaps/via/readme.md b/keyboards/do60/keymaps/via/readme.md
new file mode 100644
index 000000000..89f9acaa9
--- /dev/null
+++ b/keyboards/do60/keymaps/via/readme.md
@@ -0,0 +1,5 @@
1![Uses this layout](https://i.redd.it/v64eqwsrk8jx.jpg)
2
3All of the keys which CAN have a function should be assigned one.
4
5The keys with KC_NO cannot be assigned a value
diff --git a/keyboards/do60/keymaps/via/rules.mk b/keyboards/do60/keymaps/via/rules.mk
new file mode 100644
index 000000000..36b7ba9cb
--- /dev/null
+++ b/keyboards/do60/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
1VIA_ENABLE = yes
2LTO_ENABLE = yes
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-19 19:55:03 +0000