Skip to content

Commit b421632

Browse files
author
Lisa Ugray
committed
Macro rework
1 parent daa3256 commit b421632

File tree

2 files changed

+52
-49
lines changed

2 files changed

+52
-49
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
*~
22
.#*
33
/output/
4+
macros.h

‎Model01-Firmware.ino

+51-49
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
#include "Kaleidoscope-EEPROM-Settings.h"
1717
#include "Kaleidoscope-DynamicMacros.h"
1818
#include <Kaleidoscope-Qukeys.h>
19+
#include "macros.h"
1920

20-
enum { MACRO_NOP, QUINN }; // Macros
21-
enum { DM_ESC, DM_1, DM_2, DM_O }; // Dynamic Macros
21+
enum { MACRO_NOP, QUINN, M_ESC, M_1, M_2, M_O }; // Macros
2222
#define KNOP M(MACRO_NOP)
2323
#define STL(l) ShiftToLayer(L_ ## l)
2424

25-
enum { L_PRIMARY, L_FN, L_DM, L_QUINN, L_QFN }; // layers
25+
enum { L_PRIMARY, L_FN, L_M, L_QUINN, L_QFN }; // layers
2626

2727
#define Sleep LCTRL(LGUI(Key_Q))
2828
#define WinUp LCTRL(LALT(Key_UpArrow))
@@ -60,40 +60,40 @@ enum { L_PRIMARY, L_FN, L_DM, L_QUINN, L_QFN }; // layers
6060

