Merge remote-tracking branch 'origin/master' into develop

6 files changed, 297 insertions, 0 deletions

diff --git a/keyboards/handwired/marauder/config.h b/keyboards/handwired/marauder/config.h
new file mode 100644
index 0000000000..0935e1bee1
--- /dev/null
+++ b/keyboards/handwired/marauder/config.h
@@ -0,0 +1,70 @@
+/* Copyright 2021 BB-66

+ *

+ * 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

+ * the Free Software Foundation, either version 2 of the License, or

+ * (at your option) any later version.

+ *

+ * This program is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ * GNU General Public License for more details.

+ *

+ * You should have received a copy of the GNU General Public License

+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.

+ */

+

+#pragma once

+

+#include "config_common.h"

+

+/* USB Device descriptor parameter */

+#define VENDOR_ID       0x4D52

+#define PRODUCT_ID      0x0001

+#define DEVICE_VER      0x0001

+#define MANUFACTURER    BB-66

+#define PRODUCT         Minshara Marauder

+

+/* key matrix size */

+#define MATRIX_ROWS 12

+#define MATRIX_COLS 9

+

+/*

+ * Keyboard Matrix Assignments

+ *

+ * Change this to how you wired your keyboard

+ * COLS: AVR pins used for columns, left to right

+ * ROWS: AVR pins used for rows, top to bottom

+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)

+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)

+ *

+ */

+#define MATRIX_ROW_PINS { D0, D4, C6, D7, E6, B4, B5, B7, D5, C7, F1, F0 }

+#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4, B0 }

+

+#define DIODE_DIRECTION COL2ROW

+

+#define RGB_DI_PIN D1

+#ifdef RGB_DI_PIN

+    #define RGBLED_NUM 20

+    #define RGBLIGHT_HUE_STEP 8

+    #define RGBLIGHT_SAT_STEP 8

+    #define RGBLIGHT_VAL_STEP 8

+    #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */

+    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */

+/*== all animations enable ==*/

+    #define RGBLIGHT_ANIMATIONS

+// /*== or choose animations ==*/

+//     #define RGBLIGHT_EFFECT_BREATHING

+//     #define RGBLIGHT_EFFECT_RAINBOW_MOOD

+//     #define RGBLIGHT_EFFECT_RAINBOW_SWIRL

+//     #define RGBLIGHT_EFFECT_SNAKE

+//     #define RGBLIGHT_EFFECT_KNIGHT

+//     #define RGBLIGHT_EFFECT_CHRISTMAS

+//     #define RGBLIGHT_EFFECT_STATIC_GRADIENT

+//     #define RGBLIGHT_EFFECT_RGB_TEST

+//     #define RGBLIGHT_EFFECT_ALTERNATING

+#endif

+

+// generated by KBFirmware JSON to QMK Parser

+// https://noroadsleft.github.io/kbf_qmk_converter/

