aboutsummaryrefslogtreecommitdiff
path: root/keyboards/smithrune
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/smithrune')
-rw-r--r--keyboards/smithrune/iron160/iron160_h/keyboard.json (renamed from keyboards/smithrune/iron160/iron160_h/info.json)8
-rw-r--r--keyboards/smithrune/iron160/iron160_h/rules.mk16
-rw-r--r--keyboards/smithrune/iron160/iron160_s/keyboard.json (renamed from keyboards/smithrune/iron160/iron160_s/info.json)8
-rw-r--r--keyboards/smithrune/iron160/iron160_s/rules.mk16
-rw-r--r--keyboards/smithrune/iron165r2/f072/keyboard.json (renamed from keyboards/smithrune/iron165r2/f072/info.json)12
-rw-r--r--keyboards/smithrune/iron165r2/f072/rules.mk15
-rw-r--r--keyboards/smithrune/iron165r2/f411/config.h4
-rw-r--r--keyboards/smithrune/iron165r2/f411/keyboard.json (renamed from keyboards/smithrune/iron165r2/f411/info.json)12
-rw-r--r--keyboards/smithrune/iron165r2/f411/rules.mk14
-rw-r--r--keyboards/smithrune/iron165r2/iron165r2.c6
-rw-r--r--keyboards/smithrune/iron180/keyboard.json (renamed from keyboards/smithrune/iron180/info.json)8
-rw-r--r--keyboards/smithrune/iron180/rules.mk15
-rw-r--r--keyboards/smithrune/iron180v2/v2h/keyboard.json (renamed from keyboards/smithrune/iron180v2/v2h/info.json)0
-rw-r--r--keyboards/smithrune/iron180v2/v2h/rules.mk1
-rw-r--r--keyboards/smithrune/iron180v2/v2s/keyboard.json (renamed from keyboards/smithrune/iron180v2/v2s/info.json)0
-rw-r--r--keyboards/smithrune/iron180v2/v2s/rules.mk1
-rw-r--r--keyboards/smithrune/magnus/m75h/config.h4
-rw-r--r--keyboards/smithrune/magnus/m75h/keyboard.json (renamed from keyboards/smithrune/magnus/m75h/info.json)3
-rw-r--r--keyboards/smithrune/magnus/m75h/rules.mk1
-rw-r--r--keyboards/smithrune/magnus/m75s/config.h4
-rw-r--r--keyboards/smithrune/magnus/m75s/keyboard.json (renamed from keyboards/smithrune/magnus/m75s/info.json)4
-rw-r--r--keyboards/smithrune/magnus/m75s/rules.mk1
22 files changed, 58 insertions, 95 deletions
diff --git a/keyboards/smithrune/iron160/iron160_h/info.json b/keyboards/smithrune/iron160/iron160_h/keyboard.json
index 3fb14989d6..d9ada0879d 100644
--- a/keyboards/smithrune/iron160/iron160_h/info.json
+++ b/keyboards/smithrune/iron160/iron160_h/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x1648",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true
+ },
"processor": "STM32F072",
"bootloader": "stm32-dfu",
"matrix_pins": {
diff --git a/keyboards/smithrune/iron160/iron160_h/rules.mk b/keyboards/smithrune/iron160/iron160_h/rules.mk
index c889da168d..4138455538 100644
--- a/keyboards/smithrune/iron160/iron160_h/rules.mk
+++ b/keyboards/smithrune/iron160/iron160_h/rules.mk
@@ -1,18 +1,2 @@
-# 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 = no # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # USB Nkey Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-ENCODER_ENABLE = no
-LTO_ENABLE = no
-
EEPROM_DRIVER = wear_leveling
WEAR_LEVELING_DRIVER = legacy
-
diff --git a/keyboards/smithrune/iron160/iron160_s/info.json b/keyboards/smithrune/iron160/iron160_s/keyboard.json
index 91c66a3d4f..b2a465399f 100644
--- a/keyboards/smithrune/iron160/iron160_s/info.json
+++ b/keyboards/smithrune/iron160/iron160_s/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x1653",
"device_version": "0.0.1"
},
+ "features": {
+ "backlight": true,
+ "bootmagic": true,
+ "command": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
"processor": "STM32F072",
"bootloader": "stm32-dfu",
"matrix_pins": {
diff --git a/keyboards/smithrune/iron160/iron160_s/rules.mk b/keyboards/smithrune/iron160/iron160_s/rules.mk
index 2c863bbe31..4138455538 100644
--- a/keyboards/smithrune/iron160/iron160_s/rules.mk
+++ b/keyboards/smithrune/iron160/iron160_s/rules.mk
@@ -1,18 +1,2 @@
-# 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 = no # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # USB Nkey Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-ENCODER_ENABLE = no
-LTO_ENABLE = no
-
EEPROM_DRIVER = wear_leveling
WEAR_LEVELING_DRIVER = legacy
-
diff --git a/keyboards/smithrune/iron165r2/f072/info.json b/keyboards/smithrune/iron165r2/f072/keyboard.json
index 2cbbaa84f3..e16493d0b5 100644
--- a/keyboards/smithrune/iron165r2/f072/info.json
+++ b/keyboards/smithrune/iron165r2/f072/keyboard.json
@@ -1,4 +1,16 @@
{
+ "build": {
+ "lto": false
+ },
+ "features": {
+ "backlight": true,
+ "bootmagic": true,
+ "command": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true,
+ "rgblight": true
+ },
"backlight": {
"pin": "A6",
"levels": 20,
diff --git a/keyboards/smithrune/iron165r2/f072/rules.mk b/keyboards/smithrune/iron165r2/f072/rules.mk
deleted file mode 100644
index b524e61f4b..0000000000
--- a/keyboards/smithrune/iron165r2/f072/rules.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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 # USB Nkey Rollover
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-LTO_ENABLE = no
-ENCODER_ENABLE = no
-BACKLIGHT_ENABLE = yes
-
diff --git a/keyboards/smithrune/iron165r2/f411/config.h b/keyboards/smithrune/iron165r2/f411/config.h
index 8ed73d3ff4..bcd506ade3 100644
--- a/keyboards/smithrune/iron165r2/f411/config.h
+++ b/keyboards/smithrune/iron165r2/f411/config.h
@@ -24,5 +24,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define WS2812_PWM_DRIVER PWMD1
#define WS2812_PWM_CHANNEL 3
#define WS2812_PWM_PAL_MODE 1
-#define WS2812_DMA_STREAM STM32_DMA2_STREAM5
-#define WS2812_DMA_CHANNEL 6
+#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5
+#define WS2812_PWM_DMA_CHANNEL 6
diff --git a/keyboards/smithrune/iron165r2/f411/info.json b/keyboards/smithrune/iron165r2/f411/keyboard.json
index ff685e3cdd..d3d4b3de50 100644
--- a/keyboards/smithrune/iron165r2/f411/info.json
+++ b/keyboards/smithrune/iron165r2/f411/keyboard.json
@@ -1,4 +1,16 @@
{
+ "build": {
+ "lto": false
+ },
+ "features": {
+ "backlight": true,
+ "bootmagic": true,
+ "command": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true,
+ "rgblight": true
+ },
"eeprom": {
"driver": "i2c"
},
diff --git a/keyboards/smithrune/iron165r2/f411/rules.mk b/keyboards/smithrune/iron165r2/f411/rules.mk
deleted file mode 100644
index f5a58ab0cb..0000000000
--- a/keyboards/smithrune/iron165r2/f411/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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 # USB Nkey Rollover
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-LTO_ENABLE = no
-ENCODER_ENABLE = no
-BACKLIGHT_ENABLE = yes
diff --git a/keyboards/smithrune/iron165r2/iron165r2.c b/keyboards/smithrune/iron165r2/iron165r2.c
index 6f1606f89d..428494f408 100644
--- a/keyboards/smithrune/iron165r2/iron165r2.c
+++ b/keyboards/smithrune/iron165r2/iron165r2.c
@@ -17,8 +17,8 @@
#include "quantum.h"
void board_init(void) {
- setPinInput(B6);
- setPinInput(B7);
+ gpio_set_pin_input(B6);
+ gpio_set_pin_input(B7);
#if defined (LINE_RGBS)
rgblight_set_effect_range(0,16);
#elif defined (RUNE_RGBS)
@@ -30,6 +30,6 @@ void board_init(void) {
bool led_update_kb(led_t led_state) {
bool res = led_update_user(led_state);
- if(res) writePin(LED_CAPS_LOCK_PIN, led_state.caps_lock);
+ if(res) gpio_write_pin(LED_CAPS_LOCK_PIN, led_state.caps_lock);
return res;
}
diff --git a/keyboards/smithrune/iron180/info.json b/keyboards/smithrune/iron180/keyboard.json
index 4707f32664..0a7367649a 100644
--- a/keyboards/smithrune/iron180/info.json
+++ b/keyboards/smithrune/iron180/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x1180",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["B7", "B6", "B5", "B4", "B3", "A10", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B2", "A4", "B1", "A3"],
"rows": ["B9", "B8", "A15", "B0", "A7", "A5"]
diff --git a/keyboards/smithrune/iron180/rules.mk b/keyboards/smithrune/iron180/rules.mk
deleted file mode 100644
index bfb4a63764..0000000000
--- a/keyboards/smithrune/iron180/rules.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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 # USB Nkey Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-ENCODER_ENABLE = no
-LTO_ENABLE = no
-
diff --git a/keyboards/smithrune/iron180v2/v2h/info.json b/keyboards/smithrune/iron180v2/v2h/keyboard.json
index a41c9d7e95..a41c9d7e95 100644
--- a/keyboards/smithrune/iron180v2/v2h/info.json
+++ b/keyboards/smithrune/iron180v2/v2h/keyboard.json
diff --git a/keyboards/smithrune/iron180v2/v2h/rules.mk b/keyboards/smithrune/iron180v2/v2h/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/smithrune/iron180v2/v2h/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/smithrune/iron180v2/v2s/info.json b/keyboards/smithrune/iron180v2/v2s/keyboard.json
index 8274415991..8274415991 100644
--- a/keyboards/smithrune/iron180v2/v2s/info.json
+++ b/keyboards/smithrune/iron180v2/v2s/keyboard.json
diff --git a/keyboards/smithrune/iron180v2/v2s/rules.mk b/keyboards/smithrune/iron180v2/v2s/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/smithrune/iron180v2/v2s/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/smithrune/magnus/m75h/config.h b/keyboards/smithrune/magnus/m75h/config.h
index e72ba06969..18fd960d8f 100644
--- a/keyboards/smithrune/magnus/m75h/config.h
+++ b/keyboards/smithrune/magnus/m75h/config.h
@@ -25,5 +25,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define WS2812_PWM_DRIVER PWMD1
#define WS2812_PWM_CHANNEL 3
#define WS2812_PWM_PAL_MODE 1
-#define WS2812_DMA_STREAM STM32_DMA2_STREAM5
-#define WS2812_DMA_CHANNEL 6
+#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5
+#define WS2812_PWM_DMA_CHANNEL 6
diff --git a/keyboards/smithrune/magnus/m75h/info.json b/keyboards/smithrune/magnus/m75h/keyboard.json
index a4f2ce5768..325db7d1da 100644
--- a/keyboards/smithrune/magnus/m75h/info.json
+++ b/keyboards/smithrune/magnus/m75h/keyboard.json
@@ -17,12 +17,9 @@
}
},
"features": {
- "audio": false,
- "backlight": false,
"bootmagic": true,
"command": false,
"console": false,
- "encoder": false,
"extrakey": true,
"mousekey": true,
"nkro": true,
diff --git a/keyboards/smithrune/magnus/m75h/rules.mk b/keyboards/smithrune/magnus/m75h/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/smithrune/magnus/m75h/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/smithrune/magnus/m75s/config.h b/keyboards/smithrune/magnus/m75s/config.h
index 1e8874caa4..95fb2a420c 100644
--- a/keyboards/smithrune/magnus/m75s/config.h
+++ b/keyboards/smithrune/magnus/m75s/config.h
@@ -27,5 +27,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define WS2812_PWM_DRIVER PWMD1
#define WS2812_PWM_CHANNEL 3
#define WS2812_PWM_PAL_MODE 1
-#define WS2812_DMA_STREAM STM32_DMA2_STREAM5
-#define WS2812_DMA_CHANNEL 6
+#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5
+#define WS2812_PWM_DMA_CHANNEL 6
diff --git a/keyboards/smithrune/magnus/m75s/info.json b/keyboards/smithrune/magnus/m75s/keyboard.json
index 5b834631f7..352b529bb0 100644
--- a/keyboards/smithrune/magnus/m75s/info.json
+++ b/keyboards/smithrune/magnus/m75s/keyboard.json
@@ -17,12 +17,10 @@
}
},
"features": {
- "audio": false,
"backlight": true,
"bootmagic": true,
"command": false,
"console": false,
- "encoder": false,
"extrakey": true,
"mousekey": true,
"nkro": true,
@@ -36,7 +34,7 @@
},
"indicators": {
"caps_lock": "A10"
- }
+ },
"ws2812": {
"pin": "B15"
},
diff --git a/keyboards/smithrune/magnus/m75s/rules.mk b/keyboards/smithrune/magnus/m75s/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/smithrune/magnus/m75s/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank