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/minimacro5/keymaps/devdev/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/minimacro5') diff --git a/keyboards/minimacro5/keymaps/devdev/keymap.c b/keyboards/minimacro5/keymaps/devdev/keymap.c index d7f998fa3a..3c203fcc37 100644 --- a/keyboards/minimacro5/keymaps/devdev/keymap.c +++ b/keyboards/minimacro5/keymaps/devdev/keymap.c @@ -37,7 +37,7 @@ enum tap_dances{ bool encoder_update_user(uint8_t index, bool clockwise) { if (index == 0) { /* First encoder*/ - switch(biton32(layer_state)){ + switch(get_highest_layer(layer_state)){ case _MAIN: if (clockwise) { tap_code(KC_VOLU); -- cgit v1.2.3 From 3da6575e2480d46399be01c21270c57420e0f16d Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 3 Aug 2022 17:15:43 +1000 Subject: Move keyboard USB IDs and strings to data driven: M (#17859) --- keyboards/minimacro5/config.h | 7 ------- keyboards/minimacro5/info.json | 8 +++++++- 2 files changed, 7 insertions(+), 8 deletions(-) (limited to 'keyboards/minimacro5') diff --git a/keyboards/minimacro5/config.h b/keyboards/minimacro5/config.h index b48b5df21e..e839fea224 100644 --- a/keyboards/minimacro5/config.h +++ b/keyboards/minimacro5/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xCEEB -#define PRODUCT_ID 0x0007 -#define DEVICE_VER 0x0001 -#define MANUFACTURER leafcutterlabs -#define PRODUCT miniMACRO5 - /* key matrix size */ #define MATRIX_ROWS 1 #define MATRIX_COLS 5 diff --git a/keyboards/minimacro5/info.json b/keyboards/minimacro5/info.json index 5649c57de4..0dba5c0e6c 100644 --- a/keyboards/minimacro5/info.json +++ b/keyboards/minimacro5/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "minimacro5", + "keyboard_name": "miniMACRO5", + "manufacturer": "leafcutterlabs", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xCEEB", + "pid": "0x0007", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ortho_1x5": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":5, "y":0}] -- cgit v1.2.3 From 154d35ac146422bef938ed9756f6e0012baa83a2 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Sat, 6 Aug 2022 23:23:35 +1000 Subject: Remove `UNUSED_PINS` (#17931) --- keyboards/minimacro5/config.h | 1 - 1 file changed, 1 deletion(-) (limited to 'keyboards/minimacro5') diff --git a/keyboards/minimacro5/config.h b/keyboards/minimacro5/config.h index e839fea224..2dcc91f7ce 100644 --- a/keyboards/minimacro5/config.h +++ b/keyboards/minimacro5/config.h @@ -42,7 +42,6 @@ along with this program. If not, see . //speed for double tap #define TAPPING_TERM 200 -#define UNUSED_PINS /* rotary encoder 1,2,3 closest to usb port is 0*/ #define ENCODERS_PAD_B { D3, F6, F7, D4, C6} -- cgit v1.2.3