From 2162854eabc571f66494616b6a7d1ae3fc1c2e9d Mon Sep 17 00:00:00 2001 From: Evgenii Vilkov Date: Sat, 20 Apr 2024 12:53:51 +0200 Subject: [PATCH] fix 38keys, right bootmagic --- keyboards/stront/38keys/config.h | 8 ++++++++ keyboards/stront/38keys/keyboard.json | 5 +++++ keyboards/stront/38keys/mcuconf.h | 9 +++++++++ keyboards/stront/40keys/config.h | 4 ---- keyboards/stront/40keys/keyboard.json | 8 ++++++++ keyboards/stront/40keys/mcuconf.h | 1 - keyboards/stront/mcuconf.h | 3 --- 7 files changed, 30 insertions(+), 8 deletions(-) create mode 100644 keyboards/stront/38keys/config.h create mode 100644 keyboards/stront/38keys/mcuconf.h diff --git a/keyboards/stront/38keys/config.h b/keyboards/stront/38keys/config.h new file mode 100644 index 00000000000..a1b1bf4bfcc --- /dev/null +++ b/keyboards/stront/38keys/config.h @@ -0,0 +1,8 @@ +// Copyright 2023 zzeneg (@zzeneg) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#define LCD_DC_PIN GP12 +#define LCD_RST_PIN GP13 +#define BACKLIGHT_PWM_DRIVER PWMD7 diff --git a/keyboards/stront/38keys/keyboard.json b/keyboards/stront/38keys/keyboard.json index 4afa8d8cc58..7553af3c614 100644 --- a/keyboards/stront/38keys/keyboard.json +++ b/keyboards/stront/38keys/keyboard.json @@ -53,6 +53,11 @@ "cols": ["GP2", "GP3", "GP4", "GP5", "GP6"], "rows": ["GP28", "GP27", "GP26", "GP15"] }, + "split":{ + "bootmagic": { + "matrix": [4, 0] + } + }, "backlight": { "pin": "GP14" }, diff --git a/keyboards/stront/38keys/mcuconf.h b/keyboards/stront/38keys/mcuconf.h new file mode 100644 index 00000000000..97ae0e827b3 --- /dev/null +++ b/keyboards/stront/38keys/mcuconf.h @@ -0,0 +1,9 @@ +// Copyright 2023 zzeneg (@zzeneg) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include_next + +#undef RP_PWM_USE_PWM7 +#define RP_PWM_USE_PWM7 TRUE diff --git a/keyboards/stront/40keys/config.h b/keyboards/stront/40keys/config.h index 79a5659d8e0..880b26b4a8f 100644 --- a/keyboards/stront/40keys/config.h +++ b/keyboards/stront/40keys/config.h @@ -6,7 +6,3 @@ #define LCD_DC_PIN GP27 #define LCD_RST_PIN GP12 #define BACKLIGHT_PWM_DRIVER PWMD6 - -/* Bootmagic on top outer pinky key */ -#define BOOTMAGIC_ROW 3 -#define BOOTMAGIC_COLUMN 0 diff --git a/keyboards/stront/40keys/keyboard.json b/keyboards/stront/40keys/keyboard.json index 56e07ce5544..78325980dad 100644 --- a/keyboards/stront/40keys/keyboard.json +++ b/keyboards/stront/40keys/keyboard.json @@ -55,6 +55,14 @@ "cols": ["GP2", "GP3", "GP4", "GP5", "GP6"], "rows": ["GP26", "GP15", "GP14", "GP13"] }, + "bootmagic": { + "matrix": [3, 0] + }, + "split":{ + "bootmagic": { + "matrix": [7, 0] + } + }, "backlight": { "pin": "GP28" }, diff --git a/keyboards/stront/40keys/mcuconf.h b/keyboards/stront/40keys/mcuconf.h index a939ed1b869..8f9650f89f2 100644 --- a/keyboards/stront/40keys/mcuconf.h +++ b/keyboards/stront/40keys/mcuconf.h @@ -5,6 +5,5 @@ #include_next -#undef RP_PWM_USE_PWM7 #undef RP_PWM_USE_PWM6 #define RP_PWM_USE_PWM6 TRUE diff --git a/keyboards/stront/mcuconf.h b/keyboards/stront/mcuconf.h index 49612484d76..85cb874ddf7 100644 --- a/keyboards/stront/mcuconf.h +++ b/keyboards/stront/mcuconf.h @@ -10,6 +10,3 @@ #undef RP_SPI_USE_SPI1 #define RP_SPI_USE_SPI1 TRUE - -#undef RP_PWM_USE_PWM7 -#define RP_PWM_USE_PWM7 TRUE