Refactored the Katana60 folders under a rominronin parent folder (qmk…

…#10255)

* refactored the Katana60 folders under a rominronin parent folder

* Update keyboards/rominronin/katana60/info.json

removed 'keyboard_folder' line

* Update keyboards/rominronin/katana60/info.json

removed 'key_count' line

* Update keyboards/rominronin/katana60_rev2/config.h

removed '#define DESCRIPTION' line

* Update keyboards/rominronin/katana60_rev2/rules.mk

Removed more attributes

* Update keyboards/rominronin/katana60_rev2/rules.mk

removed 'FAUXCLICKY_ENABLE' line

* Update keyboards/rominronin/katana60_rev2/rules.mk

Updated some comments

* Update keyboards/rominronin/katana60_rev2/config.h

Removed redundant comments

* Update keyboards/rominronin/katana60_rev2/config.h

removed redundant comments

* Update keyboards/rominronin/katana60_rev2/config.h

removed redundant comments

* Update keyboards/rominronin/katana60/keymaps/default/keymap.c

Fixed a non-standard keycode

* Update keyboards/rominronin/katana60/keymaps/rominronin/keymap.c

Removed deprecated code

* Update keyboards/rominronin/katana60/rules.mk

removed redundant comments

* Update keyboards/rominronin/katana60_rev2/katana60_rev2.c

removed redundant code

* Update keyboards/rominronin/katana60_rev2/keymaps/rominronin_7u/keymap.c

removed redundant code

* Update keyboards/rominronin/katana60_rev2/rules.mk

removed redundant comments

* Update keyboards/rominronin/katana60_rev2/rules.mk

updated some comments

* Update keyboards/rominronin/katana60_rev2/rules.mk

removed redundant code

* Update keyboards/rominronin/katana60_rev2/keymaps/rominronin_7u/keymap.c

optimised the layers definition

* Update keyboards/rominronin/katana60/rules.mk

removed redundant code

* added the info.json file for every Tsuka60 layout

* updated the info.json file details

* removed broken keymap file, updated other files

* updated the Katana60 rev2 info.json file

* split katana60 into revisions

* assign unique Vendor/Product ID pairings

* modernize codebase

#pragma once on included files; rules.mk templating

* fix rev2 layout macros

* updated the keymaps for correct automated building.

* updated the default layout file

* updated default rominronin 7u layout file

* Update keyboards/rominronin/katana60/rev1/readme.md

resized an image

* Update keyboards/rominronin/katana60/rev2/readme.md

resized an image

* remove dead space from rev2 info.json file

keyboards/katana60/config.h → keyboards/rominronin/katana60/rev1/config.h

@@ -15,18 +15,16 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef CONFIG_H
-#define CONFIG_H
+#pragma once
 
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x6060
+#define VENDOR_ID       0x7272  // "rr" - rominronin
+#define PRODUCT_ID      0x0C2C
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    RominRonin CandyKeys
-#define PRODUCT         Katana60
-#define DESCRIPTION     QMK keyboard firmware for Katana60
+#define PRODUCT         Katana60 rev1
 
 /* key matrix size */
 #define MATRIX_ROWS 5
@@ -49,18 +47,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
 
-// #define BACKLIGHT_PIN B7
-// #define BACKLIGHT_BREATHING
-// #define BACKLIGHT_LEVELS 3
-
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
 /* define if matrix has ghost (lacks anti-ghosting diodes) */
 //#define MATRIX_HAS_GHOST
 
-/* number of backlight levels */
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -92,56 +84,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 //#define FORCE_NKRO
 
-/*
- * Magic Key Options
- *
- * Magic keys are hotkey commands that allow control over firmware functions of
- * the keyboard. They are best used in combination with the HID Listen program,
- * found here: https://www.pjrc.com/teensy/hid_listen.html
- *
- * The options below allow the magic key functionality to be changed. This is
- * useful if your keyboard/keypad is missing keys and you want magic key support.
- *
- */
-
 #define TAPPING_TERM 200
 
-/* control how magic key switches layers */
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS  true
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS  true
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false
-
-/* override magic key keymap */
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM
-//#define MAGIC_KEY_HELP1          H
-//#define MAGIC_KEY_HELP2          SLASH
-//#define MAGIC_KEY_DEBUG          D
-//#define MAGIC_KEY_DEBUG_MATRIX   X
-//#define MAGIC_KEY_DEBUG_KBD      K
-//#define MAGIC_KEY_DEBUG_MOUSE    M
-//#define MAGIC_KEY_VERSION        V
-//#define MAGIC_KEY_STATUS         S
-//#define MAGIC_KEY_CONSOLE        C
-//#define MAGIC_KEY_LAYER0_ALT1    ESC
-//#define MAGIC_KEY_LAYER0_ALT2    GRAVE
-//#define MAGIC_KEY_LAYER0         0
-//#define MAGIC_KEY_LAYER1         1
-//#define MAGIC_KEY_LAYER2         2
-//#define MAGIC_KEY_LAYER3         3
-//#define MAGIC_KEY_LAYER4         4
-//#define MAGIC_KEY_LAYER5         5
-//#define MAGIC_KEY_LAYER6         6
-//#define MAGIC_KEY_LAYER7         7
-//#define MAGIC_KEY_LAYER8         8
-//#define MAGIC_KEY_LAYER9         9
-//#define MAGIC_KEY_BOOTLOADER     PAUSE
-//#define MAGIC_KEY_LOCK           CAPS
-//#define MAGIC_KEY_EEPROM         E
-//#define MAGIC_KEY_NKRO           N
-//#define MAGIC_KEY_SLEEP_LED      Z
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
@@ -159,28 +103,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_ONESHOT
 //#define NO_ACTION_MACRO
 //#define NO_ACTION_FUNCTION
-
-/*
- * MIDI options
- */
-
-/* Prevent use of disabled MIDI features in the keymap */
-//#define MIDI_ENABLE_STRICT 1
-
-/* enable basic MIDI features:
-   - MIDI notes can be sent when in Music mode is on
-*/
-//#define MIDI_BASIC
-
-/* enable advanced MIDI features:
-   - MIDI notes can be added to the keymap
-   - Octave shift and transpose
-   - Virtual sustain, portamento, and modulation wheel
-   - etc.
-*/
-//#define MIDI_ADVANCED
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 1
-
-#endif

keyboards/rominronin/katana60/rev1/info.json

@@ -0,0 +1,83 @@
+{
+  "keyboard_name": "Katana60 rev1",
+  "url": "",
+  "maintainer": "rominronin",
+  "width": 15,
+  "height": 5,
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"label":"k40", "x":0, "y":0},
+        {"label":"k41", "x":1, "y":0},
+        {"label":"k42", "x":2, "y":0},
+        {"label":"k43", "x":3, "y":0},
+        {"label":"k44", "x":4, "y":0},
+        {"label":"k45", "x":5, "y":0},
+        {"label":"k46", "x":6, "y":0},
+        {"label":"k47", "x":7, "y":0},
+        {"label":"k48", "x":8, "y":0},
+        {"label":"k49", "x":9, "y":0},
+        {"label":"k4a", "x":10, "y":0},
+        {"label":"k4b", "x":11, "y":0},
+        {"label":"k4c", "x":12, "y":0},
+        {"label":"k4d", "x":13, "y":0},
+        {"label":"k4e", "x":14, "y":0},
+        {"label":"k30", "x":0, "y":1, "w":1.5},
+        {"label":"k31", "x":1.5, "y":1},
+        {"label":"k32", "x":2.5, "y":1},
+        {"label":"k33", "x":3.5, "y":1},
+        {"label":"k34", "x":4.5, "y":1},
+        {"label":"k35", "x":5.5, "y":1},
+        {"label":"k36", "x":6.5, "y":1},
+        {"label":"k37", "x":7.5, "y":1},
+        {"label":"k38", "x":8.5, "y":1},
+        {"label":"k39", "x":9.5, "y":1},
+        {"label":"k3a", "x":10.5, "y":1},
+        {"label":"k3b", "x":11.5, "y":1},
+        {"label":"k3c", "x":12.5, "y":1},
+        {"label":"k3d", "x":13.5, "y":1, "w":1.5},
+        {"label":"k20", "x":0, "y":2, "w":1.25},
+        {"label":"k21", "x":1.25, "y":2},
+        {"label":"k22", "x":2.25, "y":2},
+        {"label":"k23", "x":3.25, "y":2},
+        {"label":"k24", "x":4.25, "y":2},
+        {"label":"k25", "x":5.25, "y":2},
+        {"label":"k26", "x":6.25, "y":2},
+        {"label":"k27", "x":7.75, "y":2},
+        {"label":"k28", "x":8.75, "y":2},
+        {"label":"k29", "x":9.75, "y":2},
+        {"label":"k2a", "x":10.75, "y":2},
+        {"label":"k2b", "x":11.75, "y":2},
+        {"label":"k2c", "x":12.75, "y":2},
+        {"label":"k2d", "x":13.75, "y":2, "w":1.25},
+        {"label":"k10", "x":0, "y":3},
+        {"label":"k11", "x":1, "y":3},
+        {"label":"k12", "x":2, "y":3},
+        {"label":"k13", "x":3, "y":3},
+        {"label":"k14", "x":4, "y":3},
+        {"label":"k15", "x":5, "y":3},
+        {"label":"k16", "x":6, "y":3},
+        {"label":"k17", "x":7, "y":3},
+        {"label":"k18", "x":8, "y":3},
+        {"label":"k19", "x":9, "y":3},
+        {"label":"k1a", "x":10, "y":3},
+        {"label":"k1b", "x":11, "y":3},
+        {"label":"k1c", "x":12, "y":3},
+        {"label":"k1d", "x":13, "y":3},
+        {"label":"k1e", "x":14, "y":3},
+        {"label":"k00", "x":0, "y":4},
+        {"label":"k01", "x":1, "y":4, "w":1.25},
+        {"label":"k02", "x":2.25, "y":4, "w":1.25},
+        {"label":"k03", "x":3.5, "y":4, "w":1.25},
+        {"label":"k04", "x":4.75, "y":4, "w":2.25},
+        {"label":"k05", "x":7, "y":4},
+        {"label":"k06", "x":8, "y":4, "w":2},
+        {"label":"k09", "x":10, "y":4},
+        {"label":"k0a", "x":11, "y":4},
+        {"label":"k0b", "x":12, "y":4},
+        {"label":"k0c", "x":13, "y":4},
+        {"label":"k0d", "x":14, "y":4}
+      ]
+    }
+  }
+}

keyboards/katana60/keymaps/colemak/keymap.c → keyboards/rominronin/katana60/rev1/keymaps/colemak/keymap.c

@@ -34,7 +34,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [BASE] = LAYOUT( /* Base */
-  KC_ESC,  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    DF(1),   KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_PLUS,
+  KC_ESC,  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    DF(1),   KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,
   KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_LBRC,          KC_RBRC, KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
   MO(3),   KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_HOME,          KC_PGUP, KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_ENT,
   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_END,  KC_DEL,  KC_PGDN, KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,

keyboards/katana60/keymaps/rominronin/keymap.c → keyboards/rominronin/katana60/rev1/keymaps/rominronin/keymap.c

@@ -34,7 +34,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [BASE] = LAYOUT( /* Base */
-  KC_ESC,  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    DF(1),   KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_PLUS,
+  KC_ESC,  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    DF(1),   KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,
   KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_B,    KC_LBRC,          KC_RBRC, KC_J,    KC_L,    KC_U,    KC_Y,    KC_QUOT, KC_BSPC,
   MO(3),   KC_A,    KC_R,    KC_S,    KC_T,    KC_G,    KC_HOME,          KC_PGUP, KC_M,    KC_N,    KC_E,    KC_I,    KC_O,    KC_ENT,
   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_D,    KC_V,    KC_END,  KC_DEL,  KC_PGDN, KC_K,    KC_H,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
@@ -64,6 +64,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 };
 
+
 void matrix_init_user(void) {
 
 }

keyboards/rominronin/katana60/rev1/readme.md

@@ -0,0 +1,17 @@
+# Katana60 rev1
+
+![Katana60 rev1](https://i.imgur.com/xVkODOul.jpg)
+
+A 60% keyboard with a symmetrical staggered layout, sold by CandyKeys.com.
+
+Keyboard Maintainer: [Baris Tosun](https://github.com/rominronin)  
+Hardware Supported: Katana60 PCB rev1
+Hardware Availability: the rev1 is no longer available, the rev2 can be found at [candykeys.com](https://candykeys.com/product/katana60-pcb-V2)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make rominronin/katana60/rev1:default
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+There is also ongoing discussion for the extend layer, at the [Colemak Forum](https://forum.colemak.com/topic/2327-developing-an-extend-layer-for-the-katana60/)

keyboards/katana60/katana60.c → keyboards/rominronin/katana60/rev1/rev1.c

@@ -13,31 +13,4 @@
  * 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 "katana60.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}
+#include "rev1.h"

keyboards/katana60/katana60.h → keyboards/rominronin/katana60/rev1/rev1.h

@@ -13,8 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef KATANA60_H
-#define KATANA60_H
+#pragma once
 
 #include "quantum.h"
 
@@ -36,5 +35,3 @@
     { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, KC_NO  }, \
     { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e  }, \
 }
-
-#endif

keyboards/katana60/rules.mk → keyboards/rominronin/katana60/rev1/rules.mk

@@ -2,19 +2,12 @@
 MCU = atmega32u4
 
 # Bootloader selection
-#   Teensy       halfkay
-#   Pro Micro    caterina
-#   Atmel DFU    atmel-dfu
-#   LUFA DFU     lufa-dfu
-#   QMK DFU      qmk-dfu
-#   ATmega32A    bootloadHID
-#   ATmega328P   USBasp
 BOOTLOADER = atmel-dfu
 
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = no      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = yes        # Console for debug
@@ -23,9 +16,7 @@ COMMAND_ENABLE = yes        # Commands for debug and configuration
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 NKRO_ENABLE = no            # USB Nkey Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality on B7 by default
-MIDI_ENABLE = no            # MIDI support
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-AUDIO_ENABLE = no           # Audio output on port C6
-FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output