aboutsummaryrefslogtreecommitdiff
path: root/keyboards/ibm
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/ibm')
-rw-r--r--keyboards/ibm/model_m/ashpil_usbc/keyboard.json (renamed from keyboards/ibm/model_m/ashpil_usbc/info.json)8
-rw-r--r--keyboards/ibm/model_m/ashpil_usbc/rules.mk12
-rw-r--r--keyboards/ibm/model_m/modelh/keyboard.json (renamed from keyboards/ibm/model_m/modelh/info.json)0
-rw-r--r--keyboards/ibm/model_m/modelh/rules.mk0
-rw-r--r--keyboards/ibm/model_m/mschwingen/led_ffc/rules.mk2
-rw-r--r--keyboards/ibm/model_m/mschwingen/led_wired/rules.mk2
-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/teensy2/keyboard.json (renamed from keyboards/ibm/model_m/teensy2/info.json)8
-rw-r--r--keyboards/ibm/model_m/teensy2/rules.mk12
-rw-r--r--keyboards/ibm/model_m/yugo_m/keyboard.json (renamed from keyboards/ibm/model_m/yugo_m/info.json)8
-rw-r--r--keyboards/ibm/model_m/yugo_m/rules.mk12
-rw-r--r--keyboards/ibm/model_m_122/ibm122m/keyboard.json (renamed from keyboards/ibm/model_m_122/ibm122m/info.json)9
-rw-r--r--keyboards/ibm/model_m_122/ibm122m/rules.mk11
-rw-r--r--keyboards/ibm/model_m_122/m122_3270/blackpill/keyboard.json (renamed from keyboards/ibm/model_m_122/m122_3270/blackpill/info.json)8
-rw-r--r--keyboards/ibm/model_m_122/m122_3270/blackpill/rules.mk12
-rw-r--r--keyboards/ibm/model_m_122/m122_3270/bluepill/keyboard.json (renamed from keyboards/ibm/model_m_122/m122_3270/bluepill/info.json)0
-rw-r--r--keyboards/ibm/model_m_122/m122_3270/bluepill/rules.mk0
-rw-r--r--keyboards/ibm/model_m_122/m122_3270/teensy/keyboard.json (renamed from keyboards/ibm/model_m_122/m122_3270/teensy/info.json)8
-rw-r--r--keyboards/ibm/model_m_122/m122_3270/teensy/rules.mk12
-rw-r--r--keyboards/ibm/model_m_ssk/teensypp_ssk/keyboard.json (renamed from keyboards/ibm/model_m_ssk/teensypp_ssk/info.json)8
-rw-r--r--keyboards/ibm/model_m_ssk/teensypp_ssk/rules.mk12
22 files changed, 60 insertions, 88 deletions
diff --git a/keyboards/ibm/model_m/ashpil_usbc/info.json b/keyboards/ibm/model_m/ashpil_usbc/keyboard.json
index ffdb608edc..451589017e 100644
--- a/keyboards/ibm/model_m/ashpil_usbc/info.json
+++ b/keyboards/ibm/model_m/ashpil_usbc/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x0000",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["E6", "E7", "F0", "F1", "F2", "F3", "F4", "F5", "F6", "F7", "A0", "A1", "A2", "A3", "A4", "A5"],
"rows": ["C7", "C6", "C5", "C4", "C3", "C2", "C1", "C0"]
diff --git a/keyboards/ibm/model_m/ashpil_usbc/rules.mk b/keyboards/ibm/model_m/ashpil_usbc/rules.mk
deleted file mode 100644
index 6fe874e748..0000000000
--- a/keyboards/ibm/model_m/ashpil_usbc/rules.mk
+++ /dev/null
@@ -1,12 +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 = no # 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
diff --git a/keyboards/ibm/model_m/modelh/info.json b/keyboards/ibm/model_m/modelh/keyboard.json
index 6d55d5c6bd..6d55d5c6bd 100644
--- a/keyboards/ibm/model_m/modelh/info.json
+++ b/keyboards/ibm/model_m/modelh/keyboard.json
diff --git a/keyboards/ibm/model_m/modelh/rules.mk b/keyboards/ibm/model_m/modelh/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/ibm/model_m/modelh/rules.mk
+++ /dev/null
diff --git a/keyboards/ibm/model_m/mschwingen/led_ffc/rules.mk b/keyboards/ibm/model_m/mschwingen/led_ffc/rules.mk
index 8b13789179..6e7633bfe0 100644
--- a/keyboards/ibm/model_m/mschwingen/led_ffc/rules.mk
+++ b/keyboards/ibm/model_m/mschwingen/led_ffc/rules.mk
@@ -1 +1 @@
-
+# This file intentionally left blank
diff --git a/keyboards/ibm/model_m/mschwingen/led_wired/rules.mk b/keyboards/ibm/model_m/mschwingen/led_wired/rules.mk
index 8b13789179..6e7633bfe0 100644
--- a/keyboards/ibm/model_m/mschwingen/led_wired/rules.mk
+++ b/keyboards/ibm/model_m/mschwingen/led_wired/rules.mk
@@ -1 +1 @@
-
+# This file intentionally left blank
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/teensy2/info.json b/keyboards/ibm/model_m/teensy2/keyboard.json
index 19603adb7a..173f9e772f 100644
--- a/keyboards/ibm/model_m/teensy2/info.json
+++ b/keyboards/ibm/model_m/teensy2/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x0000",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["F0", "F1", "F4", "F5", "F6", "F7", "B6", "B5", "B4", "D7", "D6", "B0", "B1", "B2", "B3", "B7"],
"rows": ["D0", "D1", "D2", "D3", "C6", "C7", "D5", "D4"]
diff --git a/keyboards/ibm/model_m/teensy2/rules.mk b/keyboards/ibm/model_m/teensy2/rules.mk
deleted file mode 100644
index 6fe874e748..0000000000
--- a/keyboards/ibm/model_m/teensy2/rules.mk
+++ /dev/null
@@ -1,12 +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 = no # 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
diff --git a/keyboards/ibm/model_m/yugo_m/info.json b/keyboards/ibm/model_m/yugo_m/keyboard.json
index f4d9cc1d94..968c637b78 100644
--- a/keyboards/ibm/model_m/yugo_m/info.json
+++ b/keyboards/ibm/model_m/yugo_m/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x8E81",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3"],
"rows": ["B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"]
diff --git a/keyboards/ibm/model_m/yugo_m/rules.mk b/keyboards/ibm/model_m/yugo_m/rules.mk
deleted file mode 100644
index ab2c49da70..0000000000
--- a/keyboards/ibm/model_m/yugo_m/rules.mk
+++ /dev/null
@@ -1,12 +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 = 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
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/ibm/model_m_122/ibm122m/info.json b/keyboards/ibm/model_m_122/ibm122m/keyboard.json
index 54b0e9bade..3c43d17d92 100644
--- a/keyboards/ibm/model_m_122/ibm122m/info.json
+++ b/keyboards/ibm/model_m_122/ibm122m/keyboard.json
@@ -8,6 +8,15 @@
"pid": "0x0000",
"device_version": "0.0.1"
},
+ "features": {
+ "audio": true,
+ "bootmagic": false,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["E6", "B7", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "E0", "E1", "C0", "C1", "C2", "C3", "C4", "C5", "C7", "F1"],
"rows": ["F0", "B5", "B4", "B3", "B2", "B1", "B0", "E7"]
diff --git a/keyboards/ibm/model_m_122/ibm122m/rules.mk b/keyboards/ibm/model_m_122/ibm122m/rules.mk
deleted file mode 100644
index 3b2469ecc8..0000000000
--- a/keyboards/ibm/model_m_122/ibm122m/rules.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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 = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = yes # Audio output
diff --git a/keyboards/ibm/model_m_122/m122_3270/blackpill/info.json b/keyboards/ibm/model_m_122/m122_3270/blackpill/keyboard.json
index b17554b7e0..46abafb2c4 100644
--- a/keyboards/ibm/model_m_122/m122_3270/blackpill/info.json
+++ b/keyboards/ibm/model_m_122/m122_3270/blackpill/keyboard.json
@@ -2,6 +2,14 @@
"usb": {
"device_version": "0.0.2"
},
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["B0", "B1", "B10", "B12", "B13", "B14", "B15", "A8", "A7", "A10", "A6", "A5", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9"],
"rows": ["C13", "C14", "C15", "A0", "A1", "A2", "A3", "A4"]
diff --git a/keyboards/ibm/model_m_122/m122_3270/blackpill/rules.mk b/keyboards/ibm/model_m_122/m122_3270/blackpill/rules.mk
deleted file mode 100644
index 0a85fffb85..0000000000
--- a/keyboards/ibm/model_m_122/m122_3270/blackpill/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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 = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/ibm/model_m_122/m122_3270/bluepill/info.json b/keyboards/ibm/model_m_122/m122_3270/bluepill/keyboard.json
index e2f18d06e4..e2f18d06e4 100644
--- a/keyboards/ibm/model_m_122/m122_3270/bluepill/info.json
+++ b/keyboards/ibm/model_m_122/m122_3270/bluepill/keyboard.json
diff --git a/keyboards/ibm/model_m_122/m122_3270/bluepill/rules.mk b/keyboards/ibm/model_m_122/m122_3270/bluepill/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/ibm/model_m_122/m122_3270/bluepill/rules.mk
+++ /dev/null
diff --git a/keyboards/ibm/model_m_122/m122_3270/teensy/info.json b/keyboards/ibm/model_m_122/m122_3270/teensy/keyboard.json
index 7596f5fc15..ca2dd31fbf 100644
--- a/keyboards/ibm/model_m_122/m122_3270/teensy/info.json
+++ b/keyboards/ibm/model_m_122/m122_3270/teensy/keyboard.json
@@ -2,6 +2,14 @@
"usb": {
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["B5", "B6", "B7", "D0", "D1", "D2", "D3", "D4", "D5", "D7", "E0", "E1", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7"],
"rows": ["F0", "F1", "F2", "F3", "F4", "F5", "F6", "F7"]
diff --git a/keyboards/ibm/model_m_122/m122_3270/teensy/rules.mk b/keyboards/ibm/model_m_122/m122_3270/teensy/rules.mk
deleted file mode 100644
index 0a85fffb85..0000000000
--- a/keyboards/ibm/model_m_122/m122_3270/teensy/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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 = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/ibm/model_m_ssk/teensypp_ssk/info.json b/keyboards/ibm/model_m_ssk/teensypp_ssk/keyboard.json
index fbc3076c47..5994d820f4 100644
--- a/keyboards/ibm/model_m_ssk/teensypp_ssk/info.json
+++ b/keyboards/ibm/model_m_ssk/teensypp_ssk/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x0000",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["C7", "C6", "C5", "C4", "C3", "C2", "C1", "C0", "E1", "E0", "D7", "D5", "D4", "D3", "D2", "D1"],
"rows": ["F0", "F1", "F2", "F3", "F4", "F5", "F6", "F7"]
diff --git a/keyboards/ibm/model_m_ssk/teensypp_ssk/rules.mk b/keyboards/ibm/model_m_ssk/teensypp_ssk/rules.mk
deleted file mode 100644
index 2904475d7d..0000000000
--- a/keyboards/ibm/model_m_ssk/teensypp_ssk/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # 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 = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output