diff options
Diffstat (limited to 'keyboards/adpenrose')
-rw-r--r-- | keyboards/adpenrose/akemipad/config.h | 8 | ||||
-rw-r--r-- | keyboards/adpenrose/akemipad/info.json | 2 | ||||
-rw-r--r-- | keyboards/adpenrose/akemipad/keymaps/default/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/adpenrose/akemipad/keymaps/via/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/adpenrose/akemipad/rules.mk | 6 | ||||
-rw-r--r-- | keyboards/adpenrose/kintsugi/config.h | 8 | ||||
-rw-r--r-- | keyboards/adpenrose/kintsugi/info.json | 2 | ||||
-rw-r--r-- | keyboards/adpenrose/kintsugi/rules.mk | 6 | ||||
-rw-r--r-- | keyboards/adpenrose/obi/config.h | 9 | ||||
-rw-r--r-- | keyboards/adpenrose/obi/info.json | 2 | ||||
-rw-r--r-- | keyboards/adpenrose/obi/rules.mk | 6 | ||||
-rw-r--r-- | keyboards/adpenrose/shisaku/config.h | 8 | ||||
-rw-r--r-- | keyboards/adpenrose/shisaku/info.json | 2 | ||||
-rw-r--r-- | keyboards/adpenrose/shisaku/rules.mk | 6 |
14 files changed, 10 insertions, 59 deletions
diff --git a/keyboards/adpenrose/akemipad/config.h b/keyboards/adpenrose/akemipad/config.h index 7a52b25b17..f690191620 100644 --- a/keyboards/adpenrose/akemipad/config.h +++ b/keyboards/adpenrose/akemipad/config.h @@ -3,7 +3,6 @@ #pragma once -#include "config_common.h" /* Key matrix size */ #define MATRIX_ROWS 6 @@ -53,10 +52,3 @@ increase the value. If you need 2 clicks for 1 keycode, decrease*/ # define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT # define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN #endif - -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - -/* Bootmagic Lite key configuration */ -#define BOOTMAGIC_LITE_ROW 0 -#define BOOTMAGIC_LITE_COLUMN 0 diff --git a/keyboards/adpenrose/akemipad/info.json b/keyboards/adpenrose/akemipad/info.json index ba12f0ace4..2e3f785164 100644 --- a/keyboards/adpenrose/akemipad/info.json +++ b/keyboards/adpenrose/akemipad/info.json @@ -7,6 +7,8 @@ "pid": "0x0004", "vid": "0x4450" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/adpenrose/akemipad/keymaps/default/keymap.c b/keyboards/adpenrose/akemipad/keymaps/default/keymap.c index 2a3de42e2d..0aa98ed309 100644 --- a/keyboards/adpenrose/akemipad/keymaps/default/keymap.c +++ b/keyboards/adpenrose/akemipad/keymaps/default/keymap.c @@ -15,7 +15,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_all( KC_TRNS, CK_DOWN, CK_UP, CK_RST, - MU_TOG, MU_MOD, KC_TRNS, KC_TRNS, + MU_TOGG, MU_NEXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/adpenrose/akemipad/keymaps/via/keymap.c b/keyboards/adpenrose/akemipad/keymaps/via/keymap.c index fa3673b8cb..732c287a7a 100644 --- a/keyboards/adpenrose/akemipad/keymaps/via/keymap.c +++ b/keyboards/adpenrose/akemipad/keymaps/via/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_all( KC_TRNS, CK_DOWN, CK_UP, CK_RST, - MU_TOG, MU_MOD, KC_TRNS, KC_TRNS, + MU_TOGG, MU_NEXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/adpenrose/akemipad/rules.mk b/keyboards/adpenrose/akemipad/rules.mk index 9c75c3f01c..9886164987 100644 --- a/keyboards/adpenrose/akemipad/rules.mk +++ b/keyboards/adpenrose/akemipad/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/adpenrose/kintsugi/config.h b/keyboards/adpenrose/kintsugi/config.h index 1985c25751..f8b0bc537a 100644 --- a/keyboards/adpenrose/kintsugi/config.h +++ b/keyboards/adpenrose/kintsugi/config.h @@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 10 @@ -72,10 +71,3 @@ increase the value. If you need 2 clicks for 1 keycode, decrease*/ //# define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 //# 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 - -/* Bootmagic Lite key configuration */ -#define BOOTMAGIC_LITE_ROW 0 -#define BOOTMAGIC_LITE_COLUMN 0 diff --git a/keyboards/adpenrose/kintsugi/info.json b/keyboards/adpenrose/kintsugi/info.json index c305d871ea..8c6258f020 100644 --- a/keyboards/adpenrose/kintsugi/info.json +++ b/keyboards/adpenrose/kintsugi/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/adpenrose/kintsugi/rules.mk b/keyboards/adpenrose/kintsugi/rules.mk index 6a0aca4700..4704a3487d 100644 --- a/keyboards/adpenrose/kintsugi/rules.mk +++ b/keyboards/adpenrose/kintsugi/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/adpenrose/obi/config.h b/keyboards/adpenrose/obi/config.h index c1c5ea9f30..7f8e62734a 100644 --- a/keyboards/adpenrose/obi/config.h +++ b/keyboards/adpenrose/obi/config.h @@ -3,7 +3,6 @@ #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 4 @@ -58,11 +57,3 @@ increase the value. If you need 2 clicks for 1 keycode, decrease*/ //# define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 //# 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 - -/* Bootmagic Lite key configuration */ -#define BOOTMAGIC_LITE_ROW 0 -#define BOOTMAGIC_LITE_COLUMN 0 - diff --git a/keyboards/adpenrose/obi/info.json b/keyboards/adpenrose/obi/info.json index b1afa0bc0d..544b4fc5d4 100644 --- a/keyboards/adpenrose/obi/info.json +++ b/keyboards/adpenrose/obi/info.json @@ -7,6 +7,8 @@ "pid": "0x0002", "vid": "0x4450" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/adpenrose/obi/rules.mk b/keyboards/adpenrose/obi/rules.mk index 94ce0d7a66..eef937e03a 100644 --- a/keyboards/adpenrose/obi/rules.mk +++ b/keyboards/adpenrose/obi/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/adpenrose/shisaku/config.h b/keyboards/adpenrose/shisaku/config.h index 4980749d9f..f60f034d18 100644 --- a/keyboards/adpenrose/shisaku/config.h +++ b/keyboards/adpenrose/shisaku/config.h @@ -3,7 +3,6 @@ #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 8 @@ -25,12 +24,5 @@ /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - -/* Bootmagic Lite key configuration */ -#define BOOTMAGIC_LITE_ROW 0 -#define BOOTMAGIC_LITE_COLUMN 0 - /* Solenoid pin */ #define SOLENOID_PIN C5 diff --git a/keyboards/adpenrose/shisaku/info.json b/keyboards/adpenrose/shisaku/info.json index a93898c33b..dd1aaf540a 100644 --- a/keyboards/adpenrose/shisaku/info.json +++ b/keyboards/adpenrose/shisaku/info.json @@ -8,6 +8,8 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "processor": "atmega328p", + "bootloader": "usbasploader", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/adpenrose/shisaku/rules.mk b/keyboards/adpenrose/shisaku/rules.mk index ef08ed4a06..0fa7711516 100644 --- a/keyboards/adpenrose/shisaku/rules.mk +++ b/keyboards/adpenrose/shisaku/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega328p - -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # |