aboutsummaryrefslogtreecommitdiff
path: root/keyboards/bpiphany/frosty_flake/frosty_flake.h
diff options
context:
space:
mode:
authorDustin L. Howett <dustin@howett.net>2020-03-01 21:17:09 -0800
committerGitHub <noreply@github.com>2020-03-02 05:17:09 +0000
commitb72a1aa3fec986bfa7e439b68d6b7546ab1e280b (patch)
treed9d1de0e5f0893fc204dd712fd4b16b543c960e9 /keyboards/bpiphany/frosty_flake/frosty_flake.h
parent78069d482634b3b727e5d09b526fa24c227cc4e2 (diff)
downloadqmk_firmware-b72a1aa3fec986bfa7e439b68d6b7546ab1e280b.tar.gz
qmk_firmware-b72a1aa3fec986bfa7e439b68d6b7546ab1e280b.zip
Rewrite the Bathroom Epiphanies Frosty Flake matrix and LED handling (#8243)
* Keyboard: revamp frosty-flake leds This commit transitions bpiphany/frosty_flake to led_update_{kb,user} and rewrites the AVR bit twiddling logic to use the standard QMK GPIO API. * Keyboard: rewrite frosty_flake's matrix reader to be a lite custom matrix This commit replaces frosty_flake's custom matrix and debounce logic with a "lite" custom matrix. In addition to being somewhat clearer, this allows a consumer of the flake board to choose their own debouncing algorithm. The one closest to the implementation originally in use is sym_g, but this opens us up to supporting eager_pk and eager_pr. The original matrix code was 18 columns for 8 rows, but using a single row read and unpacking the bits into individual columns. To simplify, I've changed the key layout to be 8C 18R instead of 18C 8R: this lets us use a single read directly into the matrix _and_ drop down to a uint8_t instead of a uint32_t for matrix_row_t. Since we're no longer implementing our own debouncing and row unpacking, we save ~400 bytes on the final firmware image. Fully tested against a CM Storm QFR hosting the flake -- this commit message was written using the new matrix code. Firmware Sizes (assuming stock configuration as of 42d6270f2) Matrix+Debounce Size (bytes) --------------- ------------ original 17740 new + sym_g 17284 new + eager_pr 18106 new + eager_pk 18204 I expect that there are some scanning speed benefits as well. * Keyboard: update frosty_flake's UNUSED_PINS * Keyboard: Remove meaningless weak redefinitions from frosty These are not necessary (and all of them already live somewhere in Quantum).
Diffstat (limited to 'keyboards/bpiphany/frosty_flake/frosty_flake.h')
-rw-r--r--keyboards/bpiphany/frosty_flake/frosty_flake.h58
1 files changed, 38 insertions, 20 deletions
diff --git a/keyboards/bpiphany/frosty_flake/frosty_flake.h b/keyboards/bpiphany/frosty_flake/frosty_flake.h
index 824287396..cc870c277 100644
--- a/keyboards/bpiphany/frosty_flake/frosty_flake.h
+++ b/keyboards/bpiphany/frosty_flake/frosty_flake.h
@@ -34,16 +34,25 @@
34 KA4, KP2, KC6, KK6, KC0, KM3, KD0, KA1, KO0, KK0, KL0, KL6, KQ6 \ 34 KA4, KP2, KC6, KK6, KC0, KM3, KD0, KA1, KO0, KK0, KL0, KL6, KQ6 \
35) \ 35) \
36{ \ 36{ \
37/* Columns and rows need to be swapped in the below definition */ \ 37/* 0 1 2 3 4 5 6 7 */ \
38/* A B C D E F G H I J K L M N O P Q R */ \ 38/* A */ { KC_NO, KA1, KC_NO, KC_NO, KA4, KA5, KC_NO, KA7, }, \
39/* 0 */ { KC_NO, KB0, KC0, KD0, KC_NO, KF0, KG0, KC_NO, KC_NO, KC_NO, KK0, KL0, KC_NO, KC_NO, KO0, KC_NO, KQ0, KR0 }, \ 39/* B */ { KB0, KB1, KB2, KB3, KB4, KC_NO, KB6, KB7, }, \
40/* 1 */ { KA1, KB1, KC_NO, KD1, KE1, KF1, KG1, KH1, KI1, KJ1, KK1, KL1, KC_NO, KC_NO, KC_NO, KC_NO, KQ1, KC_NO }, \ 40/* C */ { KC0, KC_NO, KC_NO, KC_NO, KC_NO, KC5, KC6, KC7, }, \
41/* 2 */ { KC_NO, KB2, KC_NO, KD2, KE2, KF2, KG2, KH2, KI2, KJ2, KK2, KL2, KC_NO, KN2, KC_NO, KP2, KQ2, KR2 }, \ 41/* D */ { KD0, KD1, KD2, KD3, KD4, KD5, KC_NO, KD7, }, \
42/* 3 */ { KC_NO, KB3, KC_NO, KD3, KE3, KF3, KG3, KH3, KI3, KJ3, KK3, KL3, KM3, KN3, KO3, KC_NO, KQ3, KR3 }, \ 42/* E */ { KC_NO, KE1, KE2, KE3, KE4, KE5, KE6, KE7, }, \
43/* 4 */ { KA4, KB4, KC_NO, KD4, KE4, KF4, KG4, KH4, KI4, KJ4, KK4, KL4, KC_NO, KC_NO, KO4, KC_NO, KQ4, KR4 }, \ 43/* F */ { KF0, KF1, KF2, KF3, KF4, KF5, KF6, KF7, }, \
44/* 5 */ { KA5, KC_NO, KC5, KD5, KE5, KF5, KG5, KH5, KI5, KJ5, KK5, KL5, KC_NO, KC_NO, KO5, KC_NO, KQ5, KR5 }, \ 44/* G */ { KG0, KG1, KG2, KG3, KG4, KG5, KG6, KG7, }, \
45/* 6 */ { KC_NO, KB6, KC6, KC_NO, KE6, KF6, KG6, KH6, KI6, KJ6, KK6, KL6, KC_NO, KC_NO, KO6, KC_NO, KQ6, KR6 }, \ 45/* H */ { KC_NO, KH1, KH2, KH3, KH4, KH5, KH6, KH7, }, \
46/* 7 */ { KA7, KB7, KC7, KD7, KE7, KF7, KG7, KH7, KI7, KJ7, KC_NO, KC_NO, KC_NO, KC_NO, KO7, KC_NO, KQ7, KR7 } \ 46/* I */ { KC_NO, KI1, KI2, KI3, KI4, KI5, KI6, KI7, }, \
47/* J */ { KC_NO, KJ1, KJ2, KJ3, KJ4, KJ5, KJ6, KJ7, }, \
48/* K */ { KK0, KK1, KK2, KK3, KK4, KK5, KK6, KC_NO, }, \
49/* L */ { KL0, KL1, KL2, KL3, KL4, KL5, KL6, KC_NO, }, \
50/* M */ { KC_NO, KC_NO, KC_NO, KM3, KC_NO, KC_NO, KC_NO, KC_NO, }, \
51/* N */ { KC_NO, KC_NO, KN2, KN3, KC_NO, KC_NO, KC_NO, KC_NO, }, \
52/* O */ { KO0, KC_NO, KC_NO, KO3, KO4, KO5, KO6, KO7, }, \
53/* P */ { KC_NO, KC_NO, KP2, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, }, \
54/* Q */ { KQ0, KQ1, KQ2, KQ3, KQ4, KQ5, KQ6, KQ7, }, \
55/* R */ { KR0, KC_NO, KR2, KR3, KR4, KR5, KR6, KR7, }, \
47} 56}
48 57
49/* 58/*
@@ -74,16 +83,25 @@
74 KA4, KP2, KC6, KK6, KC0, KM3, KD0, KA1, KO0, KK0, KL0 \ 83 KA4, KP2, KC6, KK6, KC0, KM3, KD0, KA1, KO0, KK0, KL0 \
75) \ 84) \
76{ \ 85{ \
77/* Columns and rows need to be swapped in the below definition */ \ 86/* 0 1 2 3 4 5 6 7 */ \
78/* A B C D E F G H I J K L M N O P Q R */ \ 87/* A */ { KC_NO, KA1, KC_NO, KC_NO, KA4, KA5, KC_NO, KA7, }, \
79/* 0 */ { KC_NO, KB0, KC0, KD0, KC_NO, KF0, KG0, KC_NO, KC_NO, KC_NO, KK0, KL0, KC_NO, KC_NO, KO0, KC_NO, KC_NO, KR0 }, \ 88/* B */ { KB0, KB1, KB2, KB3, KB4, KC_NO, KB6, KB7, }, \
80/* 1 */ { KA1, KB1, KC_NO, KD1, KE1, KF1, KG1, KH1, KI1, KJ1, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ 89/* C */ { KC0, KC_NO, KC_NO, KC_NO, KC_NO, KC5, KC6, KC7, }, \
81/* 2 */ { KC_NO, KB2, KC_NO, KD2, KE2, KF2, KG2, KH2, KI2, KJ2, KC_NO, KC_NO, KC_NO, KN2, KC_NO, KP2, KC_NO, KR2 }, \ 90/* D */ { KD0, KD1, KD2, KD3, KD4, KD5, KC_NO, KD7, }, \
82/* 3 */ { KC_NO, KB3, KC_NO, KD3, KE3, KF3, KG3, KH3, KI3, KJ3, KC_NO, KC_NO, KM3, KN3, KC_NO, KC_NO, KC_NO, KR3 }, \ 91/* E */ { KC_NO, KE1, KE2, KE3, KE4, KE5, KE6, KE7, }, \
83/* 4 */ { KA4, KB4, KC_NO, KD4, KE4, KF4, KG4, KH4, KI4, KJ4, KK4, KL4, KC_NO, KC_NO, KO4, KC_NO, KQ4, KR4 }, \ 92/* F */ { KF0, KF1, KF2, KF3, KF4, KF5, KF6, KF7, }, \
84/* 5 */ { KA5, KC_NO, KC5, KD5, KE5, KF5, KG5, KH5, KI5, KJ5, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KR5 }, \ 93/* G */ { KG0, KG1, KG2, KG3, KG4, KG5, KG6, KG7, }, \
85/* 6 */ { KC_NO, KB6, KC6, KC_NO, KE6, KF6, KG6, KH6, KI6, KJ6, KK6, KC_NO, KC_NO, KC_NO, KO6, KC_NO, KC_NO, KR6 }, \ 94/* H */ { KC_NO, KH1, KH2, KH3, KH4, KH5, KH6, KH7, }, \
86/* 7 */ { KA7, KB7, KC7, KD7, KE7, KF7, KG7, KH7, KI7, KJ7, KC_NO, KC_NO, KC_NO, KC_NO, KO7, KC_NO, KQ7, KR7 } \ 95/* I */ { KC_NO, KI1, KI2, KI3, KI4, KI5, KI6, KI7, }, \
96/* J */ { KC_NO, KJ1, KJ2, KJ3, KJ4, KJ5, KJ6, KJ7, }, \
97/* K */ { KK0, KC_NO, KC_NO, KC_NO, KK4, KC_NO, KK6, KC_NO, }, \
98/* L */ { KL0, KC_NO, KC_NO, KC_NO, KL4, KC_NO, KC_NO, KC_NO, }, \
99/* M */ { KC_NO, KC_NO, KC_NO, KM3, KC_NO, KC_NO, KC_NO, KC_NO, }, \
100/* N */ { KC_NO, KC_NO, KN2, KN3, KC_NO, KC_NO, KC_NO, KC_NO, }, \
101/* O */ { KO0, KC_NO, KC_NO, KC_NO, KO4, KC_NO, KO6, KO7, }, \
102/* P */ { KC_NO, KC_NO, KP2, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, }, \
103/* Q */ { KC_NO, KC_NO, KC_NO, KC_NO, KQ4, KC_NO, KC_NO, KQ7, }, \
104/* R */ { KR0, KC_NO, KR2, KR3, KR4, KR5, KR6, KR7, }, \
87} 105}
88 106
89#define LAYOUT_tkl_ansi( \ 107#define LAYOUT_tkl_ansi( \