diff --git a/keyboards/handwired/marauder/info.json b/keyboards/handwired/marauder/info.json
new file mode 100644
index 0000000000..cfdad5c8dc
--- /dev/null
+++ b/keyboards/handwired/marauder/info.json
@@ -0,0 +1,108 @@
+{

+    "keyboard_name": "Minshara Marauder",

+    "url": "https://imgur.com/a/TvsXpq5",

+    "maintainer": "BB-66",

+    "width": 19.25,

+    "height": 6.5,

+    "layouts": {

+        "LAYOUT": {

+            "layout": [

+                {"label":"K00 (D0,B6)", "x":0, "y":0},

+                {"label":"K01 (D0,B2)", "x":2, "y":0},

+                {"label":"K02 (D0,B3)", "x":3, "y":0},

+                {"label":"K03 (D0,B1)", "x":4, "y":0},

+                {"label":"K04 (D0,F7)", "x":5, "y":0},

+                {"label":"K05 (D0,F6)", "x":6.5, "y":0},

+                {"label":"K06 (D0,F5)", "x":7.5, "y":0},

+                {"label":"K07 (D0,F4)", "x":8.5, "y":0},

+                {"label":"K08 (D0,B0)", "x":9.5, "y":0},

+                {"label":"K68 (B5,B0)", "x":11, "y":0},

+                {"label":"K67 (B5,F4)", "x":12, "y":0},

+                {"label":"K66 (B5,F5)", "x":13, "y":0},

+                {"label":"K65 (B5,F6)", "x":14, "y":0},

+                {"label":"K63 (B5,B1)", "x":15.25, "y":0},

+                {"label":"K62 (B5,B3)", "x":16.25, "y":0},

+                {"label":"K61 (B5,B2)", "x":17.25, "y":0},

+                {"label":"K60 (B5,B6)", "x":18.25, "y":0},

+                {"label":"K10 (D4,B6)", "x":0, "y":1.5},

+                {"label":"K11 (D4,B2)", "x":1, "y":1.5},

+                {"label":"K12 (D4,B3)", "x":2, "y":1.5},

+                {"label":"K13 (D4,B1)", "x":3, "y":1.5},

+                {"label":"K14 (D4,F7)", "x":4, "y":1.5},

+                {"label":"K15 (D4,F6)", "x":5, "y":1.5},

+                {"label":"K16 (D4,F5)", "x":6, "y":1.5},

+                {"label":"K17 (D4,F4)", "x":7, "y":1.5},

+                {"label":"K18 (D4,B0)", "x":8, "y":1.5},

+                {"label":"K78 (B7,B0)", "x":9, "y":1.5},

+                {"label":"K77 (B7,F4)", "x":10, "y":1.5},

+                {"label":"K76 (B7,F5)", "x":11, "y":1.5},

+                {"label":"K75 (B7,F6)", "x":12, "y":1.5},

+                {"label":"K74 (B7,F7)", "x":13, "y":1.5, "w":2},

+                {"label":"K73 (B7,B1)", "x":15.25, "y":1.5},

+                {"label":"K72 (B7,B3)", "x":16.25, "y":1.5},

+                {"label":"K71 (B7,B2)", "x":17.25, "y":1.5},

+                {"label":"K70 (B7,B6)", "x":18.25, "y":1.5},

+                {"label":"K20 (C6,B6)", "x":0, "y":2.5, "w":1.5},

+                {"label":"K21 (C6,B2)", "x":1.5, "y":2.5},

+                {"label":"K22 (C6,B3)", "x":2.5, "y":2.5},

+                {"label":"K23 (C6,B1)", "x":3.5, "y":2.5},

+                {"label":"K24 (C6,F7)", "x":4.5, "y":2.5},

+                {"label":"K25 (C6,F6)", "x":5.5, "y":2.5},

+                {"label":"K26 (C6,F5)", "x":6.5, "y":2.5},

+                {"label":"K27 (C6,F4)", "x":7.5, "y":2.5},

+                {"label":"K28 (C6,B0)", "x":8.5, "y":2.5},

+                {"label":"K88 (D5,B0)", "x":9.5, "y":2.5},

+                {"label":"K87 (D5,F4)", "x":10.5, "y":2.5},

+                {"label":"K86 (D5,F5)", "x":11.5, "y":2.5},

+                {"label":"K85 (D5,F6)", "x":12.5, "y":2.5},

+                {"label":"K84 (D5,F7)", "x":13.5, "y":2.5, "w":1.5},

+                {"label":"K83 (D5,B1)", "x":15.25, "y":2.5},

+                {"label":"K82 (D5,B3)", "x":16.25, "y":2.5},

+                {"label":"K81 (D5,B2)", "x":17.25, "y":2.5},

+                {"label":"K80 (D5,B6)", "x":18.25, "y":2.5, "h":2},

+                {"label":"K30 (D7,B6)", "x":0, "y":3.5, "w":1.75},

+                {"label":"K31 (D7,B2)", "x":1.75, "y":3.5},

+                {"label":"K32 (D7,B3)", "x":2.75, "y":3.5},

+                {"label":"K33 (D7,B1)", "x":3.75, "y":3.5},

+                {"label":"K34 (D7,F7)", "x":4.75, "y":3.5},

+                {"label":"K35 (D7,F6)", "x":5.75, "y":3.5},

+                {"label":"K36 (D7,F5)", "x":6.75, "y":3.5},

+                {"label":"K37 (D7,F4)", "x":7.75, "y":3.5},

+                {"label":"K38 (D7,B0)", "x":8.75, "y":3.5},

+                {"label":"K98 (C7,B0)", "x":9.75, "y":3.5},

+                {"label":"K97 (C7,F4)", "x":10.75, "y":3.5},

+                {"label":"K96 (C7,F5)", "x":11.75, "y":3.5},

+                {"label":"K95 (C7,F6)", "x":12.75, "y":3.5, "w":2.25},

+                {"label":"K93 (C7,B1)", "x":15.25, "y":3.5},

+                {"label":"K92 (C7,B3)", "x":16.25, "y":3.5},

+                {"label":"K91 (C7,B2)", "x":17.25, "y":3.5},

+                {"label":"K40 (E6,B6)", "x":0, "y":4.5, "w":2.25},

+                {"label":"K41 (E6,B2)", "x":2.25, "y":4.5},

+                {"label":"K42 (E6,B3)", "x":3.25, "y":4.5},

+                {"label":"K43 (E6,B1)", "x":4.25, "y":4.5},

+                {"label":"K44 (E6,F7)", "x":5.25, "y":4.5},

+                {"label":"K45 (E6,F6)", "x":6.25, "y":4.5},

+                {"label":"K46 (E6,F5)", "x":7.25, "y":4.5},

+                {"label":"K47 (E6,F4)", "x":8.25, "y":4.5},

+                {"label":"K48 (E6,B0)", "x":9.25, "y":4.5},

+                {"label":"KA8 (F1,B0)", "x":10.25, "y":4.5},

+                {"label":"KA7 (F1,F4)", "x":11.25, "y":4.5},

+                {"label":"KA6 (F1,F5)", "x":12.25, "y":4.5, "w":2.75},

+                {"label":"KA3 (F1,B1)", "x":15.25, "y":4.5},

+                {"label":"KA2 (F1,B3)", "x":16.25, "y":4.5},

+                {"label":"KA1 (F1,B2)", "x":17.25, "y":4.5},

+                {"label":"KA0 (F1,B6)", "x":18.25, "y":4.5, "h":2},

+                {"label":"K50 (B4,B6)", "x":0, "y":5.5, "w":1.5},

+                {"label":"K51 (B4,B2)", "x":1.5, "y":5.5},

+                {"label":"K52 (B4,B3)", "x":2.5, "y":5.5, "w":1.5},

+                {"label":"K56 (B4,F5)", "x":4, "y":5.5, "w":7},

+                {"label":"KB7 (F0,F4)", "x":11, "y":5.5, "w":1.5},

+                {"label":"KB6 (F0,F5)", "x":12.5, "y":5.5},

+                {"label":"KB4 (F0,F7)", "x":13.5, "y":5.5, "w":1.5},

+                {"label":"KB3 (F0,B1)", "x":15.25, "y":5.5, "w":2},

+                {"label":"KB1 (F0,B2)", "x":17.25, "y":5.5}

+            ]

+        }

+    }

+    ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"

+}

