aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2020-11-01 06:56:08 +1100
committerGitHub <noreply@github.com>2020-11-01 06:56:08 +1100
commitd705918f50b257cc12e13567fd22a64db1087705 (patch)
tree3957192c982cf11590ce2a414e52675b1e193c41
parenta3f1defcd40f2d53b01ace2f520ff7901a44c714 (diff)
downloadqmk_firmware-d705918f50b257cc12e13567fd22a64db1087705.tar.gz
qmk_firmware-d705918f50b257cc12e13567fd22a64db1087705.zip
Efreet refactor (#10806)
Diffstat
-rw-r--r--keyboards/efreet/config.h157
-rw-r--r--keyboards/efreet/efreet.c36
-rw-r--r--keyboards/efreet/efreet.h65
-rw-r--r--keyboards/efreet/info.json109
-rw-r--r--keyboards/efreet/keymaps/default/config.h19
-rw-r--r--keyboards/efreet/keymaps/default/keymap.c55
-rw-r--r--keyboards/efreet/keymaps/default/readme.md2
-rw-r--r--keyboards/efreet/keymaps/via/keymap.c49
-rw-r--r--keyboards/efreet/readme.md12
-rw-r--r--keyboards/efreet/rules.mk27
10 files changed, 246 insertions, 285 deletions
diff --git a/keyboards/efreet/config.h b/keyboards/efreet/config.h
index b73ce7e05..ed5bb730a 100644
--- a/keyboards/efreet/config.h
+++ b/keyboards/efreet/config.h
@@ -20,12 +20,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
20#include "config_common.h" 20#include "config_common.h"
21 21
22/* USB Device descriptor parameter */ 22/* USB Device descriptor parameter */
23#define VENDOR_ID 0x534F // "SO" 23#define VENDOR_ID 0x534F // "SO"
24#define PRODUCT_ID 0x0001 24#define PRODUCT_ID 0x0001
25#define DEVICE_VER 0x0001 25#define DEVICE_VER 0x0001
26#define MANUFACTURER Soran 26#define MANUFACTURER Soran
27#define PRODUCT Efreet 27#define PRODUCT Efreet
28#define DESCRIPTION A 40% ortholinear keyboard.
29 28
30/* key matrix size */ 29/* key matrix size */
31#define MATRIX_ROWS 8 30#define MATRIX_ROWS 8
@@ -40,50 +39,50 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
40 * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) 39 * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
41 * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) 40 * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
42 * 41 *
43*/ 42 */
44#define MATRIX_ROW_PINS { B0, D6, D5, D4, D3, D2, D1, C2 } 43#define MATRIX_ROW_PINS { B0, D6, D5, D4, D3, D2, D1, C2 }
45#define MATRIX_COL_PINS { B3, B4, B5, B6, B7, C7 } 44#define MATRIX_COL_PINS { B3, B4, B5, B6, B7, C7 }
46#define UNUSED_PINS 45#define UNUSED_PINS
47 46
48/* COL2ROW, ROW2COL*/ 47/* COL2ROW, ROW2COL */
49#define DIODE_DIRECTION COL2ROW 48#define DIODE_DIRECTION COL2ROW
50 49
51/* 50/*
52 * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. 51 * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
53 */ 52 */
54#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6 53#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6
55 54
56#define BACKLIGHT_PIN D0 55#define BACKLIGHT_PIN D0
57#define BACKLIGHT_BREATHING
58#define BACKLIGHT_LEVELS 3 56#define BACKLIGHT_LEVELS 3
57#define BACKLIGHT_BREATHING
59 58
60// #define RGB_DI_PIN E2 59//#define RGB_DI_PIN E2
61// #ifdef RGB_DI_PIN 60//#ifdef RGB_DI_PIN
62// #define RGBLED_NUM 16 61//# define RGBLED_NUM 16
63// #define RGBLIGHT_HUE_STEP 8 62//# define RGBLIGHT_HUE_STEP 8
64// #define RGBLIGHT_SAT_STEP 8 63//# define RGBLIGHT_SAT_STEP 8
65// #define RGBLIGHT_VAL_STEP 8 64//# define RGBLIGHT_VAL_STEP 8
66// #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ 65//# 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 */ 66//# define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
68// /*== all animations enable ==*/ 67/*== all animations enable ==*/
69// #define RGBLIGHT_ANIMATIONS 68//# define RGBLIGHT_ANIMATIONS
70// /*== or choose animations ==*/ 69/*== or choose animations ==*/
71// #define RGBLIGHT_EFFECT_BREATHING 70//# define RGBLIGHT_EFFECT_BREATHING
72// #define RGBLIGHT_EFFECT_RAINBOW_MOOD 71//# define RGBLIGHT_EFFECT_RAINBOW_MOOD
73// #define RGBLIGHT_EFFECT_RAINBOW_SWIRL 72//# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
74// #define RGBLIGHT_EFFECT_SNAKE 73//# define RGBLIGHT_EFFECT_SNAKE
75// #define RGBLIGHT_EFFECT_KNIGHT 74//# define RGBLIGHT_EFFECT_KNIGHT
76// #define RGBLIGHT_EFFECT_CHRISTMAS 75//# define RGBLIGHT_EFFECT_CHRISTMAS
77// #define RGBLIGHT_EFFECT_STATIC_GRADIENT 76//# define RGBLIGHT_EFFECT_STATIC_GRADIENT
78// #define RGBLIGHT_EFFECT_RGB_TEST 77//# define RGBLIGHT_EFFECT_RGB_TEST
79// #define RGBLIGHT_EFFECT_ALTERNATING 78//# define RGBLIGHT_EFFECT_ALTERNATING
80// /*== customize breathing effect ==*/ 79/*== customize breathing effect ==*/
81// /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ 80/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
82// #define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 81//# define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64
83// /*==== use exp() and sin() ====*/ 82/*==== use exp() and sin() ====*/
84// #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 83//# define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7
85// #define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 84//# define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255
86// #endif 85//#endif
87 86
88/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ 87/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
89#define DEBOUNCE 5 88#define DEBOUNCE 5
@@ -97,9 +96,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
97#define LOCKING_RESYNC_ENABLE 96#define LOCKING_RESYNC_ENABLE
98 97
99/* If defined, GRAVE_ESC will always act as ESC when CTRL is held. 98/* 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). 99 * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
101 */ 100 */
102// #define GRAVE_ESC_CTRL_OVERRIDE 101//#define GRAVE_ESC_CTRL_OVERRIDE
103 102
104/* 103/*
105 * Force NKRO 104 * Force NKRO
@@ -123,55 +122,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
123//#define FORCE_NKRO 122//#define FORCE_NKRO
124 123
125/* 124/*
126 * Magic Key Options
127 *
128 * Magic keys are hotkey commands that allow control over firmware functions of
129 * the keyboard. They are best used in combination with the HID Listen program,
130 * found here: https://www.pjrc.com/teensy/hid_listen.html
131 *
132 * The options below allow the magic key functionality to be changed. This is
133 * useful if your keyboard/keypad is missing keys and you want magic key support.
134 *
135 */
136
137/* control how magic key switches layers */
138//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS true
139//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS true
140//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false
141
142/* override magic key keymap */
143//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS
144//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS
145//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM
146//#define MAGIC_KEY_HELP H
147//#define MAGIC_KEY_HELP_ALT SLASH
148//#define MAGIC_KEY_DEBUG D
149//#define MAGIC_KEY_DEBUG_MATRIX X
150//#define MAGIC_KEY_DEBUG_KBD K
151//#define MAGIC_KEY_DEBUG_MOUSE M
152//#define MAGIC_KEY_VERSION V
153//#define MAGIC_KEY_STATUS S
154//#define MAGIC_KEY_CONSOLE C
155//#define MAGIC_KEY_LAYER0 0
156//#define MAGIC_KEY_LAYER0_ALT GRAVE
157//#define MAGIC_KEY_LAYER1 1
158//#define MAGIC_KEY_LAYER2 2
159//#define MAGIC_KEY_LAYER3 3
160//#define MAGIC_KEY_LAYER4 4
161//#define MAGIC_KEY_LAYER5 5
162//#define MAGIC_KEY_LAYER6 6
163//#define MAGIC_KEY_LAYER7 7
164//#define MAGIC_KEY_LAYER8 8
165//#define MAGIC_KEY_LAYER9 9
166//#define MAGIC_KEY_BOOTLOADER B
167//#define MAGIC_KEY_BOOTLOADER_ALT ESC
168//#define MAGIC_KEY_LOCK CAPS
169//#define MAGIC_KEY_EEPROM E
170//#define MAGIC_KEY_EEPROM_CLEAR BSPACE
171//#define MAGIC_KEY_NKRO N
172//#define MAGIC_KEY_SLEEP_LED Z
173
174/*
175 * Feature disable options 125 * Feature disable options
176 * These options are also useful to firmware size reduction. 126 * These options are also useful to firmware size reduction.
177 */ 127 */
@@ -186,32 +136,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
186//#define NO_ACTION_LAYER 136//#define NO_ACTION_LAYER
187//#define NO_ACTION_TAPPING 137//#define NO_ACTION_TAPPING
188//#define NO_ACTION_ONESHOT 138//#define NO_ACTION_ONESHOT
189//#define NO_ACTION_MACRO
190//#define NO_ACTION_FUNCTION
191
192/*
193 * MIDI options
194 */
195
196/* Prevent use of disabled MIDI features in the keymap */
197//#define MIDI_ENABLE_STRICT 1
198
199/* enable basic MIDI features:
200 - MIDI notes can be sent when in Music mode is on
201*/
202//#define MIDI_BASIC
203
204/* enable advanced MIDI features:
205 - MIDI notes can be added to the keymap
206 - Octave shift and transpose
207 - Virtual sustain, portamento, and modulation wheel
208 - etc.
209*/
210//#define MIDI_ADVANCED
211 139
212/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */ 140/* disable these deprecated features by default */
213//#define MIDI_TONE_KEYCODE_OCTAVES 1 141#define NO_ACTION_MACRO
142#define NO_ACTION_FUNCTION
214 143
215/* Bootmagic Lite key configuration */ 144/* Bootmagic Lite key configuration */
216// #define BOOTMAGIC_LITE_ROW 0 145//#define BOOTMAGIC_LITE_ROW 0
217// #define BOOTMAGIC_LITE_COLUMN 0 146//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/efreet/efreet.c b/keyboards/efreet/efreet.c
index a05db74a5..3c52e1cd1 100644
--- a/keyboards/efreet/efreet.c
+++ b/keyboards/efreet/efreet.c
@@ -13,39 +13,5 @@
13 * You should have received a copy of the GNU General Public License 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/>. 14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */ 15 */
16#include "efreet.h"
17
18// Optional override functions below.
19// You can leave any or all of these undefined.
20// These are only required if you want to perform custom actions.
21
22/*
23
24void matrix_init_kb(void) {
25 // put your keyboard start-up code here
26 // runs once when the firmware starts up
27
28 matrix_init_user();
29}
30
31void matrix_scan_kb(void) {
32 // put your looping keyboard code here
33 // runs every cycle (a lot)
34 16
35 matrix_scan_user(); 17#include "efreet.h"
36}
37
38bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
39 // put your per-action keyboard code here
40 // runs for every action, just before processing by the firmware
41
42 return process_record_user(keycode, record);
43}
44
45void led_set_kb(uint8_t usb_led) {
46 // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
47
48 led_set_user(usb_led);
49}
50
51*/
diff --git a/keyboards/efreet/efreet.h b/keyboards/efreet/efreet.h
index 7ad717f3d..4b0c9f552 100644
--- a/keyboards/efreet/efreet.h
+++ b/keyboards/efreet/efreet.h
@@ -17,7 +17,9 @@
17 17
18#include "quantum.h" 18#include "quantum.h"
19 19
20/* This a shortcut to help you visually see your layout. 20#define XXX KC_NO
21
22/* This is a shortcut to help you visually see your layout.
21 * 23 *
22 * The first section contains all of the arguments representing the physical 24 * The first section contains all of the arguments representing the physical
23 * layout of the board and position of the keys. 25 * layout of the board and position of the keys.
@@ -25,35 +27,34 @@
25 * The second converts the arguments into a two-dimensional array which 27 * The second converts the arguments into a two-dimensional array which
26 * represents the switch matrix. 28 * represents the switch matrix.
27 */ 29 */
30#define LAYOUT_ortho_4x12( \
31 k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, \
32 k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, \
33 k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, \
34 k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75 \
35) { \
36 { k10, k11, k12, k13, k14, k15 }, \
37 { k00, k01, k02, k03, k04, k05 }, \
38 { k30, k31, k32, k33, k34, k35 }, \
39 { k20, k21, k22, k23, k24, k25 }, \
40 { k50, k51, k52, k53, k54, k55 }, \
41 { k40, k41, k42, k43, k44, k45 }, \
42 { k70, k71, k72, k73, k74, k75 }, \
43 { k60, k61, k62, k63, k64, k65 } \
44}
28 45
29 #define LAYOUT_ortho_4x12( \ 46#define LAYOUT_planck_mit( \
30 K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15,\ 47 k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, \
31 K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35,\ 48 k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, \
32 K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,\ 49 k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, \
33 K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75\ 50 k60, k70, k61, k71, k62, k72, k73, k64, k74, k65, k75 \
34 ) { \ 51) { \
35 { K10, K11, K12, K13, K14, K15 }, \ 52 { k10, k11, k12, k13, k14, k15 }, \
36 { K00, K01, K02, K03, K04, K05 }, \ 53 { k00, k01, k02, k03, k04, k05 }, \
37 { K30, K31, K32, K33, K34, K35 }, \ 54 { k30, k31, k32, k33, k34, k35 }, \
38 { K20, K21, K22, K23, K24, K25 }, \ 55 { k20, k21, k22, k23, k24, k25 }, \
39 { K50, K51, K52, K53, K54, K55 }, \ 56 { k50, k51, k52, k53, k54, k55 }, \
40 { K40, K41, K42, K43, K44, K45 }, \ 57 { k40, k41, k42, k43, k44, k45 }, \
41 { K70, K71, K72, K73, K74, K75 }, \ 58 { k70, k71, k72, k73, k74, k75 }, \
42 { K60, K61, K62, K63, K64, K65 } \ 59 { k60, k61, k62, XXX, k64, k65 } \
43 } 60}
44
45 #define LAYOUT_planck_mit( \
46 K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15,\
47 K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35,\
48 K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,\
49 K60, K70, K61, K71, K62, K72, K73, K64, K74, K65, K75\
50 ) { \
51 { K10, K11, K12, K13, K14, K15 }, \
52 { K00, K01, K02, K03, K04, K05 }, \
53 { K30, K31, K32, K33, K34, K35 }, \
54 { K20, K21, K22, K23, K24, K25 }, \
55 { K50, K51, K52, K53, K54, K55 }, \
56 { K40, K41, K42, K43, K44, K45 }, \
57 { K70, K71, K72, K73, K74, K75 }, \
58 { K60, K61, K62, KC_NO, K64, K65 } \
59 }
diff --git a/keyboards/efreet/info.json b/keyboards/efreet/info.json
index 25b627d8c..6766b3952 100644
--- a/keyboards/efreet/info.json
+++ b/keyboards/efreet/info.json
@@ -6,10 +6,113 @@
6 "height": 4, 6 "height": 4,
7 "layouts": { 7 "layouts": {
8 "LAYOUT_planck_mit": { 8 "LAYOUT_planck_mit": {
9 "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back Space", "x":11, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"x":0, "y":3}, {"label":"Ctrl", "x":1, "y":3}, {"label":"Alt", "x":2, "y":3}, {"label":"Super", "x":3, "y":3}, {"label":"&dArr;", "x":4, "y":3}, {"x":5, "y":3, "w":2}, {"label":"&uArr;", "x":7, "y":3}, {"label":"&larr;", "x":8, "y":3}, {"label":"&darr;", "x":9, "y":3}, {"label":"&uarr;", "x":10, "y":3}, {"label":"&rarr;", "x":11, "y":3}] 9 "layout": [
10 {"x": 0, "y": 0},
11 {"x": 1, "y": 0},
12 {"x": 2, "y": 0},
13 {"x": 3, "y": 0},
14 {"x": 4, "y": 0},
15 {"x": 5, "y": 0},
16 {"x": 6, "y": 0},
17 {"x": 7, "y": 0},
18 {"x": 8, "y": 0},
19 {"x": 9, "y": 0},
20 {"x": 10, "y": 0},
21 {"x": 11, "y": 0},
22
23 {"x": 0, "y": 1},
24 {"x": 1, "y": 1},
25 {"x": 2, "y": 1},
26 {"x": 3, "y": 1},
27 {"x": 4, "y": 1},
28 {"x": 5, "y": 1},
29 {"x": 6, "y": 1},
30 {"x": 7, "y": 1},
31 {"x": 8, "y": 1},
32 {"x": 9, "y": 1},
33 {"x": 10, "y": 1},
34 {"x": 11, "y": 1},
35
36 {"x": 0, "y": 2},
37 {"x": 1, "y": 2},
38 {"x": 2, "y": 2},
39 {"x": 3, "y": 2},
40 {"x": 4, "y": 2},
41 {"x": 5, "y": 2},
42 {"x": 6, "y": 2},
43 {"x": 7, "y": 2},
44 {"x": 8, "y": 2},
45 {"x": 9, "y": 2},
46 {"x": 10, "y": 2},
47 {"x": 11, "y": 2},
48
49 {"x": 0, "y": 3},
50 {"x": 1, "y": 3},
51 {"x": 2, "y": 3},
52 {"x": 3, "y": 3},
53 {"x": 4, "y": 3},
54 {"x": 5, "y": 3, "w": 2},
55 {"x": 7, "y": 3},
56 {"x": 8, "y": 3},
57 {"x": 9, "y": 3},
58 {"x": 10, "y": 3},
59 {"x": 11, "y": 3}
60 ]
10 }, 61 },
11 "LAYOUT_ortho_4x12": { 62 "LAYOUT_ortho_4x12": {
12 "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back Space", "x":11, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"x":0, "y":3}, {"label":"Ctrl", "x":1, "y":3}, {"label":"Alt", "x":2, "y":3}, {"label":"Super", "x":3, "y":3}, {"label":"&dArr;", "x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"label":"&uArr;", "x":7, "y":3}, {"label":"&larr;", "x":8, "y":3}, {"label":"&darr;", "x":9, "y":3}, {"label":"&uarr;", "x":10, "y":3}, {"label":"&rarr;", "x":11, "y":3}] 63 "layout": [
64 {"x": 0, "y": 0},
65 {"x": 1, "y": 0},
66 {"x": 2, "y": 0},
67 {"x": 3, "y": 0},
68 {"x": 4, "y": 0},
69 {"x": 5, "y": 0},
70 {"x": 6, "y": 0},
71 {"x": 7, "y": 0},
72 {"x": 8, "y": 0},
73 {"x": 9, "y": 0},
74 {"x": 10, "y": 0},
75 {"x": 11, "y": 0},
76
77 {"x": 0, "y": 1},
78 {"x": 1, "y": 1},
79 {"x": 2, "y": 1},
80 {"x": 3, "y": 1},
81 {"x": 4, "y": 1},
82 {"x": 5, "y": 1},
83 {"x": 6, "y": 1},
84 {"x": 7, "y": 1},
85 {"x": 8, "y": 1},
86 {"x": 9, "y": 1},
87 {"x": 10, "y": 1},
88 {"x": 11, "y": 1},
89
90 {"x": 0, "y": 2},
91 {"x": 1, "y": 2},
92 {"x": 2, "y": 2},
93 {"x": 3, "y": 2},
94 {"x": 4, "y": 2},
95 {"x": 5, "y": 2},
96 {"x": 6, "y": 2},
97 {"x": 7, "y": 2},
98 {"x": 8, "y": 2},
99 {"x": 9, "y": 2},
100 {"x": 10, "y": 2},
101 {"x": 11, "y": 2},
102
103 {"x": 0, "y": 3},
104 {"x": 1, "y": 3},
105 {"x": 2, "y": 3},
106 {"x": 3, "y": 3},
107 {"x": 4, "y": 3},
108 {"x": 5, "y": 3},
109 {"x": 6, "y": 3},
110 {"x": 7, "y": 3},
111 {"x": 8, "y": 3},
112 {"x": 9, "y": 3},
113 {"x": 10, "y": 3},
114 {"x": 11, "y": 3}
115 ]
13 } 116 }
14 } 117 }
15} 118}
diff --git a/keyboards/efreet/keymaps/default/config.h b/keyboards/efreet/keymaps/default/config.h
deleted file mode 100644
index b825835bb..000000000
--- a/keyboards/efreet/keymaps/default/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
1/* Copyright 2019 Amber Holly
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
18
19// place overrides here
diff --git a/keyboards/efreet/keymaps/default/keymap.c b/keyboards/efreet/keymaps/default/keymap.c
index 72443411b..9f3bc08c3 100644
--- a/keyboards/efreet/keymaps/default/keymap.c
+++ b/keyboards/efreet/keymaps/default/keymap.c
@@ -13,43 +13,26 @@
13 * You should have received a copy of the GNU General Public License 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/>. 14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */ 15 */
16#include QMK_KEYBOARD_H
17 16
18// Defines the keycodes used by our macros in process_record_user 17#include QMK_KEYBOARD_H
19enum custom_keycodes {
20 QMKBEST = SAFE_RANGE,
21 QMKURL
22};
23 18
24const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 19const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
25 [0] = LAYOUT_ortho_4x12( 20 [0] = LAYOUT_ortho_4x12(
26 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, 21 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
27 KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, 22 KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
28 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , 23 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT,
29 BL_TOGG, KC_LCTL, KC_LALT, KC_LGUI, MO(1), KC_SPC, KC_SPC, MO(2), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT 24 BL_TOGG, KC_LCTL, KC_LALT, KC_LGUI, MO(1), KC_SPC, KC_SPC, MO(2), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
30 ), 25 ),
31 [1] = LAYOUT_ortho_4x12( 26 [1] = LAYOUT_ortho_4x12(
32 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, 27 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
33 KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, 28 KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,
34 _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______, 29 _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______,
35 _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY 30 _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
36 ), 31 ),
37 [2] = LAYOUT_ortho_4x12( 32 [2] = LAYOUT_ortho_4x12(
38 KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, 33 KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
39 KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, 34 KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
40 _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END, _______, 35 _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END, _______,
41 _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY 36 _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
42 ) 37 )
43}; 38};
44
45void matrix_init_user(void) {
46
47}
48
49void matrix_scan_user(void) {
50
51}
52
53void led_set_user(uint8_t usb_led) {
54
55}
diff --git a/keyboards/efreet/keymaps/default/readme.md b/keyboards/efreet/keymaps/default/readme.md
index d714acd94..08f10328c 100644
--- a/keyboards/efreet/keymaps/default/readme.md
+++ b/keyboards/efreet/keymaps/default/readme.md
@@ -1 +1 @@
# The default keymap for efreet \ No newline at end of file # The default keymap for efreet
diff --git a/keyboards/efreet/keymaps/via/keymap.c b/keyboards/efreet/keymaps/via/keymap.c
index c08e3bbe0..0cd90f80d 100644
--- a/keyboards/efreet/keymaps/via/keymap.c
+++ b/keyboards/efreet/keymaps/via/keymap.c
@@ -13,31 +13,32 @@
13 * You should have received a copy of the GNU General Public License 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/>. 14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */ 15 */
16
16#include QMK_KEYBOARD_H 17#include QMK_KEYBOARD_H
17 18
18const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 19const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
19 [0] = LAYOUT_ortho_4x12( 20 [0] = LAYOUT_ortho_4x12(
20 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, 21 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
21 KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, 22 KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
22 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , 23 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT,
23 BL_TOGG, KC_LCTL, KC_LALT, KC_LGUI, MO(1), KC_SPC, KC_SPC, MO(2), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT 24 BL_TOGG, KC_LCTL, KC_LALT, KC_LGUI, MO(1), KC_SPC, KC_SPC, MO(2), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
24 ), 25 ),
25 [1] = LAYOUT_ortho_4x12( 26 [1] = LAYOUT_ortho_4x12(
26 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, 27 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
27 KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, 28 KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,
28 _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______, 29 _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______,
29 _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY 30 _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
30 ), 31 ),
31 [2] = LAYOUT_ortho_4x12( 32 [2] = LAYOUT_ortho_4x12(
32 KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, 33 KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
33 KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, 34 KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
34 _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END, _______, 35 _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END, _______,
35 _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY 36 _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
36 ), 37 ),
37 [3] = LAYOUT_ortho_4x12( 38 [3] = LAYOUT_ortho_4x12(
38 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 39 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
39 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 40 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
40 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 41 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
41 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ 42 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
42 ) 43 )
43}; 44};
diff --git a/keyboards/efreet/readme.md b/keyboards/efreet/readme.md
index 9310dacf7..13c9cd505 100644
--- a/keyboards/efreet/readme.md
+++ b/keyboards/efreet/readme.md
@@ -1,15 +1,19 @@
1# Efreet 1# Efreet
2 2
3![efreet](https://i.imgur.com/Lh6WLuI.jpg) 3![efreet](https://i.imgur.com/Lh6WLuIl.jpg)
4 4
5Custom PCB for the Efreet (as4x) keyboard. 5Custom PCB for the Efreet (as4x) keyboard.
6 6
7Keyboard Maintainer: [Amber Holly](https://github.com/amberstarlight) 7* Keyboard Maintainer: [Amber Holly](https://github.com/amberstarlight)
8Hardware Supported: Efreet PCB 8* Hardware Supported: Efreet PCB
9Hardware Availability: private group buy 9* Hardware Availability: private group buy
10 10
11Make example for this keyboard (after setting up your build environment): 11Make example for this keyboard (after setting up your build environment):
12 12
13 make efreet:default 13 make efreet:default
14 14
15Flashing example for this keyboard:
16
17 make efreet:default:flash
18
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). 19See 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/efreet/rules.mk b/keyboards/efreet/rules.mk
index 4f0e32f55..a9a438746 100644
--- a/keyboards/efreet/rules.mk
+++ b/keyboards/efreet/rules.mk
@@ -2,30 +2,23 @@
2MCU = atmega32u2 2MCU = atmega32u2
3 3
4# Bootloader selection 4# Bootloader selection
5# Teensy halfkay
6# Pro Micro caterina
7# Atmel DFU atmel-dfu
8# LUFA DFU lufa-dfu
9# QMK DFU qmk-dfu
10# ATmega32A bootloadHID
11# ATmega328P USBasp
12BOOTLOADER = atmel-dfu 5BOOTLOADER = atmel-dfu
13 6
14# Build Options 7# Build Options
15# change yes to no to disable 8# change yes to no to disable
16# 9#
17BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration 10BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration
18MOUSEKEY_ENABLE = yes # Mouse keys 11MOUSEKEY_ENABLE = yes # Mouse keys
19EXTRAKEY_ENABLE = yes # Audio control and System control 12EXTRAKEY_ENABLE = yes # Audio control and System control
20CONSOLE_ENABLE = no # Console for debug 13CONSOLE_ENABLE = no # Console for debug
21COMMAND_ENABLE = no # Commands for debug and configuration 14COMMAND_ENABLE = no # Commands for debug and configuration
22NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work 15# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
23BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality 16SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
17# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
18NKRO_ENABLE = yes # USB Nkey Rollover
19BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
24RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow 20RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
25MIDI_ENABLE = no # MIDI support 21BLUETOOTH_ENABLE = no # Enable Bluetooth
26UNICODE_ENABLE = no # Unicode 22AUDIO_ENABLE = no # Audio output
27BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
28AUDIO_ENABLE = no # Audio output on port C6
29FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches
30 23
31LAYOUTS = ortho_4x12 planck_mit 24LAYOUTS = ortho_4x12 planck_mit
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-06 02:09:58 +0000