diff options
Diffstat (limited to 'keyboards/duck/orion')
-rw-r--r-- | keyboards/duck/orion/v3/config.h | 14 | ||||
-rw-r--r-- | keyboards/duck/orion/v3/info.json | 9 | ||||
-rw-r--r-- | keyboards/duck/orion/v3/matrix.c | 8 | ||||
-rw-r--r-- | keyboards/duck/orion/v3/rules.mk | 8 |
4 files changed, 15 insertions, 24 deletions
diff --git a/keyboards/duck/orion/v3/config.h b/keyboards/duck/orion/v3/config.h index 43a5bdec7b..6dde204a3b 100644 --- a/keyboards/duck/orion/v3/config.h +++ b/keyboards/duck/orion/v3/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 6 @@ -25,15 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define DIODE_DIRECTION COL2ROW -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - -/* number of backlight levels */ -// #define BACKLIGHT_LEVELS 3 - -#undef BACKLIGHT_PIN -#define BACKLIGHT_PINS { B1, B2, B3, E6 } -#define BACKLIGHT_LED_COUNT 4 #define BACKLIGHT_LEVELS 10 #define RGBLIGHT_EFFECT_BREATHING @@ -49,8 +39,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGB_DI_PIN D6 #define RGBLED_NUM 18 -/* Set to top left most key */ -#define BOOTMAGIC_LITE_ROW 4 -#define BOOTMAGIC_LITE_COLUMN 10 - #define TAPPING_TERM 200 diff --git a/keyboards/duck/orion/v3/info.json b/keyboards/duck/orion/v3/info.json index 39f0e1e1bd..7c4c34281c 100644 --- a/keyboards/duck/orion/v3/info.json +++ b/keyboards/duck/orion/v3/info.json @@ -8,6 +8,15 @@ "pid": "0x4F52", "device_version": "0.0.2" }, + "backlight": { + "pins": ["B1", "B2", "B3", "E6"] + }, + "bootmagic": { + "matrix": [4, 10] + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "community_layouts": ["tkl_ansi"], "layouts": { "LAYOUT_tkl_ansi": { "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":4, "y":1.5}, {"x":5, "y":1.5}, {"x":6, "y":1.5}, {"x":7, "y":1.5}, {"x":8, "y":1.5}, {"x":9, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.5}, {"x":12, "y":1.5}, {"x":13, "y":1.5, "w":2}, {"x":15.25, "y":1.5}, {"x":16.25, "y":1.5}, {"x":17.25, "y":1.5}, {"x":0, "y":2.5, "w":1.5}, {"x":1.5, "y":2.5}, {"x":2.5, "y":2.5}, {"x":3.5, "y":2.5}, {"x":4.5, "y":2.5}, {"x":5.5, "y":2.5}, {"x":6.5, "y":2.5}, {"x":7.5, "y":2.5}, {"x":8.5, "y":2.5}, {"x":9.5, "y":2.5}, {"x":10.5, "y":2.5}, {"x":11.5, "y":2.5}, {"x":12.5, "y":2.5}, {"x":13.5, "y":2.5, "w":1.5}, {"x":15.25, "y":2.5}, {"x":16.25, "y":2.5}, {"x":17.25, "y":2.5}, {"x":0, "y":3.5, "w":1.75}, {"x":1.75, "y":3.5}, {"x":2.75, "y":3.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5, "w":2.25}, {"x":0, "y":4.5, "w":2.25}, {"x":2.25, "y":4.5}, {"x":3.25, "y":4.5}, {"x":4.25, "y":4.5}, {"x":5.25, "y":4.5}, {"x":6.25, "y":4.5}, {"x":7.25, "y":4.5}, {"x":8.25, "y":4.5}, {"x":9.25, "y":4.5}, {"x":10.25, "y":4.5}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5, "w":2.75}, {"x":16.25, "y":4.5}, {"x":0, "y":5.5, "w":1.25}, {"x":1.25, "y":5.5, "w":1.25}, {"x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"x":10, "y":5.5, "w":1.25}, {"x":11.25, "y":5.5, "w":1.25}, {"x":12.5, "y":5.5, "w":1.25}, {"x":13.75, "y":5.5, "w":1.25}, {"x":15.25, "y":5.5}, {"x":16.25, "y":5.5}, {"x":17.25, "y":5.5}] diff --git a/keyboards/duck/orion/v3/matrix.c b/keyboards/duck/orion/v3/matrix.c index 84673bd44f..c82d5dd999 100644 --- a/keyboards/duck/orion/v3/matrix.c +++ b/keyboards/duck/orion/v3/matrix.c @@ -16,6 +16,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "quantum.h" +#ifndef DEBOUNCE +# define DEBOUNCE 5 +#endif + static uint8_t debouncing = DEBOUNCE; /* matrix state(1:on, 0:off) */ @@ -68,7 +72,7 @@ void matrix_init(void) { matrix_debouncing[i] = 0; } - matrix_init_quantum(); + matrix_init_kb(); } uint8_t matrix_scan(void) { @@ -102,7 +106,7 @@ uint8_t matrix_scan(void) { } } - matrix_scan_quantum(); + matrix_scan_kb(); return 1; } diff --git a/keyboards/duck/orion/v3/rules.mk b/keyboards/duck/orion/v3/rules.mk index 64897bcd67..d29d166083 100644 --- a/keyboards/duck/orion/v3/rules.mk +++ b/keyboards/duck/orion/v3/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # @@ -21,5 +15,3 @@ RGBLIGHT_ENABLE = yes CUSTOM_MATRIX = yes SRC += indicator_leds.c \ matrix.c duck_led/duck_led.c - -LAYOUTS = tkl_ansi |