[Keyboard] Refactor Caticorn PCB (qmk#21644)

jesperhellberg · Sep 9, 2023 · ecb4f1d · ecb4f1d
1 parent 81afe2f
commit ecb4f1d
Show file tree

Hide file tree

Showing 12 changed files with 107 additions and 405 deletions.
diff --git a/keyboards/horrortroll/caticorn/rev1/hotswap/info.json b/keyboards/horrortroll/caticorn/rev1/hotswap/info.json
@@ -1,20 +1,27 @@
 {
     "keyboard_name": "Caticorn Hotswap",
     "manufacturer": "HorrorTroll",
-    "url": "",
     "maintainer": "HorrorTroll",
     "usb": {
         "vid": "0x7516",
         "pid": "0x6002",
         "device_version": "0.0.1"
     },
+    "diode_direction": "COL2ROW",
     "matrix_pins": {
         "cols": ["GP6", "GP5", "GP4", "GP3", "GP2", "GP1", "GP20", "GP21", "GP16", "GP17", "GP18", "GP19", "GP15", "GP14", "GP13", "GP10", "GP9"],
         "rows": ["GP7", "GP0", "GP8", "GP25", "GP11", "GP12"]
     },
-    "diode_direction": "COL2ROW",
     "processor": "RP2040",
     "bootloader": "rp2040",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": false,
+        "command": false,
+        "nkro": true
+    },
     "community_layouts": ["tkl_f13_ansi"],
     "layouts": {
         "LAYOUT_tkl_f13_ansi": {

diff --git a/keyboards/horrortroll/caticorn/rev1/hotswap/keymaps/default/keymap.c b/keyboards/horrortroll/caticorn/rev1/hotswap/keymaps/default/keymap.c
@@ -1,4 +1,4 @@
-/* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
+/* Copyright 2023 HorrorTroll <https://github.com/HorrorTroll>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,8 +26,6 @@ enum layer_names {
     _FN,
 };
 
-// enum layer_keycodes { };
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /*
@@ -86,7 +84,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        │    │    │    │                        │    │ Fn │    │    ││   │   │   │
        └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
 */
-    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14       15       16      */
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14       15       16     */
     [_FN]   = LAYOUT_tkl_f13_ansi(
                 QK_BOOT, KC_MSEL, KC_VOLD, KC_VOLU, KC_MUTE, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MAIL, KC_WHOM, KC_CALC, KC_WSCH, KC_MYCM, _______, _______, _______,
                 NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,

diff --git a/keyboards/horrortroll/caticorn/rev1/hotswap/keymaps/via/config.h b/keyboards/horrortroll/caticorn/rev1/hotswap/keymaps/via/config.h
diff --git a/keyboards/horrortroll/caticorn/rev1/hotswap/keymaps/via/keymap.c b/keyboards/horrortroll/caticorn/rev1/hotswap/keymaps/via/keymap.c
@@ -1,4 +1,4 @@
-/* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
+/* Copyright 2023 HorrorTroll <https://github.com/HorrorTroll>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,8 +26,6 @@ enum layer_names {
     _FN,
 };
 
-// enum layer_keycodes { };
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /*

diff --git a/keyboards/horrortroll/caticorn/rev1/hotswap/readme.md b/keyboards/horrortroll/caticorn/rev1/hotswap/readme.md
@@ -1,10 +1,12 @@
 # Caticorn Hotswap (Rev 1)
 
+![Caticorn](https://i.imgur.com/DPbDtwKh.png)
+
 A TKL keyboard, which controlled by an RP2040 chipset.
 
 * Keyboard Maintainer: [HorrorTroll](https://github.com/HorrorTroll)
 * Hardware Supported: RP2040
-* Hardware Availability: Prototype PCB
+* Hardware Availability: Private prototype (only 5 PCB available)
 
 Make example for this keyboard (after setting up your build environment):
 
@@ -21,5 +23,5 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to
 Enter the bootloader in 3 ways:
 
 * **Bootmagic reset**: Hold down the key at (0,0) in the matrix (Esc key) and plug in the keyboard
-* **Physical reset button**: Press and hold the button on the back of the PCB, then plug USB onto PC
+* **Physical reset button**: Press and hold the button on the back of the PCB, then plug in the keyboard
 * **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/horrortroll/caticorn/rev1/hotswap/rules.mk b/keyboards/horrortroll/caticorn/rev1/hotswap/rules.mk
@@ -1,16 +1 @@
-# 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
-
-# EEPROM driver
-EEPROM_DRIVER = wear_leveling
-WEAR_LEVELING_DRIVER = rp2040_flash
+# This file intentionally left blank
diff --git a/keyboards/horrortroll/caticorn/rev1/solder/info.json b/keyboards/horrortroll/caticorn/rev1/solder/info.json
@@ -1,20 +1,27 @@
 {
     "keyboard_name": "Caticorn Solder",
     "manufacturer": "HorrorTroll",
-    "url": "",
     "maintainer": "HorrorTroll",
     "usb": {
         "vid": "0x7516",
         "pid": "0x6001",
         "device_version": "0.0.1"
     },
+    "diode_direction": "COL2ROW",
     "matrix_pins": {
         "cols": ["GP6", "GP5", "GP4", "GP3", "GP2", "GP1", "GP20", "GP21", "GP16", "GP17", "GP18", "GP19", "GP15", "GP14", "GP13", "GP10", "GP9"],
         "rows": ["GP7", "GP0", "GP8", "GP25", "GP11", "GP12"]
     },
-    "diode_direction": "COL2ROW",
     "processor": "RP2040",
     "bootloader": "rp2040",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": false,
+        "command": false,
+        "nkro": true
+    },
     "community_layouts": ["tkl_ansi", "tkl_ansi_split_bs_rshift", "tkl_ansi_tsangan", "tkl_ansi_tsangan_split_bs_rshift", "tkl_f13_ansi", "tkl_f13_ansi_split_bs_rshift", "tkl_f13_ansi_tsangan", "tkl_f13_ansi_tsangan_split_bs_rshift", "tkl_iso", "tkl_iso_split_bs_rshift", "tkl_iso_tsangan", "tkl_iso_tsangan_split_bs_rshift", "tkl_f13_iso", "tkl_f13_iso_split_bs_rshift", "tkl_f13_iso_tsangan", "tkl_f13_iso_tsangan_split_bs_rshift"],
     "layouts": {
         "LAYOUT_all": {