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

10 files changed, 308 insertions, 0 deletions

diff --git a/keyboards/hp69/config.h b/keyboards/hp69/config.h
new file mode 100644
index 0000000000..ca0a9eb47b
--- /dev/null
+++ b/keyboards/hp69/config.h
@@ -0,0 +1,52 @@
+/*
+Copyright 2020 Ananya Kirti
+
+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       0x416B
+#define PRODUCT_ID      0x0001
+#define DEVICE_VER      0x0011
+#define MANUFACTURER    Desiboards
+#define PRODUCT         hp69
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+/*
+ * 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 { B3, B7, A10, B9 ,A9}
+#define MATRIX_COL_PINS { B12, B15, B10, B13, B14, B11, B8, A0, A1, B5, B0, B2, B6, B1, B4}
+
+#define DIODE_DIRECTION COL2ROW
+
+#define RGB_DI_PIN A3
+#define RGBLED_NUM 20
+#define RGBLIGHT_ANIMATIONS
+
+#define A4_AUDIO
+#define A5_AUDIO
\ No newline at end of file
diff --git a/keyboards/hp69/hp69.c b/keyboards/hp69/hp69.c
new file mode 100644
index 0000000000..d9a78e3d83
--- /dev/null
+++ b/keyboards/hp69/hp69.c
@@ -0,0 +1,16 @@
+/* Copyright 2020 Ananya Kirti
+ *
+ * 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 "hp69.h"
diff --git a/keyboards/hp69/hp69.h b/keyboards/hp69/hp69.h
new file mode 100644
index 0000000000..7819eb829e
--- /dev/null
+++ b/keyboards/hp69/hp69.h
@@ -0,0 +1,32 @@
+/* Copyright 2020 Ananya Kirti
+ *
+ * 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, K09, K0A, K0B, K0C, K0D, K0E,  K1E, K4E,  \
+    K10,   K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,     K2E, K3E,  \
+    K20,    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,                    \
+    K30,       K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,     K3C,  K3D,       \
+    K40,   K41,  K42,                  K46,                 K49,   K4A,    K4B, K4C, K4D   \
+) { \
+    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
+    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
+    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   KC_NO, K2E   }, \
+    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
+    { K40,   K41,   K42,   KC_NO, KC_NO, KC_NO, K46,   KC_NO, KC_NO, K49,   K4A,   K4B,   K4C,   K4D,   K4E   }, \
+}
diff --git a/keyboards/hp69/info.json b/keyboards/hp69/info.json
new file mode 100644
index 0000000000..06689d82a5
--- /dev/null
+++ b/keyboards/hp69/info.json
@@ -0,0 +1,82 @@
+{
+    "keyboard_name": "hp69",
+    "url": "",
+    "maintainer": "Ananya Kirti",
+    "width": 17.25,
+    "height": 5,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"K00 (B0,B5)", "x":0, "y":0},
+                {"label":"K01 (B0,B6)", "x":1, "y":0},
+                {"label":"K02 (B0,B7)", "x":2, "y":0},
+                {"label":"K03 (B0,C0)", "x":3, "y":0},
+                {"label":"K04 (B0,C1)", "x":4, "y":0},
+                {"label":"K05 (B0,C2)", "x":5, "y":0},
+                {"label":"K06 (B0,C3)", "x":6, "y":0},
+                {"label":"K07 (B0,C4)", "x":7, "y":0},
+                {"label":"K08 (B0,C5)", "x":8, "y":0},
+                {"label":"K09 (B0,C6)", "x":9, "y":0},
+                {"label":"K0A (B0,C7)", "x":10, "y":0},
+                {"label":"K0B (B0,D0)", "x":11, "y":0},
+                {"label":"K0C (B0,D1)", "x":12, "y":0},
+                {"label":"K0D (B0,D2)", "x":13, "y":0},
+                {"label":"K0E (B0,D3)", "x":14, "y":0},
+                {"label":"K1E (B1,D3)", "x":15.25, "y":0},
+                {"label":"K4E (B4,D3)", "x":16.25, "y":0},
+                {"label":"K10 (B1,B5)", "x":0, "y":1, "w":1.5},
+                {"label":"K11 (B1,B6)", "x":1.5, "y":1},
+                {"label":"K12 (B1,B7)", "x":2.5, "y":1},
+                {"label":"K13 (B1,C0)", "x":3.5, "y":1},
+                {"label":"K14 (B1,C1)", "x":4.5, "y":1},
+                {"label":"K15 (B1,C2)", "x":5.5, "y":1},
+                {"label":"K16 (B1,C3)", "x":6.5, "y":1},
+                {"label":"K17 (B1,C4)", "x":7.5, "y":1},
+                {"label":"K18 (B1,C5)", "x":8.5, "y":1},
+                {"label":"K19 (B1,C6)", "x":9.5, "y":1},
+                {"label":"K1A (B1,C7)", "x":10.5, "y":1},
+                {"label":"K1B (B1,D0)", "x":11.5, "y":1},
+                {"label":"K1C (B1,D1)", "x":12.5, "y":1},
+                {"label":"K1D (B1,D2)", "x":13.5, "y":1, "w":1.5},
+                {"label":"K2E (B2,D3)", "x":15.25, "y":1},
+                {"label":"K3E (B3,D3)", "x":16.25, "y":1},
+                {"label":"K20 (B2,B5)", "x":0, "y":2, "w":1.25},
+                {"label":"K21 (B2,B6)", "x":1.75, "y":2},
+                {"label":"K22 (B2,B7)", "x":2.75, "y":2},
+                {"label":"K23 (B2,C0)", "x":3.75, "y":2},
+                {"label":"K24 (B2,C1)", "x":4.75, "y":2},
+                {"label":"K25 (B2,C2)", "x":5.75, "y":2},
+                {"label":"K26 (B2,C3)", "x":6.75, "y":2},
+                {"label":"K27 (B2,C4)", "x":7.75, "y":2},
+                {"label":"K28 (B2,C5)", "x":8.75, "y":2},
+                {"label":"K29 (B2,C6)", "x":9.75, "y":2},
+                {"label":"K2A (B2,C7)", "x":10.75, "y":2},
+                {"label":"K2B (B2,D0)", "x":11.75, "y":2},
+                {"label":"K2C (B2,D1)", "x":12.75, "y":2, "w":2.25},
+                {"label":"K30 (B3,B5)", "x":0, "y":3, "w":2.25},
+                {"label":"K31 (B3,B6)", "x":2.25, "y":3},
+                {"label":"K32 (B3,B7)", "x":3.25, "y":3},
+                {"label":"K33 (B3,C0)", "x":4.25, "y":3},
+                {"label":"K34 (B3,C1)", "x":5.25, "y":3},
+                {"label":"K35 (B3,C2)", "x":6.25, "y":3},
+                {"label":"K36 (B3,C3)", "x":7.25, "y":3},
+                {"label":"K37 (B3,C4)", "x":8.25, "y":3},
+                {"label":"K38 (B3,C5)", "x":9.25, "y":3},
+                {"label":"K39 (B3,C6)", "x":10.25, "y":3},
+                {"label":"K3A (B3,C7)", "x":11.25, "y":3},
+                {"label":"K3B (B3,D0)", "x":12.25, "y":3, "w":1.75},
+                {"label":"K3C (B3,D1)", "x":14, "y":3},
+                {"label":"K3D (B3,D2)", "x":15.25, "y":3},
+                {"label":"K40 (B4,B5)", "x":0, "y":4, "w":1.5},
+                {"label":"K41 (B4,B6)", "x":1.5, "y":4, "w":1.25},
+                {"label":"K42 (B4,B7)", "x":2.75, "y":4, "w":1.5},
+                {"label":"K46 (B4,C3)", "x":4.25, "y":4, "w":7},
+                {"label":"K49 (B4,C6)", "x":11.25, "y":4, "w":1.5},
+                {"label":"K4A (B4,C7)", "x":12.75, "y":4, "w":1.25},
+                {"label":"K4B (B4,D0)", "x":14.25, "y":4},
+                {"label":"K4C (B4,D1)", "x":15.25, "y":4},
+                {"label":"K4D (B4,D2)", "x":16.25, "y":4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/hp69/keymaps/default/keymap.c b/keyboards/hp69/keymaps/default/keymap.c
new file mode 100644
index 0000000000..e7f4d7f759
--- /dev/null
+++ b/keyboards/hp69/keymaps/default/keymap.c
@@ -0,0 +1,33 @@
+/* Copyright 2020 Ananya Kirti
+ *
+ * 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_BSLS, KC_GRV,    KC_INS,  KC_HOME,
+        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_BSPC,        KC_DEL,  KC_END,
+        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_LSFT,            KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,        MO(1),     KC_UP,
+        KC_LCTL,     KC_LALT,   KC_LGUI,                             KC_SPC,                                 KC_RGUI,     KC_RALT,      KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT(
+        RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______,
+        RGB_TOG,     RGB_MODE_FORWARD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______, _______,
+        RGB_MODE_RGBTEST,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______,   _______,
+        _______,     _______,   _______,                            _______,                                 _______,     _______,      _______, _______, _______
+    ),
+};
diff --git a/keyboards/hp69/keymaps/default/rules.mk b/keyboards/hp69/keymaps/default/rules.mk
new file mode 100644
index 0000000000..628167ff66
--- /dev/null
+++ b/keyboards/hp69/keymaps/default/rules.mk
@@ -0,0 +1 @@
+AUDIO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/hp69/keymaps/via/keymap.c b/keyboards/hp69/keymaps/via/keymap.c
new file mode 100644
index 0000000000..d47308c8ba
--- /dev/null
+++ b/keyboards/hp69/keymaps/via/keymap.c
@@ -0,0 +1,49 @@
+/* Copyright 2020 Ananya Kirti
+ *
+ * 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_GESC,  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_BSLS, KC_GRV,    KC_MEDIA_PLAY_PAUSE,  KC__VOLUP,
+        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_BSPC,        KC__MUTE,  KC__VOLDOWN,
+        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_LSFT,            KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,        MO(1),     KC_UP,
+        KC_LCTL,     KC_LALT,   KC_LGUI,                             KC_SPC,                                 KC_RGUI,     KC_RALT,      KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT(
+        RESET,   KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______,   _______, _______,
+        RGB_TOG,     RGB_MODE_FORWARD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______, _______,
+        RGB_MODE_RGBTEST,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______,   _______,
+        _______,     _______,   _______,                            _______,                                 _______,     _______,      _______, _______, _______
+    ),
+    [2] = LAYOUT(
+        _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______,
+        _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______, _______,
+        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______,   _______,
+        _______,     _______,   _______,                            _______,                                 _______,     _______,      _______, _______, _______
+    ),
+    [3] = LAYOUT(
+        _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______,
+        _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______, _______,
+        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______,   _______,
+        _______,     _______,   _______,                            _______,                                 _______,     _______,      _______, _______, _______
+    ),
+
+
+};
\ No newline at end of file
diff --git a/keyboards/hp69/keymaps/via/rules.mk b/keyboards/hp69/keymaps/via/rules.mk
new file mode 100644
index 0000000000..927ce45212
--- /dev/null
+++ b/keyboards/hp69/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+AUDIO_ENABLE = yes
diff --git a/keyboards/hp69/readme.md b/keyboards/hp69/readme.md
new file mode 100644
index 0000000000..ee80c38f55
--- /dev/null
+++ b/keyboards/hp69/readme.md
@@ -0,0 +1,19 @@
+# hp69
+
+![hp69](https://i.imgur.com/hwXvX1Vl.jpg)
+
+A 69 key layout keyboard to emulate apple bottom row with 1.5u 1.25u 1.5u bottom layout
+
+* Keyboard Maintainer: [Ananya Kirti](https://github.com/AnanyaKirti)
+* Hardware Supported: custom stacked acrylic case
+* Hardware Availability: Contact bob at IMKC Discord
+
+Make example for this keyboard (after setting up your build environment):
+
+    make hp69:default
+
+Flashing example for this keyboard:
+
+    make hp69:default:flash
+
+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/hp69/rules.mk b/keyboards/hp69/rules.mk
new file mode 100644
index 0000000000..22eb0fcd93
--- /dev/null
+++ b/keyboards/hp69/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = STM32F303
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# 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 = 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
\ No newline at end of file