diff options
| author | QMK Bot <hello@qmk.fm> | 2021-01-11 07:03:42 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-01-11 07:03:42 +0000 |
| commit | ff2bd2ee18c91d290ecabf64215a4bad5e67a168 (patch) | |
| tree | d3dc040372464987783ff1bb355ee36fca19a9e8 | |
| parent | 7464c1d3308666e04c89dfd7e19ba1e7e7f62ec6 (diff) | |
| parent | 4ae5c3a90567cd793a36fea03a807e82ed85eb49 (diff) | |
| download | qmk_firmware-ff2bd2ee18c91d290ecabf64215a4bad5e67a168.tar.gz qmk_firmware-ff2bd2ee18c91d290ecabf64215a4bad5e67a168.zip | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | layouts/community/alice/stanrc85-alice/keymap.c | 6 | ||||
| -rw-r--r-- | users/stanrc85/rules.mk | 2 | ||||
| -rw-r--r-- | users/stanrc85/startup_fanfare.c | 18 |
3 files changed, 13 insertions, 13 deletions
diff --git a/layouts/community/alice/stanrc85-alice/keymap.c b/layouts/community/alice/stanrc85-alice/keymap.c index a2998f0094..743f8f7df5 100644 --- a/layouts/community/alice/stanrc85-alice/keymap.c +++ b/layouts/community/alice/stanrc85-alice/keymap.c @@ -19,9 +19,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_QWERTY] = LAYOUT_alice( - KC_ESC, KC_GRV, 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_BSPC, - KC_PGUP, 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_BSLS, - KC_PGDN, KC_CTLE, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_MPLY, KC_GRV, 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_BSPC, + CA_SCLN, 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_BSLS, + CA_QUOT, KC_CTLE, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(_FN2_60), KC_LCTL, KC_LALT, LT_BPCF, KC_LGUI, LT_SPCF, TD_TWIN, TD_TCTL ), diff --git a/users/stanrc85/rules.mk b/users/stanrc85/rules.mk index fc2560d3a1..0c0a8dd7f6 100644 --- a/users/stanrc85/rules.mk +++ b/users/stanrc85/rules.mk @@ -20,7 +20,7 @@ ifeq ($(strip $(KEYBOARD)), projectkb/alice/rev2) endif ifeq ($(strip $(KEYBOARD)), sneakbox/aliceclone) SRC += indicator_layers_sneakbox.c - #SRC += startup_fanfare.c + SRC += startup_fanfare.c OPT_DEFS += -DHAS_INDICATORS OPT_DEFS += -DHAS_ROTARY VIA_ENABLE = yes diff --git a/users/stanrc85/startup_fanfare.c b/users/stanrc85/startup_fanfare.c index 507d9e389c..ae73261ae5 100644 --- a/users/stanrc85/startup_fanfare.c +++ b/users/stanrc85/startup_fanfare.c @@ -16,24 +16,24 @@ void matrix_scan_user(void) { counter++; if (counter == 1) { top = 1; - writePin(INDICATOR_PIN_0, !top); - wait_ms(200); + writePin(INDICATOR_PIN_0, top); + wait_ms(300); top = 0; - writePin(INDICATOR_PIN_0, !top); + writePin(INDICATOR_PIN_0, top); } if (counter == 2) { middle = 1; - writePin(INDICATOR_PIN_1, !middle); - wait_ms(200); + writePin(INDICATOR_PIN_1, middle); + wait_ms(300); middle = 0; - writePin(INDICATOR_PIN_1, !middle); + writePin(INDICATOR_PIN_1, middle); } if (counter == 3) { bottom = 1; - writePin(INDICATOR_PIN_2, !bottom); - wait_ms(200); + writePin(INDICATOR_PIN_2, bottom); + wait_ms(300); bottom = 0; - writePin(INDICATOR_PIN_2, !bottom); + writePin(INDICATOR_PIN_2, bottom); } if (counter == 4) { is_enabled = is_rgblight_startup = false; |