From b7274343913eb3e019f0dc08fa8f7774165e787d Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 29 Jan 2023 02:42:44 +1100 Subject: Remove commented out backlight config & stray "backlight levels" (#19703) --- keyboards/peranekofactory/tone/rev1/config.h | 4 ---- keyboards/peranekofactory/tone/rev2/config.h | 4 ---- 2 files changed, 8 deletions(-) (limited to 'keyboards/peranekofactory') diff --git a/keyboards/peranekofactory/tone/rev1/config.h b/keyboards/peranekofactory/tone/rev1/config.h index 926a0e48b3..a5aed59c2b 100644 --- a/keyboards/peranekofactory/tone/rev1/config.h +++ b/keyboards/peranekofactory/tone/rev1/config.h @@ -57,10 +57,6 @@ along with this program. If not, see . //#define LED_COMPOSE_PIN B3 //#define LED_KANA_PIN B4 -//#define BACKLIGHT_PIN B7 -//#define BACKLIGHT_LEVELS 3 -//#define BACKLIGHT_BREATHING - //#define RGB_DI_PIN E2 //#ifdef RGB_DI_PIN //# define RGBLED_NUM 16 diff --git a/keyboards/peranekofactory/tone/rev2/config.h b/keyboards/peranekofactory/tone/rev2/config.h index d77be1a0de..2d46e5c5db 100644 --- a/keyboards/peranekofactory/tone/rev2/config.h +++ b/keyboards/peranekofactory/tone/rev2/config.h @@ -57,10 +57,6 @@ along with this program. If not, see . //#define LED_COMPOSE_PIN B3 //#define LED_KANA_PIN B4 -//#define BACKLIGHT_PIN B7 -//#define BACKLIGHT_LEVELS 3 -//#define BACKLIGHT_BREATHING - //#define RGB_DI_PIN E2 //#ifdef RGB_DI_PIN //# define RGBLED_NUM 16 -- cgit v1.2.3 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/peranekofactory/tone/rev1/config.h | 1 - keyboards/peranekofactory/tone/rev2/config.h | 1 - 2 files changed, 2 deletions(-) (limited to 'keyboards/peranekofactory') diff --git a/keyboards/peranekofactory/tone/rev1/config.h b/keyboards/peranekofactory/tone/rev1/config.h index a5aed59c2b..021f53ec68 100644 --- a/keyboards/peranekofactory/tone/rev1/config.h +++ b/keyboards/peranekofactory/tone/rev1/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 1 diff --git a/keyboards/peranekofactory/tone/rev2/config.h b/keyboards/peranekofactory/tone/rev2/config.h index 2d46e5c5db..f06fd2b903 100644 --- a/keyboards/peranekofactory/tone/rev2/config.h +++ b/keyboards/peranekofactory/tone/rev2/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 1 -- cgit v1.2.3 From b867522f8cf90aef6f4531e669e35aba5ec0bf1c Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 31 Jan 2023 07:45:41 +1100 Subject: Clean up Force NKRO in config.h (#19718) --- keyboards/peranekofactory/tone/rev1/config.h | 21 --------------------- keyboards/peranekofactory/tone/rev2/config.h | 21 --------------------- 2 files changed, 42 deletions(-) (limited to 'keyboards/peranekofactory') diff --git a/keyboards/peranekofactory/tone/rev1/config.h b/keyboards/peranekofactory/tone/rev1/config.h index 021f53ec68..a9ca3b80cf 100644 --- a/keyboards/peranekofactory/tone/rev1/config.h +++ b/keyboards/peranekofactory/tone/rev1/config.h @@ -97,27 +97,6 @@ along with this program. If not, see . */ //#define GRAVE_ESC_CTRL_OVERRIDE -/* - * Force NKRO - * - * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved - * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the - * makefile for this to work.) - * - * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) - * until the next keyboard reset. - * - * NKRO may prevent your keystrokes from being detected in the BIOS, but it is - * fully operational during normal computer usage. - * - * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) - * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by - * bootmagic, NKRO mode will always be enabled until it is toggled again during a - * power-up. - * - */ -//#define FORCE_NKRO - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/peranekofactory/tone/rev2/config.h b/keyboards/peranekofactory/tone/rev2/config.h index f06fd2b903..0dc51ff049 100644 --- a/keyboards/peranekofactory/tone/rev2/config.h +++ b/keyboards/peranekofactory/tone/rev2/config.h @@ -88,27 +88,6 @@ along with this program. If not, see . */ //#define GRAVE_ESC_CTRL_OVERRIDE -/* - * Force NKRO - * - * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved - * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the - * makefile for this to work.) - * - * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) - * until the next keyboard reset. - * - * NKRO may prevent your keystrokes from being detected in the BIOS, but it is - * fully operational during normal computer usage. - * - * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) - * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by - * bootmagic, NKRO mode will always be enabled until it is toggled again during a - * power-up. - * - */ -//#define FORCE_NKRO - /* * Feature disable options * These options are also useful to firmware size reduction. -- cgit v1.2.3 From f20a05440ed38bb3de754b2193e56d3e41a939a1 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 3 Feb 2023 11:04:10 +1100 Subject: Remove unused `MATRIX_HAS_GHOST` from config.h (#19726) --- keyboards/peranekofactory/tone/rev1/config.h | 3 --- keyboards/peranekofactory/tone/rev2/config.h | 3 --- 2 files changed, 6 deletions(-) (limited to 'keyboards/peranekofactory') diff --git a/keyboards/peranekofactory/tone/rev1/config.h b/keyboards/peranekofactory/tone/rev1/config.h index a9ca3b80cf..ec5a03c7e1 100644 --- a/keyboards/peranekofactory/tone/rev1/config.h +++ b/keyboards/peranekofactory/tone/rev1/config.h @@ -84,9 +84,6 @@ along with this program. If not, see . /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ #define DEBOUNCE 5 -/* define if matrix has ghost (lacks anti-ghosting diodes) */ -//#define MATRIX_HAS_GHOST - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/peranekofactory/tone/rev2/config.h b/keyboards/peranekofactory/tone/rev2/config.h index 0dc51ff049..a102ad5512 100644 --- a/keyboards/peranekofactory/tone/rev2/config.h +++ b/keyboards/peranekofactory/tone/rev2/config.h @@ -75,9 +75,6 @@ along with this program. If not, see . /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ #define DEBOUNCE 5 -/* define if matrix has ghost (lacks anti-ghosting diodes) */ -//#define MATRIX_HAS_GHOST - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ -- cgit v1.2.3 From ebb512db827e84619e7151fcf76e3daf9328fe59 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 4 Feb 2023 06:19:58 +1100 Subject: Debounce defines cleanup (#19742) * Clean up `DEBOUNCE` in config.h, 0-9 * Clean up `DEBOUNCE` in config.h, A * Clean up `DEBOUNCE` in config.h, B * Clean up `DEBOUNCE` in config.h, C * Clean up `DEBOUNCE` in config.h, D * Clean up `DEBOUNCE` in config.h, E * Clean up `DEBOUNCE` in config.h, F * Clean up `DEBOUNCE` in config.h, G * Clean up `DEBOUNCE` in config.h, H * Clean up `DEBOUNCE` in config.h, handwired * Clean up `DEBOUNCE` in config.h, I * Clean up `DEBOUNCE` in config.h, J * Clean up `DEBOUNCE` in config.h, K * Clean up `DEBOUNCE` in config.h, L * Clean up `DEBOUNCE` in config.h, M * Clean up `DEBOUNCE` in config.h, N * Clean up `DEBOUNCE` in config.h, O * Clean up `DEBOUNCE` in config.h, P * Clean up `DEBOUNCE` in config.h, Q * Clean up `DEBOUNCE` in config.h, R * Clean up `DEBOUNCE` in config.h, S * Clean up `DEBOUNCE` in config.h, T * Clean up `DEBOUNCE` in config.h, U * Clean up `DEBOUNCE` in config.h, V * Clean up `DEBOUNCE` in config.h, W * Clean up `DEBOUNCE` in config.h, X * Clean up `DEBOUNCE` in config.h, Y * Clean up `DEBOUNCE` in config.h, Z * Remove default debounce from info.json * Migrate non-default debounce to info.json --- keyboards/peranekofactory/tone/rev1/config.h | 3 --- keyboards/peranekofactory/tone/rev2/config.h | 3 --- 2 files changed, 6 deletions(-) (limited to 'keyboards/peranekofactory') diff --git a/keyboards/peranekofactory/tone/rev1/config.h b/keyboards/peranekofactory/tone/rev1/config.h index ec5a03c7e1..59c30dd8a3 100644 --- a/keyboards/peranekofactory/tone/rev1/config.h +++ b/keyboards/peranekofactory/tone/rev1/config.h @@ -81,9 +81,6 @@ along with this program. If not, see . //# define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 //#endif -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/peranekofactory/tone/rev2/config.h b/keyboards/peranekofactory/tone/rev2/config.h index a102ad5512..bb7e5c2524 100644 --- a/keyboards/peranekofactory/tone/rev2/config.h +++ b/keyboards/peranekofactory/tone/rev2/config.h @@ -72,9 +72,6 @@ along with this program. If not, see . //# define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 //#endif -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ -- cgit v1.2.3 From a988f8a169112e31b21ff7c61870ab483c396cf3 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 6 Feb 2023 13:40:23 +1100 Subject: Remove unused `GRAVE_ESC_CTRL_OVERRIDE` from config.h (#19752) --- keyboards/peranekofactory/tone/rev1/config.h | 5 ----- keyboards/peranekofactory/tone/rev2/config.h | 5 ----- 2 files changed, 10 deletions(-) (limited to 'keyboards/peranekofactory') diff --git a/keyboards/peranekofactory/tone/rev1/config.h b/keyboards/peranekofactory/tone/rev1/config.h index 59c30dd8a3..f8200d1835 100644 --- a/keyboards/peranekofactory/tone/rev1/config.h +++ b/keyboards/peranekofactory/tone/rev1/config.h @@ -86,11 +86,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* If defined, GRAVE_ESC will always act as ESC when CTRL is held. - * This is useful for the Windows task manager shortcut (ctrl+shift+esc). - */ -//#define GRAVE_ESC_CTRL_OVERRIDE - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/peranekofactory/tone/rev2/config.h b/keyboards/peranekofactory/tone/rev2/config.h index bb7e5c2524..fb9a80c7ee 100644 --- a/keyboards/peranekofactory/tone/rev2/config.h +++ b/keyboards/peranekofactory/tone/rev2/config.h @@ -77,11 +77,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* If defined, GRAVE_ESC will always act as ESC when CTRL is held. - * This is useful for the Windows task manager shortcut (ctrl+shift+esc). - */ -//#define GRAVE_ESC_CTRL_OVERRIDE - /* * Feature disable options * These options are also useful to firmware size reduction. -- cgit v1.2.3 From 11b6bb8179ce93c5954c96e24ef6dd09c497a131 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 7 Feb 2023 11:05:37 +1100 Subject: Remove unused Bootmagic row/col defines from config.h (#19761) --- keyboards/peranekofactory/tone/rev1/config.h | 4 ---- keyboards/peranekofactory/tone/rev2/config.h | 4 ---- 2 files changed, 8 deletions(-) (limited to 'keyboards/peranekofactory') diff --git a/keyboards/peranekofactory/tone/rev1/config.h b/keyboards/peranekofactory/tone/rev1/config.h index f8200d1835..b4ee3821ce 100644 --- a/keyboards/peranekofactory/tone/rev1/config.h +++ b/keyboards/peranekofactory/tone/rev1/config.h @@ -101,7 +101,3 @@ along with this program. If not, see . //#define NO_ACTION_LAYER //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT - -/* Bootmagic Lite key configuration */ -//#define BOOTMAGIC_LITE_ROW 0 -//#define BOOTMAGIC_LITE_COLUMN 0 diff --git a/keyboards/peranekofactory/tone/rev2/config.h b/keyboards/peranekofactory/tone/rev2/config.h index fb9a80c7ee..9ea914add1 100644 --- a/keyboards/peranekofactory/tone/rev2/config.h +++ b/keyboards/peranekofactory/tone/rev2/config.h @@ -92,7 +92,3 @@ along with this program. If not, see . //#define NO_ACTION_LAYER //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT - -/* Bootmagic Lite key configuration */ -//#define BOOTMAGIC_LITE_ROW 0 -//#define BOOTMAGIC_LITE_COLUMN 0 -- 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/peranekofactory/tone/rev1/info.json | 2 ++ keyboards/peranekofactory/tone/rev1/rules.mk | 6 ------ keyboards/peranekofactory/tone/rev2/info.json | 2 ++ keyboards/peranekofactory/tone/rev2/rules.mk | 6 ------ 4 files changed, 4 insertions(+), 12 deletions(-) (limited to 'keyboards/peranekofactory') diff --git a/keyboards/peranekofactory/tone/rev1/info.json b/keyboards/peranekofactory/tone/rev1/info.json index 29ee59e390..a5ad8532b1 100644 --- a/keyboards/peranekofactory/tone/rev1/info.json +++ b/keyboards/peranekofactory/tone/rev1/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}] diff --git a/keyboards/peranekofactory/tone/rev1/rules.mk b/keyboards/peranekofactory/tone/rev1/rules.mk index a56e12eb22..b03b6fa905 100644 --- a/keyboards/peranekofactory/tone/rev1/rules.mk +++ b/keyboards/peranekofactory/tone/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/peranekofactory/tone/rev2/info.json b/keyboards/peranekofactory/tone/rev2/info.json index 29ee59e390..a5ad8532b1 100644 --- a/keyboards/peranekofactory/tone/rev2/info.json +++ b/keyboards/peranekofactory/tone/rev2/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}] diff --git a/keyboards/peranekofactory/tone/rev2/rules.mk b/keyboards/peranekofactory/tone/rev2/rules.mk index a56e12eb22..b03b6fa905 100644 --- a/keyboards/peranekofactory/tone/rev2/rules.mk +++ b/keyboards/peranekofactory/tone/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # -- cgit v1.2.3 From ccb6c908dd71fac3dfa89f2d8baa8196eac9994f Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 9 Feb 2023 10:57:42 +1100 Subject: Remove `SOFT_SERIAL_PIN` for non-split boards (#19774) * Remove `SOFT_SERIAL_PIN` for non-split boards * Delete more empty config.h --- keyboards/peranekofactory/tone/rev1/config.h | 5 ----- keyboards/peranekofactory/tone/rev2/config.h | 5 ----- 2 files changed, 10 deletions(-) (limited to 'keyboards/peranekofactory') diff --git a/keyboards/peranekofactory/tone/rev1/config.h b/keyboards/peranekofactory/tone/rev1/config.h index b4ee3821ce..b7d4b46921 100644 --- a/keyboards/peranekofactory/tone/rev1/config.h +++ b/keyboards/peranekofactory/tone/rev1/config.h @@ -45,11 +45,6 @@ along with this program. If not, see . #define ENCODERS_PAD_B { B4 } #define TAP_CODE_DELAY 100 -/* - * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. - */ -#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6 - //#define LED_NUM_LOCK_PIN B0 //#define LED_CAPS_LOCK_PIN B1 //#define LED_SCROLL_LOCK_PIN B2 diff --git a/keyboards/peranekofactory/tone/rev2/config.h b/keyboards/peranekofactory/tone/rev2/config.h index 9ea914add1..93a5eb8145 100644 --- a/keyboards/peranekofactory/tone/rev2/config.h +++ b/keyboards/peranekofactory/tone/rev2/config.h @@ -45,11 +45,6 @@ along with this program. If not, see . #define ENCODERS_PAD_B { B4 } #define TAP_CODE_DELAY 100 -/* - * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. - */ -#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6 - //#define LED_NUM_LOCK_PIN B0 //#define LED_CAPS_LOCK_PIN B1 //#define LED_SCROLL_LOCK_PIN B2 -- cgit v1.2.3 From 2cdf99ae950a82e233482347651b7689c4896827 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 14 Feb 2023 18:39:41 +1100 Subject: Migrate `DIRECT_PINS` to data driven (#19826) --- keyboards/peranekofactory/tone/rev1/config.h | 23 ----------------------- keyboards/peranekofactory/tone/rev1/info.json | 5 +++++ keyboards/peranekofactory/tone/rev2/config.h | 23 ----------------------- keyboards/peranekofactory/tone/rev2/info.json | 5 +++++ 4 files changed, 10 insertions(+), 46 deletions(-) (limited to 'keyboards/peranekofactory') diff --git a/keyboards/peranekofactory/tone/rev1/config.h b/keyboards/peranekofactory/tone/rev1/config.h index b7d4b46921..edf74052c5 100644 --- a/keyboards/peranekofactory/tone/rev1/config.h +++ b/keyboards/peranekofactory/tone/rev1/config.h @@ -17,29 +17,6 @@ along with this program. If not, see . #pragma once - -/* key matrix size */ -#define MATRIX_ROWS 1 -#define MATRIX_COLS 8 - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ - -#define DIRECT_PINS { \ - { D4, C6, D7, E6, F6, F7, B1, B3 } \ -} - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Rotary encoder define*/ #define ENCODERS_PAD_A { B5 } #define ENCODERS_PAD_B { B4 } diff --git a/keyboards/peranekofactory/tone/rev1/info.json b/keyboards/peranekofactory/tone/rev1/info.json index a5ad8532b1..16f1db0328 100644 --- a/keyboards/peranekofactory/tone/rev1/info.json +++ b/keyboards/peranekofactory/tone/rev1/info.json @@ -10,6 +10,11 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "matrix_pins": { + "direct": [ + ["D4", "C6", "D7", "E6", "F6", "F7", "B1", "B3"] + ] + }, "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}] diff --git a/keyboards/peranekofactory/tone/rev2/config.h b/keyboards/peranekofactory/tone/rev2/config.h index 93a5eb8145..4068b9ed0e 100644 --- a/keyboards/peranekofactory/tone/rev2/config.h +++ b/keyboards/peranekofactory/tone/rev2/config.h @@ -17,29 +17,6 @@ along with this program. If not, see . #pragma once - -/* key matrix size */ -#define MATRIX_ROWS 1 -#define MATRIX_COLS 8 - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ - -#define DIRECT_PINS { \ - { D4, C6, D7, E6, F6, F7, B1, B3 } \ -} - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Rotary encoder define*/ #define ENCODERS_PAD_A { B5 } #define ENCODERS_PAD_B { B4 } diff --git a/keyboards/peranekofactory/tone/rev2/info.json b/keyboards/peranekofactory/tone/rev2/info.json index a5ad8532b1..16f1db0328 100644 --- a/keyboards/peranekofactory/tone/rev2/info.json +++ b/keyboards/peranekofactory/tone/rev2/info.json @@ -10,6 +10,11 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "matrix_pins": { + "direct": [ + ["D4", "C6", "D7", "E6", "F6", "F7", "B1", "B3"] + ] + }, "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}] -- cgit v1.2.3 From 7fad94ba2d5092abe451d0bbc95caaa37fec95bc Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 17 Feb 2023 08:13:41 +1100 Subject: Remove unused RGBLight defines from config.h (#19859) --- keyboards/peranekofactory/tone/rev1/config.h | 25 ------------------------- keyboards/peranekofactory/tone/rev2/config.h | 16 ---------------- 2 files changed, 41 deletions(-) (limited to 'keyboards/peranekofactory') diff --git a/keyboards/peranekofactory/tone/rev1/config.h b/keyboards/peranekofactory/tone/rev1/config.h index edf74052c5..58c014f26a 100644 --- a/keyboards/peranekofactory/tone/rev1/config.h +++ b/keyboards/peranekofactory/tone/rev1/config.h @@ -28,31 +28,6 @@ along with this program. If not, see . //#define LED_COMPOSE_PIN B3 //#define LED_KANA_PIN B4 -//#define RGB_DI_PIN E2 -//#ifdef RGB_DI_PIN -//# define RGBLED_NUM 16 -//# define RGBLIGHT_HUE_STEP 8 -//# define RGBLIGHT_SAT_STEP 8 -//# define RGBLIGHT_VAL_STEP 8 -//# define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ -//# define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ -//# define RGBLIGHT_EFFECT_BREATHING -//# define RGBLIGHT_EFFECT_RAINBOW_MOOD -//# define RGBLIGHT_EFFECT_RAINBOW_SWIRL -//# define RGBLIGHT_EFFECT_SNAKE -//# define RGBLIGHT_EFFECT_KNIGHT -//# define RGBLIGHT_EFFECT_CHRISTMAS -//# define RGBLIGHT_EFFECT_STATIC_GRADIENT -//# define RGBLIGHT_EFFECT_RGB_TEST -//# define RGBLIGHT_EFFECT_ALTERNATING -/*== customize breathing effect ==*/ -/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ -//# define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 -/*==== use exp() and sin() ====*/ -//# define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 -//# define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 -//#endif - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/peranekofactory/tone/rev2/config.h b/keyboards/peranekofactory/tone/rev2/config.h index 4068b9ed0e..58c014f26a 100644 --- a/keyboards/peranekofactory/tone/rev2/config.h +++ b/keyboards/peranekofactory/tone/rev2/config.h @@ -28,22 +28,6 @@ along with this program. If not, see . //#define LED_COMPOSE_PIN B3 //#define LED_KANA_PIN B4 -//#define RGB_DI_PIN E2 -//#ifdef RGB_DI_PIN -//# define RGBLED_NUM 16 -//# define RGBLIGHT_HUE_STEP 8 -//# define RGBLIGHT_SAT_STEP 8 -//# define RGBLIGHT_VAL_STEP 8 -//# define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ -//# define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ -/*== customize breathing effect ==*/ -/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ -//# define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 -/*==== use exp() and sin() ====*/ -//# define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 -//# define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 -//#endif - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ -- cgit v1.2.3 From f4ba17c4a0ee59603c167b04f2d6f6eee8b2cf1b Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 17 Feb 2023 13:14:29 +1100 Subject: Move LED indicator config to data driven (#19800) --- keyboards/peranekofactory/tone/rev1/config.h | 6 ------ keyboards/peranekofactory/tone/rev2/config.h | 6 ------ 2 files changed, 12 deletions(-) (limited to 'keyboards/peranekofactory') diff --git a/keyboards/peranekofactory/tone/rev1/config.h b/keyboards/peranekofactory/tone/rev1/config.h index 58c014f26a..9429a2261f 100644 --- a/keyboards/peranekofactory/tone/rev1/config.h +++ b/keyboards/peranekofactory/tone/rev1/config.h @@ -22,12 +22,6 @@ along with this program. If not, see . #define ENCODERS_PAD_B { B4 } #define TAP_CODE_DELAY 100 -//#define LED_NUM_LOCK_PIN B0 -//#define LED_CAPS_LOCK_PIN B1 -//#define LED_SCROLL_LOCK_PIN B2 -//#define LED_COMPOSE_PIN B3 -//#define LED_KANA_PIN B4 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/peranekofactory/tone/rev2/config.h b/keyboards/peranekofactory/tone/rev2/config.h index 58c014f26a..9429a2261f 100644 --- a/keyboards/peranekofactory/tone/rev2/config.h +++ b/keyboards/peranekofactory/tone/rev2/config.h @@ -22,12 +22,6 @@ along with this program. If not, see . #define ENCODERS_PAD_B { B4 } #define TAP_CODE_DELAY 100 -//#define LED_NUM_LOCK_PIN B0 -//#define LED_CAPS_LOCK_PIN B1 -//#define LED_SCROLL_LOCK_PIN B2 -//#define LED_COMPOSE_PIN B3 -//#define LED_KANA_PIN B4 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ -- cgit v1.2.3 From e837a32b2b4d6eb96ffacad0022699d67c0f8f1e Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 19 Feb 2023 18:55:12 +1100 Subject: Move layouts for direct_pins boards to data driven (#19872) --- keyboards/peranekofactory/tone/rev1/info.json | 11 ++++++++- keyboards/peranekofactory/tone/rev1/rev1.c | 17 ------------- keyboards/peranekofactory/tone/rev1/rev1.h | 35 --------------------------- keyboards/peranekofactory/tone/rev2/info.json | 11 ++++++++- keyboards/peranekofactory/tone/rev2/rev2.c | 17 ------------- keyboards/peranekofactory/tone/rev2/rev2.h | 35 --------------------------- 6 files changed, 20 insertions(+), 106 deletions(-) delete mode 100644 keyboards/peranekofactory/tone/rev1/rev1.c delete mode 100644 keyboards/peranekofactory/tone/rev1/rev1.h delete mode 100644 keyboards/peranekofactory/tone/rev2/rev2.c delete mode 100644 keyboards/peranekofactory/tone/rev2/rev2.h (limited to 'keyboards/peranekofactory') diff --git a/keyboards/peranekofactory/tone/rev1/info.json b/keyboards/peranekofactory/tone/rev1/info.json index 16f1db0328..00afdbbdc7 100644 --- a/keyboards/peranekofactory/tone/rev1/info.json +++ b/keyboards/peranekofactory/tone/rev1/info.json @@ -17,7 +17,16 @@ }, "layouts": { "LAYOUT": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}] + "layout": [ + {"x":0, "y":0, "matrix": [0, 0]}, + {"x":1, "y":0, "matrix": [0, 1]}, + {"x":2, "y":0, "matrix": [0, 2]}, + {"x":3, "y":0, "matrix": [0, 3]}, + {"x":0, "y":1, "matrix": [0, 4]}, + {"x":1, "y":1, "matrix": [0, 5]}, + {"x":2, "y":1, "matrix": [0, 6]}, + {"x":3, "y":1, "matrix": [0, 7]} + ] } } } diff --git a/keyboards/peranekofactory/tone/rev1/rev1.c b/keyboards/peranekofactory/tone/rev1/rev1.c deleted file mode 100644 index df99ef2e0b..0000000000 --- a/keyboards/peranekofactory/tone/rev1/rev1.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 peraneko - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include "rev1.h" diff --git a/keyboards/peranekofactory/tone/rev1/rev1.h b/keyboards/peranekofactory/tone/rev1/rev1.h deleted file mode 100644 index 47f6423391..0000000000 --- a/keyboards/peranekofactory/tone/rev1/rev1.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2021 peraneko - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#include "quantum.h" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - K00, K01, K02, K03, \ - K04, K05, K06, K07 \ -) \ -{ \ - { K00, K01, K02, K03, K04, K05, K06, K07 }, \ -} diff --git a/keyboards/peranekofactory/tone/rev2/info.json b/keyboards/peranekofactory/tone/rev2/info.json index 16f1db0328..00afdbbdc7 100644 --- a/keyboards/peranekofactory/tone/rev2/info.json +++ b/keyboards/peranekofactory/tone/rev2/info.json @@ -17,7 +17,16 @@ }, "layouts": { "LAYOUT": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}] + "layout": [ + {"x":0, "y":0, "matrix": [0, 0]}, + {"x":1, "y":0, "matrix": [0, 1]}, + {"x":2, "y":0, "matrix": [0, 2]}, + {"x":3, "y":0, "matrix": [0, 3]}, + {"x":0, "y":1, "matrix": [0, 4]}, + {"x":1, "y":1, "matrix": [0, 5]}, + {"x":2, "y":1, "matrix": [0, 6]}, + {"x":3, "y":1, "matrix": [0, 7]} + ] } } } diff --git a/keyboards/peranekofactory/tone/rev2/rev2.c b/keyboards/peranekofactory/tone/rev2/rev2.c deleted file mode 100644 index aa95110979..0000000000 --- a/keyboards/peranekofactory/tone/rev2/rev2.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 peraneko - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include "rev2.h" diff --git a/keyboards/peranekofactory/tone/rev2/rev2.h b/keyboards/peranekofactory/tone/rev2/rev2.h deleted file mode 100644 index 47f6423391..0000000000 --- a/keyboards/peranekofactory/tone/rev2/rev2.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2021 peraneko - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#include "quantum.h" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - K00, K01, K02, K03, \ - K04, K05, K06, K07 \ -) \ -{ \ - { K00, K01, K02, K03, K04, K05, K06, K07 }, \ -} -- 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/peranekofactory/tone/rev1/config.h | 3 --- keyboards/peranekofactory/tone/rev1/info.json | 5 +++++ keyboards/peranekofactory/tone/rev2/config.h | 3 --- keyboards/peranekofactory/tone/rev2/info.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) (limited to 'keyboards/peranekofactory') diff --git a/keyboards/peranekofactory/tone/rev1/config.h b/keyboards/peranekofactory/tone/rev1/config.h index 9429a2261f..c97fab915a 100644 --- a/keyboards/peranekofactory/tone/rev1/config.h +++ b/keyboards/peranekofactory/tone/rev1/config.h @@ -17,9 +17,6 @@ along with this program. If not, see . #pragma once -/* Rotary encoder define*/ -#define ENCODERS_PAD_A { B5 } -#define ENCODERS_PAD_B { B4 } #define TAP_CODE_DELAY 100 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/peranekofactory/tone/rev1/info.json b/keyboards/peranekofactory/tone/rev1/info.json index 00afdbbdc7..24e5777045 100644 --- a/keyboards/peranekofactory/tone/rev1/info.json +++ b/keyboards/peranekofactory/tone/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "encoder": { + "rotary": [ + {"pin_a": "B5", "pin_b": "B4"} + ] + }, "processor": "atmega32u4", "bootloader": "caterina", "matrix_pins": { diff --git a/keyboards/peranekofactory/tone/rev2/config.h b/keyboards/peranekofactory/tone/rev2/config.h index 9429a2261f..c97fab915a 100644 --- a/keyboards/peranekofactory/tone/rev2/config.h +++ b/keyboards/peranekofactory/tone/rev2/config.h @@ -17,9 +17,6 @@ along with this program. If not, see . #pragma once -/* Rotary encoder define*/ -#define ENCODERS_PAD_A { B5 } -#define ENCODERS_PAD_B { B4 } #define TAP_CODE_DELAY 100 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/peranekofactory/tone/rev2/info.json b/keyboards/peranekofactory/tone/rev2/info.json index 00afdbbdc7..24e5777045 100644 --- a/keyboards/peranekofactory/tone/rev2/info.json +++ b/keyboards/peranekofactory/tone/rev2/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "encoder": { + "rotary": [ + {"pin_a": "B5", "pin_b": "B4"} + ] + }, "processor": "atmega32u4", "bootloader": "caterina", "matrix_pins": { -- cgit v1.2.3