aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfauxpark <fauxpark@gmail.com>2020-01-26 07:43:43 +1100
committerDrashna Jaelre <drashna@live.com>2020-01-25 12:43:43 -0800
commit480a391929de9e66d36c84df900c49297c7dfec0 (patch)
treed37d22e5dcca10c4560650be99c0cd85158d6f70
parent154336ee2747eafee23a13073203cd984dc999b5 (diff)
downloadqmk_firmware-480a391929de9e66d36c84df900c49297c7dfec0.tar.gz
qmk_firmware-480a391929de9e66d36c84df900c49297c7dfec0.zip
[Keyboard] Daisy refactor (#7985)
Diffstat
-rw-r--r--keyboards/daisy/config.h129
-rw-r--r--keyboards/daisy/daisy.c46
-rw-r--r--keyboards/daisy/daisy.h58
-rw-r--r--keyboards/daisy/info.json117
-rw-r--r--keyboards/daisy/keymaps/default/keymap.c159
-rw-r--r--keyboards/daisy/keymaps/default/readme.md6
-rw-r--r--keyboards/daisy/readme.md28
-rw-r--r--keyboards/daisy/rules.mk28
8 files changed, 385 insertions, 186 deletions
diff --git a/keyboards/daisy/config.h b/keyboards/daisy/config.h
index 567a215a6..4ee4d242f 100644
--- a/keyboards/daisy/config.h
+++ b/keyboards/daisy/config.h
@@ -1,13 +1,29 @@
1#ifndef CONFIG_H 1/*
2#define CONFIG_H 2Copyright 2020
3
4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17
18#pragma once
3 19
4#include "config_common.h" 20#include "config_common.h"
5 21
6/* USB Device descriptor parameter */ 22/* USB Device descriptor parameter */
7#define VENDOR_ID 0x1209 23#define VENDOR_ID 0xFEED
8#define PRODUCT_ID 0x2328 24#define PRODUCT_ID 0x7169
9#define DEVICE_VER 0x501 25#define DEVICE_VER 0x0501
10#define MANUFACTURER K.T.E.C. 26#define MANUFACTURER KTEC
11#define PRODUCT Daisy 27#define PRODUCT Daisy
12#define DESCRIPTION qmk port for Daisy 28#define DESCRIPTION qmk port for Daisy
13 29
@@ -32,22 +48,59 @@
32/* COL2ROW, ROW2COL*/ 48/* COL2ROW, ROW2COL*/
33#define DIODE_DIRECTION COL2ROW 49#define DIODE_DIRECTION COL2ROW
34 50
51/*
52 * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
53 */
54//#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6
55
35#define BACKLIGHT_PIN D0 56#define BACKLIGHT_PIN D0
57// #define BACKLIGHT_BREATHING
36#define BACKLIGHT_LEVELS 6 58#define BACKLIGHT_LEVELS 6
37 59
60#define RGB_DI_PIN C7
61#ifdef RGB_DI_PIN
62# define RGBLED_NUM 8
63# define RGBLIGHT_HUE_STEP 12
64# define RGBLIGHT_SAT_STEP 25
65# define RGBLIGHT_VAL_STEP 12
66// #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
67// #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
68// /*== all animations enable ==*/
69# define RGBLIGHT_ANIMATIONS
70// /*== or choose animations ==*/
71// #define RGBLIGHT_EFFECT_BREATHING
72// #define RGBLIGHT_EFFECT_RAINBOW_MOOD
73// #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
74// #define RGBLIGHT_EFFECT_SNAKE
75// #define RGBLIGHT_EFFECT_KNIGHT
76// #define RGBLIGHT_EFFECT_CHRISTMAS
77// #define RGBLIGHT_EFFECT_STATIC_GRADIENT
78// #define RGBLIGHT_EFFECT_RGB_TEST
79// #define RGBLIGHT_EFFECT_ALTERNATING
80// /*== customize breathing effect ==*/
81// /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
82// #define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64
83// /*==== use exp() and sin() ====*/
84// #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7
85// #define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255
86#endif
87
38/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ 88/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
39#define DEBOUNCE 5 89#define DEBOUNCE 5
40 90
41/* define if matrix has ghost (lacks anti-ghosting diodes) */ 91/* define if matrix has ghost (lacks anti-ghosting diodes) */
42//#define MATRIX_HAS_GHOST 92//#define MATRIX_HAS_GHOST
43 93
44/* number of backlight levels */
45
46/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ 94/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
47#define LOCKING_SUPPORT_ENABLE 95#define LOCKING_SUPPORT_ENABLE
48/* Locking resynchronize hack */ 96/* Locking resynchronize hack */
49#define LOCKING_RESYNC_ENABLE 97#define LOCKING_RESYNC_ENABLE
50 98
99/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
100 * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
101 */
102// #define GRAVE_ESC_CTRL_OVERRIDE
103
51/* 104/*
52 * Force NKRO 105 * Force NKRO
53 * 106 *
@@ -81,6 +134,10 @@
81 * 134 *
82 */ 135 */
83 136
137/* key combination for magic key command */
138/* defined by default; to change, uncomment and set to the combination you want */
139// #define IS_COMMAND() (get_mods() == MOD_MASK_SHIFT)
140
84/* control how magic key switches layers */ 141/* control how magic key switches layers */
85//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS true 142//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS true
86//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS true 143//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS true
@@ -90,8 +147,8 @@
90//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS 147//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS
91//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS 148//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS
92//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM 149//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM
93//#define MAGIC_KEY_HELP1 H 150//#define MAGIC_KEY_HELP H
94//#define MAGIC_KEY_HELP2 SLASH 151//#define MAGIC_KEY_HELP_ALT SLASH
95//#define MAGIC_KEY_DEBUG D 152//#define MAGIC_KEY_DEBUG D
96//#define MAGIC_KEY_DEBUG_MATRIX X 153//#define MAGIC_KEY_DEBUG_MATRIX X
97//#define MAGIC_KEY_DEBUG_KBD K 154//#define MAGIC_KEY_DEBUG_KBD K
@@ -99,9 +156,8 @@
99//#define MAGIC_KEY_VERSION V 156//#define MAGIC_KEY_VERSION V
100//#define MAGIC_KEY_STATUS S 157//#define MAGIC_KEY_STATUS S
101//#define MAGIC_KEY_CONSOLE C 158//#define MAGIC_KEY_CONSOLE C
102//#define MAGIC_KEY_LAYER0_ALT1 ESC
103//#define MAGIC_KEY_LAYER0_ALT2 GRAVE
104//#define MAGIC_KEY_LAYER0 0 159//#define MAGIC_KEY_LAYER0 0
160//#define MAGIC_KEY_LAYER0_ALT GRAVE
105//#define MAGIC_KEY_LAYER1 1 161//#define MAGIC_KEY_LAYER1 1
106//#define MAGIC_KEY_LAYER2 2 162//#define MAGIC_KEY_LAYER2 2
107//#define MAGIC_KEY_LAYER3 3 163//#define MAGIC_KEY_LAYER3 3
@@ -111,9 +167,11 @@
111//#define MAGIC_KEY_LAYER7 7 167//#define MAGIC_KEY_LAYER7 7
112//#define MAGIC_KEY_LAYER8 8 168//#define MAGIC_KEY_LAYER8 8
113//#define MAGIC_KEY_LAYER9 9 169//#define MAGIC_KEY_LAYER9 9
114//#define MAGIC_KEY_BOOTLOADER PAUSE 170//#define MAGIC_KEY_BOOTLOADER B
171//#define MAGIC_KEY_BOOTLOADER_ALT ESC
115//#define MAGIC_KEY_LOCK CAPS 172//#define MAGIC_KEY_LOCK CAPS
116//#define MAGIC_KEY_EEPROM E 173//#define MAGIC_KEY_EEPROM E
174//#define MAGIC_KEY_EEPROM_CLEAR BSPACE
117//#define MAGIC_KEY_NKRO N 175//#define MAGIC_KEY_NKRO N
118//#define MAGIC_KEY_SLEEP_LED Z 176//#define MAGIC_KEY_SLEEP_LED Z
119 177
@@ -132,17 +190,12 @@
132//#define NO_ACTION_LAYER 190//#define NO_ACTION_LAYER
133//#define NO_ACTION_TAPPING 191//#define NO_ACTION_TAPPING
134//#define NO_ACTION_ONESHOT 192//#define NO_ACTION_ONESHOT
135//#define NO_ACTION_MACRO
136//#define NO_ACTION_FUNCTION
137
138// ws2812 options
139#define RGB_DI_PIN C7 // pin the DI on the ws2812 is hooked-up to
140#define RGBLIGHT_ANIMATIONS // run RGB animations
141#define RGBLED_NUM 8 // number of LEDs
142#define RGBLIGHT_HUE_STEP 12 // units to step when in/decreasing hue
143#define RGBLIGHT_SAT_STEP 25 // units to step when in/decresing saturation
144#define RGBLIGHT_VAL_STEP 12 // units to step when in/decreasing value (brightness)
145 193
194/* disable these deprecated features by default */
195#ifndef LINK_TIME_OPTIMIZATION_ENABLE
196 #define NO_ACTION_MACRO
197 #define NO_ACTION_FUNCTION
198#endif
146/* 199/*
147 * MIDI options 200 * MIDI options
148 */ 201 */
@@ -166,4 +219,34 @@
166/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */ 219/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
167//#define MIDI_TONE_KEYCODE_OCTAVES 1 220//#define MIDI_TONE_KEYCODE_OCTAVES 1
168 221
222/*
223 * HD44780 LCD Display Configuration
224 */
225/*
226#define LCD_LINES 2 //< number of visible lines of the display
227#define LCD_DISP_LENGTH 16 //< visibles characters per line of the display
228
229#define LCD_IO_MODE 1 //< 0: memory mapped mode, 1: IO port mode
230
231#if LCD_IO_MODE
232#define LCD_PORT PORTB //< port for the LCD lines
233#define LCD_DATA0_PORT LCD_PORT //< port for 4bit data bit 0
234#define LCD_DATA1_PORT LCD_PORT //< port for 4bit data bit 1
235#define LCD_DATA2_PORT LCD_PORT //< port for 4bit data bit 2
236#define LCD_DATA3_PORT LCD_PORT //< port for 4bit data bit 3
237#define LCD_DATA0_PIN 4 //< pin for 4bit data bit 0
238#define LCD_DATA1_PIN 5 //< pin for 4bit data bit 1
239#define LCD_DATA2_PIN 6 //< pin for 4bit data bit 2
240#define LCD_DATA3_PIN 7 //< pin for 4bit data bit 3
241#define LCD_RS_PORT LCD_PORT //< port for RS line
242#define LCD_RS_PIN 3 //< pin for RS line
243#define LCD_RW_PORT LCD_PORT //< port for RW line
244#define LCD_RW_PIN 2 //< pin for RW line
245#define LCD_E_PORT LCD_PORT //< port for Enable line
246#define LCD_E_PIN 1 //< pin for Enable line
169#endif 247#endif
248*/
249
250/* Bootmagic Lite key configuration */
251// #define BOOTMAGIC_LITE_ROW 0
252// #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/daisy/daisy.c b/keyboards/daisy/daisy.c
index f8ca24ff0..4e365ed46 100644
--- a/keyboards/daisy/daisy.c
+++ b/keyboards/daisy/daisy.c
@@ -1,15 +1,35 @@
1/* Copyright 2020
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
1#include "daisy.h" 17#include "daisy.h"
2 18
3void led_set_kb(uint8_t usb_led) { 19void keyboard_pre_init_kb(void) {
4 // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here 20 led_init_ports();
5 if (usb_led & (1<<USB_LED_CAPS_LOCK)) { 21 keyboard_pre_init_user();
6 // output low 22}
7 DDRC |= (1<<PC6); 23
8 PORTC &= ~(1<<PC6); 24void led_init_ports(void) {
9 } else { 25 setPinOutput(C6);
10 // Hi-Z 26 writePinHigh(C6);
11 DDRC &= ~(1<<PC6); 27}
12 PORTC &= ~(1<<PC6); 28
13 } 29bool led_update_kb(led_t led_state) {
14 led_set_user(usb_led); 30 if (led_update_user(led_state)) {
15} \ No newline at end of file 31 writePin(C6, !led_state.caps_lock);
32 }
33
34 return true;
35}
diff --git a/keyboards/daisy/daisy.h b/keyboards/daisy/daisy.h
index 15483e3a3..b78c60464 100644
--- a/keyboards/daisy/daisy.h
+++ b/keyboards/daisy/daisy.h
@@ -1,19 +1,51 @@
1#ifndef DAISY_H 1/* Copyright 2020
2#define DAISY_H 2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#pragma once
3 18
4#include "quantum.h" 19#include "quantum.h"
5 20
21/* This is a shortcut to help you visually see your layout.
22 *
23 * The first section contains all of the arguments representing the physical
24 * layout of the board and position of the keys.
25 *
26 * The second converts the arguments into a two-dimensional array which
27 * represents the switch matrix.
28 */
6#define LAYOUT( \ 29#define LAYOUT( \
7 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K3A, \ 30 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K3A, \
8 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \ 31 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
9 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \ 32 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \
10 K30, K31, K32, K34, K35, K37, K38, K39 \ 33 K30, K31, K32, K34, K35, K37, K38, K39 \
11) \ 34) { \
12{ \ 35 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A }, \
13 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A }, \ 36 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A }, \
14 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A }, \ 37 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A }, \
15 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A }, \ 38 { K30, K31, K32, KC_NO, K34, K35, KC_NO, K37, K38, K39, K3A } \
16 { K30, K31, K32, KC_NO, K34, K35, KC_NO, K37, K38, K39, K3A } \
17} 39}
18 40
19#endif 41#define LAYOUT_625_space( \
42 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K3A, \
43 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
44 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \
45 K30, K31, K32, K35, K38, K39 \
46) { \
47 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A }, \
48 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A }, \
49 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A }, \
50 { K30, K31, K32, KC_NO, KC_NO, K35, KC_NO, KC_NO, K38, K39, K3A } \
51}
diff --git a/keyboards/daisy/info.json b/keyboards/daisy/info.json
index 400575793..fcc7cd9fa 100644
--- a/keyboards/daisy/info.json
+++ b/keyboards/daisy/info.json
@@ -1,18 +1,107 @@
1{ 1{
2 "keyboard_name": "Daisy", 2 "keyboard_name": "Daisy",
3 "url": "", 3 "url": "",
4 "maintainer": "qmk", 4 "maintainer": "qmk",
5 "width": 12, 5 "width": 12,
6 "height": 4, 6 "height": 4,
7 "layouts": { 7 "layouts": {
8 "LAYOUT": { 8 "LAYOUT": {
9 "key_count": 42, 9 "key_count": 42,
10 "layout": [{"label": "K00", "x": 0, "y": 0}, {"label": "K01", "x": 1, "y": 0}, {"label": "K02", "x": 2, "y": 0}, {"label": "K03", "x": 3, "y": 0}, {"label": "K04", "x": 4, "y": 0}, {"label": "K05", "x": 5, "y": 0}, {"label": "K06", "x": 6, "y": 0}, {"label": "K07", "x": 7, "y": 0}, {"label": "K08", "x": 8, "y": 0}, {"label": "K09", "x": 9, "y": 0}, {"label": "K0A", "x": 10, "y": 0}, {"label": "K3A", "x": 11, "y": 0}, {"label": "K10", "x": 0, "y": 1, "w": 1.25}, {"label": "K11", "x": 1.25, "y": 1}, {"label": "K12", "x": 2.25, "y": 1}, {"label": "K13", "x": 3.25, "y": 1}, {"label": "K14", "x": 4.25, "y": 1}, {"label": "K15", "x": 5.25, "y": 1}, {"label": "K16", "x": 6.25, "y": 1}, {"label": "K17", "x": 7.25, "y": 1}, {"label": "K18", "x": 8.25, "y": 1}, {"label": "K19", "x": 9.25, "y": 1}, {"label": "K1A", "x": 10.25, "y": 1, "w": 1.75}, {"label": "K20", "x": 0, "y": 2, "w": 1.75}, {"label": "K21", "x": 1.75, "y": 2}, {"label": "K22", "x": 2.75, "y": 2}, {"label": "K23", "x": 3.75, "y": 2}, {"label": "K24", "x": 4.75, "y": 2}, {"label": "K25", "x": 5.75, "y": 2}, {"label": "K26", "x": 6.75, "y": 2}, {"label": "K27", "x": 7.75, "y": 2}, {"label": "K28", "x": 8.75, "y": 2}, {"label": "K29", "x": 9.75, "y": 2}, {"label": "K2A", "x": 10.75, "y": 2, "w": 1.25}, {"label": "K30", "x": 0, "y": 3, "w": 1.25}, {"label": "K31", "x": 1.25, "y": 3}, {"label": "K32", "x": 2.25, "y": 3, "w": 1.25}, {"label": "K34", "x": 3.5, "y": 3, "w": 2.25}, {"label": "K35", "x": 5.75, "y": 3, "w": 2.75}, {"label": "K37", "x": 8.5, "y": 3, "w": 1.25}, {"label": "K38", "x": 9.75, "y": 3}, {"label": "K39", "x": 10.75, "y": 3, "w": 1.25}] 10 "layout": [
11 }, 11 {"x": 0, "y": 0},
12 {"x": 1, "y": 0},
13 {"x": 2, "y": 0},
14 {"x": 3, "y": 0},
15 {"x": 4, "y": 0},
16 {"x": 5, "y": 0},
17 {"x": 6, "y": 0},
18 {"x": 7, "y": 0},
19 {"x": 8, "y": 0},
20 {"x": 9, "y": 0},
21 {"x": 10, "y": 0},
22 {"x": 11, "y": 0},
12 23
13 "LAYOUT_625_space": { 24 {"x": 0, "y": 1, "w": 1.25},
14 "key_count": 40, 25 {"x": 1.25, "y": 1},
15 "layout": [{"label": "K00", "x": 0, "y": 0}, {"label": "K01", "x": 1, "y": 0}, {"label": "K02", "x": 2, "y": 0}, {"label": "K03", "x": 3, "y": 0}, {"label": "K04", "x": 4, "y": 0}, {"label": "K05", "x": 5, "y": 0}, {"label": "K06", "x": 6, "y": 0}, {"label": "K07", "x": 7, "y": 0}, {"label": "K08", "x": 8, "y": 0}, {"label": "K09", "x": 9, "y": 0}, {"label": "K0A", "x": 10, "y": 0}, {"label": "K3A", "x": 11, "y": 0}, {"label": "K10", "x": 0, "y": 1, "w": 1.25}, {"label": "K11", "x": 1.25, "y": 1}, {"label": "K12", "x": 2.25, "y": 1}, {"label": "K13", "x": 3.25, "y": 1}, {"label": "K14", "x": 4.25, "y": 1}, {"label": "K15", "x": 5.25, "y": 1}, {"label": "K16", "x": 6.25, "y": 1}, {"label": "K17", "x": 7.25, "y": 1}, {"label": "K18", "x": 8.25, "y": 1}, {"label": "K19", "x": 9.25, "y": 1}, {"label": "K1A", "x": 10.25, "y": 1, "w": 1.75}, {"label": "K20", "x": 0, "y": 2, "w": 1.75}, {"label": "K21", "x": 1.75, "y": 2}, {"label": "K22", "x": 2.75, "y": 2}, {"label": "K23", "x": 3.75, "y": 2}, {"label": "K24", "x": 4.75, "y": 2}, {"label": "K25", "x": 5.75, "y": 2}, {"label": "K26", "x": 6.75, "y": 2}, {"label": "K27", "x": 7.75, "y": 2}, {"label": "K28", "x": 8.75, "y": 2}, {"label": "K29", "x": 9.75, "y": 2}, {"label": "K2A", "x": 10.75, "y": 2, "w": 1.25}, {"label": "K30", "x": 0, "y": 3, "w": 1.25}, {"label": "K31", "x": 1.25, "y": 3}, {"label": "K32", "x": 2.25, "y": 3}, {"x": 3.25, "y": 3, "w": 6.25}, {"label": "K38", "x": 9.5, "y": 3, "w": 1.25}, {"label": "K39", "x": 10.75, "y": 3, "w": 1.25}] 26 {"x": 2.25, "y": 1},
27 {"x": 3.25, "y": 1},
28 {"x": 4.25, "y": 1},
29 {"x": 5.25, "y": 1},
30 {"x": 6.25, "y": 1},
31 {"x": 7.25, "y": 1},
32 {"x": 8.25, "y": 1},
33 {"x": 9.25, "y": 1},
34 {"x": 10.25, "y": 1, "w": 1.75},
35
36 {"x": 0, "y": 2, "w": 1.75},
37 {"x": 1.75, "y": 2},
38 {"x": 2.75, "y": 2},
39 {"x": 3.75, "y": 2},
40 {"x": 4.75, "y": 2},
41 {"x": 5.75, "y": 2},
42 {"x": 6.75, "y": 2},
43 {"x": 7.75, "y": 2},
44 {"x": 8.75, "y": 2},
45 {"x": 9.75, "y": 2},
46 {"x": 10.75, "y": 2, "w": 1.25},
47
48 {"x": 0, "y": 3, "w": 1.25},
49 {"x": 1.25, "y": 3},
50 {"x": 2.25, "y": 3, "w": 1.25},
51 {"x": 3.5, "y": 3, "w": 2.25},
52 {"x": 5.75, "y": 3, "w": 2.75},
53 {"x": 8.5, "y": 3, "w": 1.25},
54 {"x": 9.75, "y": 3},
55 {"x": 10.75, "y": 3, "w": 1.25}
56 ]
57 },
58 "LAYOUT_625_space": {
59 "key_count": 40,
60 "layout": [
61 {"x": 0, "y": 0},
62 {"x": 1, "y": 0},
63 {"x": 2, "y": 0},
64 {"x": 3, "y": 0},
65 {"x": 4, "y": 0},
66 {"x": 5, "y": 0},
67 {"x": 6, "y": 0},
68 {"x": 7, "y": 0},
69 {"x": 8, "y": 0},
70 {"x": 9, "y": 0},
71 {"x": 10, "y": 0},
72 {"x": 11, "y": 0},
73
74 {"x": 0, "y": 1, "w": 1.25},
75 {"x": 1.25, "y": 1},
76 {"x": 2.25, "y": 1},
77 {"x": 3.25, "y": 1},
78 {"x": 4.25, "y": 1},
79 {"x": 5.25, "y": 1},
80 {"x": 6.25, "y": 1},
81 {"x": 7.25, "y": 1},
82 {"x": 8.25, "y": 1},
83 {"x": 9.25, "y": 1},
84 {"x": 10.25, "y": 1, "w": 1.75},
85
86 {"x": 0, "y": 2, "w": 1.75},
87 {"x": 1.75, "y": 2},
88 {"x": 2.75, "y": 2},
89 {"x": 3.75, "y": 2},
90 {"x": 4.75, "y": 2},
91 {"x": 5.75, "y": 2},
92 {"x": 6.75, "y": 2},
93 {"x": 7.75, "y": 2},
94 {"x": 8.75, "y": 2},
95 {"x": 9.75, "y": 2},
96 {"x": 10.75, "y": 2, "w": 1.25},
97
98 {"x": 0, "y": 3, "w": 1.25},
99 {"x": 1.25, "y": 3},
100 {"x": 2.25, "y": 3},
101 {"x": 3.25, "y": 3, "w": 6.25},
102 {"x": 9.5, "y": 3, "w": 1.25},
103 {"x": 10.75, "y": 3, "w": 1.25}
104 ]
105 }
16 } 106 }
17 }
18} 107}
diff --git a/keyboards/daisy/keymaps/default/keymap.c b/keyboards/daisy/keymaps/default/keymap.c
index adc3298d0..f07680376 100644
--- a/keyboards/daisy/keymaps/default/keymap.c
+++ b/keyboards/daisy/keymaps/default/keymap.c
@@ -1,92 +1,83 @@
1#include QMK_KEYBOARD_H 1/* Copyright 2020
2 2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
3 16
4// Layer shorthand 17#include QMK_KEYBOARD_H
5#define _BL 0
6#define _LW 1
7#define _RS 2
8 18
9enum layer_keycodes { 19// Defines names for use in layer keycodes and the keymap
10 QWERTY = SAFE_RANGE, LOWER, RAISE 20enum layer_names {
21 _BL,
22 _LW,
23 _RS
11}; 24};
12 25
13const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 26#define LOWER MO(_LW)
14 27#define RAISE MO(_RS)
15 /* Base Layer
16 * .-----------------------------------------------------------------------.
17 * | ESC | Q | W | E | R | T | Y | U | I | O | P | \| |
18 * |-----------------------------------------------------------------------|
19 * | TAB | A | S | D | F | G | H | J | K | L | ENTER |
20 * |-----------------------------------------------------------------------|
21 * | LSHIFT | Z | X | C | V | B | N | M | ,< | .> | /? |
22 * |-----------------------------------------------------------------------|
23 * | LCTRL | LGUI | LALT | SPACE | BACKSPACE | LW | RS | RALT |
24 * '-----------------------------------------------------------------------'
25 */
26 [_BL] = LAYOUT(
27 GRAVE_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
28 KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT,
29 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,
30 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_BSPC, LOWER, RAISE, KC_RALT
31 ),
32 28
33 /* Function Layer 29const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
34 * .-----------------------------------------------------------------------. 30 /* Base Layer
35 * | GRV | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | -_ | 31 * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
36 * |-----------------------------------------------------------------------| 32 * │Esc│ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ \ │
37 * | | =+ | UP | | | | [{ | ]} | ;: | '" | | 33 * ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤
38 * |-----------------------------------------------------------------------| 34 * │Tab │ A │ S │ D │ F │ G │ H │ J │ K │ L │ Enter│
39 * | | LEFT| DOWN |RIGHT| | | | | | | | 35 * ├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬────┤
40 * |-----------------------------------------------------------------------| 36 * │Shift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │  / │
41 * | | | | | DELETE | | | | 37 * ├────┬─┴─┬─┴──┬┴───┴───┼───┴───┴──┬┴───┼───┼────┤
42 * '-----------------------------------------------------------------------' 38 * │Ctrl│GUI│Alt │        │ Backspace│Lowr│Rse│ Alt│
43 */ 39 * └────┴───┴────┴────────┴──────────┴────┴───┴────┘
44 40 */
45 [_LW] = LAYOUT( 41 [_BL] = LAYOUT(
46 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, 42 KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
47 KC_TRNS, KC_EQL, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_SCLN, KC_QUOT, KC_TRNS, 43 KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT,
48 KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 44 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,
49 KC_LCTL, KC_LGUI, KC_LALT, KC_TRNS, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS 45 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_BSPC, LOWER, RAISE, KC_RALT
50 ), 46 ),
51
52 /* Second Function Layer
53 * .-----------------------------------------------------------------------.
54 * | RST | F1 | F2 | F3 | F4 | F5 | F6 | | HOME| PGUP| | |
55 * |-----------------------------------------------------------------------|
56 * | | F7 | F8 | F9 | F10 | F11 | F12 | | END | PGDN| |
57 * |-----------------------------------------------------------------------|
58 * | |RGBtog|RGBmod|RGBhud|RGBhui|RGBvad|RGBvai|RGBsad|RGBsai|BL| |
59 * |-----------------------------------------------------------------------|
60 * | | | | | | | | |
61 * '-----------------------------------------------------------------------'
62 */
63 [_RS] = LAYOUT(
64 RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_TRNS, KC_HOME, KC_PGUP, KC_TRNS, KC_TRNS,
65 KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_END, KC_PGDN, KC_TRNS,
66 KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_VAD, RGB_VAI, RGB_SAD, RGB_SAI, BL_STEP, KC_TRNS,
67 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
68 ),
69 47
70}; 48 /* Function Layer 1 (Lower)
49 * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
50 * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │
51 * └───┴┬──┴┬──┴┬──┴───┴───┴┬──┴┬──┴┬──┴┬──┴┬──┴───┘
52 * │    │ = │ ▴ │   │   │   │ [ │ ] │ ; │ ' │      │
53 * ├────└─┬─┴─┬─┴─┬───┐─┴─┬─└───┴───┴───┴───┘─┬────┤
54 * │      │ ◂ │ ▾ │ ▸ │   │   │   │   │   │   │    │
55 * ├────┬─└───┴───┴───┘───┌──────────┐┴───┼───┼────┤
56 * │    │   │    │        │   Delete │    │   │    │
57 * └────┴───┴────┴────────└──────────┘────┴───┴────┘
58 */
59 [_LW] = LAYOUT(
60 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
61 _______, KC_EQL, KC_UP, _______, _______, _______, KC_LBRC, KC_RBRC, KC_SCLN, KC_QUOT, _______,
62 _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______,
63 _______, _______, _______, _______, KC_DEL, _______, _______, _______
64 ),
71 65
72bool process_record_user(uint16_t keycode, keyrecord_t *record) { 66 /* Function Layer 2 (Raise)
73 switch (keycode) { 67 * ┌───┬───┬───┬───┬───┬───┬───┐───┌───┬───┐───┬───┐
74 case LOWER: 68 * │Rst│F1 │F2 │F3 │F4 │F5 │F6 │   │Hom│PgU│   │   │
75 if(record->event.pressed){ 69 * └───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐──└┬──┴┬──┴┐──┴───┤
76 layer_on(_LW); 70 * │    │F7 │F8 │F9 │F10│F11│F12│   │ ; │ ' │      │
77 } else { 71 * ├────└─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴───┴───┴───┴─┐────┤
78 layer_off(_LW); 72 * │      │RGB│Mod│HuD│HuI│VaD│VaI│SaD│SaI│BLS│    │
79 } 73 * ├────┬─└───┴───┴───┴───┴───┴───┴───┴───┴───┘────┤
80 return false; 74 * │    │   │    │        │          │    │   │    │
81 break; 75 * └────┴───┴────┴────────┴──────────┴────┴───┴────┘
82 case RAISE: 76 */
83 if(record->event.pressed){ 77 [_RS] = LAYOUT(
84 layer_on(_RS); 78 RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, _______, KC_HOME, KC_PGUP, _______, _______,
85 } else { 79 _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_END, KC_PGDN, _______,
86 layer_off(_RS); 80 _______, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_VAD, RGB_VAI, RGB_SAD, RGB_SAI, BL_STEP, _______,
87 } 81 _______, _______, _______, _______, _______, _______, _______, _______
88 return false; 82 )
89 break;
90 }
91 return true;
92}; 83};
diff --git a/keyboards/daisy/keymaps/default/readme.md b/keyboards/daisy/keymaps/default/readme.md
index dff0dcbde..b8c7d17f2 100644
--- a/keyboards/daisy/keymaps/default/readme.md
+++ b/keyboards/daisy/keymaps/default/readme.md
@@ -1,5 +1 @@
1![Daisy Layout Image](https://imgur.com/9mSF0yf) # The default keymap for Daisy
2
3# Default Daisy Layout
4
5This is the default layout as offered by KPRepublic's TMK firmware for the Daisy with a few minor tweaks for usability made by me.
diff --git a/keyboards/daisy/readme.md b/keyboards/daisy/readme.md
index c8175c283..a8a93bf79 100644
--- a/keyboards/daisy/readme.md
+++ b/keyboards/daisy/readme.md
@@ -1,29 +1,15 @@
1# Daisy 1# Daisy
2 2
3A 40% keyboard kit sold by KPRepublic. 3![Daisy PCB](https://cdn.shopify.com/s/files/1/2711/4238/products/HTB1Pj1UggMPMeJjy1Xcq6xpppXa7_1024x1024.jpg)
4 4
5Keyboard Maintainer: westfoxtrot (https://github.com/westfoxtrot) 5A 40% keyboard kit sold by KPrepublic.
6Hardware Supported: Daisy PCB Rev.1, Daisy PCB Rev.2 6
7Hardware Availability: http://tinyurl.com/yc26lq22 7* Keyboard Maintainer: [westfoxtrot](https://github.com/westfoxtrot)
8* Hardware Supported: Daisy PCB Rev.1, Daisy PCB Rev.2
9* Hardware Availability: [KPrepublic](https://kprepublic.com/products/daisy-40-custom-keyboard-pcb)
8 10
9Make example for this keyboard (after setting up your build environment): 11Make example for this keyboard (after setting up your build environment):
10 12
11 make daisy:default 13 make daisy:default
12 14
13See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. 15See 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).
14
15
16# Other Keymaps
17
18The "default" keymap included is the layout I personally use on the Daisy and the one I have found the most comfortable.
19
20A printable picture showing this layout is available here: https://imgur.com/9mSF0yf
21
22
23```
24$ make daisy:[default|<name>]
25```
26
27# Bootloader
28
29I personally had issues with the bootloader on my Daisy PCB and was unable to flash a firmware to the board after the first time. I replaced the bootloader with the one available in the repository at ../../util/bootloader_atmega32u4_1_0_0.hex
diff --git a/keyboards/daisy/rules.mk b/keyboards/daisy/rules.mk
index d2b0d7d16..c82fa9bc6 100644
--- a/keyboards/daisy/rules.mk
+++ b/keyboards/daisy/rules.mk
@@ -11,20 +11,22 @@ MCU = atmega32u4
11# ATmega328P USBasp 11# ATmega328P USBasp
12BOOTLOADER = atmel-dfu 12BOOTLOADER = atmel-dfu
13 13
14# QMK Build Options 14# Build Options
15# change to "no" to disable the options, or define them in the Makefile in 15# change yes to no to disable
16# the appropriate keymap folder that will get included automatically
17# 16#
18BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) 17BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration
19MOUSEKEY_ENABLE = no # Mouse keys(+4700) 18MOUSEKEY_ENABLE = no # Mouse keys
20EXTRAKEY_ENABLE = yes # Audio control and System control(+450) 19EXTRAKEY_ENABLE = yes # Audio control and System control
21CONSOLE_ENABLE = no # Console for debug(+400) 20CONSOLE_ENABLE = no # Console for debug
22COMMAND_ENABLE = no # Commands for debug and configuration 21COMMAND_ENABLE = no # Commands for debug and configuration
23NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work 22# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
23SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
24# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
25NKRO_ENABLE = no # USB Nkey Rollover
24BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality 26BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
25MIDI_ENABLE = no # MIDI support (+2400 to 4200, depending on config) 27RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
26AUDIO_ENABLE = no # Audio output on port C6 28MIDI_ENABLE = no # MIDI support
27UNICODE_ENABLE = no # Unicode
28BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID 29BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
29RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. 30AUDIO_ENABLE = no # Audio output on port C6
30SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend 31FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches
32HD44780_ENABLE = no # Enable support for HD44780 based LCDs
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-14 19:12:51 +0000