aboutsummaryrefslogtreecommitdiff
path: root/keyboards/maple_computing
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/maple_computing')
-rw-r--r--keyboards/maple_computing/6ball/keyboard.json (renamed from keyboards/maple_computing/6ball/info.json)10
-rw-r--r--keyboards/maple_computing/6ball/rules.mk13
-rwxr-xr-xkeyboards/maple_computing/c39/keyboard.json (renamed from keyboards/maple_computing/c39/info.json)8
-rwxr-xr-xkeyboards/maple_computing/c39/rules.mk12
-rw-r--r--keyboards/maple_computing/christmas_tree/info.json9
-rw-r--r--keyboards/maple_computing/christmas_tree/rules.mk13
-rw-r--r--keyboards/maple_computing/ivy/rev1/keyboard.json (renamed from keyboards/maple_computing/ivy/rev1/info.json)0
-rw-r--r--keyboards/maple_computing/ivy/rev1/rules.mk0
-rw-r--r--keyboards/maple_computing/launchpad/rev1/keyboard.json (renamed from keyboards/maple_computing/launchpad/rev1/info.json)0
-rw-r--r--keyboards/maple_computing/launchpad/rev1/rules.mk0
-rw-r--r--keyboards/maple_computing/lets_split_eh/eh/info.json1
-rw-r--r--keyboards/maple_computing/lets_split_eh/rules.mk2
-rw-r--r--keyboards/maple_computing/minidox/keymaps/default/keymap.c17
-rw-r--r--keyboards/maple_computing/minidox/rev1/info.json1
-rw-r--r--keyboards/maple_computing/minidox/rules.mk2
-rw-r--r--keyboards/maple_computing/the_ruler/keyboard.json (renamed from keyboards/maple_computing/the_ruler/info.json)9
-rw-r--r--keyboards/maple_computing/the_ruler/keymaps/default/keymap.c18
-rw-r--r--keyboards/maple_computing/the_ruler/rules.mk12
18 files changed, 39 insertions, 88 deletions
diff --git a/keyboards/maple_computing/6ball/info.json b/keyboards/maple_computing/6ball/keyboard.json
index 56531d6fa2..3f125c75c4 100644
--- a/keyboards/maple_computing/6ball/info.json
+++ b/keyboards/maple_computing/6ball/keyboard.json
@@ -26,6 +26,16 @@
"ws2812": {
"pin": "F7"
},
+ "features": {
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true,
+ "unicode": true
+ },
"matrix_pins": {
"cols": ["F4", "D4", "B5", "B6", "B2", "F6"],
"rows": ["F5"]
diff --git a/keyboards/maple_computing/6ball/rules.mk b/keyboards/maple_computing/6ball/rules.mk
deleted file mode 100644
index a73f2bd693..0000000000
--- a/keyboards/maple_computing/6ball/rules.mk
+++ /dev/null
@@ -1,13 +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 = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-UNICODE_ENABLE = yes # Unicode
-RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight.
diff --git a/keyboards/maple_computing/c39/info.json b/keyboards/maple_computing/c39/keyboard.json
index 8a70fe365e..de4cbc6aeb 100755
--- a/keyboards/maple_computing/c39/info.json
+++ b/keyboards/maple_computing/c39/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0xCA39",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D7", "E6", "C6", "D2", "D3"],
"rows": ["D1", "B4", "B5"]
diff --git a/keyboards/maple_computing/c39/rules.mk b/keyboards/maple_computing/c39/rules.mk
deleted file mode 100755
index 3328e87188..0000000000
--- a/keyboards/maple_computing/c39/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 = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = no # RGB Enable / Disable
diff --git a/keyboards/maple_computing/christmas_tree/info.json b/keyboards/maple_computing/christmas_tree/info.json
index e675f2f932..ced352ccaa 100644
--- a/keyboards/maple_computing/christmas_tree/info.json
+++ b/keyboards/maple_computing/christmas_tree/info.json
@@ -7,6 +7,15 @@
"vid": "0xFEED",
"pid": "0x3070"
},
+ "features": {
+ "backlight": true,
+ "bootmagic": false,
+ "command": false,
+ "console": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["D1"],
"rows": ["D3", "F4", "D0", "F6", "F5", "D4"]
diff --git a/keyboards/maple_computing/christmas_tree/rules.mk b/keyboards/maple_computing/christmas_tree/rules.mk
index 54ee848437..3a6633cf56 100644
--- a/keyboards/maple_computing/christmas_tree/rules.mk
+++ b/keyboards/maple_computing/christmas_tree/rules.mk
@@ -1,14 +1 @@
-# 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 = yes # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
-
DEFAULT_FOLDER = maple_computing/christmas_tree/v2017
diff --git a/keyboards/maple_computing/ivy/rev1/info.json b/keyboards/maple_computing/ivy/rev1/keyboard.json
index de89abee75..de89abee75 100644
--- a/keyboards/maple_computing/ivy/rev1/info.json
+++ b/keyboards/maple_computing/ivy/rev1/keyboard.json
diff --git a/keyboards/maple_computing/ivy/rev1/rules.mk b/keyboards/maple_computing/ivy/rev1/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/maple_computing/ivy/rev1/rules.mk
+++ /dev/null
diff --git a/keyboards/maple_computing/launchpad/rev1/info.json b/keyboards/maple_computing/launchpad/rev1/keyboard.json
index a846dd83f5..a846dd83f5 100644
--- a/keyboards/maple_computing/launchpad/rev1/info.json
+++ b/keyboards/maple_computing/launchpad/rev1/keyboard.json
diff --git a/keyboards/maple_computing/launchpad/rev1/rules.mk b/keyboards/maple_computing/launchpad/rev1/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/maple_computing/launchpad/rev1/rules.mk
+++ /dev/null
diff --git a/keyboards/maple_computing/lets_split_eh/eh/info.json b/keyboards/maple_computing/lets_split_eh/eh/info.json
index 2b77267da8..6b680418df 100644
--- a/keyboards/maple_computing/lets_split_eh/eh/info.json
+++ b/keyboards/maple_computing/lets_split_eh/eh/info.json
@@ -36,6 +36,7 @@
"pin": "B2"
},
"split": {
+ "enabled": true,
"soft_serial_pin": "D0"
},
"processor": "atmega32u4",
diff --git a/keyboards/maple_computing/lets_split_eh/rules.mk b/keyboards/maple_computing/lets_split_eh/rules.mk
index 4c5d9f9e5d..8e8d4c13b6 100644
--- a/keyboards/maple_computing/lets_split_eh/rules.mk
+++ b/keyboards/maple_computing/lets_split_eh/rules.mk
@@ -11,6 +11,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
AUDIO_ENABLE = no # Audio output
RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
-SPLIT_KEYBOARD = yes
-
DEFAULT_FOLDER = maple_computing/lets_split_eh/eh
diff --git a/keyboards/maple_computing/minidox/keymaps/default/keymap.c b/keyboards/maple_computing/minidox/keymaps/default/keymap.c
index d71e5b6e55..39ebffd987 100644
--- a/keyboards/maple_computing/minidox/keymaps/default/keymap.c
+++ b/keyboards/maple_computing/minidox/keymaps/default/keymap.c
@@ -13,8 +13,7 @@ enum layer_names {
};
enum custom_keycodes {
- QWERTY = SAFE_RANGE,
- LOWER,
+ LOWER = SAFE_RANGE,
RAISE,
ADJUST,
};
@@ -114,22 +113,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
)
};
-void persistant_default_layer_set(uint16_t default_layer) {
- eeconfig_update_default_layer(default_layer);
- default_layer_set(default_layer);
-}
-
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch (keycode) {
- case QWERTY:
- if (record->event.pressed) {
- #ifdef AUDIO_ENABLE
- PLAY_SONG(tone_qwerty);
- #endif
- persistant_default_layer_set(1UL<<_QWERTY);
- }
- return false;
- break;
case LOWER:
if (record->event.pressed) {
layer_on(_LOWER);
diff --git a/keyboards/maple_computing/minidox/rev1/info.json b/keyboards/maple_computing/minidox/rev1/info.json
index e42ec5a08d..6f3a0dd1fc 100644
--- a/keyboards/maple_computing/minidox/rev1/info.json
+++ b/keyboards/maple_computing/minidox/rev1/info.json
@@ -14,6 +14,7 @@
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D0"
},
"processor": "atmega32u4",
diff --git a/keyboards/maple_computing/minidox/rules.mk b/keyboards/maple_computing/minidox/rules.mk
index 4cf751c493..64efe31512 100644
--- a/keyboards/maple_computing/minidox/rules.mk
+++ b/keyboards/maple_computing/minidox/rules.mk
@@ -11,6 +11,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
-SPLIT_KEYBOARD = yes
-
DEFAULT_FOLDER = maple_computing/minidox/rev1
diff --git a/keyboards/maple_computing/the_ruler/info.json b/keyboards/maple_computing/the_ruler/keyboard.json
index 9ba1355fdd..c38af0a320 100644
--- a/keyboards/maple_computing/the_ruler/info.json
+++ b/keyboards/maple_computing/the_ruler/keyboard.json
@@ -27,6 +27,15 @@
"ws2812": {
"pin": "E6"
},
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["D6", "D7", "B4", "B5", "B6", "C6"],
"rows": ["C7"]
diff --git a/keyboards/maple_computing/the_ruler/keymaps/default/keymap.c b/keyboards/maple_computing/the_ruler/keymaps/default/keymap.c
index 87190f0b3f..6ef57fd895 100644
--- a/keyboards/maple_computing/the_ruler/keymaps/default/keymap.c
+++ b/keyboards/maple_computing/the_ruler/keymaps/default/keymap.c
@@ -9,12 +9,6 @@
#define _FN_1 1
#define _FN_2 2
-enum custom_keycodes {
- DEFAULT = SAFE_RANGE,
- FN_1,
- FN_2
-};
-
// Defines for task manager and such
#define CALTDEL LCTL(LALT(KC_DEL))
#define TSKMGR LCTL(LSFT(KC_ESC))
@@ -49,15 +43,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
)
};
-
-void persistant_default_layer_set(uint16_t default_layer) {
- eeconfig_update_default_layer(default_layer);
- default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
- switch (keycode) {
- // NONE
- }
- return true;
-}
diff --git a/keyboards/maple_computing/the_ruler/rules.mk b/keyboards/maple_computing/the_ruler/rules.mk
deleted file mode 100644
index 473689d814..0000000000
--- a/keyboards/maple_computing/the_ruler/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 = 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
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight.