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

9 files changed, 275 insertions, 0 deletions

diff --git a/keyboards/ai03/lunar_ii/config.h b/keyboards/ai03/lunar_ii/config.h
new file mode 100644
index 0000000000..5942457d57
--- /dev/null
+++ b/keyboards/ai03/lunar_ii/config.h
@@ -0,0 +1,62 @@
+/*
+Copyright 2022 ai03 Design Studio
+
+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"
+
+/* Mechanical lock switch support */
+#define LOCKING_SUPPORT_ENABLE
+#define LOCKING_RESYNC_ENABLE
+
+/* Solenoid support */
+#define SOLENOID_PIN B7
+#define SOLENOID_DEFAULT_DWELL 15
+
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
diff --git a/keyboards/ai03/lunar_ii/info.json b/keyboards/ai03/lunar_ii/info.json
new file mode 100644
index 0000000000..5d86a13ad1
--- /dev/null
+++ b/keyboards/ai03/lunar_ii/info.json
@@ -0,0 +1,90 @@
+{
+    "keyboard_name": "Lunar II",
+    "manufacturer": "ai03 Design Studio",
+    "url": "https://ai03.com/projects/lunar-ii",
+    "maintainer": "ai03-2725",
+    "usb": {
+        "vid": "0xA103",
+        "pid": "0x0016",
+        "device_version": "1.0.0",
+    },
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "rows": [ "D0", "D1", "D2", "F0", "F1" ],
+        "cols": [ "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"]
+    },
+    "indicators": {
+        "caps_lock": "B3",
+        "on_state": 0
+    },
+    "build": {
+        "debounce_type": "asym_eager_defer_pk"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0.0, "y": 0.0 },
+                { "matrix": [0, 1], "x": 1.0, "y": 0.0 },
+                { "matrix": [0, 2], "x": 2.0, "y": 0.0 },
+                { "matrix": [0, 3], "x": 3.0, "y": 0.0 },
+                { "matrix": [0, 4], "x": 4.0, "y": 0.0 },
+                { "matrix": [0, 5], "x": 5.0, "y": 0.0 },
+                { "matrix": [0, 6], "x": 6.0, "y": 0.0 },
+                { "matrix": [0, 7], "x": 7.0, "y": 0.0 },
+                { "matrix": [0, 8], "x": 8.0, "y": 0.0 },
+                { "matrix": [0, 9], "x": 9.0, "y": 0.0 },
+                { "matrix": [0, 10], "x": 10.0, "y": 0.0 },
+                { "matrix": [0, 11], "x": 11.0, "y": 0.0 },
+                { "matrix": [0, 12], "x": 12.0, "y": 0.0 },
+                { "matrix": [0, 13], "x": 13.0, "y": 0.0 },
+                { "matrix": [2, 12], "x": 14.0, "y": 0.0 },
+                { "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0 },
+                { "matrix": [1, 1], "x": 1.5, "y": 1.0 },
+                { "matrix": [1, 2], "x": 2.5, "y": 1.0 },
+                { "matrix": [1, 3], "x": 3.5, "y": 1.0 },
+                { "matrix": [1, 4], "x": 4.5, "y": 1.0 },
+                { "matrix": [1, 5], "x": 5.5, "y": 1.0 },
+                { "matrix": [1, 6], "x": 6.5, "y": 1.0 },
+                { "matrix": [1, 7], "x": 7.5, "y": 1.0 },
+                { "matrix": [1, 8], "x": 8.5, "y": 1.0 },
+                { "matrix": [1, 9], "x": 9.5, "y": 1.0 },
+                { "matrix": [1, 10], "x": 10.5, "y": 1.0 },
+                { "matrix": [1, 11], "x": 11.5, "y": 1.0 },
+                { "matrix": [1, 12], "x": 12.5, "y": 1.0 },
+                { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1.0 },
+                { "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0 },
+                { "matrix": [2, 1], "x": 1.75, "y": 2.0 },
+                { "matrix": [2, 2], "x": 2.75, "y": 2.0 },
+                { "matrix": [2, 3], "x": 3.75, "y": 2.0 },
+                { "matrix": [2, 4], "x": 4.75, "y": 2.0 },
+                { "matrix": [2, 5], "x": 5.75, "y": 2.0 },
+                { "matrix": [2, 6], "x": 6.75, "y": 2.0 },
+                { "matrix": [2, 7], "x": 7.75, "y": 2.0 },
+                { "matrix": [2, 8], "x": 8.75, "y": 2.0 },
+                { "matrix": [2, 9], "x": 9.75, "y": 2.0 },
+                { "matrix": [2, 10], "x": 10.75, "y": 2.0 },
+                { "matrix": [2, 11], "x": 11.75, "y": 2.0 },
+                { "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2.0 },
+                { "matrix": [3, 0], "w": 2.25, "x": 0.0, "y": 3.0 },
+                { "matrix": [3, 2], "x": 2.25, "y": 3.0 },
+                { "matrix": [3, 3], "x": 3.25, "y": 3.0 },
+                { "matrix": [3, 4], "x": 4.25, "y": 3.0 },
+                { "matrix": [3, 5], "x": 5.25, "y": 3.0 },
+                { "matrix": [3, 6], "x": 6.25, "y": 3.0 },
+                { "matrix": [3, 7], "x": 7.25, "y": 3.0 },
+                { "matrix": [3, 8], "x": 8.25, "y": 3.0 },
+                { "matrix": [3, 9], "x": 9.25, "y": 3.0 },
+                { "matrix": [3, 10], "x": 10.25, "y": 3.0 },
+                { "matrix": [3, 11], "x": 11.25, "y": 3.0 },
+                { "matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3.0 },
+                { "matrix": [4, 0], "w": 1.5, "x": 0.0, "y": 4.0 },
+                { "matrix": [4, 2], "w": 1.25, "x": 1.5, "y": 4.0 },
+                { "matrix": [4, 3], "w": 1.5, "x": 2.75, "y": 4.0 },
+                { "matrix": [4, 7], "w": 6.5, "x": 4.25, "y": 4.0 },
+                { "matrix": [4, 11], "w": 1.5, "x": 10.75, "y": 4.0 },
+                { "matrix": [4, 12], "w": 1.25, "x": 12.25, "y": 4.0 },
+                { "matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4.0 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/ai03/lunar_ii/keymaps/default/keymap.c b/keyboards/ai03/lunar_ii/keymaps/default/keymap.c
new file mode 100644
index 0000000000..261c999da7
--- /dev/null
+++ b/keyboards/ai03/lunar_ii/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+/* Copyright 2022 ai03 Design Studio
+ *
+ * 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_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_DEL,
+		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,
+		MO(1),   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_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,                   KC_RSFT,
+		KC_LCTL, KC_LGUI, KC_LALT,                                     KC_SPC,                                      KC_RALT, KC_RGUI, KC_RCTL
+    ),
+    [1] = 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_DEL,
+		KC_CAPS, _______, _______, KC_PGUP, _______, _______, _______, _______, KC_UP,   _______, _______, _______, _______,          _______,
+		_______, _______, KC_HOME, KC_PGDN, KC_END,  _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,                   _______,
+		_______,          HPT_TOG, HPT_FBK, HPT_DWLI, HPT_DWLD, _______, _______, _______, _______, _______, _______,                 _______,
+		_______, _______, _______,                                     _______,                                     _______, _______, _______
+    )
+};
+
diff --git a/keyboards/ai03/lunar_ii/keymaps/default/readme.md b/keyboards/ai03/lunar_ii/keymaps/default/readme.md
new file mode 100644
index 0000000000..a956904f1c
--- /dev/null
+++ b/keyboards/ai03/lunar_ii/keymaps/default/readme.md
@@ -0,0 +1,2 @@
+# The default keymap for lunar_ii
+Nothing special
\ No newline at end of file
diff --git a/keyboards/ai03/lunar_ii/keymaps/via/keymap.c b/keyboards/ai03/lunar_ii/keymaps/via/keymap.c
new file mode 100644
index 0000000000..58fe4c7ecb
--- /dev/null
+++ b/keyboards/ai03/lunar_ii/keymaps/via/keymap.c
@@ -0,0 +1,48 @@
+/* Copyright 2022 ai03 Design Studio
+ *
+ * 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_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_DEL,
+		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,
+		MO(1),   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_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,                   KC_RSFT,
+		KC_LCTL, KC_LGUI, KC_LALT,                                     KC_SPC,                                      KC_RALT, KC_RGUI, KC_RCTL
+    ),
+    [1] = 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_DEL,
+		KC_CAPS, _______, _______, KC_PGUP, _______, _______, _______, _______, KC_UP,   _______, _______, _______, _______,          _______,
+		_______, _______, KC_HOME, KC_PGDN, KC_END,  _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,                   _______,
+		_______,          HPT_TOG, HPT_FBK, HPT_DWLI, HPT_DWLD, _______, _______, _______, _______, _______, _______,                 _______,
+		_______, _______, _______,                                     _______,                                     _______, _______, _______
+    ),
+	[2] = LAYOUT(
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+		_______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+		_______, _______, _______,                                     _______,                                     _______, _______, _______
+    ),
+	[3] = LAYOUT(
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+		_______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+		_______, _______, _______,                                     _______,                                     _______, _______, _______
+    )
+};
+
diff --git a/keyboards/ai03/lunar_ii/keymaps/via/readme.md b/keyboards/ai03/lunar_ii/keymaps/via/readme.md
new file mode 100644
index 0000000000..942e11ff4a
--- /dev/null
+++ b/keyboards/ai03/lunar_ii/keymaps/via/readme.md
@@ -0,0 +1,2 @@
+# The via keymap for lunar_ii
+Enables via support; for use with via configurator
diff --git a/keyboards/ai03/lunar_ii/keymaps/via/rules.mk b/keyboards/ai03/lunar_ii/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/ai03/lunar_ii/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/ai03/lunar_ii/readme.md b/keyboards/ai03/lunar_ii/readme.md
new file mode 100644
index 0000000000..7bf8769c76
--- /dev/null
+++ b/keyboards/ai03/lunar_ii/readme.md
@@ -0,0 +1,15 @@
+# Lunar II
+
+![lunar_ii](https://i.imgur.com/W3xbm4mh.png)
+
+Second generation compact AEK keyboard
+
+* Keyboard Maintainer: [ai03-2725](https://github.com/ai03-2725)
+* Hardware Supported: The Lunar II PCB
+* Hardware Availability: Switchplate Peripherals, TypePlus
+
+Make example for this keyboard (after setting up your build environment):
+
+    make ai03/lunar_ii: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).
diff --git a/keyboards/ai03/lunar_ii/rules.mk b/keyboards/ai03/lunar_ii/rules.mk
new file mode 100644
index 0000000000..1a29d22700
--- /dev/null
+++ b/keyboards/ai03/lunar_ii/rules.mk
@@ -0,0 +1,21 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = yes        # 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
+
+HAPTIC_ENABLE = yes         # Enable solenoid support
+HAPTIC_DRIVER += SOLENOID