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/rgbkb/pan/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/rgbkb/pan') diff --git a/keyboards/rgbkb/pan/keymaps/default/keymap.c b/keyboards/rgbkb/pan/keymaps/default/keymap.c index dbc127616a..dcafeec765 100644 --- a/keyboards/rgbkb/pan/keymaps/default/keymap.c +++ b/keyboards/rgbkb/pan/keymaps/default/keymap.c @@ -75,7 +75,7 @@ bool oled_task_user(void) { // Host Keyboard Layer Status oled_write_P(PSTR("RGBKB Pan\n"), false); oled_write_P(PSTR("Layer: "), false); - uint8_t layer = layer_state ? biton(layer_state) : biton32(default_layer_state); + uint8_t layer = get_highest_layer(layer_state|default_layer_state); switch (layer) { case _QWERTY: oled_write_P(PSTR("Default\n"), false); -- cgit v1.2.1 From 201a914beb7a07d8e08b1cbfa8dd35a768f6ae3a Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 20 Aug 2022 10:42:49 +1000 Subject: Move keyboard USB IDs and strings to data driven, pass 2: P-R (#18091) --- keyboards/rgbkb/pan/config.h | 6 ------ keyboards/rgbkb/pan/info.json | 8 +++++++- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'keyboards/rgbkb/pan') diff --git a/keyboards/rgbkb/pan/config.h b/keyboards/rgbkb/pan/config.h index 43c534ca92..5b6ca7e876 100644 --- a/keyboards/rgbkb/pan/config.h +++ b/keyboards/rgbkb/pan/config.h @@ -18,12 +18,6 @@ along with this program. If not, see . #include "config_common.h" -#define VENDOR_ID 0x5247 // "RG" - RGBKB -#define PRODUCT_ID 0x8C9C // Pan -#define DEVICE_VER 0x0002 -#define MANUFACTURER RGBKB -#define PRODUCT Pan - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 13 diff --git a/keyboards/rgbkb/pan/info.json b/keyboards/rgbkb/pan/info.json index 54ac24a3a4..524eec0da8 100644 --- a/keyboards/rgbkb/pan/info.json +++ b/keyboards/rgbkb/pan/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "RGBKB Pan", + "keyboard_name": "Pan", + "manufacturer": "RGBKB", "url": "https://www.rgbkb.net/collections/all/products/pan-keyboard-diy-kit", "maintainer": "Legonut", + "usb": { + "vid": "0x5247", + "pid": "0x8C9C", + "device_version": "0.0.2" + }, "layouts": { "LAYOUT_all": { "layout": [ -- cgit v1.2.1