diff --git a/keyboards/handwired/marauder/keymaps/default/keymap.c b/keyboards/handwired/marauder/keymaps/default/keymap.c
new file mode 100644
index 0000000000..f4a3cbfc22
--- /dev/null
+++ b/keyboards/handwired/marauder/keymaps/default/keymap.c
@@ -0,0 +1,29 @@
+/* Copyright 2021 BB-66

+ *

+ * 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

+ * the Free Software Foundation, either version 2 of the License, or

+ * (at your option) any later version.

+ *

+ * This program is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ * GNU General Public License for more details.

+ *

+ * 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 QMK_KEYBOARD_H

+

+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

+    [0] = LAYOUT(

+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,       KC_F5,   KC_F6,   KC_F7,   KC_F8,        KC_F9,   KC_F10,  KC_F11,  KC_F12,    KC_PAUS, KC_PSCR, KC_SLCK, KC_ESC,

+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,            KC_NLCK, KC_KP_SLSH, KC__KP_ASTR, KC_KP_MINS,

+        KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,        KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_PLUS,

+        KC_CAPS,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                KC_KP_4, KC_KP_5, KC_CP_6,

+        KC_LSFT,            KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                   KC_KP_1, KC_KP_2, KC_KP_3, KC__PENT,

+        KC_LCTL,     KC_LGUI, KC_LALT,                             KC_SPC,                                 KC_RALT,     KC_RGUI, KC_RCTL,        KC_KP_0,          KC_KP_DOT

+    ),

+

+};

diff --git a/keyboards/handwired/marauder/marauder.c b/keyboards/handwired/marauder/marauder.c
new file mode 100644
index 0000000000..dcfe75fd3c
--- /dev/null
+++ b/keyboards/handwired/marauder/marauder.c
@@ -0,0 +1,20 @@
+/* Copyright 2021 BB-66

+ *

+ * 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

+ * the Free Software Foundation, either version 2 of the License, or

+ * (at your option) any later version.

+ *

+ * This program is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ * GNU General Public License for more details.

+ *

+ * 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 "marauder.h"

+

+// generated by KBFirmware JSON to QMK Parser

+// https://noroadsleft.github.io/kbf_qmk_converter/

diff --git a/keyboards/handwired/marauder/marauder.h b/keyboards/handwired/marauder/marauder.h
new file mode 100644
index 0000000000..ee098dd5cb
--- /dev/null
+++ b/keyboards/handwired/marauder/marauder.h
@@ -0,0 +1,44 @@
+/* Copyright 2021 BB-66

+ *

+ * 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

+ * the Free Software Foundation, either version 2 of the License, or

+ * (at your option) any later version.

+ *

+ * This program is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ * GNU General Public License for more details.

+ *

+ * You should have received a copy of the GNU General Public License

+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.

+ */

