Merge remote-tracking branch 'origin/master' into develop

14 files changed, 19 insertions, 17 deletions

diff --git a/keyboards/helix/pico/back/keyboard.json b/keyboards/helix/pico/back/keyboard.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/keyboards/helix/pico/back/keyboard.json
@@ -0,0 +1 @@
+{}
diff --git a/keyboards/helix/pico/base/keyboard.json b/keyboards/helix/pico/base/keyboard.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/keyboards/helix/pico/base/keyboard.json
@@ -0,0 +1 @@
+{}
diff --git a/keyboards/helix/pico/qmk_conf/keyboard.json b/keyboards/helix/pico/qmk_conf/keyboard.json
new file mode 100644
index 0000000000..ddb7220342
--- /dev/null
+++ b/keyboards/helix/pico/qmk_conf/keyboard.json
@@ -0,0 +1,6 @@
+{
+    "features": {
+        "audio": true,
+        "extrakey": true
+    }
+}
diff --git a/keyboards/helix/pico/qmk_conf/rules.mk b/keyboards/helix/pico/qmk_conf/rules.mk
deleted file mode 100644
index 08ca8e094d..0000000000
--- a/keyboards/helix/pico/qmk_conf/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-AUDIO_ENABLE = yes          # Audio output
diff --git a/keyboards/helix/pico/rules.mk b/keyboards/helix/pico/rules.mk
index e18b8fb0c4..449df9caa6 100644
--- a/keyboards/helix/pico/rules.mk
+++ b/keyboards/helix/pico/rules.mk
@@ -3,3 +3,5 @@ LED_BACK_ENABLE = no        # LED backlight (Enable WS2812 RGB underlight.)
 LED_UNDERGLOW_ENABLE = no   # LED underglow (Enable WS2812 RGB underlight.)
 LED_ANIMATIONS = yes        # LED animations
 IOS_DEVICE_ENABLE = no      # connect to IOS device (iPad,iPhone)
+
+DEFAULT_FOLDER = helix/pico/base
diff --git a/keyboards/helix/pico/sc/keyboard.json b/keyboards/helix/pico/sc/keyboard.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/keyboards/helix/pico/sc/keyboard.json
@@ -0,0 +1 @@
+{}
diff --git a/keyboards/helix/pico/under/keyboard.json b/keyboards/helix/pico/under/keyboard.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/keyboards/helix/pico/under/keyboard.json
@@ -0,0 +1 @@
+{}
diff --git a/keyboards/helix/rev2/back/keyboard.json b/keyboards/helix/rev2/back/keyboard.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/keyboards/helix/rev2/back/keyboard.json
@@ -0,0 +1 @@
+{}
diff --git a/keyboards/helix/rev2/base/keyboard.json b/keyboards/helix/rev2/base/keyboard.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/keyboards/helix/rev2/base/keyboard.json
@@ -0,0 +1 @@
+{}
diff --git a/keyboards/helix/rev2/qmk_conf/keyboard.json b/keyboards/helix/rev2/qmk_conf/keyboard.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/keyboards/helix/rev2/qmk_conf/keyboard.json
@@ -0,0 +1 @@
+{}
diff --git a/keyboards/helix/rev2/rules.mk b/keyboards/helix/rev2/rules.mk
index e827ae111f..4f830403f4 100644
--- a/keyboards/helix/rev2/rules.mk
+++ b/keyboards/helix/rev2/rules.mk
@@ -7,3 +7,5 @@ LED_BACK_ENABLE = no        # LED backlight (Enable WS2812 RGB underlight.)
 LED_UNDERGLOW_ENABLE = no   # LED underglow (Enable WS2812 RGB underlight.)
 LED_ANIMATIONS = yes        # LED animations
 IOS_DEVICE_ENABLE = no      # connect to IOS device (iPad,iPhone)
+
+DEFAULT_FOLDER = helix/rev2/base
diff --git a/keyboards/helix/rev2/sc/keyboard.json b/keyboards/helix/rev2/sc/keyboard.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/keyboards/helix/rev2/sc/keyboard.json
@@ -0,0 +1 @@
+{}
diff --git a/keyboards/helix/rev2/under/keyboard.json b/keyboards/helix/rev2/under/keyboard.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/keyboards/helix/rev2/under/keyboard.json
@@ -0,0 +1 @@
+{}
diff --git a/keyboards/helix/rules.mk b/keyboards/helix/rules.mk
index 8ea71064b2..f743d48d0e 100644
--- a/keyboards/helix/rules.mk
+++ b/keyboards/helix/rules.mk
@@ -1,18 +1,3 @@
-# Build Options
-#   change yes to no to disable
-#
-#   See TOP/docs/config_options.md for more information.
-#
-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 = no     # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no   # Enable keyboard backlight functionality
-AUDIO_ENABLE = no       # Audio output
-RGBLIGHT_ENABLE = no    # Enable WS2812 RGB underlight.
-
 DEFAULT_FOLDER = helix/rev2
 
 HELIX_TOP_DIR := $(patsubst %/,%,$(dir $(lastword $(MAKEFILE_LIST))))