aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2016-06-29 18:29:20 -0400
committerJack Humbert <jack.humb@gmail.com>2016-06-29 18:29:20 -0400
commit197f152dee834a737cd820f2a95d1ade98be4898 (patch)
tree5b545c4c4ea27d151defa607ddae8750a3feb3f4
parent65faab3b89245f81c50b029ca178aed175d5f330 (diff)
downloadqmk_firmware-197f152dee834a737cd820f2a95d1ade98be4898.tar.gz
qmk_firmware-197f152dee834a737cd820f2a95d1ade98be4898.zip
adds random base64 character generator
-rw-r--r--keyboards/planck/keymaps/experimental/keymap.c15
-rw-r--r--keyboards/planck/rev3/Makefile2
-rw-r--r--keyboards/planck/rev4/Makefile2
-rw-r--r--quantum/quantum.c35
-rw-r--r--quantum/quantum.h3
5 files changed, 53 insertions, 4 deletions
diff --git a/keyboards/planck/keymaps/experimental/keymap.c b/keyboards/planck/keymaps/experimental/keymap.c
index 041285684..856059289 100644
--- a/keyboards/planck/keymaps/experimental/keymap.c
+++ b/keyboards/planck/keymaps/experimental/keymap.c
@@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
54 {KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC}, 54 {KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC},
55 {KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT}, 55 {KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT},
56 {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT }, 56 {KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT },
57 {M(M_BL), KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT} 57 {KC_LEAD, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT}
58}, 58},
59 59
60/* Colemak 60/* Colemak
@@ -90,7 +90,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
90 {KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC}, 90 {KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC},
91 {KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH}, 91 {KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH},
92 {KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_ENT }, 92 {KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_ENT },
93 {M(M_BL), KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT} 93 {KC_LEAD, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT}
94}, 94},
95 95
96/* Lower 96/* Lower
@@ -326,6 +326,17 @@ void matrix_scan_user(void) {
326 leading = false; 326 leading = false;
327 leader_end(); 327 leader_end();
328 328
329 SEQ_ONE_KEY (KC_R) {
330 tap_random_base64();
331 tap_random_base64();
332 tap_random_base64();
333 tap_random_base64();
334 tap_random_base64();
335 tap_random_base64();
336 tap_random_base64();
337 tap_random_base64();
338 tap_random_base64();
339 }
329 SEQ_ONE_KEY (KC_V) { 340 SEQ_ONE_KEY (KC_V) {
330 SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION); 341 SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
331 } 342 }
diff --git a/keyboards/planck/rev3/Makefile b/keyboards/planck/rev3/Makefile
index 559409682..3ed1445e4 100644
--- a/keyboards/planck/rev3/Makefile
+++ b/keyboards/planck/rev3/Makefile
@@ -1,4 +1,4 @@
1AUDIO_ENABLE = no # Audio output on port C6 1AUDIO_ENABLE ?= no # Audio output on port C6
2 2
3ifndef QUANTUM_DIR 3ifndef QUANTUM_DIR
4 include ../../../Makefile 4 include ../../../Makefile
diff --git a/keyboards/planck/rev4/Makefile b/keyboards/planck/rev4/Makefile
index 01d848e98..ed09f85a4 100644
--- a/keyboards/planck/rev4/Makefile
+++ b/keyboards/planck/rev4/Makefile
@@ -1,4 +1,4 @@
1AUDIO_ENABLE = yes # Audio output on port C6 1AUDIO_ENABLE ?= yes # Audio output on port C6
2 2
3ifndef QUANTUM_DIR 3ifndef QUANTUM_DIR
4 include ../../../Makefile 4 include ../../../Makefile
diff --git a/quantum/quantum.c b/quantum/quantum.c
index c0580e0aa..224bfb795 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -307,6 +307,41 @@ void update_tri_layer(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
307 } 307 }
308} 308}
309 309
310void tap_random_base64(void) {
311 uint8_t key = (TCNT0 + TCNT1 + TCNT3 + TCNT4) % 64;
312 // uint8_t key = rand() % 64;
313 switch (key) {
314 case 0 ... 25:
315 register_code(KC_LSFT);
316 register_code(key + KC_A);
317 unregister_code(key + KC_A);
318 unregister_code(KC_LSFT);
319 break;
320 case 26 ... 51:
321 register_code(key - 26 + KC_A);
322 unregister_code(key - 26 + KC_A);
323 break;
324 case 52:
325 register_code(KC_0);
326 unregister_code(KC_0);
327 break;
328 case 53 ... 61:
329 register_code(key - 53 + KC_1);
330 unregister_code(key - 53 + KC_1);
331 break;
332 case 62:
333 register_code(KC_LSFT);
334 register_code(KC_EQL);
335 unregister_code(KC_EQL);
336 unregister_code(KC_LSFT);
337 break;
338 case 63:
339 register_code(KC_SLSH);
340 unregister_code(KC_SLSH);
341 break;
342 }
343}
344
310void matrix_init_quantum() { 345void matrix_init_quantum() {
311 #ifdef BACKLIGHT_ENABLE 346 #ifdef BACKLIGHT_ENABLE
312 backlight_init_ports(); 347 backlight_init_ports();
diff --git a/quantum/quantum.h b/quantum/quantum.h
index ad180c71f..dd290ac00 100644
--- a/quantum/quantum.h
+++ b/quantum/quantum.h
@@ -60,6 +60,9 @@ void send_string(const char *str);
60 60
61// For tri-layer 61// For tri-layer
62void update_tri_layer(uint8_t layer1, uint8_t layer2, uint8_t layer3); 62void update_tri_layer(uint8_t layer1, uint8_t layer2, uint8_t layer3);
63
64void tap_random_base64(void);
65
63#define IS_LAYER_ON(layer) (layer_state & (1UL << (layer))) 66#define IS_LAYER_ON(layer) (layer_state & (1UL << (layer)))
64#define IS_LAYER_OFF(layer) (~layer_state & (1UL << (layer))) 67#define IS_LAYER_OFF(layer) (~layer_state & (1UL << (layer)))
65 68