+

+#pragma once

+

+#include "quantum.h"

+

+#define LAYOUT( \

+    K00,      K01, K02, K03, K04,   K05, K06, K07, K08,    K68, K67, K66, K65,  K63, K62, K61, K60,  \

+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K78, K77, K76, K75, K74,       K73, K72, K71, K70,  \

+    K20,   K21, K22, K23, K24, K25, K26, K27, K28, K88, K87, K86, K85, K84,     K83, K82, K81, K80,  \

+    K30,    K31, K32, K33, K34, K35, K36, K37, K38, K98, K97, K96, K95,         K93, K92, K91,       \

+    K40,       K41, K42, K43, K44, K45, K46, K47, K48, KA8, KA7, KA6,           KA3, KA2, KA1, KA0,  \

+    K50,   K51, K52,                  K56,                 KB7,   KB6, KB4,     KB3,      KB1        \

+) { \

+    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08   }, \

+    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18   }, \

+    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28   }, \

+    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38   }, \

+    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48   }, \

+    { K50,   K51,   K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO }, \

+    { K60,   K61,   K62,   K63,   KC_NO, K65,   K66,   K67,   K68   }, \

+    { K70,   K71,   K72,   K73,   K74,   K75,   K76,   K77,   K78   }, \

+    { K80,   K81,   K82,   K83,   K84,   K85,   K86,   K87,   K88   }, \

+    { KC_NO, K91,   K92,   K93,   KC_NO, K95,   K96,   K97,   K98   }, \

+    { KA0,   KA1,   KA2,   KA3,   KC_NO, KC_NO, KA6,   KA7,   KA8   }, \

+    { KC_NO, KB1,   KC_NO, KB3,   KB4,   KC_NO, KB6,   KB7,   KC_NO }, \

+}

+

+// generated by KBFirmware JSON to QMK Parser

+// https://noroadsleft.github.io/kbf_qmk_converter/

diff --git a/keyboards/handwired/marauder/rules.mk b/keyboards/handwired/marauder/rules.mk
new file mode 100644
index 0000000000..44b2935192
--- /dev/null
+++ b/keyboards/handwired/marauder/rules.mk
@@ -0,0 +1,26 @@
+# MCU name

+MCU = atmega32u4

+

+# Bootloader selection

+BOOTLOADER = atmel-dfu

+

+# Build Options

+#   change yes to no to disable

+#

+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration

+MOUSEKEY_ENABLE = no       # Mouse keys

+EXTRAKEY_ENABLE = yes       # Audio control and System control

+CONSOLE_ENABLE = yes        # Console for debug

+COMMAND_ENABLE = yes        # Commands for debug and configuration

+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE

+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 = yes            # USB Nkey Rollover

+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality

+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow

+BLUETOOTH_ENABLE = no       # Enable Bluetooth

+AUDIO_ENABLE = no           # Audio output

+LTO_ENABLE = yes            # Link Time Optimization, shrinks the output slightly

+

+# generated by KBFirmware JSON to QMK Parser

+# https://noroadsleft.github.io/kbf_qmk_converter/