From f6dd8dea2e493dc549a60fee99de871c4088d09a Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Tue, 31 Jan 2023 06:03:30 +1100 Subject: Remove usages of config_common.h from config.h files. (#19714) --- keyboards/gmmk/pro/rev2/ansi/config.h | 1 - keyboards/gmmk/pro/rev2/config.h | 1 - keyboards/gmmk/pro/rev2/iso/config.h | 1 - 3 files changed, 3 deletions(-) (limited to 'keyboards/gmmk/pro/rev2') diff --git a/keyboards/gmmk/pro/rev2/ansi/config.h b/keyboards/gmmk/pro/rev2/ansi/config.h index 6803bd8ced..cc489b9c63 100644 --- a/keyboards/gmmk/pro/rev2/ansi/config.h +++ b/keyboards/gmmk/pro/rev2/ansi/config.h @@ -16,7 +16,6 @@ #pragma once -#include "config_common.h" #define DRIVER_1_LED_TOTAL 66 #define DRIVER_2_LED_TOTAL 32 diff --git a/keyboards/gmmk/pro/rev2/config.h b/keyboards/gmmk/pro/rev2/config.h index c2b3755d77..fa409ba026 100644 --- a/keyboards/gmmk/pro/rev2/config.h +++ b/keyboards/gmmk/pro/rev2/config.h @@ -16,7 +16,6 @@ #pragma once -#include "config_common.h" /* External spi flash */ #define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN B12 diff --git a/keyboards/gmmk/pro/rev2/iso/config.h b/keyboards/gmmk/pro/rev2/iso/config.h index 0b2e0a4cb2..9a115d9194 100644 --- a/keyboards/gmmk/pro/rev2/iso/config.h +++ b/keyboards/gmmk/pro/rev2/iso/config.h @@ -16,7 +16,6 @@ #pragma once -#include "config_common.h" #define DRIVER_1_LED_TOTAL 66 #define DRIVER_2_LED_TOTAL 33 -- cgit v1.2.3 From f9aeea64c1f85d388485503e52035b5f7533ed26 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 8 Feb 2023 18:41:46 +1100 Subject: Migrate `MCU` and `BOOTLOADER` to data-driven (#19529) --- keyboards/gmmk/pro/rev2/ansi/info.json | 2 ++ keyboards/gmmk/pro/rev2/ansi/rules.mk | 6 ------ keyboards/gmmk/pro/rev2/iso/info.json | 2 ++ keyboards/gmmk/pro/rev2/iso/rules.mk | 6 ------ 4 files changed, 4 insertions(+), 12 deletions(-) (limited to 'keyboards/gmmk/pro/rev2') diff --git a/keyboards/gmmk/pro/rev2/ansi/info.json b/keyboards/gmmk/pro/rev2/ansi/info.json index a78e608f2f..11882e8af0 100644 --- a/keyboards/gmmk/pro/rev2/ansi/info.json +++ b/keyboards/gmmk/pro/rev2/ansi/info.json @@ -8,6 +8,8 @@ "pid": "0x5044", "device_version": "0.0.2" }, + "processor": "WB32F3G71", + "bootloader": "wb32-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/gmmk/pro/rev2/ansi/rules.mk b/keyboards/gmmk/pro/rev2/ansi/rules.mk index 8d81af0fdf..1672a47804 100644 --- a/keyboards/gmmk/pro/rev2/ansi/rules.mk +++ b/keyboards/gmmk/pro/rev2/ansi/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = WB32F3G71 - -# Bootloader selection -BOOTLOADER = wb32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/gmmk/pro/rev2/iso/info.json b/keyboards/gmmk/pro/rev2/iso/info.json index afec8e275b..4ffe92e4d8 100644 --- a/keyboards/gmmk/pro/rev2/iso/info.json +++ b/keyboards/gmmk/pro/rev2/iso/info.json @@ -8,6 +8,8 @@ "pid": "0x5044", "device_version": "0.0.2" }, + "processor": "WB32F3G71", + "bootloader": "wb32-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/gmmk/pro/rev2/iso/rules.mk b/keyboards/gmmk/pro/rev2/iso/rules.mk index cf6373ae46..7f154b74c1 100644 --- a/keyboards/gmmk/pro/rev2/iso/rules.mk +++ b/keyboards/gmmk/pro/rev2/iso/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = WB32F3G71 - -# Bootloader selection -BOOTLOADER = wb32-dfu - # Build Options # change yes to no to disable # -- cgit v1.2.3 From d784f78bd0a034c1d6085379615014fd701536ab Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 17 Feb 2023 08:49:49 +1100 Subject: Move Bootmagic config to data driven (#19860) --- keyboards/gmmk/pro/rev2/ansi/info.json | 3 +++ keyboards/gmmk/pro/rev2/iso/info.json | 3 +++ 2 files changed, 6 insertions(+) (limited to 'keyboards/gmmk/pro/rev2') diff --git a/keyboards/gmmk/pro/rev2/ansi/info.json b/keyboards/gmmk/pro/rev2/ansi/info.json index 11882e8af0..37b2e4b1cc 100644 --- a/keyboards/gmmk/pro/rev2/ansi/info.json +++ b/keyboards/gmmk/pro/rev2/ansi/info.json @@ -8,6 +8,9 @@ "pid": "0x5044", "device_version": "0.0.2" }, + "bootmagic": { + "matrix": [1, 3] + }, "processor": "WB32F3G71", "bootloader": "wb32-dfu", "layouts": { diff --git a/keyboards/gmmk/pro/rev2/iso/info.json b/keyboards/gmmk/pro/rev2/iso/info.json index 4ffe92e4d8..10eaa5474b 100644 --- a/keyboards/gmmk/pro/rev2/iso/info.json +++ b/keyboards/gmmk/pro/rev2/iso/info.json @@ -8,6 +8,9 @@ "pid": "0x5044", "device_version": "0.0.2" }, + "bootmagic": { + "matrix": [1, 3] + }, "processor": "WB32F3G71", "bootloader": "wb32-dfu", "layouts": { -- cgit v1.2.3 From 7e0299117b389b1c7fcdfa2f20891ba2287ea771 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 26 Feb 2023 09:45:12 +1100 Subject: Move encoder config to data driven (#19923) Co-authored-by: Nick Brassel --- keyboards/gmmk/pro/rev2/ansi/info.json | 5 +++++ keyboards/gmmk/pro/rev2/iso/info.json | 5 +++++ 2 files changed, 10 insertions(+) (limited to 'keyboards/gmmk/pro/rev2') diff --git a/keyboards/gmmk/pro/rev2/ansi/info.json b/keyboards/gmmk/pro/rev2/ansi/info.json index 37b2e4b1cc..a8a25f8547 100644 --- a/keyboards/gmmk/pro/rev2/ansi/info.json +++ b/keyboards/gmmk/pro/rev2/ansi/info.json @@ -8,6 +8,11 @@ "pid": "0x5044", "device_version": "0.0.2" }, + "encoder": { + "rotary": [ + {"pin_a": "C15", "pin_b": "C14"} + ] + }, "bootmagic": { "matrix": [1, 3] }, diff --git a/keyboards/gmmk/pro/rev2/iso/info.json b/keyboards/gmmk/pro/rev2/iso/info.json index 10eaa5474b..c37ccd53df 100644 --- a/keyboards/gmmk/pro/rev2/iso/info.json +++ b/keyboards/gmmk/pro/rev2/iso/info.json @@ -8,6 +8,11 @@ "pid": "0x5044", "device_version": "0.0.2" }, + "encoder": { + "rotary": [ + {"pin_a": "C15", "pin_b": "C14"} + ] + }, "bootmagic": { "matrix": [1, 3] }, -- cgit v1.2.3