6161
KEYMAPS(
6262
[L_PRIMARY]=KEYMAP(
63-
Key_Escape, Key_1, Key_2, Key_3, Key_4, Key_5, HYPER, Sleep, Key_6, Key_7, Key_8, Key_9, Key_0, Key_Backslash,
64-
Key_Backtick, Key_Q, Key_W, Key_E, Key_R, Key_T, Key_Tab, Key_Enter, Key_Y, Key_U, Key_I, Key_O, Key_P, Key_Equals,
65-
Key_Home, Key_A, Key_S, Key_D, Key_F, Key_G, /**/ /**/ Key_H, Key_J, Key_K, Key_L, Key_Colon, Key_Quote,
66-
Key_End, Key_Z, Key_X, Key_C, Key_V, Key_B, Key_Escape, Underscore, Key_N, Key_M, Key_Comma, Key_Period, Key_Slash, Key_Minus,
67-
/**/ /**/ /**/ LCtrl, BkSpc, LCmd, LShift, RShift, RCmd, SpcBar, RCtrl, /**/ /**/ /**/
68-
/**/ /**/ /**/ /**/ /**/ /**/ STL(FN), STL(FN) /**/ /**/ /**/ /**/ /**/ /**/
63+
Key_Escape, Key_1, Key_2, Key_3, Key_4, Key_5, HYPER, Sleep, Key_6, Key_7, Key_8, Key_9, Key_0, Key_Backslash,
64+
Key_Backtick, Key_Q, Key_W, Key_E, Key_R, Key_T, Key_Tab, Key_Enter, Key_Y, Key_U, Key_I, Key_O, Key_P, Key_Equals,
65+
Key_Home, Key_A, Key_S, Key_D, Key_F, Key_G, /**/ /**/ Key_H, Key_J, Key_K, Key_L, Key_Colon, Key_Quote,
66+
Key_End, Key_Z, Key_X, Key_C, Key_V, Key_B, Key_Escape, Underscore, Key_N, Key_M, Key_Comma, Key_Period, Key_Slash, Key_Minus,
67+
/**/ /**/ /**/ LCtrl, BkSpc, LCmd, LShift, RShift, RCmd, SpcBar, RCtrl, /**/ /**/ /**/
68+
/**/ /**/ /**/ /**/ /**/ /**/ STL(FN), STL(FN) /**/ /**/ /**/ /**/ /**/ /**/
6969
),[L_FN]=KEYMAP(
70-
___, Key_F1, Key_F2, Key_F3, Key_F4, Key_F5, M(QUINN), ___, Key_F6, Key_F7, Key_F8, Key_F9, Key_F10, Key_F11,
71-
___, ___, ___, ___, ___, CSA(T), ___, WinMax, ___, ___, ___, ___, ___, Key_F12,
72-
Key_PageUp, WinLeft, CSA(S), WinRight, ___, ___, /**/ /**/ Left, Down, Up, Right, Key_Semicolon, TOPSY(Quote),
73-
Key_PageDown, ___, ___, CSA(C), ___, CSA(B), ___, Key_Minus, ___, Mute, VolDown, VolUp, Pipe, STL(DM),
74-
/**/ /**/ /**/ ___, Key_Delete, ___, ___, ___, ___, Key_Enter, ___, /**/ /**/ /**/
75-
/**/ /**/ /**/ /**/ /**/ /**/ ___, ___ /**/ /**/ /**/ /**/ /**/ /**/
76-
),[L_DM]=KEYMAP(
77-
DM(DM_ESC), DM(DM_1), DM(DM_2), ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___,
78-
___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, DM(DM_O), ___, ___,
79-
___, ___, ___, ___, ___, ___, /**/ /**/ ___, ___, ___, ___, ___, ___,
80-
___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___,
81-
/**/ /**/ /**/ ___, ___, ___, ___, ___, ___, ___, ___, /**/ /**/ /**/
82-
/**/ /**/ /**/ /**/ /**/ /**/ ___, ___ /**/ /**/ /**/ /**/ /**/ /**/
70+
___, Key_F1, Key_F2, Key_F3, Key_F4, Key_F5, M(QUINN), ___, Key_F6, Key_F7, Key_F8, Key_F9, Key_F10, Key_F11,
71+
___, ___, ___, ___, ___, CSA(T), ___, WinMax, ___, ___, ___, ___, ___, Key_F12,
72+
Key_PageUp, WinLeft, CSA(S), WinRight, ___, ___, /**/ /**/ Left, Down, Up, Right, Key_Semicolon, TOPSY(Quote),
73+
Key_PageDown, ___, ___, CSA(C), ___, CSA(B), ___, Key_Minus, ___, Mute, VolDown, VolUp, Pipe, STL(M),
74+
/**/ /**/ /**/ ___, Key_Delete, ___, ___, ___, ___, Key_Enter, ___, /**/ /**/ /**/
75+
/**/ /**/ /**/ /**/ /**/ /**/ ___, ___ /**/ /**/ /**/ /**/ /**/ /**/
76+
),[L_M]=KEYMAP(
77+
M(M_ESC), M(M_1), M(M_2), ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___,
78+
___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, M(M_O), ___, ___,
79+
___, ___, ___, ___, ___, ___, /**/ /**/ ___, ___, ___, ___, ___, ___,
80+
___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___,
81+
/**/ /**/ /**/ ___, ___, ___, ___, ___, ___, ___, ___, /**/ /**/ /**/
82+
/**/ /**/ /**/ /**/ /**/ /**/ ___, ___ /**/ /**/ /**/ /**/ /**/ /**/
8383
),[L_QUINN]=KEYMAP(
84-
KNOP, KNOP, KNOP, KNOP, KNOP, KNOP, KNOP, KNOP, KNOP, KNOP, KNOP, KNOP, KNOP, KNOP,
85-
KNOP, KNOP, KNOP, KNOP, KNOP, KNOP, KNOP, KNOP, KNOP, KNOP, KNOP, KNOP, KNOP, KNOP,
86-
KNOP, KNOP, KNOP, KNOP, KNOP, KNOP, /**/ /**/ KNOP, KNOP, KNOP, KNOP, KNOP, KNOP,
87-
KNOP, KNOP, KNOP, KNOP, KNOP, KNOP, KNOP, KNOP, KNOP, KNOP, KNOP, KNOP, KNOP, KNOP,
88-
/**/ /**/ /**/ KNOP, KNOP, KNOP, KNOP, KNOP, KNOP, KNOP, KNOP, /**/ /**/ /**/
89-
/**/ /**/ /**/ /**/ /**/ /**/ STL(QFN), STL(QFN) /**/ /**/ /**/ /**/ /**/ /**/
84+
KNOP, KNOP, KNOP, KNOP, KNOP, KNOP, KNOP, KNOP, KNOP, KNOP, KNOP, KNOP, KNOP, KNOP,
85+
KNOP, KNOP, KNOP, KNOP, KNOP, KNOP, KNOP, KNOP, KNOP, KNOP, KNOP, KNOP, KNOP, KNOP,
86+
KNOP, KNOP, KNOP, KNOP, KNOP, KNOP, /**/ /**/ KNOP, KNOP, KNOP, KNOP, KNOP, KNOP,
87+
KNOP, KNOP, KNOP, KNOP, KNOP, KNOP, KNOP, KNOP, KNOP, KNOP, KNOP, KNOP, KNOP, KNOP,
88+
/**/ /**/ /**/ KNOP, KNOP, KNOP, KNOP, KNOP, KNOP, KNOP, KNOP, /**/ /**/ /**/
89+
/**/ /**/ /**/ /**/ /**/ /**/ STL(QFN), STL(QFN) /**/ /**/ /**/ /**/ /**/ /**/
9090
),[L_QFN]=KEYMAP(
91-
___, ___, ___, ___, ___, ___, M(QUINN), ___, ___, ___, ___, ___, ___, ___,
92-
___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___,
93-
___, ___, ___, ___, ___, ___, /**/ /**/ ___, ___, ___, ___, ___, ___,
94-
___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___,
95-
/**/ /**/ /**/ ___, ___, ___, ___, ___, ___, ___, ___, /**/ /**/ /**/
96-
/**/ /**/ /**/ /**/ /**/ /**/ ___, ___ /**/ /**/ /**/ /**/ /**/ /**/
91+
___, ___, ___, ___, ___, ___, M(QUINN), ___, ___, ___, ___, ___, ___, ___,
92+
___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___,
93+
___, ___, ___, ___, ___, ___, /**/ /**/ ___, ___, ___, ___, ___, ___,
94+
___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___,
95+
/**/ /**/ /**/ ___, ___, ___, ___, ___, ___, ___, ___, /**/ /**/ /**/
96+
/**/ /**/ /**/ /**/ /**/ /**/ ___, ___ /**/ /**/ /**/ /**/ /**/ /**/
9797
)
9898
)
9999

