From 0da6562c4df570729889690e21061229c5648b73 Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Sat, 18 Jun 2022 14:37:51 -0700 Subject: Make default layer size 16-bit (#15286) Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/bpiphany/pegasushoof/keymaps/blowrak/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/bpiphany/pegasushoof') diff --git a/keyboards/bpiphany/pegasushoof/keymaps/blowrak/keymap.c b/keyboards/bpiphany/pegasushoof/keymaps/blowrak/keymap.c index 7884462021..dc55cdf9fd 100644 --- a/keyboards/bpiphany/pegasushoof/keymaps/blowrak/keymap.c +++ b/keyboards/bpiphany/pegasushoof/keymaps/blowrak/keymap.c @@ -77,7 +77,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { void matrix_scan_user(void) { - uint8_t layer = biton32(layer_state); + uint8_t layer = get_highest_layer(layer_state); switch (layer) { case KM_BLOWRAK: ph_caps_led_on(); -- cgit v1.2.3 From 3a7dbc89817950709717d6dcec18a6eccbcc2d28 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 14 Aug 2022 12:16:16 +1000 Subject: Move keyboard USB IDs and strings to data driven, pass 2: B-C (#17945) --- keyboards/bpiphany/pegasushoof/2013/config.h | 8 -------- keyboards/bpiphany/pegasushoof/2013/info.json | 3 +++ keyboards/bpiphany/pegasushoof/2015/config.h | 8 -------- keyboards/bpiphany/pegasushoof/2015/info.json | 3 +++ keyboards/bpiphany/pegasushoof/info.json | 7 ++++++- 5 files changed, 12 insertions(+), 17 deletions(-) create mode 100644 keyboards/bpiphany/pegasushoof/2013/info.json create mode 100644 keyboards/bpiphany/pegasushoof/2015/info.json (limited to 'keyboards/bpiphany/pegasushoof') diff --git a/keyboards/bpiphany/pegasushoof/2013/config.h b/keyboards/bpiphany/pegasushoof/2013/config.h index 2573cecfca..33762f020d 100644 --- a/keyboards/bpiphany/pegasushoof/2013/config.h +++ b/keyboards/bpiphany/pegasushoof/2013/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6050 -#define DEVICE_VER 0x0104 -#define MANUFACTURER Filco -#define PRODUCT Majestouch TKL \\w The Pegasus Hoof 2013 - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 18 diff --git a/keyboards/bpiphany/pegasushoof/2013/info.json b/keyboards/bpiphany/pegasushoof/2013/info.json new file mode 100644 index 0000000000..c96b6ba06c --- /dev/null +++ b/keyboards/bpiphany/pegasushoof/2013/info.json @@ -0,0 +1,3 @@ +{ + "keyboard_name": "Majestouch TKL \\\\w The Pegasus Hoof 2013" +} diff --git a/keyboards/bpiphany/pegasushoof/2015/config.h b/keyboards/bpiphany/pegasushoof/2015/config.h index 479175c477..d1d52d3098 100644 --- a/keyboards/bpiphany/pegasushoof/2015/config.h +++ b/keyboards/bpiphany/pegasushoof/2015/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6050 -#define DEVICE_VER 0x0104 -#define MANUFACTURER Filco -#define PRODUCT Majestouch TKL \\w The Pegasus Hoof 2015 - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 18 diff --git a/keyboards/bpiphany/pegasushoof/2015/info.json b/keyboards/bpiphany/pegasushoof/2015/info.json new file mode 100644 index 0000000000..8af38d9501 --- /dev/null +++ b/keyboards/bpiphany/pegasushoof/2015/info.json @@ -0,0 +1,3 @@ +{ + "keyboard_name": "Majestouch TKL \\\\w The Pegasus Hoof 2015" +} diff --git a/keyboards/bpiphany/pegasushoof/info.json b/keyboards/bpiphany/pegasushoof/info.json index fb4d2479a5..2869e9f763 100644 --- a/keyboards/bpiphany/pegasushoof/info.json +++ b/keyboards/bpiphany/pegasushoof/info.json @@ -1,7 +1,12 @@ { - "keyboard_name": "Pegasus Hoof", + "manufacturer": "Filco", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x6050", + "device_version": "1.0.4" + }, "layouts": { "LAYOUT": { "layout": [ -- cgit v1.2.3 From bbc3bc55f2d52b90881470695ee132f5a57bfaa3 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sun, 21 Aug 2022 23:55:30 +0100 Subject: RESET -> QK_BOOT user keymaps (#17940) --- keyboards/bpiphany/pegasushoof/keymaps/blowrak/keymap.c | 2 +- keyboards/bpiphany/pegasushoof/keymaps/citadel/keymap.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'keyboards/bpiphany/pegasushoof') diff --git a/keyboards/bpiphany/pegasushoof/keymaps/blowrak/keymap.c b/keyboards/bpiphany/pegasushoof/keymaps/blowrak/keymap.c index dc55cdf9fd..68e412ceb9 100644 --- a/keyboards/bpiphany/pegasushoof/keymaps/blowrak/keymap.c +++ b/keyboards/bpiphany/pegasushoof/keymaps/blowrak/keymap.c @@ -64,7 +64,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, KC_MUTE,_______,KC_VOLD, \ _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, \ _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, KC_MPLY, \ - _______,_______,_______, _______, _______,_______,RESET ,_______, KC_MPRV,KC_MSTP,KC_MNXT), + _______,_______,_______, _______, _______,_______,QK_BOOT,_______, KC_MPRV,KC_MSTP,KC_MNXT), /* Layer 3: Programming layer */ [KM_HAXHAX] = LAYOUT( \ _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______, \ diff --git a/keyboards/bpiphany/pegasushoof/keymaps/citadel/keymap.c b/keyboards/bpiphany/pegasushoof/keymaps/citadel/keymap.c index 5036bcb3f5..a9b9b6e8b9 100644 --- a/keyboards/bpiphany/pegasushoof/keymaps/citadel/keymap.c +++ b/keyboards/bpiphany/pegasushoof/keymaps/citadel/keymap.c @@ -106,7 +106,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [RES] = LAYOUT( \ _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______, \ _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______, \ - _______,_______,_______,_______,RESET, _______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______, \ + _______,_______,_______,_______,QK_BOOT, _______,_______,_______,_______,_______,_______,_______,_______,_______, _______,_______,_______, \ _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,/*NUHS*/_______, \ _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______, \ _______,_______,_______, _______, _______,_______,_______,_______, _______,_______,_______), -- cgit v1.2.3