aboutsummaryrefslogtreecommitdiff
path: root/keyboards/duck
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/duck')
-rw-r--r--keyboards/duck/duck_led/duck_led.c3
-rw-r--r--keyboards/duck/eagle_viper/v2/keyboard.json (renamed from keyboards/duck/eagle_viper/v2/info.json)9
-rw-r--r--keyboards/duck/eagle_viper/v2/rules.mk13
-rw-r--r--keyboards/duck/jetfire/indicator_leds.c5
-rw-r--r--keyboards/duck/jetfire/indicator_leds.h2
-rw-r--r--keyboards/duck/jetfire/keyboard.json (renamed from keyboards/duck/jetfire/info.json)9
-rw-r--r--keyboards/duck/jetfire/rules.mk13
-rw-r--r--keyboards/duck/lightsaver/keyboard.json (renamed from keyboards/duck/lightsaver/info.json)9
-rw-r--r--keyboards/duck/lightsaver/rules.mk13
-rw-r--r--keyboards/duck/octagon/v1/keyboard.json (renamed from keyboards/duck/octagon/v1/info.json)9
-rw-r--r--keyboards/duck/octagon/v1/rules.mk13
-rw-r--r--keyboards/duck/octagon/v2/keyboard.json (renamed from keyboards/duck/octagon/v2/info.json)9
-rw-r--r--keyboards/duck/octagon/v2/rules.mk13
-rw-r--r--keyboards/duck/orion/v3/keyboard.json (renamed from keyboards/duck/orion/v3/info.json)9
-rw-r--r--keyboards/duck/orion/v3/matrix.c5
-rw-r--r--keyboards/duck/orion/v3/rules.mk13
-rw-r--r--keyboards/duck/tcv3/keyboard.json (renamed from keyboards/duck/tcv3/info.json)8
-rw-r--r--keyboards/duck/tcv3/rules.mk13
18 files changed, 70 insertions, 98 deletions
diff --git a/keyboards/duck/duck_led/duck_led.c b/keyboards/duck/duck_led/duck_led.c
index 2fa920e4b6..ce9bd0fde1 100644
--- a/keyboards/duck/duck_led/duck_led.c
+++ b/keyboards/duck/duck_led/duck_led.c
@@ -1,6 +1,5 @@
-#include <avr/io.h>
#include "duck_led.h"
-#include "quantum.h"
+#include "wait.h"
void show(void) {
wait_us((RES / 1000UL) + 1);
diff --git a/keyboards/duck/eagle_viper/v2/info.json b/keyboards/duck/eagle_viper/v2/keyboard.json
index c2acc3b0d9..9c16c48db3 100644
--- a/keyboards/duck/eagle_viper/v2/info.json
+++ b/keyboards/duck/eagle_viper/v2/keyboard.json
@@ -32,6 +32,15 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": false,
+ "extrakey": true,
+ "command": true,
+ "nkro": true,
+ "backlight": true,
+ "rgblight": true
+ },
"layout_aliases": {
"LAYOUT_eagle": "LAYOUT_60_ansi",
"LAYOUT_viper": "LAYOUT_60_hhkb",
diff --git a/keyboards/duck/eagle_viper/v2/rules.mk b/keyboards/duck/eagle_viper/v2/rules.mk
index a2b82ea590..819cb814ec 100644
--- a/keyboards/duck/eagle_viper/v2/rules.mk
+++ b/keyboards/duck/eagle_viper/v2/rules.mk
@@ -1,15 +1,2 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
CUSTOM_MATRIX = yes
SRC += indicator_leds.c matrix.c duck_led/duck_led.c
diff --git a/keyboards/duck/jetfire/indicator_leds.c b/keyboards/duck/jetfire/indicator_leds.c
index 7dbdb1ff79..200a9ce6ff 100644
--- a/keyboards/duck/jetfire/indicator_leds.c
+++ b/keyboards/duck/jetfire/indicator_leds.c
@@ -12,13 +12,10 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "indicator_leds.h"
#include <avr/interrupt.h>
#include <avr/io.h>
-#include <stdbool.h>
#include <util/delay.h>
-#include <stdint.h>
-#include "indicator_leds.h"
-#include "quantum.h"
#define LED_T1H 900
#define LED_T1L 600
diff --git a/keyboards/duck/jetfire/indicator_leds.h b/keyboards/duck/jetfire/indicator_leds.h
index 36dda632fb..27dcc1535b 100644
--- a/keyboards/duck/jetfire/indicator_leds.h
+++ b/keyboards/duck/jetfire/indicator_leds.h
@@ -1,5 +1,7 @@
#pragma once
+#include <stdint.h>
+#include <stdbool.h>
#include "duck_led/duck_led.h"
void backlight_init_ports(void);
diff --git a/keyboards/duck/jetfire/info.json b/keyboards/duck/jetfire/keyboard.json
index fbd5d8cb14..a97ff193a8 100644
--- a/keyboards/duck/jetfire/info.json
+++ b/keyboards/duck/jetfire/keyboard.json
@@ -35,6 +35,15 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": false,
+ "extrakey": false,
+ "console": true,
+ "command": true,
+ "backlight": true,
+ "rgblight": true
+ },
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/duck/jetfire/rules.mk b/keyboards/duck/jetfire/rules.mk
index 2689836623..8d6e39eef1 100644
--- a/keyboards/duck/jetfire/rules.mk
+++ b/keyboards/duck/jetfire/rules.mk
@@ -1,16 +1,3 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = no # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
CUSTOM_MATRIX = yes
SRC += indicator_leds.c \
matrix.c duck_led/duck_led.c
diff --git a/keyboards/duck/lightsaver/info.json b/keyboards/duck/lightsaver/keyboard.json
index 06d0d59ed1..d4e1cd1e35 100644
--- a/keyboards/duck/lightsaver/info.json
+++ b/keyboards/duck/lightsaver/keyboard.json
@@ -35,6 +35,15 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": false,
+ "command": true,
+ "nkro": true,
+ "backlight": true,
+ "rgblight": true
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/duck/lightsaver/rules.mk b/keyboards/duck/lightsaver/rules.mk
index 2014cb4611..8d6e39eef1 100644
--- a/keyboards/duck/lightsaver/rules.mk
+++ b/keyboards/duck/lightsaver/rules.mk
@@ -1,16 +1,3 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = no # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = yes
-
CUSTOM_MATRIX = yes
SRC += indicator_leds.c \
matrix.c duck_led/duck_led.c
diff --git a/keyboards/duck/octagon/v1/info.json b/keyboards/duck/octagon/v1/keyboard.json
index fbbae2723a..47f3acdc4d 100644
--- a/keyboards/duck/octagon/v1/info.json
+++ b/keyboards/duck/octagon/v1/keyboard.json
@@ -35,6 +35,15 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": false,
+ "extrakey": false,
+ "command": true,
+ "nkro": true,
+ "backlight": true,
+ "rgblight": true
+ },
"community_layouts": ["75_ansi"],
"layouts": {
"LAYOUT_75_ansi": {
diff --git a/keyboards/duck/octagon/v1/rules.mk b/keyboards/duck/octagon/v1/rules.mk
index 5d79f0af09..8784813b33 100644
--- a/keyboards/duck/octagon/v1/rules.mk
+++ b/keyboards/duck/octagon/v1/rules.mk
@@ -1,15 +1,2 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = no # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = yes
-
CUSTOM_MATRIX = yes
SRC += matrix.c
diff --git a/keyboards/duck/octagon/v2/info.json b/keyboards/duck/octagon/v2/keyboard.json
index be552c7b57..4afbc42d47 100644
--- a/keyboards/duck/octagon/v2/info.json
+++ b/keyboards/duck/octagon/v2/keyboard.json
@@ -35,6 +35,15 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": false,
+ "extrakey": false,
+ "command": true,
+ "nkro": true,
+ "backlight": true,
+ "rgblight": true
+ },
"layout_aliases": {
"LAYOUT": "LAYOUT_all"
},
diff --git a/keyboards/duck/octagon/v2/rules.mk b/keyboards/duck/octagon/v2/rules.mk
index 5e50c2ff8e..8d6e39eef1 100644
--- a/keyboards/duck/octagon/v2/rules.mk
+++ b/keyboards/duck/octagon/v2/rules.mk
@@ -1,16 +1,3 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = no # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = yes
-
CUSTOM_MATRIX = yes
SRC += indicator_leds.c \
matrix.c duck_led/duck_led.c
diff --git a/keyboards/duck/orion/v3/info.json b/keyboards/duck/orion/v3/keyboard.json
index 97885c0910..280cd8b07f 100644
--- a/keyboards/duck/orion/v3/info.json
+++ b/keyboards/duck/orion/v3/keyboard.json
@@ -36,6 +36,15 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": false,
+ "extrakey": true,
+ "command": true,
+ "nkro": true,
+ "backlight": true,
+ "rgblight": true
+ },
"community_layouts": ["tkl_ansi"],
"layouts": {
"LAYOUT_tkl_ansi": {
diff --git a/keyboards/duck/orion/v3/matrix.c b/keyboards/duck/orion/v3/matrix.c
index c82d5dd999..f392b9b190 100644
--- a/keyboards/duck/orion/v3/matrix.c
+++ b/keyboards/duck/orion/v3/matrix.c
@@ -14,7 +14,10 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "quantum.h"
+#include "matrix.h"
+#include "debug.h"
+#include "bitwise.h"
+#include "wait.h"
#ifndef DEBOUNCE
# define DEBOUNCE 5
diff --git a/keyboards/duck/orion/v3/rules.mk b/keyboards/duck/orion/v3/rules.mk
index 49bc32f39b..8d6e39eef1 100644
--- a/keyboards/duck/orion/v3/rules.mk
+++ b/keyboards/duck/orion/v3/rules.mk
@@ -1,16 +1,3 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = yes
-
CUSTOM_MATRIX = yes
SRC += indicator_leds.c \
matrix.c duck_led/duck_led.c
diff --git a/keyboards/duck/tcv3/info.json b/keyboards/duck/tcv3/keyboard.json
index cee675229d..c03142b4db 100644
--- a/keyboards/duck/tcv3/info.json
+++ b/keyboards/duck/tcv3/keyboard.json
@@ -31,6 +31,14 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": false,
+ "extrakey": false,
+ "command": true,
+ "nkro": true,
+ "rgblight": true
+ },
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/duck/tcv3/rules.mk b/keyboards/duck/tcv3/rules.mk
index b13684d8fd..8d6e39eef1 100644
--- a/keyboards/duck/tcv3/rules.mk
+++ b/keyboards/duck/tcv3/rules.mk
@@ -1,16 +1,3 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = no # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = yes
-
CUSTOM_MATRIX = yes
SRC += indicator_leds.c \
matrix.c duck_led/duck_led.c