diff options
author | fauxpark <fauxpark@gmail.com> | 2021-01-15 18:34:12 +1100 |
---|---|---|
committer | fauxpark <fauxpark@gmail.com> | 2021-01-15 18:34:12 +1100 |
commit | ca7da3866d8a7a80e5c932ebac40fe0061d00c7f (patch) | |
tree | 5686046b1f73ed22253fc74bd4851c77e638a615 /keyboards/bpiphany | |
parent | ab375d3d075c105f09a1ddd0e155f178225518bc (diff) | |
parent | 8cf5f72aadc7f287b2716a174730a4b2cc26c900 (diff) | |
download | qmk_firmware-ca7da3866d8a7a80e5c932ebac40fe0061d00c7f.tar.gz qmk_firmware-ca7da3866d8a7a80e5c932ebac40fe0061d00c7f.zip |
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'keyboards/bpiphany')
-rw-r--r-- | keyboards/bpiphany/frosty_flake/config.h | 1 | ||||
-rw-r--r-- | keyboards/bpiphany/pegasushoof/2013/config.h | 1 | ||||
-rw-r--r-- | keyboards/bpiphany/pegasushoof/2015/config.h | 1 | ||||
-rw-r--r-- | keyboards/bpiphany/sixshooter/config.h | 1 | ||||
-rw-r--r-- | keyboards/bpiphany/tiger_lily/config.h | 1 | ||||
-rw-r--r-- | keyboards/bpiphany/unloved_bastard/config.h | 1 |
6 files changed, 0 insertions, 6 deletions
diff --git a/keyboards/bpiphany/frosty_flake/config.h b/keyboards/bpiphany/frosty_flake/config.h index 79bc31aec..344db5f0d 100644 --- a/keyboards/bpiphany/frosty_flake/config.h +++ b/keyboards/bpiphany/frosty_flake/config.h | |||
@@ -26,7 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
26 | #define DEVICE_VER 0x0001 | 26 | #define DEVICE_VER 0x0001 |
27 | #define MANUFACTURER Bathroom Epiphanies | 27 | #define MANUFACTURER Bathroom Epiphanies |
28 | #define PRODUCT frosty_flake | 28 | #define PRODUCT frosty_flake |
29 | #define DESCRIPTION Frosty Flake controller for the CM Storm Quick Fire Rapid | ||
30 | 29 | ||
31 | /* | 30 | /* |
32 | * Frosty Flake Rev. 20140521 made by Bathroom Ephiphanies | 31 | * Frosty Flake Rev. 20140521 made by Bathroom Ephiphanies |
diff --git a/keyboards/bpiphany/pegasushoof/2013/config.h b/keyboards/bpiphany/pegasushoof/2013/config.h index d2f81fedc..2573cecfc 100644 --- a/keyboards/bpiphany/pegasushoof/2013/config.h +++ b/keyboards/bpiphany/pegasushoof/2013/config.h | |||
@@ -24,7 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
24 | #define DEVICE_VER 0x0104 | 24 | #define DEVICE_VER 0x0104 |
25 | #define MANUFACTURER Filco | 25 | #define MANUFACTURER Filco |
26 | #define PRODUCT Majestouch TKL \\w The Pegasus Hoof 2013 | 26 | #define PRODUCT Majestouch TKL \\w The Pegasus Hoof 2013 |
27 | #define DESCRIPTION QMK firmware for Majestouch TKL | ||
28 | 27 | ||
29 | /* key matrix size */ | 28 | /* key matrix size */ |
30 | #define MATRIX_ROWS 8 | 29 | #define MATRIX_ROWS 8 |
diff --git a/keyboards/bpiphany/pegasushoof/2015/config.h b/keyboards/bpiphany/pegasushoof/2015/config.h index 6edfa5993..479175c47 100644 --- a/keyboards/bpiphany/pegasushoof/2015/config.h +++ b/keyboards/bpiphany/pegasushoof/2015/config.h | |||
@@ -24,7 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
24 | #define DEVICE_VER 0x0104 | 24 | #define DEVICE_VER 0x0104 |
25 | #define MANUFACTURER Filco | 25 | #define MANUFACTURER Filco |
26 | #define PRODUCT Majestouch TKL \\w The Pegasus Hoof 2015 | 26 | #define PRODUCT Majestouch TKL \\w The Pegasus Hoof 2015 |
27 | #define DESCRIPTION QMK firmware for Majestouch TKL | ||
28 | 27 | ||
29 | /* key matrix size */ | 28 | /* key matrix size */ |
30 | #define MATRIX_ROWS 8 | 29 | #define MATRIX_ROWS 8 |
diff --git a/keyboards/bpiphany/sixshooter/config.h b/keyboards/bpiphany/sixshooter/config.h index c3ce8c884..0637e8d6b 100644 --- a/keyboards/bpiphany/sixshooter/config.h +++ b/keyboards/bpiphany/sixshooter/config.h | |||
@@ -8,7 +8,6 @@ | |||
8 | #define DEVICE_VER 0x0001 | 8 | #define DEVICE_VER 0x0001 |
9 | #define MANUFACTURER bpiphany | 9 | #define MANUFACTURER bpiphany |
10 | #define PRODUCT sixshooter | 10 | #define PRODUCT sixshooter |
11 | #define DESCRIPTION A PCB for the CM Storm switch tester utilizing a Teensy 2.0. | ||
12 | 11 | ||
13 | /* key matrix size */ | 12 | /* key matrix size */ |
14 | #define MATRIX_ROWS 2 | 13 | #define MATRIX_ROWS 2 |
diff --git a/keyboards/bpiphany/tiger_lily/config.h b/keyboards/bpiphany/tiger_lily/config.h index d7eb42941..cc619a5b8 100644 --- a/keyboards/bpiphany/tiger_lily/config.h +++ b/keyboards/bpiphany/tiger_lily/config.h | |||
@@ -26,7 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
26 | #define DEVICE_VER 0x0001 | 26 | #define DEVICE_VER 0x0001 |
27 | #define MANUFACTURER Bathroom Epiphanies | 27 | #define MANUFACTURER Bathroom Epiphanies |
28 | #define PRODUCT tiger_lily | 28 | #define PRODUCT tiger_lily |
29 | #define DESCRIPTION Tiger Lily controller for the Filco Majestouch 2 | ||
30 | 29 | ||
31 | /* | 30 | /* |
32 | * Frosty Flake Rev. 20140521 made by Bathroom Ephiphanies | 31 | * Frosty Flake Rev. 20140521 made by Bathroom Ephiphanies |
diff --git a/keyboards/bpiphany/unloved_bastard/config.h b/keyboards/bpiphany/unloved_bastard/config.h index e67ca658f..f1dc87d72 100644 --- a/keyboards/bpiphany/unloved_bastard/config.h +++ b/keyboards/bpiphany/unloved_bastard/config.h | |||
@@ -26,7 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
26 | #define DEVICE_VER 0x0001 | 26 | #define DEVICE_VER 0x0001 |
27 | #define MANUFACTURER BathroomEpiphanies | 27 | #define MANUFACTURER BathroomEpiphanies |
28 | #define PRODUCT Unloved Bastard | 28 | #define PRODUCT Unloved Bastard |
29 | #define DESCRIPTION Unloved Bastard controller for CM Masterkeys S | ||
30 | 29 | ||
31 | /* key matrix size */ | 30 | /* key matrix size */ |
32 | #define MATRIX_ROWS 8 | 31 | #define MATRIX_ROWS 8 |