diff options
author | Wilba <Jason.S.Williams@gmail.com> | 2018-12-01 03:43:34 +1100 |
---|---|---|
committer | Drashna Jaelre <drashna@live.com> | 2018-11-30 08:43:34 -0800 |
commit | d7f1e072a859d7fcbaccd675b4bad7d02d214e52 (patch) | |
tree | fb24714b6f37ef58f265802897a5225abf171753 /quantum/dynamic_keymap.c | |
parent | b10aad45b60326c7e9f2d1fc67e45bd201341552 (diff) | |
download | qmk_firmware-d7f1e072a859d7fcbaccd675b4bad7d02d214e52.tar.gz qmk_firmware-d7f1e072a859d7fcbaccd675b4bad7d02d214e52.zip |
Added macros to Dynamic Keymaps, Zeal60 RGB backlight improvements (#4520)
* Refactored M6-B to use Zeal60 RGB backlight code
* Fixed M6-B LED co-ordinates
* Minor changes to RGB config for Zeal65
* Added dynamic keymaps to WT80-A, WT60-A, WT-80A, U80-A
* Macro implementation
* Implemented macros, API protocol version 8, RGB backlight fixes
* Improved radial effects for M6-B
* Fixed undefined references when building an RGB keyboard after M6-A
Diffstat (limited to 'quantum/dynamic_keymap.c')
-rw-r--r-- | quantum/dynamic_keymap.c | 147 |
1 files changed, 146 insertions, 1 deletions
diff --git a/quantum/dynamic_keymap.c b/quantum/dynamic_keymap.c index ee39a2025..14627a93d 100644 --- a/quantum/dynamic_keymap.c +++ b/quantum/dynamic_keymap.c | |||
@@ -18,7 +18,7 @@ | |||
18 | #include "keymap.h" // to get keymaps[][][] | 18 | #include "keymap.h" // to get keymaps[][][] |
19 | #include "tmk_core/common/eeprom.h" | 19 | #include "tmk_core/common/eeprom.h" |
20 | #include "progmem.h" // to read default from flash | 20 | #include "progmem.h" // to read default from flash |
21 | 21 | #include "quantum.h" // for send_string() | |
22 | #include "dynamic_keymap.h" | 22 | #include "dynamic_keymap.h" |
23 | 23 | ||
24 | #ifdef DYNAMIC_KEYMAP_ENABLE | 24 | #ifdef DYNAMIC_KEYMAP_ENABLE |
@@ -31,6 +31,23 @@ | |||
31 | #error DYNAMIC_KEYMAP_LAYER_COUNT not defined | 31 | #error DYNAMIC_KEYMAP_LAYER_COUNT not defined |
32 | #endif | 32 | #endif |
33 | 33 | ||
34 | #ifndef DYNAMIC_KEYMAP_MACRO_COUNT | ||
35 | #error DYNAMIC_KEYMAP_MACRO_COUNT not defined | ||
36 | #endif | ||
37 | |||
38 | #ifndef DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR | ||
39 | #error DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR not defined | ||
40 | #endif | ||
41 | |||
42 | #ifndef DYNAMIC_KEYMAP_MACRO_EEPROM_SIZE | ||
43 | #error DYNAMIC_KEYMAP_MACRO_EEPROM_SIZE not defined | ||
44 | #endif | ||
45 | |||
46 | uint8_t dynamic_keymap_get_layer_count(void) | ||
47 | { | ||
48 | return DYNAMIC_KEYMAP_LAYER_COUNT; | ||
49 | } | ||
50 | |||
34 | void *dynamic_keymap_key_to_eeprom_address(uint8_t layer, uint8_t row, uint8_t column) | 51 | void *dynamic_keymap_key_to_eeprom_address(uint8_t layer, uint8_t row, uint8_t column) |
35 | { | 52 | { |
36 | // TODO: optimize this with some left shifts | 53 | // TODO: optimize this with some left shifts |
@@ -69,6 +86,36 @@ void dynamic_keymap_reset(void) | |||
69 | } | 86 | } |
70 | } | 87 | } |
71 | 88 | ||
89 | void dynamic_keymap_get_buffer( uint16_t offset, uint16_t size, uint8_t *data ) | ||
90 | { | ||
91 | uint16_t dynamic_keymap_eeprom_size = DYNAMIC_KEYMAP_LAYER_COUNT * MATRIX_ROWS * MATRIX_COLS * 2; | ||
92 | void *source = (void*)(DYNAMIC_KEYMAP_EEPROM_ADDR+offset); | ||
93 | uint8_t *target = data; | ||
94 | for ( uint16_t i = 0; i < size; i++ ) { | ||
95 | if ( offset + i < dynamic_keymap_eeprom_size ) { | ||
96 | *target = eeprom_read_byte(source); | ||
97 | } else { | ||
98 | *target = 0x00; | ||
99 | } | ||
100 | source++; | ||
101 | target++; | ||
102 | } | ||
103 | } | ||
104 | |||
105 | void dynamic_keymap_set_buffer( uint16_t offset, uint16_t size, uint8_t *data ) | ||
106 | { | ||
107 | uint16_t dynamic_keymap_eeprom_size = DYNAMIC_KEYMAP_LAYER_COUNT * MATRIX_ROWS * MATRIX_COLS * 2; | ||
108 | void *target = (void*)(DYNAMIC_KEYMAP_EEPROM_ADDR+offset); | ||
109 | uint8_t *source = data; | ||
110 | for ( uint16_t i = 0; i < size; i++ ) { | ||
111 | if ( offset + i < dynamic_keymap_eeprom_size ) { | ||
112 | eeprom_update_byte(target, *source); | ||
113 | } | ||
114 | source++; | ||
115 | target++; | ||
116 | } | ||
117 | } | ||
118 | |||
72 | // This overrides the one in quantum/keymap_common.c | 119 | // This overrides the one in quantum/keymap_common.c |
73 | uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key) | 120 | uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key) |
74 | { | 121 | { |
@@ -81,5 +128,103 @@ uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key) | |||
81 | } | 128 | } |
82 | } | 129 | } |
83 | 130 | ||
131 | |||
132 | |||
133 | uint8_t dynamic_keymap_macro_get_count(void) | ||
134 | { | ||
135 | return DYNAMIC_KEYMAP_MACRO_COUNT; | ||
136 | } | ||
137 | |||
138 | uint16_t dynamic_keymap_macro_get_buffer_size(void) | ||
139 | { | ||
140 | return DYNAMIC_KEYMAP_MACRO_EEPROM_SIZE; | ||
141 | } | ||
142 | |||
143 | void dynamic_keymap_macro_get_buffer( uint16_t offset, uint16_t size, uint8_t *data ) | ||
144 | { | ||
145 | void *source = (void*)(DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR+offset); | ||
146 | uint8_t *target = data; | ||
147 | for ( uint16_t i = 0; i < size; i++ ) { | ||
148 | if ( offset + i < DYNAMIC_KEYMAP_MACRO_EEPROM_SIZE ) { | ||
149 | *target = eeprom_read_byte(source); | ||
150 | } else { | ||
151 | *target = 0x00; | ||
152 | } | ||
153 | source++; | ||
154 | target++; | ||
155 | } | ||
156 | } | ||
157 | |||
158 | void dynamic_keymap_macro_set_buffer( uint16_t offset, uint16_t size, uint8_t *data ) | ||
159 | { | ||
160 | void *target = (void*)(DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR+offset); | ||
161 | uint8_t *source = data; | ||
162 | for ( uint16_t i = 0; i < size; i++ ) { | ||
163 | if ( offset + i < DYNAMIC_KEYMAP_MACRO_EEPROM_SIZE ) { | ||
164 | eeprom_update_byte(target, *source); | ||
165 | } | ||
166 | source++; | ||
167 | target++; | ||
168 | } | ||
169 | } | ||
170 | |||
171 | void dynamic_keymap_macro_reset(void) | ||
172 | { | ||
173 | void *p = (void*)(DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR); | ||
174 | void *end = (void*)(DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR+DYNAMIC_KEYMAP_MACRO_EEPROM_SIZE); | ||
175 | while ( p != end ) { | ||
176 | eeprom_update_byte(p, 0); | ||
177 | ++p; | ||
178 | } | ||
179 | } | ||
180 | |||
181 | void dynamic_keymap_macro_send( uint8_t id ) | ||
182 | { | ||
183 | if ( id >= DYNAMIC_KEYMAP_MACRO_COUNT ) { | ||
184 | return; | ||
185 | } | ||
186 | |||
187 | // Check the last byte of the buffer. | ||
188 | // If it's not zero, then we are in the middle | ||
189 | // of buffer writing, possibly an aborted buffer | ||
190 | // write. So do nothing. | ||
191 | void *p = (void*)(DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR+DYNAMIC_KEYMAP_MACRO_EEPROM_SIZE-1); | ||
192 | if ( eeprom_read_byte(p) != 0 ) { | ||
193 | return; | ||
194 | } | ||
195 | |||
196 | // Skip N null characters | ||
197 | // p will then point to the Nth macro | ||
198 | p = (void*)(DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR); | ||
199 | void *end = (void*)(DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR+DYNAMIC_KEYMAP_MACRO_EEPROM_SIZE); | ||
200 | while ( id > 0 ) { | ||
201 | // If we are past the end of the buffer, then the buffer | ||
202 | // contents are garbage, i.e. there were not DYNAMIC_KEYMAP_MACRO_COUNT | ||
203 | // nulls in the buffer. | ||
204 | if ( p == end ) { | ||
205 | return; | ||
206 | } | ||
207 | if ( eeprom_read_byte(p) == 0 ) { | ||
208 | --id; | ||
209 | } | ||
210 | ++p; | ||
211 | } | ||
212 | |||
213 | // Send the macro string one char at a time | ||
214 | // by making temporary 1 char strings | ||
215 | char data[2] = { 0, 0 }; | ||
216 | // We already checked there was a null at the end of | ||
217 | // the buffer, so this cannot go past the end | ||
218 | while ( 1 ) { | ||
219 | data[0] = eeprom_read_byte(p); | ||
220 | // Stop at the null terminator of this macro string | ||
221 | if ( data[0] == 0 ) { | ||
222 | break; | ||
223 | } | ||
224 | send_string(data); | ||
225 | ++p; | ||
226 | } | ||
227 | } | ||
228 | |||
84 | #endif // DYNAMIC_KEYMAP_ENABLE | 229 | #endif // DYNAMIC_KEYMAP_ENABLE |
85 | 230 | ||