diff options
Diffstat (limited to 'keyboards/montsinger')
-rw-r--r-- | keyboards/montsinger/rebound/rev1/config.h | 13 | ||||
-rw-r--r-- | keyboards/montsinger/rebound/rev1/info.json | 3 | ||||
-rw-r--r-- | keyboards/montsinger/rebound/rev1/keymaps/curry/rules.mk | 2 | ||||
-rw-r--r-- | keyboards/montsinger/rebound/rev1/rules.mk | 7 | ||||
-rw-r--r-- | keyboards/montsinger/rebound/rev2/config.h | 16 | ||||
-rw-r--r-- | keyboards/montsinger/rebound/rev2/info.json | 8 | ||||
-rw-r--r-- | keyboards/montsinger/rebound/rev2/rules.mk | 7 | ||||
-rw-r--r-- | keyboards/montsinger/rebound/rev3/config.h | 16 | ||||
-rw-r--r-- | keyboards/montsinger/rebound/rev3/info.json | 8 | ||||
-rw-r--r-- | keyboards/montsinger/rebound/rev3/rules.mk | 7 | ||||
-rw-r--r-- | keyboards/montsinger/rebound/rev4/config.h | 16 | ||||
-rw-r--r-- | keyboards/montsinger/rebound/rev4/info.json | 8 | ||||
-rw-r--r-- | keyboards/montsinger/rebound/rev4/keymaps/via/config.h | 6 | ||||
-rw-r--r-- | keyboards/montsinger/rebound/rev4/rules.mk | 7 | ||||
-rw-r--r-- | keyboards/montsinger/rewind/config.h | 13 | ||||
-rw-r--r-- | keyboards/montsinger/rewind/info.json | 2 | ||||
-rw-r--r-- | keyboards/montsinger/rewind/rules.mk | 6 |
17 files changed, 36 insertions, 109 deletions
diff --git a/keyboards/montsinger/rebound/rev1/config.h b/keyboards/montsinger/rebound/rev1/config.h index 446d6db71d..6063a52f09 100644 --- a/keyboards/montsinger/rebound/rev1/config.h +++ b/keyboards/montsinger/rebound/rev1/config.h @@ -14,12 +14,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 4 -#define MATRIX_COLS 12 /* * Keyboard Matrix Assignments @@ -39,14 +33,7 @@ diode) /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION ROW2COL -/* 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 */ #define LOCKING_RESYNC_ENABLE - -/* Bootmagic Lite key configuration */ -// #define BOOTMAGIC_LITE_ROW 0 -// #define BOOTMAGIC_LITE_COLUMN 0 diff --git a/keyboards/montsinger/rebound/rev1/info.json b/keyboards/montsinger/rebound/rev1/info.json index f4b4362470..d7d6cf0d07 100644 --- a/keyboards/montsinger/rebound/rev1/info.json +++ b/keyboards/montsinger/rebound/rev1/info.json @@ -8,6 +8,9 @@ "pid": "0x552F", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "community_layouts": ["ortho_4x12"], "layouts": { "LAYOUT_ortho_4x12": { "layout": [ diff --git a/keyboards/montsinger/rebound/rev1/keymaps/curry/rules.mk b/keyboards/montsinger/rebound/rev1/keymaps/curry/rules.mk index 36225f7ba6..7300873397 100644 --- a/keyboards/montsinger/rebound/rev1/keymaps/curry/rules.mk +++ b/keyboards/montsinger/rebound/rev1/keymaps/curry/rules.mk @@ -1 +1 @@ -CTPC = yes +CONVERT_TO=proton_c diff --git a/keyboards/montsinger/rebound/rev1/rules.mk b/keyboards/montsinger/rebound/rev1/rules.mk index f914cd14cb..fc1633fe63 100644 --- a/keyboards/montsinger/rebound/rev1/rules.mk +++ b/keyboards/montsinger/rebound/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # @@ -17,5 +11,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output -LAYOUTS = ortho_4x12 LAYOUTS_HAS_RGB = no diff --git a/keyboards/montsinger/rebound/rev2/config.h b/keyboards/montsinger/rebound/rev2/config.h index 0cdb9f8d61..cbf4c9b8df 100644 --- a/keyboards/montsinger/rebound/rev2/config.h +++ b/keyboards/montsinger/rebound/rev2/config.h @@ -14,12 +14,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 5 -#define MATRIX_COLS 12 /* * Keyboard Matrix Assignments @@ -36,20 +30,10 @@ diode) #define MATRIX_ROW_PINS { D1, B5, B2, B6, B0 } #define MATRIX_COL_PINS { D0, D4, C6, D7, E6, B4, B3, B1, F7, F6, F5, F4 } -#define ENCODERS_PAD_A { D2 } -#define ENCODERS_PAD_B { D3 } - /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION ROW2COL -/* 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 */ #define LOCKING_RESYNC_ENABLE - -/* Bootmagic Lite key configuration */ -// #define BOOTMAGIC_LITE_ROW 0 -// #define BOOTMAGIC_LITE_COLUMN 0 diff --git a/keyboards/montsinger/rebound/rev2/info.json b/keyboards/montsinger/rebound/rev2/info.json index 99e07ef405..8c2aec4e4d 100644 --- a/keyboards/montsinger/rebound/rev2/info.json +++ b/keyboards/montsinger/rebound/rev2/info.json @@ -8,6 +8,14 @@ "pid": "0x552F", "device_version": "0.0.2" }, + "encoder": { + "rotary": [ + {"pin_a": "D2", "pin_b": "D3"} + ] + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "community_layouts": ["ortho_4x12"], "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/montsinger/rebound/rev2/rules.mk b/keyboards/montsinger/rebound/rev2/rules.mk index 211b7290b5..02bef78ce3 100644 --- a/keyboards/montsinger/rebound/rev2/rules.mk +++ b/keyboards/montsinger/rebound/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # @@ -18,5 +12,4 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes -LAYOUTS = ortho_4x12 LAYOUTS_HAS_RGB = no diff --git a/keyboards/montsinger/rebound/rev3/config.h b/keyboards/montsinger/rebound/rev3/config.h index 25dee80ff3..00506c85bc 100644 --- a/keyboards/montsinger/rebound/rev3/config.h +++ b/keyboards/montsinger/rebound/rev3/config.h @@ -14,12 +14,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 5 -#define MATRIX_COLS 12 /* * Keyboard Matrix Assignments @@ -36,20 +30,10 @@ diode) #define MATRIX_ROW_PINS { F4, F5, D1, D0, B0 } #define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5, B6, B2, B3, B1, F7, F6 } -#define ENCODERS_PAD_A { D3 } -#define ENCODERS_PAD_B { D2 } - /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION ROW2COL -/* 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 */ #define LOCKING_RESYNC_ENABLE - -/* Bootmagic Lite key configuration */ -// #define BOOTMAGIC_LITE_ROW 0 -// #define BOOTMAGIC_LITE_COLUMN 0 diff --git a/keyboards/montsinger/rebound/rev3/info.json b/keyboards/montsinger/rebound/rev3/info.json index e2ba432c57..2f9338afc3 100644 --- a/keyboards/montsinger/rebound/rev3/info.json +++ b/keyboards/montsinger/rebound/rev3/info.json @@ -8,6 +8,14 @@ "pid": "0x552F", "device_version": "0.0.2" }, + "encoder": { + "rotary": [ + {"pin_a": "D3", "pin_b": "D2"} + ] + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "community_layouts": ["ortho_4x12"], "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/montsinger/rebound/rev3/rules.mk b/keyboards/montsinger/rebound/rev3/rules.mk index 211b7290b5..02bef78ce3 100644 --- a/keyboards/montsinger/rebound/rev3/rules.mk +++ b/keyboards/montsinger/rebound/rev3/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # @@ -18,5 +12,4 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes -LAYOUTS = ortho_4x12 LAYOUTS_HAS_RGB = no diff --git a/keyboards/montsinger/rebound/rev4/config.h b/keyboards/montsinger/rebound/rev4/config.h index 6b03a19288..58cf478e13 100644 --- a/keyboards/montsinger/rebound/rev4/config.h +++ b/keyboards/montsinger/rebound/rev4/config.h @@ -14,12 +14,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 8 -#define MATRIX_COLS 7 /* * Keyboard Matrix Assignments @@ -36,15 +30,9 @@ diode) #define MATRIX_ROW_PINS { D1, D0, D4, C6, F7, F6, F5, F4 } #define MATRIX_COL_PINS { D7, E6, B4, B5, B2, B3, B1 } -#define ENCODERS_PAD_A { D2 } -#define ENCODERS_PAD_B { D3 } - /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION ROW2COL -/* 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 */ @@ -53,7 +41,3 @@ diode) /* ws2812 RGB LED */ #define RGB_DI_PIN B6 #define RGBLED_NUM 17 - -/* Bootmagic Lite key configuration */ -// #define BOOTMAGIC_LITE_ROW 0 -// #define BOOTMAGIC_LITE_COLUMN 0 diff --git a/keyboards/montsinger/rebound/rev4/info.json b/keyboards/montsinger/rebound/rev4/info.json index bfe2b6a372..dd76ea25e9 100644 --- a/keyboards/montsinger/rebound/rev4/info.json +++ b/keyboards/montsinger/rebound/rev4/info.json @@ -8,6 +8,14 @@ "pid": "0x0001", "device_version": "0.0.2" }, + "encoder": { + "rotary": [ + {"pin_a": "D2", "pin_b": "D3"} + ] + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "community_layouts": ["ortho_4x12"], "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/montsinger/rebound/rev4/keymaps/via/config.h b/keyboards/montsinger/rebound/rev4/keymaps/via/config.h new file mode 100644 index 0000000000..7460bef840 --- /dev/null +++ b/keyboards/montsinger/rebound/rev4/keymaps/via/config.h @@ -0,0 +1,6 @@ +// Copyright 2020 Ross Montsinger +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#define DYNAMIC_KEYMAP_LAYER_COUNT 6 diff --git a/keyboards/montsinger/rebound/rev4/rules.mk b/keyboards/montsinger/rebound/rev4/rules.mk index e0e8339713..f52c1697f7 100644 --- a/keyboards/montsinger/rebound/rev4/rules.mk +++ b/keyboards/montsinger/rebound/rev4/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # @@ -18,7 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes -LAYOUTS = ortho_4x12 LAYOUTS_HAS_RGB = no # Disable unsupported hardware diff --git a/keyboards/montsinger/rewind/config.h b/keyboards/montsinger/rewind/config.h index bc83168ae6..fb1d814501 100644 --- a/keyboards/montsinger/rewind/config.h +++ b/keyboards/montsinger/rewind/config.h @@ -14,12 +14,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 5 -#define MATRIX_COLS 10 /* * Keyboard Matrix Assignments @@ -39,14 +33,7 @@ diode) /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION ROW2COL -/* 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 */ #define LOCKING_RESYNC_ENABLE - -/* Bootmagic Lite key configuration */ -// #define BOOTMAGIC_LITE_ROW 0 -// #define BOOTMAGIC_LITE_COLUMN 0
\ No newline at end of file diff --git a/keyboards/montsinger/rewind/info.json b/keyboards/montsinger/rewind/info.json index 5e0bf1e3e1..6df88109e8 100644 --- a/keyboards/montsinger/rewind/info.json +++ b/keyboards/montsinger/rewind/info.json @@ -8,6 +8,8 @@ "pid": "0x552F", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_ortho_5x10": { "layout": [ diff --git a/keyboards/montsinger/rewind/rules.mk b/keyboards/montsinger/rewind/rules.mk index 33d28b3a89..309e55c9f4 100644 --- a/keyboards/montsinger/rewind/rules.mk +++ b/keyboards/montsinger/rewind/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # |