aboutsummaryrefslogtreecommitdiff
path: root/keyboards/ibm/model_m/mschwingen
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/ibm/model_m/mschwingen')
-rw-r--r--keyboards/ibm/model_m/mschwingen/info.json12
-rw-r--r--keyboards/ibm/model_m/mschwingen/led_ffc/keyboard.json2
-rw-r--r--keyboards/ibm/model_m/mschwingen/led_ffc/rules.mk1
-rw-r--r--keyboards/ibm/model_m/mschwingen/led_wired/keyboard.json2
-rw-r--r--keyboards/ibm/model_m/mschwingen/led_wired/rules.mk1
-rw-r--r--keyboards/ibm/model_m/mschwingen/led_ws2812/keyboard.json2
-rw-r--r--keyboards/ibm/model_m/mschwingen/matrix.c3
-rw-r--r--keyboards/ibm/model_m/mschwingen/mschwingen.c1
-rw-r--r--keyboards/ibm/model_m/mschwingen/post_rules.mk2
-rw-r--r--keyboards/ibm/model_m/mschwingen/rules.mk22
10 files changed, 22 insertions, 26 deletions
diff --git a/keyboards/ibm/model_m/mschwingen/info.json b/keyboards/ibm/model_m/mschwingen/info.json
index ce740e4a54..0deb57ed03 100644
--- a/keyboards/ibm/model_m/mschwingen/info.json
+++ b/keyboards/ibm/model_m/mschwingen/info.json
@@ -16,6 +16,18 @@
},
"processor": "atmega32u4",
"bootloader": "lufa-dfu",
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "key_lock": true,
+ "dynamic_macro": true
+ },
+ "build": {
+ "lto": true
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/ibm/model_m/mschwingen/led_ffc/keyboard.json b/keyboards/ibm/model_m/mschwingen/led_ffc/keyboard.json
new file mode 100644
index 0000000000..2c63c08510
--- /dev/null
+++ b/keyboards/ibm/model_m/mschwingen/led_ffc/keyboard.json
@@ -0,0 +1,2 @@
+{
+}
diff --git a/keyboards/ibm/model_m/mschwingen/led_ffc/rules.mk b/keyboards/ibm/model_m/mschwingen/led_ffc/rules.mk
deleted file mode 100644
index 8b13789179..0000000000
--- a/keyboards/ibm/model_m/mschwingen/led_ffc/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/keyboards/ibm/model_m/mschwingen/led_wired/keyboard.json b/keyboards/ibm/model_m/mschwingen/led_wired/keyboard.json
new file mode 100644
index 0000000000..2c63c08510
--- /dev/null
+++ b/keyboards/ibm/model_m/mschwingen/led_wired/keyboard.json
@@ -0,0 +1,2 @@
+{
+}
diff --git a/keyboards/ibm/model_m/mschwingen/led_wired/rules.mk b/keyboards/ibm/model_m/mschwingen/led_wired/rules.mk
deleted file mode 100644
index 8b13789179..0000000000
--- a/keyboards/ibm/model_m/mschwingen/led_wired/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/keyboards/ibm/model_m/mschwingen/led_ws2812/keyboard.json b/keyboards/ibm/model_m/mschwingen/led_ws2812/keyboard.json
new file mode 100644
index 0000000000..2c63c08510
--- /dev/null
+++ b/keyboards/ibm/model_m/mschwingen/led_ws2812/keyboard.json
@@ -0,0 +1,2 @@
+{
+}
diff --git a/keyboards/ibm/model_m/mschwingen/matrix.c b/keyboards/ibm/model_m/mschwingen/matrix.c
index 361803edec..85df5e5d6f 100644
--- a/keyboards/ibm/model_m/mschwingen/matrix.c
+++ b/keyboards/ibm/model_m/mschwingen/matrix.c
@@ -14,12 +14,9 @@
* 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 "util.h"
#include "matrix.h"
#include "debounce.h"
-#include "quantum.h"
#include "spi_master.h"
#include "print.h"
#include "mschwingen.h"
diff --git a/keyboards/ibm/model_m/mschwingen/mschwingen.c b/keyboards/ibm/model_m/mschwingen/mschwingen.c
index 03dfcdc2f2..6a8a0ec8fc 100644
--- a/keyboards/ibm/model_m/mschwingen/mschwingen.c
+++ b/keyboards/ibm/model_m/mschwingen/mschwingen.c
@@ -90,6 +90,7 @@ void sleep_led_enable(void) {
void keyboard_pre_init_kb(void) {
#ifdef KEYBOARD_ibm_model_m_mschwingen_led_ws2812
+ ws2812_init();
ws2812_setleds(led, RGBLIGHT_LED_COUNT);
#else
/* Set status LEDs pins to output and Low (on) */
diff --git a/keyboards/ibm/model_m/mschwingen/post_rules.mk b/keyboards/ibm/model_m/mschwingen/post_rules.mk
index a1c2040f4c..025068e057 100644
--- a/keyboards/ibm/model_m/mschwingen/post_rules.mk
+++ b/keyboards/ibm/model_m/mschwingen/post_rules.mk
@@ -1,3 +1,5 @@
+UART_DEBUG ?= no
+
ifeq ($(strip $(UART_DEBUG)), yes)
OPT_DEFS += -DUART_DEBUG
endif
diff --git a/keyboards/ibm/model_m/mschwingen/rules.mk b/keyboards/ibm/model_m/mschwingen/rules.mk
index 7d81ffe326..65761bcf9a 100644
--- a/keyboards/ibm/model_m/mschwingen/rules.mk
+++ b/keyboards/ibm/model_m/mschwingen/rules.mk
@@ -1,29 +1,9 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # 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 = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
CUSTOM_MATRIX = lite
-KEY_LOCK_ENABLE = yes
-
-DYNAMIC_MACRO_ENABLE = yes
-
-UART_DEBUG = no
SRC += matrix.c
UART_DRIVER_REQUIRED = yes
SPI_DRIVER_REQUIRED = yes
-OPT_DEFS += -DSLEEP_LED_ENABLE # we need our own sleep callbacks to turn of WS2812 LEDs
-
-LTO_ENABLE = yes
+OPT_DEFS += -DSLEEP_LED_ENABLE
DEFAULT_FOLDER = ibm/model_m/mschwingen/led_wired