aboutsummaryrefslogtreecommitdiff
path: root/keyboards/horrortroll
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/horrortroll')
-rw-r--r--keyboards/horrortroll/caticorn/rev1/hotswap/keyboard.json (renamed from keyboards/horrortroll/caticorn/rev1/hotswap/info.json)0
-rw-r--r--keyboards/horrortroll/caticorn/rev1/hotswap/rules.mk1
-rw-r--r--keyboards/horrortroll/caticorn/rev1/solder/keyboard.json (renamed from keyboards/horrortroll/caticorn/rev1/solder/info.json)0
-rw-r--r--keyboards/horrortroll/caticorn/rev1/solder/rules.mk1
-rw-r--r--keyboards/horrortroll/chinese_pcb/black_e65/keyboard.json (renamed from keyboards/horrortroll/chinese_pcb/black_e65/info.json)10
-rw-r--r--keyboards/horrortroll/chinese_pcb/black_e65/rules.mk12
-rw-r--r--keyboards/horrortroll/chinese_pcb/devil68_pro/keyboard.json (renamed from keyboards/horrortroll/chinese_pcb/devil68_pro/info.json)9
-rw-r--r--keyboards/horrortroll/chinese_pcb/devil68_pro/rules.mk15
-rw-r--r--keyboards/horrortroll/handwired_k552/keyboard.json (renamed from keyboards/horrortroll/handwired_k552/info.json)9
-rw-r--r--keyboards/horrortroll/handwired_k552/lib/bongocat.c9
-rw-r--r--keyboards/horrortroll/handwired_k552/lib/galaxy.c4
-rw-r--r--keyboards/horrortroll/handwired_k552/lib/logo.c4
-rw-r--r--keyboards/horrortroll/handwired_k552/rules.mk20
-rw-r--r--keyboards/horrortroll/lemon40/keyboard.json (renamed from keyboards/horrortroll/lemon40/info.json)12
-rw-r--r--keyboards/horrortroll/lemon40/lib/bongocat.c9
-rw-r--r--keyboards/horrortroll/lemon40/rules.mk20
-rw-r--r--keyboards/horrortroll/nyx/rev1/keyboard.json (renamed from keyboards/horrortroll/nyx/rev1/info.json)0
-rw-r--r--keyboards/horrortroll/nyx/rev1/rev1.c (renamed from keyboards/horrortroll/nyx/rev1/nyx.c)0
-rw-r--r--keyboards/horrortroll/paws60/keyboard.json (renamed from keyboards/horrortroll/paws60/info.json)8
-rw-r--r--keyboards/horrortroll/paws60/rules.mk12
20 files changed, 68 insertions, 87 deletions
diff --git a/keyboards/horrortroll/caticorn/rev1/hotswap/info.json b/keyboards/horrortroll/caticorn/rev1/hotswap/keyboard.json
index ecd3c8a043..ecd3c8a043 100644
--- a/keyboards/horrortroll/caticorn/rev1/hotswap/info.json
+++ b/keyboards/horrortroll/caticorn/rev1/hotswap/keyboard.json
diff --git a/keyboards/horrortroll/caticorn/rev1/hotswap/rules.mk b/keyboards/horrortroll/caticorn/rev1/hotswap/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/horrortroll/caticorn/rev1/hotswap/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/horrortroll/caticorn/rev1/solder/info.json b/keyboards/horrortroll/caticorn/rev1/solder/keyboard.json
index d14278f989..d14278f989 100644
--- a/keyboards/horrortroll/caticorn/rev1/solder/info.json
+++ b/keyboards/horrortroll/caticorn/rev1/solder/keyboard.json
diff --git a/keyboards/horrortroll/caticorn/rev1/solder/rules.mk b/keyboards/horrortroll/caticorn/rev1/solder/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/horrortroll/caticorn/rev1/solder/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/horrortroll/chinese_pcb/black_e65/info.json b/keyboards/horrortroll/chinese_pcb/black_e65/keyboard.json
index 7ee7b8b3f8..cef69593d7 100644
--- a/keyboards/horrortroll/chinese_pcb/black_e65/info.json
+++ b/keyboards/horrortroll/chinese_pcb/black_e65/keyboard.json
@@ -9,6 +9,16 @@
"device_version": "0.0.1",
"force_nkro": true
},
+ "features": {
+ "backlight": true,
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0"],
"rows": ["B0", "B1", "B2", "B3", "B7"]
diff --git a/keyboards/horrortroll/chinese_pcb/black_e65/rules.mk b/keyboards/horrortroll/chinese_pcb/black_e65/rules.mk
deleted file mode 100644
index 1955f1d315..0000000000
--- a/keyboards/horrortroll/chinese_pcb/black_e65/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 = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/info.json b/keyboards/horrortroll/chinese_pcb/devil68_pro/keyboard.json
index 6146bd517a..77eac52ebd 100644
--- a/keyboards/horrortroll/chinese_pcb/devil68_pro/info.json
+++ b/keyboards/horrortroll/chinese_pcb/devil68_pro/keyboard.json
@@ -58,6 +58,15 @@
"driver": "ws2812",
"max_brightness": 200
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true,
+ "rgb_matrix": true
+ },
"matrix_pins": {
"cols": ["B1", "B0", "B5", "B6", "C6", "C7", "E2", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
"rows": ["B7", "B3", "B2", "F6", "F7"]
diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/rules.mk b/keyboards/horrortroll/chinese_pcb/devil68_pro/rules.mk
deleted file mode 100644
index 138bf78056..0000000000
--- a/keyboards/horrortroll/chinese_pcb/devil68_pro/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 = no # 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
-
-# RGB Matrix enabled
-RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/horrortroll/handwired_k552/info.json b/keyboards/horrortroll/handwired_k552/keyboard.json
index 6eb5cbd80e..6bbfa86e12 100644
--- a/keyboards/horrortroll/handwired_k552/info.json
+++ b/keyboards/horrortroll/handwired_k552/keyboard.json
@@ -48,6 +48,15 @@
"backing_size": 2048
}
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": false,
+ "extrakey": true,
+ "nkro": true,
+ "rgb_matrix": true,
+ "oled": true,
+ "wpm": true
+ },
"community_layouts": ["tkl_ansi"],
"layouts": {
"LAYOUT_tkl_ansi": {
diff --git a/keyboards/horrortroll/handwired_k552/lib/bongocat.c b/keyboards/horrortroll/handwired_k552/lib/bongocat.c
index 6510223b22..70699ff3cd 100644
--- a/keyboards/horrortroll/handwired_k552/lib/bongocat.c
+++ b/keyboards/horrortroll/handwired_k552/lib/bongocat.c
@@ -14,7 +14,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "quantum.h"
+#include "bongocat.h"
+#include <stdlib.h>
+#include "oled_driver.h"
+#include "progmem.h"
+#include "timer.h"
+#include "wpm.h"
+#include "util.h"
// WPM-responsive animation stuff here
# define IDLE_FRAMES 5
@@ -28,7 +34,6 @@
# define ANIM_FRAME_RATIO 2.5 // how aggressively animation speeds up with wpm
// #define SLEEP_TIMER 60000 // should sleep after this period of 0 wpm, needs fixing
# define ANIM_SIZE 636 // number of bytes in array, minimize for adequate firmware size, max is 1024
-# define MAX(x, y) (((x) > (y)) ? (x) : (y)) // Math.max macro
uint32_t curr_anim_duration = 0; // variable animation duration
uint32_t bongo_timer = 0;
diff --git a/keyboards/horrortroll/handwired_k552/lib/galaxy.c b/keyboards/horrortroll/handwired_k552/lib/galaxy.c
index 04885b8085..6578295c6f 100644
--- a/keyboards/horrortroll/handwired_k552/lib/galaxy.c
+++ b/keyboards/horrortroll/handwired_k552/lib/galaxy.c
@@ -14,7 +14,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "quantum.h"
+#include "galaxy.h"
+#include "oled_driver.h"
+#include "progmem.h"
# define ANIM_SIZE 636 // number of bytes in array, minimize for adequate firmware size, max is 1024
diff --git a/keyboards/horrortroll/handwired_k552/lib/logo.c b/keyboards/horrortroll/handwired_k552/lib/logo.c
index 3931fdf455..f3ae2f8a06 100644
--- a/keyboards/horrortroll/handwired_k552/lib/logo.c
+++ b/keyboards/horrortroll/handwired_k552/lib/logo.c
@@ -14,7 +14,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "quantum.h"
+#include "logo.h"
+#include "oled_driver.h"
+#include "progmem.h"
# define ANIM_SIZE 636 // number of bytes in array, minimize for adequate firmware size, max is 1024
diff --git a/keyboards/horrortroll/handwired_k552/rules.mk b/keyboards/horrortroll/handwired_k552/rules.mk
index 6d6ec253db..b2ab6eed6d 100644
--- a/keyboards/horrortroll/handwired_k552/rules.mk
+++ b/keyboards/horrortroll/handwired_k552/rules.mk
@@ -12,23 +12,3 @@ BOARD = STM32_F103_STM32DUINO
BOOTLOADER_TYPE = stm32duino
DFU_ARGS = -d 1EAF:0003 -a 2 -R
DFU_SUFFIX_ARGS = -v 1EAF -p 0003
-
-# 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 = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
-# RGB Matrix enabled
-RGB_MATRIX_ENABLE = yes
-
-# OLED enabled
-OLED_ENABLE = yes
-WPM_ENABLE = yes
diff --git a/keyboards/horrortroll/lemon40/info.json b/keyboards/horrortroll/lemon40/keyboard.json
index 7b0b1c394b..6303fb70bb 100644
--- a/keyboards/horrortroll/lemon40/info.json
+++ b/keyboards/horrortroll/lemon40/keyboard.json
@@ -32,6 +32,18 @@
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": false,
+ "extrakey": true,
+ "nkro": true,
+ "rgblight": true,
+ "oled": true,
+ "wpm": true
+ },
+ "build": {
+ "lto": true
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/horrortroll/lemon40/lib/bongocat.c b/keyboards/horrortroll/lemon40/lib/bongocat.c
index 12ca8694c1..c90df38aec 100644
--- a/keyboards/horrortroll/lemon40/lib/bongocat.c
+++ b/keyboards/horrortroll/lemon40/lib/bongocat.c
@@ -14,7 +14,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "quantum.h"
+#include "bongocat.h"
+#include <stdlib.h>
+#include "oled_driver.h"
+#include "progmem.h"
+#include "timer.h"
+#include "wpm.h"
+#include "util.h"
// WPM-responsive animation stuff here
#define IDLE_FRAMES 5
@@ -28,7 +34,6 @@
#define ANIM_FRAME_RATIO 2.5 // how aggressively animation speeds up with wpm
// #define SLEEP_TIMER 60000 // should sleep after this period of 0 wpm, needs fixing
#define ANIM_SIZE 525 // number of bytes in array, minimize for adequate firmware size, max is 1024
-#define MAX(x, y) (((x) > (y)) ? (x) : (y)) // Math.max macro
uint32_t curr_anim_duration = 0; // variable animation duration
uint32_t bongo_timer = 0;
diff --git a/keyboards/horrortroll/lemon40/rules.mk b/keyboards/horrortroll/lemon40/rules.mk
index 9ac59719d8..89d3a12a0b 100644
--- a/keyboards/horrortroll/lemon40/rules.mk
+++ b/keyboards/horrortroll/lemon40/rules.mk
@@ -1,21 +1 @@
SRC += lib/bongocat.c
-
-# 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 = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
-# OLED enabled
-OLED_ENABLE = yes
-WPM_ENABLE = yes
-
-# Additional thing to reduce compiled size
-LTO_ENABLE = yes
diff --git a/keyboards/horrortroll/nyx/rev1/info.json b/keyboards/horrortroll/nyx/rev1/keyboard.json
index f3b859de0a..f3b859de0a 100644
--- a/keyboards/horrortroll/nyx/rev1/info.json
+++ b/keyboards/horrortroll/nyx/rev1/keyboard.json
diff --git a/keyboards/horrortroll/nyx/rev1/nyx.c b/keyboards/horrortroll/nyx/rev1/rev1.c
index fb4ce3183b..fb4ce3183b 100644
--- a/keyboards/horrortroll/nyx/rev1/nyx.c
+++ b/keyboards/horrortroll/nyx/rev1/rev1.c
diff --git a/keyboards/horrortroll/paws60/info.json b/keyboards/horrortroll/paws60/keyboard.json
index a8da9ee2c2..ac93b580a0 100644
--- a/keyboards/horrortroll/paws60/info.json
+++ b/keyboards/horrortroll/paws60/keyboard.json
@@ -9,6 +9,14 @@
"device_version": "0.0.1",
"force_nkro": true
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1"],
"rows": ["E6", "B7", "F7", "F4", "F5"]
diff --git a/keyboards/horrortroll/paws60/rules.mk b/keyboards/horrortroll/paws60/rules.mk
deleted file mode 100644
index 718a1e8d09..0000000000
--- a/keyboards/horrortroll/paws60/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 = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output