aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile21
-rw-r--r--keyboards/ergodox/keymaps/algernon/NEWS.md14
-rw-r--r--keyboards/ergodox/keymaps/algernon/keymap.c8
-rwxr-xr-xkeyboards/ergodox/keymaps/algernon/tools/hid-commands5
-rw-r--r--keyboards/gh60/gh60.h2
-rw-r--r--keyboards/gh60/keymaps/dbroqua/Makefile112
-rw-r--r--keyboards/gh60/keymaps/dbroqua/config.h187
-rw-r--r--keyboards/gh60/keymaps/dbroqua/keymap.c198
-rw-r--r--keyboards/satan/keymaps/dbroqua/keymap.c152
-rw-r--r--keyboards/satan/keymaps/dbroqua/readme.md (renamed from keyboards/satan/keymaps/dbroqua_hhkb/readme.md)0
-rw-r--r--keyboards/satan/keymaps/dbroqua_hhkb/keymap.c110
-rw-r--r--quantum/api/api_sysex.c60
-rw-r--r--quantum/config_common.h2
-rw-r--r--quantum/keymap.h313
-rw-r--r--quantum/keymap_common.c16
-rw-r--r--quantum/quantum.c2
-rw-r--r--quantum/quantum_keycodes.h313
-rw-r--r--quantum/rgblight.c1
-rw-r--r--quantum/rgblight.h2
-rw-r--r--tmk_core/common/keycode.h2
-rw-r--r--tmk_core/protocol/lufa/lufa.c32
-rw-r--r--tmk_core/protocol/lufa/lufa.h4
22 files changed, 1081 insertions, 475 deletions
diff --git a/Makefile b/Makefile
index aa33c40f1..9cc77c55c 100644
--- a/Makefile
+++ b/Makefile
@@ -473,7 +473,7 @@ if [ $$error_occured -gt 0 ]; then echo $$error_occured > $(ERROR_FILE); fi;
473endef 473endef
474define RUN_TEST 474define RUN_TEST
475+error_occured=0;\ 475+error_occured=0;\
476$($(TEST)_COMMAND))\ 476$($(TEST)_COMMAND)\
477if [ $$error_occured -gt 0 ]; then echo $$error_occured > $(ERROR_FILE); fi; 477if [ $$error_occured -gt 0 ]; then echo $$error_occured > $(ERROR_FILE); fi;
478 478
479endef 479endef
@@ -485,11 +485,11 @@ $(SUBPROJECTS): %: %-allkm
485 485
486# Let's match everything, we handle all the rule parsing ourselves 486# Let's match everything, we handle all the rule parsing ourselves
487.PHONY: % 487.PHONY: %
488ifndef SKIP_GIT
489%: 488%:
490 # Check if we have the CMP tool installed 489 # Check if we have the CMP tool installed
491 cmp --version >/dev/null 2>&1; if [ $$? -gt 0 ]; then printf "$(MSG_NO_CMP)"; exit 1; fi; 490 cmp --version >/dev/null 2>&1; if [ $$? -gt 0 ]; then printf "$(MSG_NO_CMP)"; exit 1; fi;
492 # Check if the submodules are dirty, and display a warning if they are 491 # Check if the submodules are dirty, and display a warning if they are
492ifndef SKIP_GIT
493 git submodule status --recursive 2>/dev/null | \ 493 git submodule status --recursive 2>/dev/null | \
494 while IFS= read -r x; do \ 494 while IFS= read -r x; do \
495 case "$$x" in \ 495 case "$$x" in \
@@ -497,6 +497,7 @@ ifndef SKIP_GIT
497 *) printf "$(MSG_SUBMODULE_DIRTY)";break;; \ 497 *) printf "$(MSG_SUBMODULE_DIRTY)";break;; \
498 esac \ 498 esac \
499 done 499 done
500endif
500 rm -f $(ERROR_FILE) > /dev/null 2>&1 501 rm -f $(ERROR_FILE) > /dev/null 2>&1
501 $(eval $(call PARSE_RULE,$@)) 502 $(eval $(call PARSE_RULE,$@))
502 $(eval $(call SET_SILENT_MODE)) 503 $(eval $(call SET_SILENT_MODE))
@@ -508,22 +509,6 @@ ifndef SKIP_GIT
508 if [ -f $(ERROR_FILE) ]; then printf "$(MSG_ERRORS)" & exit 1; fi; 509 if [ -f $(ERROR_FILE) ]; then printf "$(MSG_ERRORS)" & exit 1; fi;
509 $(foreach TEST,$(TESTS),$(RUN_TEST)) 510 $(foreach TEST,$(TESTS),$(RUN_TEST))
510 if [ -f $(ERROR_FILE) ]; then printf "$(MSG_ERRORS)" & exit 1; fi; 511 if [ -f $(ERROR_FILE) ]; then printf "$(MSG_ERRORS)" & exit 1; fi;
511else
512%:
513 # Check if we have the CMP tool installed
514 cmp --version >/dev/null 2>&1; if [ $$? -gt 0 ]; then printf "$(MSG_NO_CMP)"; exit 1; fi;
515 rm -f $(ERROR_FILE) > /dev/null 2>&1
516 $(eval $(call PARSE_RULE,$@))
517 $(eval $(call SET_SILENT_MODE))
518 # Run all the commands in the same shell, notice the + at the first line
519 # it has to be there to allow parallel execution of the submake
520 # This always tries to compile everything, even if error occurs in the middle
521 # But we return the error code at the end, to trigger travis failures
522 $(foreach COMMAND,$(COMMANDS),$(RUN_COMMAND))
523 if [ -f $(ERROR_FILE) ]; then printf "$(MSG_ERRORS)" & exit 1; fi;
524 $(foreach TEST,$(TESTS),$(RUN_TEST))
525 if [ -f $(ERROR_FILE) ]; then printf "$(MSG_ERRORS)" & exit 1; fi;
526endif
527 512
528# All should compile everything 513# All should compile everything
529.PHONY: all 514.PHONY: all
diff --git a/keyboards/ergodox/keymaps/algernon/NEWS.md b/keyboards/ergodox/keymaps/algernon/NEWS.md
index e11998998..ee9d60670 100644
--- a/keyboards/ergodox/keymaps/algernon/NEWS.md
+++ b/keyboards/ergodox/keymaps/algernon/NEWS.md
@@ -1,5 +1,19 @@
1<!-- -*- mode: markdown; fill-column: 8192 -*- --> 1<!-- -*- mode: markdown; fill-column: 8192 -*- -->
2 2
3## v1.10
4
5*2016-12-28*
6
7### Miscellaneous
8
9* `µ` can now be entered with UCIS.
10* `™` can now be entered with UCIS.
11
12### Tools
13
14* `tools/hid-commands` can now find Banshee, and prefers it over Kodi.
15* `tools/hid-commands` can now find Chrome too, not juts Chromium.
16
3## v1.9 17## v1.9
4 18
5*2016-10-16* 19*2016-10-16*
diff --git a/keyboards/ergodox/keymaps/algernon/keymap.c b/keyboards/ergodox/keymaps/algernon/keymap.c
index bad240337..b615f3f5f 100644
--- a/keyboards/ergodox/keymaps/algernon/keymap.c
+++ b/keyboards/ergodox/keymaps/algernon/keymap.c
@@ -96,8 +96,6 @@ enum {
96 96
97uint16_t gui_timer = 0; 97uint16_t gui_timer = 0;
98 98
99uint16_t kf_timers[12];
100
101#if KEYLOGGER_ENABLE 99#if KEYLOGGER_ENABLE
102# ifdef AUTOLOG_ENABLE 100# ifdef AUTOLOG_ENABLE
103bool log_enable = true; 101bool log_enable = true;
@@ -786,7 +784,7 @@ static void ang_tap_dance_tmux_pane_select (qk_tap_dance_state_t *state, void *u
786 if (state->count >= 2) { 784 if (state->count >= 2) {
787 kc = KC_Z; 785 kc = KC_Z;
788 } 786 }
789 787
790 register_code(KC_LALT); 788 register_code(KC_LALT);
791 register_code(KC_SPC); 789 register_code(KC_SPC);
792 unregister_code(KC_SPC); 790 unregister_code(KC_SPC);
@@ -1040,7 +1038,9 @@ const qk_ucis_symbol_t ucis_symbol_table[] = UCIS_TABLE
1040 UCIS_SYM("heart", 0x2764), 1038 UCIS_SYM("heart", 0x2764),
1041 UCIS_SYM("bolt", 0x26a1), 1039 UCIS_SYM("bolt", 0x26a1),
1042 UCIS_SYM("pi", 0x03c0), 1040 UCIS_SYM("pi", 0x03c0),
1043 UCIS_SYM("mouse", 0x1f401) 1041 UCIS_SYM("mouse", 0x1f401),
1042 UCIS_SYM("micro", 0x00b5),
1043 UCIS_SYM("tm", 0x2122)
1044); 1044);
1045 1045
1046bool process_record_user (uint16_t keycode, keyrecord_t *record) { 1046bool process_record_user (uint16_t keycode, keyrecord_t *record) {
diff --git a/keyboards/ergodox/keymaps/algernon/tools/hid-commands b/keyboards/ergodox/keymaps/algernon/tools/hid-commands
index a29d38f41..54ca7556a 100755
--- a/keyboards/ergodox/keymaps/algernon/tools/hid-commands
+++ b/keyboards/ergodox/keymaps/algernon/tools/hid-commands
@@ -16,7 +16,8 @@ _cmd_appsel () {
16} 16}
17 17
18cmd_appsel_music () { 18cmd_appsel_music () {
19 wmctrl -x -a rhythmbox || wmctrl -x -a spotify || wmctrl -x -a kodi || true 19 wmctrl -x -a rhythmbox || wmctrl -x -a spotify || \
20 wmctrl -x -a banshee || wmctrl -x -a kodi || true
20 xdotool key Escape 21 xdotool key Escape
21} 22}
22 23
@@ -33,7 +34,7 @@ cmd_appsel_term () {
33} 34}
34 35
35cmd_appsel_chrome () { 36cmd_appsel_chrome () {
36 _cmd_appsel chromium 37 _cmd_appsel chrom
37} 38}
38 39
39cmd_appsel_start () { 40cmd_appsel_start () {
diff --git a/keyboards/gh60/gh60.h b/keyboards/gh60/gh60.h
index 66bc2790d..99ccf1757 100644
--- a/keyboards/gh60/gh60.h
+++ b/keyboards/gh60/gh60.h
@@ -72,4 +72,4 @@ inline void gh60_wasd_leds_off(void) { DDRF &= ~(1<<7); PORTF &= ~(1<<7); }
72 { K40, K41, K42, KC_NO, KC_NO, K45, KC_NO, KC_NO, KC_NO, K49, K4A, K4B, K4C, K4D } \ 72 { K40, K41, K42, KC_NO, KC_NO, K45, KC_NO, KC_NO, KC_NO, K49, K4A, K4B, K4C, K4D } \
73} 73}
74 74
75#endif 75#endif \ No newline at end of file
diff --git a/keyboards/gh60/keymaps/dbroqua/Makefile b/keyboards/gh60/keymaps/dbroqua/Makefile
new file mode 100644
index 000000000..f1644a8e4
--- /dev/null
+++ b/keyboards/gh60/keymaps/dbroqua/Makefile
@@ -0,0 +1,112 @@
1#----------------------------------------------------------------------------
2# On command line:
3#
4# make all = Make software.
5#
6# make clean = Clean out built project files.
7#
8# make coff = Convert ELF to AVR COFF.
9#
10# make extcoff = Convert ELF to AVR Extended COFF.
11#
12# make program = Download the hex file to the device.
13# Please customize your programmer settings(PROGRAM_CMD)
14#
15# make teensy = Download the hex file to the device, using teensy_loader_cli.
16# (must have teensy_loader_cli installed).
17#
18# make dfu = Download the hex file to the device, using dfu-programmer (must
19# have dfu-programmer installed).
20#
21# make flip = Download the hex file to the device, using Atmel FLIP (must
22# have Atmel FLIP installed).
23#
24# make dfu-ee = Download the eeprom file to the device, using dfu-programmer
25# (must have dfu-programmer installed).
26#
27# make flip-ee = Download the eeprom file to the device, using Atmel FLIP
28# (must have Atmel FLIP installed).
29#
30# make debug = Start either simulavr or avarice as specified for debugging,
31# with avr-gdb or avr-insight as the front end for debugging.
32#
33# make filename.s = Just compile filename.c into the assembler code only.
34#
35# make filename.i = Create a preprocessed source file for use in submitting
36# bug reports to the GCC project.
37#
38# To rebuild project do "make clean" then "make all".
39#----------------------------------------------------------------------------
40
41# MCU name
42#MCU = at90usb1287
43MCU = atmega32u4
44
45# Processor frequency.
46# This will define a symbol, F_CPU, in all source code files equal to the
47# processor frequency in Hz. You can then use this symbol in your source code to
48# calculate timings. Do NOT tack on a 'UL' at the end, this will be done
49# automatically to create a 32-bit value in your source code.
50#
51# This will be an integer division of F_USB below, as it is sourced by
52# F_USB after it has run through any CPU prescalers. Note that this value
53# does not *change* the processor frequency - it should merely be updated to
54# reflect the processor speed set externally so that the code can use accurate
55# software delays.
56F_CPU = 16000000
57
58
59#
60# LUFA specific
61#
62# Target architecture (see library "Board Types" documentation).
63ARCH = AVR8
64
65# Input clock frequency.
66# This will define a symbol, F_USB, in all source code files equal to the
67# input clock frequency (before any prescaling is performed) in Hz. This value may
68# differ from F_CPU if prescaling is used on the latter, and is required as the
69# raw input clock is fed directly to the PLL sections of the AVR for high speed
70# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL'
71# at the end, this will be done automatically to create a 32-bit value in your
72# source code.
73#
74# If no clock division is performed on the input clock inside the AVR (via the
75# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
76F_USB = $(F_CPU)
77
78# Interrupt driven control endpoint task(+60)
79OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
80
81
82# Boot Section Size in *bytes*
83# Teensy halfKay 512
84# Teensy++ halfKay 1024
85# Atmel DFU loader 4096
86# LUFA bootloader 4096
87# USBaspLoader 2048
88OPT_DEFS += -DBOOTLOADER_SIZE=4096
89
90
91# Build Options
92# comment out to disable the options.
93#
94BOOTMAGIC_ENABLE ?= yes # Virtual DIP switch configuration(+1000)
95MOUSEKEY_ENABLE ?= yes # Mouse keys(+4700)
96EXTRAKEY_ENABLE ?= yes # Audio control and System control(+450)
97# CONSOLE_ENABLE ?= yes # Console for debug(+400)
98# COMMAND_ENABLE ?= yes # Commands for debug and configuration
99KEYBOARD_LOCK_ENABLE ?= yes # Allow locking of keyboard via magic key
100# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
101SLEEP_LED_ENABLE ?= yes # Breathing sleep LED during USB suspend
102NKRO_ENABLE ?= yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
103# BACKLIGHT_ENABLE ?= yes # Enable keyboard backlight functionality
104# MIDI_ENABLE ?= YES # MIDI controls
105# UNICODE_ENABLE ?= YES # Unicode
106# BLUETOOTH_ENABLE ?= yes # Enable Bluetooth with the Adafruit EZ-Key HID
107RGBLIGHT_ENABLE ?= yes # Enable RGB Underglow
108
109ifndef QUANTUM_DIR
110 include ../../../../Makefile
111endif
112
diff --git a/keyboards/gh60/keymaps/dbroqua/config.h b/keyboards/gh60/keymaps/dbroqua/config.h
new file mode 100644
index 000000000..75ccec097
--- /dev/null
+++ b/keyboards/gh60/keymaps/dbroqua/config.h
@@ -0,0 +1,187 @@
1/*
2Copyright 2012 Jun Wako <wakojun@gmail.com>
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#ifndef CONFIG_H
19#define CONFIG_H
20
21#include "config_common.h"
22
23/* USB Device descriptor parameter */
24#define VENDOR_ID 0xFEED
25#define PRODUCT_ID 0x6060
26#define DEVICE_VER 0x0001
27#define MANUFACTURER geekhack
28#define PRODUCT GH60
29#define DESCRIPTION t.m.k. keyboard firmware for GH60
30
31/* key matrix size */
32#define MATRIX_ROWS 5
33#define MATRIX_COLS 14
34
35/*
36 * Keyboard Matrix Assignments
37 *
38 * Change this to how you wired your keyboard
39 * COLS: AVR pins used for columns, left to right
40 * ROWS: AVR pins used for rows, top to bottom
41 * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
42 * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
43 *
44*/
45#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
46#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B7, B5, B4, D7, D6, B3 }
47#define UNUSED_PINS
48
49/* COL2ROW or ROW2COL */
50#define DIODE_DIRECTION COL2ROW
51
52/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
53#define DEBOUNCING_DELAY 5
54
55/* define if matrix has ghost (lacks anti-ghosting diodes) */
56//#define MATRIX_HAS_GHOST
57
58/* number of backlight levels */
59#define BACKLIGHT_LEVELS 3
60
61/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
62#define LOCKING_SUPPORT_ENABLE
63/* Locking resynchronize hack */
64#define LOCKING_RESYNC_ENABLE
65
66/*
67 * Force NKRO
68 *
69 * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
70 * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
71 * makefile for this to work.)
72 *
73 * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
74 * until the next keyboard reset.
75 *
76 * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
77 * fully operational during normal computer usage.
78 *
79 * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
80 * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
81 * bootmagic, NKRO mode will always be enabled until it is toggled again during a
82 * power-up.
83 *
84 */
85//#define FORCE_NKRO
86
87/*
88 * Magic Key Options
89 *
90 * Magic keys are hotkey commands that allow control over firmware functions of
91 * the keyboard. They are best used in combination with the HID Listen program,
92 * found here: https://www.pjrc.com/teensy/hid_listen.html
93 *
94 * The options below allow the magic key functionality to be changed. This is
95 * useful if your keyboard/keypad is missing keys and you want magic key support.
96 *
97 */
98
99/* key combination for magic key command */
100#define IS_COMMAND() ( \
101 keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
102)
103
104/* control how magic key switches layers */
105//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS true
106//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS true
107//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false
108
109/* override magic key keymap */
110//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS
111//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS
112//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM
113//#define MAGIC_KEY_HELP1 H
114//#define MAGIC_KEY_HELP2 SLASH
115//#define MAGIC_KEY_DEBUG D
116//#define MAGIC_KEY_DEBUG_MATRIX X
117//#define MAGIC_KEY_DEBUG_KBD K
118//#define MAGIC_KEY_DEBUG_MOUSE M
119//#define MAGIC_KEY_VERSION V
120//#define MAGIC_KEY_STATUS S
121//#define MAGIC_KEY_CONSOLE C
122//#define MAGIC_KEY_LAYER0_ALT1 ESC
123//#define MAGIC_KEY_LAYER0_ALT2 GRAVE
124//#define MAGIC_KEY_LAYER0 0
125//#define MAGIC_KEY_LAYER1 1
126//#define MAGIC_KEY_LAYER2 2
127//#define MAGIC_KEY_LAYER3 3
128//#define MAGIC_KEY_LAYER4 4
129//#define MAGIC_KEY_LAYER5 5
130//#define MAGIC_KEY_LAYER6 6
131//#define MAGIC_KEY_LAYER7 7
132//#define MAGIC_KEY_LAYER8 8
133//#define MAGIC_KEY_LAYER9 9
134//#define MAGIC_KEY_BOOTLOADER PAUSE
135//#define MAGIC_KEY_LOCK CAPS
136//#define MAGIC_KEY_EEPROM E
137//#define MAGIC_KEY_NKRO N
138//#define MAGIC_KEY_SLEEP_LED Z
139
140/*
141 * Feature disable options
142 * These options are also useful to firmware size reduction.
143 */
144
145/* disable debug print */
146//#define NO_DEBUG
147
148/* disable print */
149//#define NO_PRINT
150
151/* disable action features */
152//#define NO_ACTION_LAYER
153//#define NO_ACTION_TAPPING
154//#define NO_ACTION_ONESHOT
155//#define NO_ACTION_MACRO
156//#define NO_ACTION_FUNCTION
157
158/*
159 * RGB Underglow
160 * These settings are for the F4 by default:
161 *
162 *
163 * #define ws2812_PORTREG PORTF
164 * #define ws2812_DDRREG DDRF
165 * #define ws2812_pin PF4
166 * #define RGBLED_NUM 14 // Number of LEDs
167 * #define RGBLIGHT_HUE_STEP 10
168 * #define RGBLIGHT_SAT_STEP 17
169 * #define RGBLIGHT_VAL_STEP 17
170 *
171 * The firmware supports 5 different light effects, and the color (hue, saturation, brightness) can be customized in most effects.
172 * To control the underglow, you need to modify your keymap file to assign those functions to some keys/key combinations.
173 * For details, please check this keymap. keyboard/planck/keymaps/yang/keymap.c
174*/
175
176/* Deprecated code below
177#define ws2812_PORTREG PORTF
178#define ws2812_DDRREG DDRF
179#define ws2812_pin PF4
180*/
181#define RGB_DI_PIN F4
182#define RGBLIGHT_ANIMATIONS
183#define RGBLED_NUM 11 // Number of LEDs
184#define RGBLIGHT_HUE_STEP 8
185#define RGBLIGHT_SAT_STEP 8
186#define RGBLIGHT_VAL_STEP 8
187#endif
diff --git a/keyboards/gh60/keymaps/dbroqua/keymap.c b/keyboards/gh60/keymaps/dbroqua/keymap.c
new file mode 100644
index 000000000..be88edc09
--- /dev/null
+++ b/keyboards/gh60/keymaps/dbroqua/keymap.c
@@ -0,0 +1,198 @@
1#include "gh60.h"
2#include "action_layer.h"
3#include "rgblight.h"
4
5#define _DEFAULT 0
6#define _FN 1
7#define _WASD 2
8#define _SFX 3
9
10//bool esc_led_on;
11
12enum planck_keycodes {
13 DEFAULT = SAFE_RANGE
14};
15
16// Fillers to make layering more clear
17#define ______ KC_TRNS
18
19const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
20/* Qwerty gui/alt/space/alt/gui
21 * ,-----------------------------------------------------------------------------------------.
22 * | Esc | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | \ | ` |
23 * |-----------------------------------------------------------------------------------------+
24 * | Tab | Q | W | E | R | T | Y | U | I | O | P | [ | ] | Bksp |
25 * |-----------------------------------------------------------------------------------------+
26 * | Ctrl | A | S | D | F | G | H | J | K | L | ; | ' | Enter |
27 * |-----------------------------------------------------------------------------------------+
28 * | Shift | Z | X | C | V | B | N | M | , | . | / | RShift | FN |
29 * |-----------------------------------------------------------------------------------------+
30 * |LGUI | LAlt | Space | RAlt |RGUI |
31 * `-----------------------------------------------------------------'
32 */
33 [_DEFAULT] = KEYMAP_HHKB( /* Basic QWERTY */
34 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_BSLS, KC_GRV, \
35 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_BSPC, \
36 KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \
37 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(_FN), \
38 ______, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, ______, ______ \
39 ),
40
41/* FN Layer
42 * ,-----------------------------------------------------------------------------------------.
43 * | | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | Ins | Del |
44 * |-----------------------------------------------------------------------------------------+
45 * | CAPS | | | | | | | | Psc | Slck| Paus| Up | | |
46 * |-----------------------------------------------------------------------------------------+
47 * | | Vol-| Vol+| Mute| | | * | / | Home| PgUp| Left|Right| |
48 * |-----------------------------------------------------------------------------------------+
49 * | | Prev| Play| Next| | | + | - | End |PgDn| Down| | |
50 * |-----------------------------------------------------------------------------------------+
51 * | | | | Stop | |
52 * `-----------------------------------------------------------------'
53 */
54 [_FN] = KEYMAP_HHKB( /* Layer 1 */
55 TG(_SFX),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_INS, KC_DEL, \
56 KC_CAPS, ______, ______, ______, ______, ______, ______, ______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, ______, ______, \
57 ______, KC_VOLD, KC_VOLU, KC_MUTE, ______, ______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,______, \
58 ______, KC_MPRV, KC_MPLY, KC_MNXT, ______, ______, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, ______, ______, \
59 ______, ______, ______, TG(_WASD), KC_MSTP, ______, ______, ______ \
60 ),
61
62/* WASD Layer
63 * ,-----------------------------------------------------------------------------------------.
64 * | | | | | | | | | | | | | | | |
65 * |-----------------------------------------------------------------------------------------+
66 * | | | Up | | | | | | | | | | | |
67 * |-----------------------------------------------------------------------------------------+
68 * | | Left| Down|Right| | | | | | | | | |
69 * |-----------------------------------------------------------------------------------------+
70 * | | | | | | | | | | | | | |
71 * |-----------------------------------------------------------------------------------------+
72 * | | | | | |
73 * `-----------------------------------------------------------------'
74 */
75 [_WASD] = KEYMAP_HHKB( /* Layer 2 */
76 ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, \
77 ______, ______, KC_UP, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, \
78 ______, KC_LEFT, KC_DOWN,KC_RGHT,______, ______, ______, ______, ______, ______, ______, ______, ______, \
79 ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,______, \
80 ______, ______, ______, ______, ______, ______, ______, ______ \
81 ),
82
83/* SFX Layer
84 * ,-----------------------------------------------------------------------------------------.
85 * | | | | | | | | | | | | | | | |
86 * |-----------------------------------------------------------------------------------------+
87 * | | BL- | BL+ | BL | | | | | | | | | | |
88 * |-----------------------------------------------------------------------------------------+
89 * | | RGBT| RGBM| | | | | | | | | | |
90 * |-----------------------------------------------------------------------------------------+
91 * | | Hue+| Hue-| Sat+| Sat-| Val+| Val-| | | | | | |
92 * |-----------------------------------------------------------------------------------------+
93 * | | | | | |
94 * `-----------------------------------------------------------------'
95 */
96 [_SFX] = KEYMAP_HHKB(
97 ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, \
98 ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, \
99 ______, F(0), F(1), ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, \
100 ______, F(2), F(3), F(4), F(5), F(6), F(7), ______, ______, ______, ______, ______, ______, \
101 ______, ______, ______, ______, ______, ______, ______, ______ \
102 )
103};
104
105const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
106{
107 // MACRODOWN only works in this function
108 return MACRO_NONE;
109};
110
111enum function_id {
112 RGBLED_TOGGLE,
113 RGBLED_STEP_MODE,
114 RGBLED_INCREASE_HUE,
115 RGBLED_DECREASE_HUE,
116 RGBLED_INCREASE_SAT,
117 RGBLED_DECREASE_SAT,
118 RGBLED_INCREASE_VAL,
119 RGBLED_DECREASE_VAL
120};
121
122const uint16_t PROGMEM fn_actions[] = {
123 [0] = ACTION_FUNCTION(RGBLED_TOGGLE),
124 [1] = ACTION_FUNCTION(RGBLED_STEP_MODE),
125 [2] = ACTION_FUNCTION(RGBLED_INCREASE_HUE),
126 [3] = ACTION_FUNCTION(RGBLED_DECREASE_HUE),
127 [4] = ACTION_FUNCTION(RGBLED_INCREASE_SAT),
128 [5] = ACTION_FUNCTION(RGBLED_DECREASE_SAT),
129 [6] = ACTION_FUNCTION(RGBLED_INCREASE_VAL),
130 [7] = ACTION_FUNCTION(RGBLED_DECREASE_VAL)
131};
132
133void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) {
134 switch (id) {
135 case RGBLED_TOGGLE:
136 if (record->event.pressed) {
137 rgblight_toggle();
138 }
139 break;
140 case RGBLED_INCREASE_HUE:
141 if (record->event.pressed) {
142 rgblight_increase_hue();
143 }
144 break;
145 case RGBLED_DECREASE_HUE:
146 if (record->event.pressed) {
147 rgblight_decrease_hue();
148 }
149 break;
150 case RGBLED_INCREASE_SAT:
151 if (record->event.pressed) {
152 rgblight_increase_sat();
153 }
154 break;
155 case RGBLED_DECREASE_SAT:
156 if (record->event.pressed) {
157 rgblight_decrease_sat();
158 }
159 break;
160 case RGBLED_INCREASE_VAL:
161 if (record->event.pressed) {
162 rgblight_increase_val();
163 }
164 break;
165 case RGBLED_DECREASE_VAL:
166 if (record->event.pressed) {
167 rgblight_decrease_val();
168 }
169 break;
170 case RGBLED_STEP_MODE:
171 if (record->event.pressed) {
172 rgblight_step();
173 }
174 break;
175 }
176}
177
178void matrix_scan_user(void) {
179 uint32_t layer = layer_state;
180
181 if (layer & (1<<1)) {
182 gh60_fn_led_on();
183 } else {
184 gh60_fn_led_off();
185 }
186
187 if (layer & (1<<2)) {
188 gh60_wasd_leds_on();
189 } else {
190 gh60_wasd_leds_off();
191 }
192
193 if (layer & (1<<3)) {
194 gh60_esc_led_on();
195 } else {
196 gh60_esc_led_off();
197 }
198}; \ No newline at end of file
diff --git a/keyboards/satan/keymaps/dbroqua/keymap.c b/keyboards/satan/keymaps/dbroqua/keymap.c
new file mode 100644
index 000000000..5b921e021
--- /dev/null
+++ b/keyboards/satan/keymaps/dbroqua/keymap.c
@@ -0,0 +1,152 @@
1#include "satan.h"
2#include "action_layer.h"
3#include "rgblight.h"
4
5#define _DEFAULT 0
6#define _FN 1
7#define _SFX 2
8
9enum planck_keycodes {
10 DEFAULT = SAFE_RANGE
11};
12
13// Fillers to make layering more clear
14#define ______ KC_TRNS
15
16const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
17/* Qwerty gui/alt/space/alt/gui
18 * ,-----------------------------------------------------------------------------------------.
19 * | Esc | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | \ | ` |
20 * |-----------------------------------------------------------------------------------------+
21 * | Tab | Q | W | E | R | T | Y | U | I | O | P | [ | ] | Bksp |
22 * |-----------------------------------------------------------------------------------------+
23 * | Ctrl | A | S | D | F | G | H | J | K | L | ; | ' | Enter |
24 * |-----------------------------------------------------------------------------------------+
25 * | Shift | Z | X | C | V | B | N | M | , | . | / | RShift | FN |
26 * |-----------------------------------------------------------------------------------------+
27 * |LGUI | LAlt | Space | RAlt |RGUI |
28 * `-----------------------------------------------------------------'
29 */
30 [_DEFAULT] = KEYMAP_HHKB( /* Basic QWERTY */
31 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_BSLS, KC_GRV, \
32 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_BSPC, \
33 KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \
34 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(_FN), \
35 ______, KC_LGUI,KC_LALT, KC_SPC, KC_RALT,KC_RGUI, ______, ______ \
36 ),
37
38/* FN Layer
39 * ,-----------------------------------------------------------------------------------------.
40 * | | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | Ins | Del |
41 * |-----------------------------------------------------------------------------------------+
42 * | CAPS | BL- | BL+ | BL | | | | | Psc | Slck| Paus| Up | | |
43 * |-----------------------------------------------------------------------------------------+
44 * | | Vol-| Vol+| Mute| | | * | / | Home| PgUp| Left|Right| |
45 * |-----------------------------------------------------------------------------------------+
46 * | | Prev| Play| Next| | | + | - | End |PgDn| Down| | |
47 * |-----------------------------------------------------------------------------------------+
48 * | | | | Stop | |
49 * `-----------------------------------------------------------------'
50 */
51 [_FN] = KEYMAP_HHKB( /* Layer 1 */
52 TG(_SFX), 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_INS, KC_DEL, \
53 KC_CAPS, ______, ______, ______, ______, ______, ______, ______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, ______, ______, \
54 ______, KC_VOLD,KC_VOLU,KC_MUTE,______, ______, KC_PAST,KC_PSLS,KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, ______, \
55 ______, KC_MPRV,KC_MPLY,KC_MNXT,______, ______, KC_PPLS,KC_PMNS,KC_END, KC_PGDN, KC_DOWN, ______, ______, \
56 ______, ______, ______, ______, KC_MSTP, ______, ______, ______ \
57 ),
58
59/* SFX Layer
60 * ,-----------------------------------------------------------------------------------------.
61 * | | | | | | | | | | | | | | | |
62 * |-----------------------------------------------------------------------------------------+
63 * | | BL- | BL+ | BL | | | | | | | | | | |
64 * |-----------------------------------------------------------------------------------------+
65 * | | RGBT| RGBM| | | | | | | | | | |
66 * |-----------------------------------------------------------------------------------------+
67 * | | Hue+| Hue-| Sat+| Sat-| Val+| Val-| | | | | | |
68 * |-----------------------------------------------------------------------------------------+
69 * | | | | | |
70 * `-----------------------------------------------------------------'
71 */
72 [_SFX] = KEYMAP_HHKB(
73 ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, \
74 ______, BL_DEC, BL_INC, BL_TOGG,______, ______, ______, ______, ______, ______, ______, ______, ______, ______, \
75 ______, F(0), F(1), ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, \
76 ______, F(2), F(3), F(4), F(5), F(6), F(7), ______, ______, ______, ______, ______, ______, \
77 ______, ______, ______, ______, ______, ______, ______, ______ \
78 )
79};
80
81const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
82{
83 // MACRODOWN only works in this function
84 return MACRO_NONE;
85};
86
87enum function_id {
88 RGBLED_TOGGLE,
89 RGBLED_STEP_MODE,
90 RGBLED_INCREASE_HUE,
91 RGBLED_DECREASE_HUE,
92 RGBLED_INCREASE_SAT,
93 RGBLED_DECREASE_SAT,
94 RGBLED_INCREASE_VAL,
95 RGBLED_DECREASE_VAL
96};
97
98const uint16_t PROGMEM fn_actions[] = {
99 [0] = ACTION_FUNCTION(RGBLED_TOGGLE),
100 [1] = ACTION_FUNCTION(RGBLED_STEP_MODE),
101 [2] = ACTION_FUNCTION(RGBLED_INCREASE_HUE),
102 [3] = ACTION_FUNCTION(RGBLED_DECREASE_HUE),
103 [4] = ACTION_FUNCTION(RGBLED_INCREASE_SAT),
104 [5] = ACTION_FUNCTION(RGBLED_DECREASE_SAT),
105 [6] = ACTION_FUNCTION(RGBLED_INCREASE_VAL),
106 [7] = ACTION_FUNCTION(RGBLED_DECREASE_VAL)
107};
108
109void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) {
110 switch (id) {
111 case RGBLED_TOGGLE:
112 if (record->event.pressed) {
113 rgblight_toggle();
114 }
115 break;
116 case RGBLED_INCREASE_HUE:
117 if (record->event.pressed) {
118 rgblight_increase_hue();
119 }
120 break;
121 case RGBLED_DECREASE_HUE:
122 if (record->event.pressed) {
123 rgblight_decrease_hue();
124 }
125 break;
126 case RGBLED_INCREASE_SAT:
127 if (record->event.pressed) {
128 rgblight_increase_sat();
129 }
130 break;
131 case RGBLED_DECREASE_SAT:
132 if (record->event.pressed) {
133 rgblight_decrease_sat();
134 }
135 break;
136 case RGBLED_INCREASE_VAL:
137 if (record->event.pressed) {
138 rgblight_increase_val();
139 }
140 break;
141 case RGBLED_DECREASE_VAL:
142 if (record->event.pressed) {
143 rgblight_decrease_val();
144 }
145 break;
146 case RGBLED_STEP_MODE:
147 if (record->event.pressed) {
148 rgblight_step();
149 }
150 break;
151 }
152} \ No newline at end of file
diff --git a/keyboards/satan/keymaps/dbroqua_hhkb/readme.md b/keyboards/satan/keymaps/dbroqua/readme.md
index 39e71beed..39e71beed 100644
--- a/keyboards/satan/keymaps/dbroqua_hhkb/readme.md
+++ b/keyboards/satan/keymaps/dbroqua/readme.md
diff --git a/keyboards/satan/keymaps/dbroqua_hhkb/keymap.c b/keyboards/satan/keymaps/dbroqua_hhkb/keymap.c
deleted file mode 100644
index 98a298e76..000000000
--- a/keyboards/satan/keymaps/dbroqua_hhkb/keymap.c
+++ /dev/null
@@ -1,110 +0,0 @@
1// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
2// this is the style you want to emulate.
3
4#include "satan.h"
5
6#define _DEFAULT 0
7#define _ALTDISP 1
8#define _FN 2
9
10enum planck_keycodes {
11 DEFAULT = SAFE_RANGE,
12 ALTDISP
13};
14
15// Fillers to make layering more clear
16#define ______ KC_TRNS
17
18const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
19/* Qwerty alt/gui/space/gui/alt
20 * ,-----------------------------------------------------------------------------------------.
21 * | Esc | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | \ | ` |
22 * |-----------------------------------------------------------------------------------------+
23 * | Tab | Q | W | E | R | T | Y | U | I | O | P | [ | ] | Bksp |
24 * |-----------------------------------------------------------------------------------------+
25 * | Ctrl | A | S | D | F | G | H | J | K | L | ; | ' | Enter |
26 * |-----------------------------------------------------------------------------------------+
27 * | Shift | Z | X | C | V | B | N | M | , | . | / | RShift | FN |
28 * |-----------------------------------------------------------------------------------------+
29 * | LAlt| LGUI | Space | RGUI | RAlt |
30 * `-----------------------------------------------------------------'
31 */
32 [_DEFAULT] = KEYMAP_HHKB( /* Basic QWERTY */
33 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_BSLS, KC_GRV, \
34 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_BSPC, \
35 KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \
36 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(_FN), \
37 ______, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT, ______, ______ \
38 ),
39
40/* Qwerty gui/alt/space/alt/gui
41 * ,-----------------------------------------------------------------------------------------.
42 * | Esc | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | \ | ` |
43 * |-----------------------------------------------------------------------------------------+
44 * | Tab | Q | W | E | R | T | Y | U | I | O | P | [ | ] | Bksp |
45 * |-----------------------------------------------------------------------------------------+
46 * | Ctrl | A | S | D | F | G | H | J | K | L | ; | ' | Enter |
47 * |-----------------------------------------------------------------------------------------+
48 * | Shift | Z | X | C | V | B | N | M | , | . | / | RShift | FN |
49 * |-----------------------------------------------------------------------------------------+
50 * |LGUI | LAlt | Space | RAlt |RGUI |
51 * `-----------------------------------------------------------------'
52 */
53 [_ALTDISP] = KEYMAP_HHKB( /* Basic QWERTY */
54 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_BSLS, KC_GRV, \
55 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_BSPC, \
56 KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \
57 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(_FN), \
58 ______, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, ______, ______ \
59 ),
60
61/* FN Layer
62 * ,-----------------------------------------------------------------------------------------.
63 * | | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | Ins | Del |
64 * |-----------------------------------------------------------------------------------------+
65 * | CAPS | BL- | BL+ | BL | | | | | Psc | Slck| Paus| Up | | |
66 * |-----------------------------------------------------------------------------------------+
67 * | | Vol-| Vol+| Mute| | | * | / | Home| PgUp| Left|Right| |
68 * |-----------------------------------------------------------------------------------------+
69 * | | Prev| Play| Next| | | + | - | End |PgDn| Down| | |
70 * |-----------------------------------------------------------------------------------------+
71 * | | | | Stop | |
72 * `-----------------------------------------------------------------'
73 */
74 [_FN] = KEYMAP_HHKB( /* Layer 1 */
75 ______, 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_INS, KC_DEL, \
76 KC_CAPS, BL_DEC, BL_INC, BL_TOGG, ______, ______, ______, ______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, ______, ______, \
77 ______, KC_VOLD, KC_VOLU, KC_MUTE, ______, ______, KC_PAST, KC_PSLS,KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, ______, \
78 ______, KC_MPRV, KC_MPLY, KC_MNXT,______,______,KC_PPLS,KC_PMNS,KC_END, KC_PGDN, KC_DOWN, ______,______, \
79 ______, DEFAULT, ALTDISP, ______, KC_MSTP, ______, ______, ______ \
80 )
81};
82
83const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
84{
85 // MACRODOWN only works in this function
86 return MACRO_NONE;
87};
88
89void persistant_default_layer_set(uint16_t default_layer) {
90 eeconfig_update_default_layer(default_layer);
91 default_layer_set(default_layer);
92}
93
94bool process_record_user(uint16_t keycode, keyrecord_t *record) {
95 switch (keycode) {
96 case DEFAULT:
97 if (record->event.pressed) {
98 persistant_default_layer_set(1UL<<_DEFAULT);
99 }
100 return false;
101 break;
102 case ALTDISP:
103 if (record->event.pressed) {
104 persistant_default_layer_set(1UL<<_ALTDISP);
105 }
106 return false;
107 break;
108 }
109 return true;
110} \ No newline at end of file
diff --git a/quantum/api/api_sysex.c b/quantum/api/api_sysex.c
index a4a554e76..868f854b9 100644
--- a/quantum/api/api_sysex.c
+++ b/quantum/api/api_sysex.c
@@ -1,4 +1,6 @@
1#include "api_sysex.h" 1#include "api_sysex.h"
2#include "sysex_tools.h"
3#include "print.h"
2 4
3void send_bytes_sysex(uint8_t message_type, uint8_t data_type, uint8_t * bytes, uint16_t length) { 5void send_bytes_sysex(uint8_t message_type, uint8_t data_type, uint8_t * bytes, uint16_t length) {
4 // SEND_STRING("\nTX: "); 6 // SEND_STRING("\nTX: ");
@@ -6,24 +8,50 @@ void send_bytes_sysex(uint8_t message_type, uint8_t data_type, uint8_t * bytes,
6 // send_byte(bytes[i]); 8 // send_byte(bytes[i]);
7 // SEND_STRING(" "); 9 // SEND_STRING(" ");
8 // } 10 // }
9 uint8_t * precode = malloc(sizeof(uint8_t) * (length + 2)); 11 if (length > API_SYSEX_MAX_SIZE) {
10 precode[0] = message_type; 12 xprintf("Sysex msg too big %d %d %d", message_type, data_type, length);
11 precode[1] = data_type; 13 return;
12 memcpy(precode + 2, bytes, length); 14 }
13 uint8_t * encoded = malloc(sizeof(uint8_t) * (sysex_encoded_length(length + 2))); 15
14 uint16_t encoded_length = sysex_encode(encoded, precode, length + 2); 16
15 uint8_t * array = malloc(sizeof(uint8_t) * (encoded_length + 5)); 17 // The buffer size required is calculated as the following
16 array[0] = 0xF0; 18 // API_SYSEX_MAX_SIZE is the maximum length
17 array[1] = 0x00; 19 // In addition to that we have a two byte message header consisting of the message_type and data_type
18 array[2] = 0x00; 20 // This has to be encoded with an additional overhead of one byte for every starting 7 bytes
19 array[3] = 0x00; 21 // We just add one extra byte in case it's not divisible by 7
20 array[encoded_length + 4] = 0xF7; 22 // Then we have an unencoded header consisting of 4 bytes
21 memcpy(array + 4, encoded, encoded_length); 23 // Plus a one byte terminator
22 midi_send_array(&midi_device, encoded_length + 5, array); 24 const unsigned message_header = 2;
25 const unsigned unencoded_message = API_SYSEX_MAX_SIZE + message_header;
26 const unsigned encoding_overhead = unencoded_message / 7 + 1;
27 const unsigned encoded_size = unencoded_message + encoding_overhead;
28 const unsigned unencoded_header = 4;
29 const unsigned terminator = 1;
30 const unsigned buffer_size = encoded_size + unencoded_header + terminator;
31 uint8_t buffer[encoded_size + unencoded_header + terminator];
32 // The unencoded header
33 buffer[0] = 0xF0;
34 buffer[1] = 0x00;
35 buffer[2] = 0x00;
36 buffer[3] = 0x00;
37
38 // We copy the message to the end of the array, this way we can do an inplace encoding, using the same
39 // buffer for both input and output
40 const unsigned message_size = length + message_header;
41 uint8_t* unencoded_start = buffer + buffer_size - message_size;
42 uint8_t* ptr = unencoded_start;
43 *(ptr++) = message_type;
44 *(ptr++) = data_type;
45 memcpy(ptr, bytes, length);
46
47 unsigned encoded_length = sysex_encode(buffer + unencoded_header, unencoded_start, message_size);
48 unsigned final_size = unencoded_header + encoded_length + terminator;
49 buffer[final_size - 1] = 0xF7;
50 midi_send_array(&midi_device, final_size, buffer);
23 51
24 // SEND_STRING("\nTD: "); 52 // SEND_STRING("\nTD: ");
25 // for (uint8_t i = 0; i < encoded_length + 5; i++) { 53 // for (uint8_t i = 0; i < encoded_length + 5; i++) {
26 // send_byte(array[i]); 54 // send_byte(buffer[i]);
27 // SEND_STRING(" "); 55 // SEND_STRING(" ");
28 // } 56 // }
29} \ No newline at end of file 57}
diff --git a/quantum/config_common.h b/quantum/config_common.h
index 17c11faeb..4bdb2065d 100644
--- a/quantum/config_common.h
+++ b/quantum/config_common.h
@@ -80,4 +80,6 @@
80# endif 80# endif
81#endif 81#endif
82 82
83#define API_SYSEX_MAX_SIZE 32
84
83#endif 85#endif
diff --git a/quantum/keymap.h b/quantum/keymap.h
index ae56d16c7..c000d2da8 100644
--- a/quantum/keymap.h
+++ b/quantum/keymap.h
@@ -38,317 +38,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
38#define RESET QK_RESET 38#define RESET QK_RESET
39#endif 39#endif
40 40
41/* translates key to keycode */ 41#include "quantum_keycodes.h"
42
43// translates key to keycode
42uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key); 44uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key);
43 45
46// translates function id to action
47uint16_t keymap_function_id_to_action( uint16_t function_id );
48
44extern const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS]; 49extern const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS];
45extern const uint16_t fn_actions[]; 50extern const uint16_t fn_actions[];
46 51
47enum quantum_keycodes {
48 // Ranges used in shortucuts - not to be used directly
49 QK_TMK = 0x0000,
50 QK_TMK_MAX = 0x00FF,
51 QK_MODS = 0x0100,
52 QK_LCTL = 0x0100,
53 QK_LSFT = 0x0200,
54 QK_LALT = 0x0400,
55 QK_LGUI = 0x0800,
56 QK_RCTL = 0x1100,
57 QK_RSFT = 0x1200,
58 QK_RALT = 0x1400,
59 QK_RGUI = 0x1800,
60 QK_MODS_MAX = 0x1FFF,
61 QK_FUNCTION = 0x2000,
62 QK_FUNCTION_MAX = 0x2FFF,
63 QK_MACRO = 0x3000,
64 QK_MACRO_MAX = 0x3FFF,
65 QK_LAYER_TAP = 0x4000,
66 QK_LAYER_TAP_MAX = 0x4FFF,
67 QK_TO = 0x5000,
68 QK_TO_MAX = 0x50FF,
69 QK_MOMENTARY = 0x5100,
70 QK_MOMENTARY_MAX = 0x51FF,
71 QK_DEF_LAYER = 0x5200,
72 QK_DEF_LAYER_MAX = 0x52FF,
73 QK_TOGGLE_LAYER = 0x5300,
74 QK_TOGGLE_LAYER_MAX = 0x53FF,
75 QK_ONE_SHOT_LAYER = 0x5400,
76 QK_ONE_SHOT_LAYER_MAX = 0x54FF,
77 QK_ONE_SHOT_MOD = 0x5500,
78 QK_ONE_SHOT_MOD_MAX = 0x55FF,
79#ifndef DISABLE_CHORDING
80 QK_CHORDING = 0x5600,
81 QK_CHORDING_MAX = 0x56FF,
82#endif
83 QK_MOD_TAP = 0x6000,
84 QK_MOD_TAP_MAX = 0x6FFF,
85 QK_TAP_DANCE = 0x7100,
86 QK_TAP_DANCE_MAX = 0x71FF,
87#ifdef UNICODEMAP_ENABLE
88 QK_UNICODE_MAP = 0x7800,
89 QK_UNICODE_MAP_MAX = 0x7FFF,
90#endif
91#ifdef UNICODE_ENABLE
92 QK_UNICODE = 0x8000,
93 QK_UNICODE_MAX = 0xFFFF,
94#endif
95
96 // Loose keycodes - to be used directly
97
98 RESET = 0x7000,
99 DEBUG,
100 MAGIC_SWAP_CONTROL_CAPSLOCK,
101 MAGIC_CAPSLOCK_TO_CONTROL,
102 MAGIC_SWAP_LALT_LGUI,
103 MAGIC_SWAP_RALT_RGUI,
104 MAGIC_NO_GUI,
105 MAGIC_SWAP_GRAVE_ESC,
106 MAGIC_SWAP_BACKSLASH_BACKSPACE,
107 MAGIC_HOST_NKRO,
108 MAGIC_SWAP_ALT_GUI,
109 MAGIC_UNSWAP_CONTROL_CAPSLOCK,
110 MAGIC_UNCAPSLOCK_TO_CONTROL,
111 MAGIC_UNSWAP_LALT_LGUI,
112 MAGIC_UNSWAP_RALT_RGUI,
113 MAGIC_UNNO_GUI,
114 MAGIC_UNSWAP_GRAVE_ESC,
115 MAGIC_UNSWAP_BACKSLASH_BACKSPACE,
116 MAGIC_UNHOST_NKRO,
117 MAGIC_UNSWAP_ALT_GUI,
118 MAGIC_TOGGLE_NKRO,
119
120 // Leader key
121#ifndef DISABLE_LEADER
122 KC_LEAD,
123#endif
124
125 // Audio on/off/toggle
126 AU_ON,
127 AU_OFF,
128 AU_TOG,
129
130 // Music mode on/off/toggle
131 MU_ON,
132 MU_OFF,
133 MU_TOG,
134
135 // Music voice iterate
136 MUV_IN,
137 MUV_DE,
138
139 // Midi mode on/off
140 MIDI_ON,
141 MIDI_OFF,
142
143 // Backlight functionality
144 BL_0,
145 BL_1,
146 BL_2,
147 BL_3,
148 BL_4,
149 BL_5,
150 BL_6,
151 BL_7,
152 BL_8,
153 BL_9,
154 BL_10,
155 BL_11,
156 BL_12,
157 BL_13,
158 BL_14,
159 BL_15,
160 BL_DEC,
161 BL_INC,
162 BL_TOGG,
163 BL_STEP,
164
165 // RGB functionality
166 RGB_TOG,
167 RGB_MOD,
168 RGB_HUI,
169 RGB_HUD,
170 RGB_SAI,
171 RGB_SAD,
172 RGB_VAI,
173 RGB_VAD,
174
175 // Left shift, open paren
176 KC_LSPO,
177
178 // Right shift, close paren
179 KC_RSPC,
180
181 // Printing
182 PRINT_ON,
183 PRINT_OFF,
184
185 // always leave at the end
186 SAFE_RANGE
187};
188
189// Ability to use mods in layouts
190#define LCTL(kc) (kc | QK_LCTL)
191#define LSFT(kc) (kc | QK_LSFT)
192#define LALT(kc) (kc | QK_LALT)
193#define LGUI(kc) (kc | QK_LGUI)
194#define RCTL(kc) (kc | QK_RCTL)
195#define RSFT(kc) (kc | QK_RSFT)
196#define RALT(kc) (kc | QK_RALT)
197#define RGUI(kc) (kc | QK_RGUI)
198
199#define HYPR(kc) (kc | QK_LCTL | QK_LSFT | QK_LALT | QK_LGUI)
200#define MEH(kc) (kc | QK_LCTL | QK_LSFT | QK_LALT)
201#define LCAG(kc) (kc | QK_LCTL | QK_LALT | QK_LGUI)
202#define ALTG(kc) (kc | QK_RCTL | QK_RALT)
203
204#define MOD_HYPR 0xf
205#define MOD_MEH 0x7
206
207
208// Aliases for shifted symbols
209// Each key has a 4-letter code, and some have longer aliases too.
210// While the long aliases are descriptive, the 4-letter codes
211// make for nicer grid layouts (everything lines up), and are
212// the preferred style for Quantum.
213#define KC_TILD LSFT(KC_GRV) // ~
214#define KC_TILDE KC_TILD
215
216#define KC_EXLM LSFT(KC_1) // !
217#define KC_EXCLAIM KC_EXLM
218
219#define KC_AT LSFT(KC_2) // @
220
221#define KC_HASH LSFT(KC_3) // #
222
223#define KC_DLR LSFT(KC_4) // $
224#define KC_DOLLAR KC_DLR
225
226#define KC_PERC LSFT(KC_5) // %
227#define KC_PERCENT KC_PERC
228
229#define KC_CIRC LSFT(KC_6) // ^
230#define KC_CIRCUMFLEX KC_CIRC
231
232#define KC_AMPR LSFT(KC_7) // &
233#define KC_AMPERSAND KC_AMPR
234
235#define KC_ASTR LSFT(KC_8) // *
236#define KC_ASTERISK KC_ASTR
237
238#define KC_LPRN LSFT(KC_9) // (
239#define KC_LEFT_PAREN KC_LPRN
240
241#define KC_RPRN LSFT(KC_0) // )
242#define KC_RIGHT_PAREN KC_RPRN
243
244#define KC_UNDS LSFT(KC_MINS) // _
245#define KC_UNDERSCORE KC_UNDS
246
247#define KC_PLUS LSFT(KC_EQL) // +
248
249#define KC_LCBR LSFT(KC_LBRC) // {
250#define KC_LEFT_CURLY_BRACE KC_LCBR
251
252#define KC_RCBR LSFT(KC_RBRC) // }
253#define KC_RIGHT_CURLY_BRACE KC_RCBR
254
255#define KC_LABK LSFT(KC_COMM) // <
256#define KC_LEFT_ANGLE_BRACKET KC_LABK
257
258#define KC_RABK LSFT(KC_DOT) // >
259#define KC_RIGHT_ANGLE_BRACKET KC_RABK
260
261#define KC_COLN LSFT(KC_SCLN) // :
262#define KC_COLON KC_COLN
263
264#define KC_PIPE LSFT(KC_BSLS) // |
265
266#define KC_LT LSFT(KC_COMM) // <
267
268#define KC_GT LSFT(KC_DOT) // >
269
270#define KC_QUES LSFT(KC_SLSH) // ?
271#define KC_QUESTION KC_QUES
272
273#define KC_DQT LSFT(KC_QUOT) // "
274#define KC_DOUBLE_QUOTE KC_DQT
275#define KC_DQUO KC_DQT
276
277#define KC_DELT KC_DELETE // Del key (four letter code)
278
279// Alias for function layers than expand past FN31
280#define FUNC(kc) (kc | QK_FUNCTION)
281
282// Aliases
283#define S(kc) LSFT(kc)
284#define F(kc) FUNC(kc)
285
286#define M(kc) (kc | QK_MACRO)
287
288#define MACRODOWN(...) (record->event.pressed ? MACRO(__VA_ARGS__) : MACRO_NONE)
289
290// L-ayer, T-ap - 256 keycode max, 16 layer max
291#define LT(layer, kc) (kc | QK_LAYER_TAP | ((layer & 0xF) << 8))
292
293#define AG_SWAP MAGIC_SWAP_ALT_GUI
294#define AG_NORM MAGIC_UNSWAP_ALT_GUI
295
296#define BL_ON BL_9
297#define BL_OFF BL_0
298
299#define MI_ON MIDI_ON
300#define MI_OFF MIDI_OFF
301
302// GOTO layer - 16 layers max
303// when:
304// ON_PRESS = 1
305// ON_RELEASE = 2
306// Unless you have a good reason not to do so, prefer ON_PRESS (1) as your default.
307// In fact, we changed it to assume ON_PRESS for sanity/simplicity. If needed, you can add your own
308// keycode modeled after the old version, kept below for this.
309/* #define TO(layer, when) (layer | QK_TO | (when << 0x4)) */
310#define TO(layer) (layer | QK_TO | (ON_PRESS << 0x4))
311
312// Momentary switch layer - 256 layer max
313#define MO(layer) (layer | QK_MOMENTARY)
314
315// Set default layer - 256 layer max
316#define DF(layer) (layer | QK_DEF_LAYER)
317
318// Toggle to layer - 256 layer max
319#define TG(layer) (layer | QK_TOGGLE_LAYER)
320
321// One-shot layer - 256 layer max
322#define OSL(layer) (layer | QK_ONE_SHOT_LAYER)
323
324// One-shot mod
325#define OSM(mod) (mod | QK_ONE_SHOT_MOD)
326
327// M-od, T-ap - 256 keycode max
328#define MT(mod, kc) (kc | QK_MOD_TAP | ((mod & 0xF) << 8))
329#define CTL_T(kc) MT(MOD_LCTL, kc)
330#define SFT_T(kc) MT(MOD_LSFT, kc)
331#define ALT_T(kc) MT(MOD_LALT, kc)
332#define GUI_T(kc) MT(MOD_LGUI, kc)
333#define C_S_T(kc) MT((MOD_LCTL | MOD_LSFT), kc) // Control + Shift e.g. for gnome-terminal
334#define MEH_T(kc) MT((MOD_LCTL | MOD_LSFT | MOD_LALT), kc) // Meh is a less hyper version of the Hyper key -- doesn't include Win or Cmd, so just alt+shift+ctrl
335#define LCAG_T(kc) MT((MOD_LCTL | MOD_LALT | MOD_LGUI), kc) // Left control alt and gui
336#define ALL_T(kc) MT((MOD_LCTL | MOD_LSFT | MOD_LALT | MOD_LGUI), kc) // see http://brettterpstra.com/2012/12/08/a-useful-caps-lock-key/
337
338// Dedicated keycode versions for Hyper and Meh, if you want to use them as standalone keys rather than mod-tap
339#define KC_HYPR HYPR(KC_NO)
340#define KC_MEH MEH(KC_NO)
341
342#ifdef UNICODE_ENABLE
343 // For sending unicode codes.
344 // You may not send codes over 7FFF -- this supports most of UTF8.
345 // To have a key that sends out Œ, go UC(0x0152)
346 #define UNICODE(n) (n | QK_UNICODE)
347 #define UC(n) UNICODE(n)
348#endif
349
350#ifdef UNICODEMAP_ENABLE
351 #define X(n) (n | QK_UNICODE_MAP)
352#endif
353 52
354#endif 53#endif
diff --git a/quantum/keymap_common.c b/quantum/keymap_common.c
index 833e5a8f8..eced3d2bb 100644
--- a/quantum/keymap_common.c
+++ b/quantum/keymap_common.c
@@ -48,12 +48,10 @@ action_t action_for_key(uint8_t layer, keypos_t key)
48 48
49 action_t action; 49 action_t action;
50 uint8_t action_layer, when, mod; 50 uint8_t action_layer, when, mod;
51 // The arm-none-eabi compiler generates out of bounds warnings when using the fn_actions directly for some reason
52 const uint16_t* actions = fn_actions;
53 51
54 switch (keycode) { 52 switch (keycode) {
55 case KC_FN0 ... KC_FN31: 53 case KC_FN0 ... KC_FN31:
56 action.code = pgm_read_word(&actions[FN_INDEX(keycode)]); 54 action.code = keymap_function_id_to_action(FN_INDEX(keycode));
57 break; 55 break;
58 case KC_A ... KC_EXSEL: 56 case KC_A ... KC_EXSEL:
59 case KC_LCTRL ... KC_RGUI: 57 case KC_LCTRL ... KC_RGUI:
@@ -79,7 +77,7 @@ action_t action_for_key(uint8_t layer, keypos_t key)
79 case QK_FUNCTION ... QK_FUNCTION_MAX: ; 77 case QK_FUNCTION ... QK_FUNCTION_MAX: ;
80 // Is a shortcut for function action_layer, pull last 12bits 78 // Is a shortcut for function action_layer, pull last 12bits
81 // This means we have 4,096 FN macros at our disposal 79 // This means we have 4,096 FN macros at our disposal
82 action.code = pgm_read_word(&actions[(int)keycode & 0xFFF]); 80 action.code = keymap_function_id_to_action( (int)keycode & 0xFFF );
83 break; 81 break;
84 case QK_MACRO ... QK_MACRO_MAX: 82 case QK_MACRO ... QK_MACRO_MAX:
85 action.code = ACTION_MACRO(keycode & 0xFF); 83 action.code = ACTION_MACRO(keycode & 0xFF);
@@ -163,9 +161,17 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt)
163{ 161{
164} 162}
165 163
166/* translates key to keycode */ 164// translates key to keycode
165__attribute__ ((weak))
167uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key) 166uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
168{ 167{
169 // Read entire word (16bits) 168 // Read entire word (16bits)
170 return pgm_read_word(&keymaps[(layer)][(key.row)][(key.col)]); 169 return pgm_read_word(&keymaps[(layer)][(key.row)][(key.col)]);
171} 170}
171
172// translates function id to action
173__attribute__ ((weak))
174uint16_t keymap_function_id_to_action( uint16_t function_id )
175{
176 return pgm_read_word(&fn_actions[function_id]);
177}
diff --git a/quantum/quantum.c b/quantum/quantum.c
index f653564a6..63ffe2074 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -21,6 +21,8 @@ static void do_code16 (uint16_t code, void (*f) (uint8_t)) {
21 if (code & QK_LGUI) 21 if (code & QK_LGUI)
22 f(KC_LGUI); 22 f(KC_LGUI);
23 23
24 if (code < QK_RMODS_MIN) return;
25
24 if (code & QK_RCTL) 26 if (code & QK_RCTL)
25 f(KC_RCTL); 27 f(KC_RCTL);
26 if (code & QK_RSFT) 28 if (code & QK_RSFT)
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h
new file mode 100644
index 000000000..5cd3c8e78
--- /dev/null
+++ b/quantum/quantum_keycodes.h
@@ -0,0 +1,313 @@
1
2#ifndef QUANTUM_KEYCODES_H
3#define QUANTUM_KEYCODES_H
4
5enum quantum_keycodes {
6 // Ranges used in shortucuts - not to be used directly
7 QK_TMK = 0x0000,
8 QK_TMK_MAX = 0x00FF,
9 QK_MODS = 0x0100,
10 QK_LCTL = 0x0100,
11 QK_LSFT = 0x0200,
12 QK_LALT = 0x0400,
13 QK_LGUI = 0x0800,
14 QK_RMODS_MIN = 0x1000,
15 QK_RCTL = 0x1100,
16 QK_RSFT = 0x1200,
17 QK_RALT = 0x1400,
18 QK_RGUI = 0x1800,
19 QK_MODS_MAX = 0x1FFF,
20 QK_FUNCTION = 0x2000,
21 QK_FUNCTION_MAX = 0x2FFF,
22 QK_MACRO = 0x3000,
23 QK_MACRO_MAX = 0x3FFF,
24 QK_LAYER_TAP = 0x4000,
25 QK_LAYER_TAP_MAX = 0x4FFF,
26 QK_TO = 0x5000,
27 QK_TO_MAX = 0x50FF,
28 QK_MOMENTARY = 0x5100,
29 QK_MOMENTARY_MAX = 0x51FF,
30 QK_DEF_LAYER = 0x5200,
31 QK_DEF_LAYER_MAX = 0x52FF,
32 QK_TOGGLE_LAYER = 0x5300,
33 QK_TOGGLE_LAYER_MAX = 0x53FF,
34 QK_ONE_SHOT_LAYER = 0x5400,
35 QK_ONE_SHOT_LAYER_MAX = 0x54FF,
36 QK_ONE_SHOT_MOD = 0x5500,
37 QK_ONE_SHOT_MOD_MAX = 0x55FF,
38#ifndef DISABLE_CHORDING
39 QK_CHORDING = 0x5600,
40 QK_CHORDING_MAX = 0x56FF,
41#endif
42 QK_MOD_TAP = 0x6000,
43 QK_MOD_TAP_MAX = 0x6FFF,
44 QK_TAP_DANCE = 0x7100,
45 QK_TAP_DANCE_MAX = 0x71FF,
46#ifdef UNICODEMAP_ENABLE
47 QK_UNICODE_MAP = 0x7800,
48 QK_UNICODE_MAP_MAX = 0x7FFF,
49#endif
50#ifdef UNICODE_ENABLE
51 QK_UNICODE = 0x8000,
52 QK_UNICODE_MAX = 0xFFFF,
53#endif
54
55 // Loose keycodes - to be used directly
56
57 RESET = 0x7000,
58 DEBUG,
59 MAGIC_SWAP_CONTROL_CAPSLOCK,
60 MAGIC_CAPSLOCK_TO_CONTROL,
61 MAGIC_SWAP_LALT_LGUI,
62 MAGIC_SWAP_RALT_RGUI,
63 MAGIC_NO_GUI,
64 MAGIC_SWAP_GRAVE_ESC,
65 MAGIC_SWAP_BACKSLASH_BACKSPACE,
66 MAGIC_HOST_NKRO,
67 MAGIC_SWAP_ALT_GUI,
68 MAGIC_UNSWAP_CONTROL_CAPSLOCK,
69 MAGIC_UNCAPSLOCK_TO_CONTROL,
70 MAGIC_UNSWAP_LALT_LGUI,
71 MAGIC_UNSWAP_RALT_RGUI,
72 MAGIC_UNNO_GUI,
73 MAGIC_UNSWAP_GRAVE_ESC,
74 MAGIC_UNSWAP_BACKSLASH_BACKSPACE,
75 MAGIC_UNHOST_NKRO,
76 MAGIC_UNSWAP_ALT_GUI,
77 MAGIC_TOGGLE_NKRO,
78
79 // Leader key
80#ifndef DISABLE_LEADER
81 KC_LEAD,
82#endif
83
84 // Audio on/off/toggle
85 AU_ON,
86 AU_OFF,
87 AU_TOG,
88
89 // Music mode on/off/toggle
90 MU_ON,
91 MU_OFF,
92 MU_TOG,
93
94 // Music voice iterate
95 MUV_IN,
96 MUV_DE,
97
98 // Midi mode on/off
99 MIDI_ON,
100 MIDI_OFF,
101
102 // Backlight functionality
103 BL_0,
104 BL_1,
105 BL_2,
106 BL_3,
107 BL_4,
108 BL_5,
109 BL_6,
110 BL_7,
111 BL_8,
112 BL_9,
113 BL_10,
114 BL_11,
115 BL_12,
116 BL_13,
117 BL_14,
118 BL_15,
119 BL_DEC,
120 BL_INC,
121 BL_TOGG,
122 BL_STEP,
123
124 // RGB functionality
125 RGB_TOG,
126 RGB_MOD,
127 RGB_HUI,
128 RGB_HUD,
129 RGB_SAI,
130 RGB_SAD,
131 RGB_VAI,
132 RGB_VAD,
133
134 // Left shift, open paren
135 KC_LSPO,
136
137 // Right shift, close paren
138 KC_RSPC,
139
140 // Printing
141 PRINT_ON,
142 PRINT_OFF,
143
144 // always leave at the end
145 SAFE_RANGE
146};
147
148// Ability to use mods in layouts
149#define LCTL(kc) (kc | QK_LCTL)
150#define LSFT(kc) (kc | QK_LSFT)
151#define LALT(kc) (kc | QK_LALT)
152#define LGUI(kc) (kc | QK_LGUI)
153#define RCTL(kc) (kc | QK_RCTL)
154#define RSFT(kc) (kc | QK_RSFT)
155#define RALT(kc) (kc | QK_RALT)
156#define RGUI(kc) (kc | QK_RGUI)
157
158#define HYPR(kc) (kc | QK_LCTL | QK_LSFT | QK_LALT | QK_LGUI)
159#define MEH(kc) (kc | QK_LCTL | QK_LSFT | QK_LALT)
160#define LCAG(kc) (kc | QK_LCTL | QK_LALT | QK_LGUI)
161#define ALTG(kc) (kc | QK_RCTL | QK_RALT)
162
163#define MOD_HYPR 0xf
164#define MOD_MEH 0x7
165
166
167// Aliases for shifted symbols
168// Each key has a 4-letter code, and some have longer aliases too.
169// While the long aliases are descriptive, the 4-letter codes
170// make for nicer grid layouts (everything lines up), and are
171// the preferred style for Quantum.
172#define KC_TILD LSFT(KC_GRV) // ~
173#define KC_TILDE KC_TILD
174
175#define KC_EXLM LSFT(KC_1) // !
176#define KC_EXCLAIM KC_EXLM
177
178#define KC_AT LSFT(KC_2) // @
179
180#define KC_HASH LSFT(KC_3) // #
181
182#define KC_DLR LSFT(KC_4) // $
183#define KC_DOLLAR KC_DLR
184
185#define KC_PERC LSFT(KC_5) // %
186#define KC_PERCENT KC_PERC
187
188#define KC_CIRC LSFT(KC_6) // ^
189#define KC_CIRCUMFLEX KC_CIRC
190
191#define KC_AMPR LSFT(KC_7) // &
192#define KC_AMPERSAND KC_AMPR
193
194#define KC_ASTR LSFT(KC_8) // *
195#define KC_ASTERISK KC_ASTR
196
197#define KC_LPRN LSFT(KC_9) // (
198#define KC_LEFT_PAREN KC_LPRN
199
200#define KC_RPRN LSFT(KC_0) // )
201#define KC_RIGHT_PAREN KC_RPRN
202
203#define KC_UNDS LSFT(KC_MINS) // _
204#define KC_UNDERSCORE KC_UNDS
205
206#define KC_PLUS LSFT(KC_EQL) // +
207
208#define KC_LCBR LSFT(KC_LBRC) // {
209#define KC_LEFT_CURLY_BRACE KC_LCBR
210
211#define KC_RCBR LSFT(KC_RBRC) // }
212#define KC_RIGHT_CURLY_BRACE KC_RCBR
213
214#define KC_LABK LSFT(KC_COMM) // <
215#define KC_LEFT_ANGLE_BRACKET KC_LABK
216
217#define KC_RABK LSFT(KC_DOT) // >
218#define KC_RIGHT_ANGLE_BRACKET KC_RABK
219
220#define KC_COLN LSFT(KC_SCLN) // :
221#define KC_COLON KC_COLN
222
223#define KC_PIPE LSFT(KC_BSLS) // |
224
225#define KC_LT LSFT(KC_COMM) // <
226
227#define KC_GT LSFT(KC_DOT) // >
228
229#define KC_QUES LSFT(KC_SLSH) // ?
230#define KC_QUESTION KC_QUES
231
232#define KC_DQT LSFT(KC_QUOT) // "
233#define KC_DOUBLE_QUOTE KC_DQT
234#define KC_DQUO KC_DQT
235
236#define KC_DELT KC_DELETE // Del key (four letter code)
237
238// Alias for function layers than expand past FN31
239#define FUNC(kc) (kc | QK_FUNCTION)
240
241// Aliases
242#define S(kc) LSFT(kc)
243#define F(kc) FUNC(kc)
244
245#define M(kc) (kc | QK_MACRO)
246
247#define MACRODOWN(...) (record->event.pressed ? MACRO(__VA_ARGS__) : MACRO_NONE)
248
249// L-ayer, T-ap - 256 keycode max, 16 layer max
250#define LT(layer, kc) (kc | QK_LAYER_TAP | ((layer & 0xF) << 8))
251
252#define AG_SWAP MAGIC_SWAP_ALT_GUI
253#define AG_NORM MAGIC_UNSWAP_ALT_GUI
254
255#define BL_ON BL_9
256#define BL_OFF BL_0
257
258#define MI_ON MIDI_ON
259#define MI_OFF MIDI_OFF
260
261// GOTO layer - 16 layers max
262// when:
263// ON_PRESS = 1
264// ON_RELEASE = 2
265// Unless you have a good reason not to do so, prefer ON_PRESS (1) as your default.
266// In fact, we changed it to assume ON_PRESS for sanity/simplicity. If needed, you can add your own
267// keycode modeled after the old version, kept below for this.
268/* #define TO(layer, when) (layer | QK_TO | (when << 0x4)) */
269#define TO(layer) (layer | QK_TO | (ON_PRESS << 0x4))
270
271// Momentary switch layer - 256 layer max
272#define MO(layer) (layer | QK_MOMENTARY)
273
274// Set default layer - 256 layer max
275#define DF(layer) (layer | QK_DEF_LAYER)
276
277// Toggle to layer - 256 layer max
278#define TG(layer) (layer | QK_TOGGLE_LAYER)
279
280// One-shot layer - 256 layer max
281#define OSL(layer) (layer | QK_ONE_SHOT_LAYER)
282
283// One-shot mod
284#define OSM(mod) (mod | QK_ONE_SHOT_MOD)
285
286// M-od, T-ap - 256 keycode max
287#define MT(mod, kc) (kc | QK_MOD_TAP | ((mod & 0xF) << 8))
288#define CTL_T(kc) MT(MOD_LCTL, kc)
289#define SFT_T(kc) MT(MOD_LSFT, kc)
290#define ALT_T(kc) MT(MOD_LALT, kc)
291#define GUI_T(kc) MT(MOD_LGUI, kc)
292#define C_S_T(kc) MT((MOD_LCTL | MOD_LSFT), kc) // Control + Shift e.g. for gnome-terminal
293#define MEH_T(kc) MT((MOD_LCTL | MOD_LSFT | MOD_LALT), kc) // Meh is a less hyper version of the Hyper key -- doesn't include Win or Cmd, so just alt+shift+ctrl
294#define LCAG_T(kc) MT((MOD_LCTL | MOD_LALT | MOD_LGUI), kc) // Left control alt and gui
295#define ALL_T(kc) MT((MOD_LCTL | MOD_LSFT | MOD_LALT | MOD_LGUI), kc) // see http://brettterpstra.com/2012/12/08/a-useful-caps-lock-key/
296
297// Dedicated keycode versions for Hyper and Meh, if you want to use them as standalone keys rather than mod-tap
298#define KC_HYPR HYPR(KC_NO)
299#define KC_MEH MEH(KC_NO)
300
301#ifdef UNICODE_ENABLE
302 // For sending unicode codes.
303 // You may not send codes over 7FFF -- this supports most of UTF8.
304 // To have a key that sends out Œ, go UC(0x0152)
305 #define UNICODE(n) (n | QK_UNICODE)
306 #define UC(n) UNICODE(n)
307#endif
308
309#ifdef UNICODEMAP_ENABLE
310 #define X(n) (n | QK_UNICODE_MAP)
311#endif
312
313#endif // QUANTUM_KEYCODES_H
diff --git a/quantum/rgblight.c b/quantum/rgblight.c
index 6e335a483..52a09817a 100644
--- a/quantum/rgblight.c
+++ b/quantum/rgblight.c
@@ -370,6 +370,7 @@ void rgblight_setrgb(uint8_t r, uint8_t g, uint8_t b) {
370 rgblight_set(); 370 rgblight_set();
371} 371}
372 372
373__attribute__ ((weak))
373void rgblight_set(void) { 374void rgblight_set(void) {
374 if (rgblight_config.enable) { 375 if (rgblight_config.enable) {
375 #ifdef RGBW 376 #ifdef RGBW
diff --git a/quantum/rgblight.h b/quantum/rgblight.h
index ceb624692..726b8de72 100644
--- a/quantum/rgblight.h
+++ b/quantum/rgblight.h
@@ -40,6 +40,8 @@
40#include "eeconfig.h" 40#include "eeconfig.h"
41#include "light_ws2812.h" 41#include "light_ws2812.h"
42 42
43extern LED_TYPE led[RGBLED_NUM];
44
43extern const uint8_t RGBLED_BREATHING_INTERVALS[4] PROGMEM; 45extern const uint8_t RGBLED_BREATHING_INTERVALS[4] PROGMEM;
44extern const uint8_t RGBLED_RAINBOW_MOOD_INTERVALS[3] PROGMEM; 46extern const uint8_t RGBLED_RAINBOW_MOOD_INTERVALS[3] PROGMEM;
45extern const uint8_t RGBLED_RAINBOW_SWIRL_INTERVALS[3] PROGMEM; 47extern const uint8_t RGBLED_RAINBOW_SWIRL_INTERVALS[3] PROGMEM;
diff --git a/tmk_core/common/keycode.h b/tmk_core/common/keycode.h
index 2f208c54e..54e9c322c 100644
--- a/tmk_core/common/keycode.h
+++ b/tmk_core/common/keycode.h
@@ -85,7 +85,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
85#define KC_LCAP KC_LOCKING_CAPS 85#define KC_LCAP KC_LOCKING_CAPS
86#define KC_LNUM KC_LOCKING_NUM 86#define KC_LNUM KC_LOCKING_NUM
87#define KC_LSCR KC_LOCKING_SCROLL 87#define KC_LSCR KC_LOCKING_SCROLL
88#define KC_ERAS KC_ALT_ERASE, 88#define KC_ERAS KC_ALT_ERASE
89#define KC_CLR KC_CLEAR 89#define KC_CLR KC_CLEAR
90/* Japanese specific */ 90/* Japanese specific */
91#define KC_ZKHK KC_GRAVE 91#define KC_ZKHK KC_GRAVE
diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c
index 097189770..6dd5959dc 100644
--- a/tmk_core/protocol/lufa/lufa.c
+++ b/tmk_core/protocol/lufa/lufa.c
@@ -1252,28 +1252,40 @@ void cc_callback(MidiDevice * device,
1252 // midi_send_cc(device, (chan + 1) % 16, num, val); 1252 // midi_send_cc(device, (chan + 1) % 16, num, val);
1253} 1253}
1254 1254
1255#ifdef API_SYSEX_ENABLE
1255uint8_t midi_buffer[MIDI_SYSEX_BUFFER] = {0}; 1256uint8_t midi_buffer[MIDI_SYSEX_BUFFER] = {0};
1257#endif
1256 1258
1257void sysex_callback(MidiDevice * device, uint16_t start, uint8_t length, uint8_t * data) { 1259void sysex_callback(MidiDevice * device, uint16_t start, uint8_t length, uint8_t * data) {
1258 #ifdef API_SYSEX_ENABLE 1260 #ifdef API_SYSEX_ENABLE
1259 // SEND_STRING("\n"); 1261 // SEND_STRING("\n");
1260 // send_word(start); 1262 // send_word(start);
1261 // SEND_STRING(": "); 1263 // SEND_STRING(": ");
1264 // Don't store the header
1265 int16_t pos = start - 4;
1262 for (uint8_t place = 0; place < length; place++) { 1266 for (uint8_t place = 0; place < length; place++) {
1263 // send_byte(*data); 1267 // send_byte(*data);
1264 midi_buffer[start + place] = *data; 1268 if (pos >= 0) {
1265 if (*data == 0xF7) { 1269 if (*data == 0xF7) {
1266 // SEND_STRING("\nRD: "); 1270 // SEND_STRING("\nRD: ");
1267 // for (uint8_t i = 0; i < start + place + 1; i++){ 1271 // for (uint8_t i = 0; i < start + place + 1; i++){
1268 // send_byte(midi_buffer[i]); 1272 // send_byte(midi_buffer[i]);
1269 // SEND_STRING(" "); 1273 // SEND_STRING(" ");
1270 // } 1274 // }
1271 uint8_t * decoded = malloc(sizeof(uint8_t) * (sysex_decoded_length(start + place - 4))); 1275 const unsigned decoded_length = sysex_decoded_length(pos);
1272 uint16_t decode_length = sysex_decode(decoded, midi_buffer + 4, start + place - 4); 1276 uint8_t decoded[API_SYSEX_MAX_SIZE];
1273 process_api(decode_length, decoded); 1277 sysex_decode(decoded, midi_buffer, pos);
1278 process_api(decoded_length, decoded);
1279 return;
1280 }
1281 else if (pos >= MIDI_SYSEX_BUFFER) {
1282 return;
1283 }
1284 midi_buffer[pos] = *data;
1274 } 1285 }
1275 // SEND_STRING(" "); 1286 // SEND_STRING(" ");
1276 data++; 1287 data++;
1288 pos++;
1277 } 1289 }
1278 #endif 1290 #endif
1279} 1291}
diff --git a/tmk_core/protocol/lufa/lufa.h b/tmk_core/protocol/lufa/lufa.h
index b11854101..a049fd43c 100644
--- a/tmk_core/protocol/lufa/lufa.h
+++ b/tmk_core/protocol/lufa/lufa.h
@@ -70,7 +70,6 @@ typedef struct {
70#ifdef MIDI_ENABLE 70#ifdef MIDI_ENABLE
71 void MIDI_Task(void); 71 void MIDI_Task(void);
72 MidiDevice midi_device; 72 MidiDevice midi_device;
73 #define MIDI_SYSEX_BUFFER 32
74#endif 73#endif
75 74
76#ifdef API_ENABLE 75#ifdef API_ENABLE
@@ -79,6 +78,9 @@ typedef struct {
79 78
80#ifdef API_SYSEX_ENABLE 79#ifdef API_SYSEX_ENABLE
81 #include "api_sysex.h" 80 #include "api_sysex.h"
81 // Allocate space for encoding overhead.
82 //The header and terminator are not stored to save a few bytes of precious ram
83 #define MIDI_SYSEX_BUFFER (API_SYSEX_MAX_SIZE + API_SYSEX_MAX_SIZE / 7 + (API_SYSEX_MAX_SIZE % 7 ? 1 : 0))
82#endif 84#endif
83 85
84// #if LUFA_VERSION_INTEGER < 0x120730 86// #if LUFA_VERSION_INTEGER < 0x120730
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-05 20:09:19 +0000