@@ -125,20 +125,24 @@ class : public kaleidoscope::plugin::LEDMode {
125125
uint16_t cycle_time = 10000;
126126
} ledRainbowEffect;
127127

128-
const macro_t *macroAction(uint8_t macroIndex, uint8_t keyState) {
129-
if (!keyToggledOn(keyState)) {
128+
const macro_t *macroAction(uint8_t macro_id, KeyEvent &event) {
129+
if (!keyToggledOn(event.state)) {
130130
return MACRO_NONE;
131131
}
132-
switch(macroIndex) {
133-
case QUINN:
134-
if (Layer.mostRecent() == L_FN) {
135-
Layer.move(L_QUINN);
136-
WavepoolEffect.activate();
137-
} else {
138-
Layer.move(L_PRIMARY);
139-
ledRainbowEffect.activate();
140-
}
141-
break;
132+
switch(macro_id) {
133+
case QUINN:
134+
if (Layer.mostRecent() == L_FN) {
135+
Layer.move(L_QUINN);
136+
WavepoolEffect.activate();
137+
} else {
138+
Layer.move(L_PRIMARY);
139+
ledRainbowEffect.activate();
140+
}
141+
break;
142+
case M_ESC: MACRO_ESC;
143+
case M_1: MACRO_1;
144+
case M_2: MACRO_2;
145+
case M_O: MACRO_O;
142146
}
143147
return MACRO_NONE;
144148
}
@@ -152,8 +156,7 @@ KALEIDOSCOPE_INIT_PLUGINS(
152156
WavepoolEffect,
153157
TopsyTurvy,
154158
Macros,
155-
EEPROMSettings,
156-
DynamicMacros
159+
EEPROMSettings
157160
);
158161

159162
void setup() {
@@ -174,7 +177,6 @@ void setup() {
174177
Kaleidoscope.setup();
175178
WavepoolEffect.idle_timeout = 0;
176179
ledRainbowEffect.activate();
177-
DynamicMacros.reserve_storage(512);
178180
}
179181

180182
void loop() {

0 commit comments

Comments
 (0)