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

8 files changed, 287 insertions, 0 deletions

diff --git a/keyboards/handwired/aim65/aim65.c b/keyboards/handwired/aim65/aim65.c
new file mode 100644
index 0000000000..6f8ea6ecda
--- /dev/null
+++ b/keyboards/handwired/aim65/aim65.c
@@ -0,0 +1,17 @@
+/* Copyright 2021 Matteo Bonora
+ *
+ * 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 "aim65.h"
diff --git a/keyboards/handwired/aim65/aim65.h b/keyboards/handwired/aim65/aim65.h
new file mode 100644
index 0000000000..cce4a603af
--- /dev/null
+++ b/keyboards/handwired/aim65/aim65.h
@@ -0,0 +1,36 @@
+/* Copyright 2021 Matteo Bonora
+ *
+ * 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( \
+         K62, K71, K61, K74, K64, K75, K65, K76, K66, K77, K67, K72, K53,   \
+    K52,   K42, K51, K41, K54, K44, K55, K45, K56, K46, K57, K47, K22, K40, \
+       K60, K31, K21, K34, K24, K35, K25, K36, K26, K37, K27, K33, K12, K23,\
+       K70,    K01, K11, K04, K14, K05, K15, K06, K16, K07, K17, K20,       \
+                                    K00                                     \
+) { \
+    { K00,   K01,   KC_NO, KC_NO, K04,   K05,   K06,   K07   }, \
+    { KC_NO, K11,   K12,   KC_NO, K14,   K15,   K16,   K17   }, \
+    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27   }, \
+    { KC_NO, K31,   KC_NO, K33,   K34,   K35,   K36,   K37   }, \
+    { K40,   K41,   K42,   KC_NO, K44,   K45,   K46,   K47   }, \
+    { KC_NO, K51,   K52,   K53,   K54,   K55,   K56,   K57   }, \
+    { K60,   K61,   K62,   KC_NO, K64,   K65,   K66,   K67   }, \
+    { K70,   K71,   K72,   KC_NO, K74,   K75,   K76,   K77   }, \
+}
diff --git a/keyboards/handwired/aim65/config.h b/keyboards/handwired/aim65/config.h
new file mode 100644
index 0000000000..1c0468c7b0
--- /dev/null
+++ b/keyboards/handwired/aim65/config.h
@@ -0,0 +1,48 @@
+/* Copyright 2021 Matteo Bonora
+ *
+ * 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       0xFEED
+#define PRODUCT_ID      0x0F34
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Hi-Tek
+#define PRODUCT         AIM-65
+
+/* key matrix size */
+#define MATRIX_ROWS 8
+#define MATRIX_COLS 8
+
+/*
+ * 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, D7, E6, B4, B5, B3, B1 }
+#define MATRIX_COL_PINS { D1, C6, B6, B2, F7, F6, F5, F4 }
+
+#define DIODE_DIRECTION COL2ROW
+
+#define LED_CAPS_LOCK_PIN B0
+#define LED_PIN_ON_STATE 0
diff --git a/keyboards/handwired/aim65/info.json b/keyboards/handwired/aim65/info.json
new file mode 100644
index 0000000000..64d57377a6
--- /dev/null
+++ b/keyboards/handwired/aim65/info.json
@@ -0,0 +1,68 @@
+{
+    "keyboard_name": "Hi-Tek AIM-65",
+    "url": "https://github.com/Bonnee/aim-65_keyboard",
+    "maintainer": "bonnee",
+    "width": 15.25,
+    "height": 5,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"K62 (B3,B6)", "x":1, "y":0},
+                {"label":"K71 (B1,C6)", "x":2, "y":0},
+                {"label":"K61 (B3,C6)", "x":3, "y":0},
+                {"label":"K74 (B1,F7)", "x":4, "y":0},
+                {"label":"K64 (B3,F7)", "x":5, "y":0},
+                {"label":"K75 (B1,F6)", "x":6, "y":0},
+                {"label":"K65 (B3,F6)", "x":7, "y":0},
+                {"label":"K76 (B1,F5)", "x":8, "y":0},
+                {"label":"K66 (B3,F5)", "x":9, "y":0},
+                {"label":"K77 (B1,F4)", "x":10, "y":0},
+                {"label":"K67 (B3,F4)", "x":11, "y":0},
+                {"label":"K72 (B1,B6)", "x":12, "y":0},
+                {"label":"K53 (B5,B2)", "x":13, "y":0},
+                {"label":"K52 (B5,B6)", "x":0, "y":1, "w":1.5},
+                {"label":"K42 (B4,B6)", "x":1.5, "y":1},
+                {"label":"K51 (B5,C6)", "x":2.5, "y":1},
+                {"label":"K41 (B4,C6)", "x":3.5, "y":1},
+                {"label":"K54 (B5,F7)", "x":4.5, "y":1},
+                {"label":"K44 (B4,F7)", "x":5.5, "y":1},
+                {"label":"K55 (B5,F6)", "x":6.5, "y":1},
+                {"label":"K45 (B4,F6)", "x":7.5, "y":1},
+                {"label":"K56 (B5,F5)", "x":8.5, "y":1},
+                {"label":"K46 (B4,F5)", "x":9.5, "y":1},
+                {"label":"K57 (B5,F4)", "x":10.5, "y":1},
+                {"label":"K47 (B4,F4)", "x":11.5, "y":1},
+                {"label":"K22 (D7,B6)", "x":12.5, "y":1},
+                {"label":"K40 (B4,D1)", "x":13.5, "y":1},
+                {"label":"K60 (B3,D1)", "x":0.75, "y":2},
+                {"label":"K31 (E6,C6)", "x":1.75, "y":2},
+                {"label":"K21 (D7,C6)", "x":2.75, "y":2},
+                {"label":"K34 (E6,F7)", "x":3.75, "y":2},
+                {"label":"K24 (D7,F7)", "x":4.75, "y":2},
+                {"label":"K35 (E6,F6)", "x":5.75, "y":2},
+                {"label":"K25 (D7,F6)", "x":6.75, "y":2},
+                {"label":"K36 (E6,F5)", "x":7.75, "y":2},
+                {"label":"K26 (D7,F5)", "x":8.75, "y":2},
+                {"label":"K37 (E6,F4)", "x":9.75, "y":2},
+                {"label":"K27 (D7,F4)", "x":10.75, "y":2},
+                {"label":"K33 (E6,B2)", "x":11.75, "y":2},
+                {"label":"K12 (D4,B6)", "x":12.75, "y":2},
+                {"label":"K23 (D7,B2)", "x":13.75, "y":2, "w":1.5},
+                {"label":"K70 (B1,D1)", "x":0.75, "y":3, "w":1.5},
+                {"label":"K01 (D0,C6)", "x":2.25, "y":3},
+                {"label":"K11 (D4,C6)", "x":3.25, "y":3},
+                {"label":"K04 (D0,F7)", "x":4.25, "y":3},
+                {"label":"K14 (D4,F7)", "x":5.25, "y":3},
+                {"label":"K05 (D0,F6)", "x":6.25, "y":3},
+                {"label":"K15 (D4,F6)", "x":7.25, "y":3},
+                {"label":"K06 (D0,F5)", "x":8.25, "y":3},
+                {"label":"K16 (D4,F5)", "x":9.25, "y":3},
+                {"label":"K07 (D0,F4)", "x":10.25, "y":3},
+                {"label":"K17 (D4,F4)", "x":11.25, "y":3},
+                {"label":"K20 (D7,D1)", "x":12.25, "y":3, "w":1.5},
+                {"label":"K00 (D0,D1)", "x":3.25, "y":4, "w":8}
+            ]
+        }
+    }
+}
+
diff --git a/keyboards/handwired/aim65/keymaps/bonnee/keymap.c b/keyboards/handwired/aim65/keymaps/bonnee/keymap.c
new file mode 100644
index 0000000000..62f2d21e95
--- /dev/null
+++ b/keyboards/handwired/aim65/keymaps/bonnee/keymap.c
@@ -0,0 +1,42 @@
+/* Copyright 2021 Matteo Bonora
+ *
+ * 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
+
+#define CTESC LCTL_T(KC_ESC)
+
+enum layer_names {
+    BL,
+    FL
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [BL] = LAYOUT(
+             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_GRV,    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_RGUI,
+         CTESC,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN,   KC_QUOT,   KC_BSLS,      KC_ENT,
+       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH, KC_RSFT,
+                                                           LT(FL, KC_SPC)
+    ),
+
+    [FL] = LAYOUT(
+            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_DEL,
+     KC_TAB, _______, _______, _______,   RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+         _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN,   KC_UP, KC_RGHT, _______, _______, _______, _______,
+         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+                                                             _______
+    )
+};
diff --git a/keyboards/handwired/aim65/keymaps/default/keymap.c b/keyboards/handwired/aim65/keymaps/default/keymap.c
new file mode 100644
index 0000000000..78356babe0
--- /dev/null
+++ b/keyboards/handwired/aim65/keymaps/default/keymap.c
@@ -0,0 +1,27 @@
+/* Copyright 2021 Matteo Bonora
+ *
+ * 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] = {
+    LAYOUT(
+         KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_SCLN,   KC_F3, KC_PSCR,
+      KC_ESC,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_MINS,   KC_F2,KC_RETURN,
+           KC_LCTL,    KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_AT, KC_F1, KC_DEL,
+           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_SPC
+    )
+};
diff --git a/keyboards/handwired/aim65/readme.md b/keyboards/handwired/aim65/readme.md
new file mode 100644
index 0000000000..8c05c43f83
--- /dev/null
+++ b/keyboards/handwired/aim65/readme.md
@@ -0,0 +1,27 @@
+# Hi-Tek AIM-65
+
+![Hi-Tek AIM-65 Keyboard](https://imgur.com/7Gam1f2l.jpg)
+
+The keboard assembly that came with the Rockwell AIM-65, a microcomputer from the '70s [Wikipedia article](https://en.wikipedia.org/wiki/AIM-65)
+
+The controller is a Pro Micro handwired to the original connector. [This](https://github.com/Bonnee/aim-65_keyboard) repo collects 3D models for the case, schematics for the matrix and pics.
+
+* Keyboard Maintainer: [Matteo Bonora](https://github.com/bonnee)
+* Hardware Supported: Pro Micro
+
+The default layout is useless on a modern computer, you can use it as a base for your own though.
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/aim65:default
+
+Flashing example for this keyboard:
+
+    make handwired/aim65:default:flash
+
+To reset the board into bootloader mode, do one of the following:
+
+* Double-tap the Reset switch mounted on the Pro Micro
+* Hold the spacebar while connecting the USB cable (also erases persistent settings)
+
+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).
diff --git a/keyboards/handwired/aim65/rules.mk b/keyboards/handwired/aim65/rules.mk
new file mode 100644
index 0000000000..fd76a52478
--- /dev/null
+++ b/keyboards/handwired/aim65/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+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
+# 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 = no            # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output