aboutsummaryrefslogtreecommitdiff
path: root/keyboards/mechlovin/adelais
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/mechlovin/adelais')
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/rev1/keyboard.json (renamed from keyboards/mechlovin/adelais/rgb_led/rev1/info.json)9
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/rev1/rules.mk1
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/rev2/keyboard.json (renamed from keyboards/mechlovin/adelais/rgb_led/rev2/info.json)11
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/rev2/rules.mk3
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/rev3/keyboard.json (renamed from keyboards/mechlovin/adelais/rgb_led/rev3/info.json)11
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk8
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/rules.mk4
-rw-r--r--keyboards/mechlovin/adelais/rules.mk11
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/rev2/keyboard.json (renamed from keyboards/mechlovin/adelais/standard_led/arm/rev2/info.json)10
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/rev2/rules.mk0
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/rev3/keyboard.json (renamed from keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json)11
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/rev3/rules.mk1
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/info.json4
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/keyboard.json15
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/rules.mk0
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/rev4/rules.mk2
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/info.json5
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/keyboard.json16
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/rules.mk0
-rw-r--r--keyboards/mechlovin/adelais/standard_led/avr/rev1/keyboard.json (renamed from keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json)10
-rw-r--r--keyboards/mechlovin/adelais/standard_led/avr/rev1/matrix.c3
-rw-r--r--keyboards/mechlovin/adelais/standard_led/avr/rev1/rules.mk4
-rw-r--r--keyboards/mechlovin/adelais/standard_led/rules.mk4
23 files changed, 94 insertions, 49 deletions
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/info.json b/keyboards/mechlovin/adelais/rgb_led/rev1/keyboard.json
index af68bb8457..01232b07e8 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev1/info.json
+++ b/keyboards/mechlovin/adelais/rgb_led/rev1/keyboard.json
@@ -3,6 +3,15 @@
"usb": {
"pid": "0xAEC1"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
"rgb_matrix": {
"animations": {
"alphas_mods": true,
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/rules.mk b/keyboards/mechlovin/adelais/rgb_led/rev1/rules.mk
deleted file mode 100644
index aad92997d0..0000000000
--- a/keyboards/mechlovin/adelais/rgb_led/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/info.json b/keyboards/mechlovin/adelais/rgb_led/rev2/keyboard.json
index fb88cb359d..a8633af5da 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev2/info.json
+++ b/keyboards/mechlovin/adelais/rgb_led/rev2/keyboard.json
@@ -3,6 +3,17 @@
"usb": {
"pid": "0xAEC2"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "nkro": true,
+ "rgblight": true,
+ "rgb_matrix": true,
+ "encoder": true
+ },
"rgb_matrix": {
"animations": {
"alphas_mods": true,
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/rules.mk b/keyboards/mechlovin/adelais/rgb_led/rev2/rules.mk
deleted file mode 100644
index e79b2862e6..0000000000
--- a/keyboards/mechlovin/adelais/rgb_led/rev2/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-RGB_MATRIX_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-ENCODER_ENABLE = yes
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/info.json b/keyboards/mechlovin/adelais/rgb_led/rev3/keyboard.json
index 62acf349c0..628eb404a5 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev3/info.json
+++ b/keyboards/mechlovin/adelais/rgb_led/rev3/keyboard.json
@@ -3,6 +3,17 @@
"usb": {
"pid": "0xAEC3"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": false,
+ "command": false,
+ "nkro": true,
+ "rgblight": true,
+ "rgb_matrix": true,
+ "encoder": true
+ },
"rgb_matrix": {
"animations": {
"alphas_mods": true,
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk b/keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk
deleted file mode 100644
index e144301381..0000000000
--- a/keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-RGB_MATRIX_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-ENCODER_ENABLE = yes
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
diff --git a/keyboards/mechlovin/adelais/rgb_led/rules.mk b/keyboards/mechlovin/adelais/rgb_led/rules.mk
index 8a9bdd433d..18047f12c7 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rules.mk
+++ b/keyboards/mechlovin/adelais/rgb_led/rules.mk
@@ -1,3 +1 @@
-
-
-DEFAULT_FOLDER = mechlovin/adelais/rgb_led/rev1 \ No newline at end of file
+DEFAULT_FOLDER = mechlovin/adelais/rgb_led/rev1
diff --git a/keyboards/mechlovin/adelais/rules.mk b/keyboards/mechlovin/adelais/rules.mk
index 264ea93322..a1d2ba038d 100644
--- a/keyboards/mechlovin/adelais/rules.mk
+++ b/keyboards/mechlovin/adelais/rules.mk
@@ -1,12 +1 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-AUDIO_ENABLE = no # Audio output
-
DEFAULT_FOLDER = mechlovin/adelais/standard_led/arm/rev2
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev2/info.json b/keyboards/mechlovin/adelais/standard_led/arm/rev2/keyboard.json
index 9a2a280c10..53005dfa33 100644
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev2/info.json
+++ b/keyboards/mechlovin/adelais/standard_led/arm/rev2/keyboard.json
@@ -2,6 +2,16 @@
"usb": {
"pid": "0xAD01"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "nkro": true,
+ "backlight": true,
+ "rgblight": true
+ },
"processor": "STM32F303",
"board": "QMK_PROTON_C",
"bootloader": "stm32-dfu",
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev2/rules.mk b/keyboards/mechlovin/adelais/standard_led/arm/rev2/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev2/rules.mk
+++ /dev/null
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json b/keyboards/mechlovin/adelais/standard_led/arm/rev3/keyboard.json
index 46907dc7a9..1129500790 100644
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json
+++ b/keyboards/mechlovin/adelais/standard_led/arm/rev3/keyboard.json
@@ -2,6 +2,17 @@
"usb": {
"pid": "0xAD02"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "nkro": true,
+ "backlight": true,
+ "rgblight": true,
+ "encoder": true
+ },
"encoder": {
"rotary": [
{"pin_a": "A6", "pin_b": "A5"},
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev3/rules.mk b/keyboards/mechlovin/adelais/standard_led/arm/rev3/rules.mk
deleted file mode 100644
index 5af1ba8536..0000000000
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev3/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-ENCODER_ENABLE = yes
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/info.json b/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/info.json
deleted file mode 100644
index cf993be247..0000000000
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/info.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "processor": "STM32F103",
- "bootloader": "stm32duino"
-}
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/keyboard.json b/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/keyboard.json
new file mode 100644
index 0000000000..f6b79e35d0
--- /dev/null
+++ b/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/keyboard.json
@@ -0,0 +1,15 @@
+{
+ "processor": "STM32F103",
+ "bootloader": "stm32duino",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "nkro": true,
+ "backlight": true,
+ "rgblight": true,
+ "encoder": true
+ }
+}
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/rules.mk b/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/rules.mk
+++ /dev/null
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/rules.mk b/keyboards/mechlovin/adelais/standard_led/arm/rev4/rules.mk
index 257dd3bf57..d348ae660f 100644
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev4/rules.mk
+++ b/keyboards/mechlovin/adelais/standard_led/arm/rev4/rules.mk
@@ -1,3 +1 @@
-ENCODER_ENABLE = yes
-
DEFAULT_FOLDER = mechlovin/adelais/standard_led/arm/rev4/stm32f303
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/info.json b/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/info.json
deleted file mode 100644
index 774c3dcf31..0000000000
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/info.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "processor": "STM32F303",
- "board": "QMK_PROTON_C",
- "bootloader": "stm32-dfu"
-}
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/keyboard.json b/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/keyboard.json
new file mode 100644
index 0000000000..9e9748fa93
--- /dev/null
+++ b/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/keyboard.json
@@ -0,0 +1,16 @@
+{
+ "processor": "STM32F303",
+ "board": "QMK_PROTON_C",
+ "bootloader": "stm32-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "nkro": true,
+ "backlight": true,
+ "rgblight": true,
+ "encoder": true
+ }
+}
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/rules.mk b/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/rules.mk
+++ /dev/null
diff --git a/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json b/keyboards/mechlovin/adelais/standard_led/avr/rev1/keyboard.json
index 95aac7b0d4..3758a8f085 100644
--- a/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json
+++ b/keyboards/mechlovin/adelais/standard_led/avr/rev1/keyboard.json
@@ -3,6 +3,16 @@
"usb": {
"pid": "0xAD04"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": false,
+ "command": false,
+ "nkro": true,
+ "backlight": true,
+ "rgblight": true
+ },
"encoder": {
"rotary": [
{"pin_a": "D3", "pin_b": "D2"},
diff --git a/keyboards/mechlovin/adelais/standard_led/avr/rev1/matrix.c b/keyboards/mechlovin/adelais/standard_led/avr/rev1/matrix.c
index 37046790fe..864de5e660 100644
--- a/keyboards/mechlovin/adelais/standard_led/avr/rev1/matrix.c
+++ b/keyboards/mechlovin/adelais/standard_led/avr/rev1/matrix.c
@@ -16,13 +16,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 <stdint.h>
-#include <stdbool.h>
#include "wait.h"
#include "util.h"
#include "matrix.h"
#include "debounce.h"
-#include "quantum.h"
#ifdef DIRECT_PINS
static pin_t direct_pins[MATRIX_ROWS][MATRIX_COLS] = DIRECT_PINS;
diff --git a/keyboards/mechlovin/adelais/standard_led/avr/rev1/rules.mk b/keyboards/mechlovin/adelais/standard_led/avr/rev1/rules.mk
index c807f2ad09..179d02c3c6 100644
--- a/keyboards/mechlovin/adelais/standard_led/avr/rev1/rules.mk
+++ b/keyboards/mechlovin/adelais/standard_led/avr/rev1/rules.mk
@@ -1,7 +1,3 @@
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
CUSTOM_MATRIX = lite
SRC += matrix.c
diff --git a/keyboards/mechlovin/adelais/standard_led/rules.mk b/keyboards/mechlovin/adelais/standard_led/rules.mk
index 271c6a9179..a1d2ba038d 100644
--- a/keyboards/mechlovin/adelais/standard_led/rules.mk
+++ b/keyboards/mechlovin/adelais/standard_led/rules.mk
@@ -1,5 +1 @@
-
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
DEFAULT_FOLDER = mechlovin/adelais/standard_led/arm/rev2