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

7 files changed, 225 insertions, 0 deletions

diff --git a/keyboards/hubble/config.h b/keyboards/hubble/config.h
new file mode 100644
index 0000000000..eb2aad2e50
--- /dev/null
+++ b/keyboards/hubble/config.h
@@ -0,0 +1,23 @@
+// Copyright 2022 Anton Chernenko (@ch3rny)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+/* rgb */
+#define RGB_DI_PIN D2
+#define RGBLED_NUM 7
+#define RGBLIGHT_SLEEP
+#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
+#define RGBLIGHT_EFFECT_TWINKLE
+
+#define DEBOUNCE 5
diff --git a/keyboards/hubble/info.json b/keyboards/hubble/info.json
new file mode 100644
index 0000000000..2677927194
--- /dev/null
+++ b/keyboards/hubble/info.json
@@ -0,0 +1,91 @@
+{
+    "manufacturer": "Anton Chernenko",
+    "keyboard_name": "hubble",
+    "maintainer": "ch3rny",
+    "development_board": "promicro",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true,
+        "velocikey": true
+    },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "B4", "E6", "D7", "C6", "D4", "D0"],
+        "rows": ["D1", "F4", "F7", "B5", "B1", "B3", "B6", "B2"]
+    },
+    "url": "",
+    "usb": {
+        "vid": "0x4680",
+        "pid": "0x1357",
+        "device_version": "1.0.0"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [0, 3], "x": 3, "y": 0 },
+                { "matrix": [0, 4], "x": 4, "y": 0 },
+                { "matrix": [0, 5], "x": 5, "y": 0 },
+                { "matrix": [0, 6], "x": 6, "y": 0 },
+                { "matrix": [0, 7], "x": 7, "y": 0 },
+                { "matrix": [1, 7], "x": 8, "y": 0 },
+                { "matrix": [1, 6], "x": 9, "y": 0 },
+                { "matrix": [1, 5], "x": 10, "y": 0 },
+                { "matrix": [1, 4], "x": 11, "y": 0 },
+                { "matrix": [1, 3], "x": 12, "y": 0 },
+                { "matrix": [1, 2], "x": 13, "y": 0 },
+                { "matrix": [1, 1], "x": 14.25, "y": 0 },
+                { "matrix": [1, 0], "x": 15.25, "y": 0 },
+                { "matrix": [2, 0], "x": 0, "y": 1, "w": 1.25 },
+                { "matrix": [2, 1], "x": 1.25, "y": 1 },
+                { "matrix": [2, 2], "x": 2.25, "y": 1 },
+                { "matrix": [2, 3], "x": 3.25, "y": 1 },
+                { "matrix": [2, 4], "x": 4.25, "y": 1 },
+                { "matrix": [2, 5], "x": 5.25, "y": 1 },
+                { "matrix": [2, 6], "x": 6.25, "y": 1 },
+                { "matrix": [2, 7], "x": 7.25, "y": 1 }, 
+                { "matrix": [3, 7], "x": 8.25, "y": 1 },
+                { "matrix": [3, 6], "x": 9.25, "y": 1 },
+                { "matrix": [3, 5], "x": 10.25, "y": 1 },
+                { "matrix": [3, 4], "x": 11.25, "y": 1 },
+                { "matrix": [3, 3], "x": 12.25, "y": 1, "w": 1.75 },
+                { "matrix": [3, 1], "x": 14.25, "y": 1 },
+                { "matrix": [3, 0], "x": 15.25, "y": 1 },
+                { "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75 },
+                { "matrix": [4, 1], "x": 1.75, "y": 2 },
+                { "matrix": [4, 2], "x": 2.75, "y": 2 },
+                { "matrix": [4, 3], "x": 3.75, "y": 2 },
+                { "matrix": [4, 4], "x": 4.75, "y": 2 },
+                { "matrix": [4, 5], "x": 5.75, "y": 2 },
+                { "matrix": [4, 6], "x": 6.75, "y": 2 },
+                { "matrix": [4, 7], "x": 7.75, "y": 2 },
+                { "matrix": [5, 7], "x": 8.75, "y": 2 },
+                { "matrix": [5, 6], "x": 9.75, "y": 2 },
+                { "matrix": [5, 5], "x": 10.75, "y": 2 },
+                { "matrix": [5, 4], "x": 11.75, "y": 2, "w": 1.25 },
+                { "matrix": [5, 3], "x": 13, "y": 2 },
+                { "matrix": [5, 1], "x": 14.25, "y": 2 },
+                { "matrix": [6, 0], "x": 0, "y": 3, "w": 1.25  },             
+                { "matrix": [6, 1], "x": 1.25, "y": 3, "w": 1.25},
+                { "matrix": [6, 2], "x": 2.5, "y": 3, "w": 1.25 },
+                { "matrix": [6, 3], "x": 3.75, "y": 3, "w": 2.25 },
+                { "matrix": [6, 5], "x": 6, "y": 3, "w": 1.25 },
+                { "matrix": [6, 7], "x": 7.25, "y": 3, "w": 2.75 },
+                { "matrix": [7, 6], "x": 10, "y": 3 },             
+                { "matrix": [7, 5], "x": 11, "y": 3 },
+                { "matrix": [7, 4], "x": 12, "y": 3 },
+                { "matrix": [7, 2], "x": 13.25, "y": 3 },
+                { "matrix": [7, 1], "x": 14.25, "y": 3 },
+                { "matrix": [7, 0], "x": 15.25, "y": 3 }
+
+            ]
+        }
+    }
+}
diff --git a/keyboards/hubble/keymaps/default/keymap.c b/keyboards/hubble/keymaps/default/keymap.c
new file mode 100644
index 0000000000..41e21de0e2
--- /dev/null
+++ b/keyboards/hubble/keymaps/default/keymap.c
@@ -0,0 +1,41 @@
+// Copyright 2022 Anton Chernenko (@ch3rny)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum layers {
+  BASE,
+  LOWER,
+  RAISE,
+  ADJUST
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [BASE] = LAYOUT(
+       KC_ESC,  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_INS,  KC_PGUP, 
+       KC_TAB,  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_DEL,  KC_PGDN, 
+       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(LOWER),        KC_UP,
+       KC_LCTL, KC_LGUI, KC_LALT, LT(LOWER, KC_BSPC),   LT(ADJUST, KC_ENT),    LT(RAISE, KC_SPC),KC_RALT,MO(RAISE),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [LOWER] = LAYOUT(
+       KC_GRV,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS, KC_PPLS, KC_EQL,  _______, KC_HOME, 
+       _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_PMNS, _______,          _______, KC_END, 
+       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,      
+       _______, _______, _______, _______,          _______,          _______,          _______, _______, _______,          _______, _______, _______
+    ),
+
+    [RAISE] = 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_PSCR, _______, _______, 
+       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, 
+       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,      
+       _______, _______, _______,          _______, _______, _______,                   _______, _______, _______,          _______, _______, _______
+    ),
+
+    [ADJUST] = LAYOUT(
+       QK_BOOT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_RBT,  RGB_HUI, RGB_SAI, 
+       _______, KC_MPLY, KC_MPRV, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG,          RGB_HUD, RGB_SAD, 
+       _______, VLK_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          RGB_VAI,      
+       _______, _______, _______,          _______, _______, _______,                   _______, _______, _______,         RGB_RMOD, RGB_VAD, RGB_MOD
+    ),
+};
diff --git a/keyboards/hubble/keymaps/via/keymap.c b/keyboards/hubble/keymaps/via/keymap.c
new file mode 100644
index 0000000000..050781373d
--- /dev/null
+++ b/keyboards/hubble/keymaps/via/keymap.c
@@ -0,0 +1,42 @@
+// Copyright 2022 Anton Chernenko (@ch3rny)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+
+enum layers {
+  BASE,
+  LOWER,
+  RAISE,
+  ADJUST
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [BASE] = LAYOUT(
+       KC_ESC,  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_INS,  KC_PGUP, 
+       KC_TAB,  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_DEL,  KC_PGDN, 
+       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(LOWER),        KC_UP,
+       KC_LCTL, KC_LGUI, KC_LALT, LT(LOWER, KC_BSPC),   LT(ADJUST, KC_ENT),    LT(RAISE, KC_SPC),KC_RALT,MO(RAISE),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [LOWER] = LAYOUT(
+       KC_GRV,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS, KC_PPLS, KC_EQL,  _______, KC_HOME, 
+       _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_PMNS, _______,          _______, KC_END, 
+       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,      
+       _______, _______, _______, _______,          _______,          _______,          _______, _______, _______,          _______, _______, _______
+    ),
+
+    [RAISE] = 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_PSCR, _______, _______, 
+       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, 
+       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,      
+       _______, _______, _______,          _______, _______, _______,                   _______, _______, _______,          _______, _______, _______
+    ),
+
+    [ADJUST] = LAYOUT(
+       QK_BOOT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_RBT,  RGB_HUI, RGB_SAI, 
+       _______, KC_MPLY, KC_MPRV, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG,          RGB_HUD, RGB_SAD, 
+       _______, VLK_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          RGB_VAI,      
+       _______, _______, _______,          _______, _______, _______,                   _______, _______, _______,         RGB_RMOD, RGB_VAD, RGB_MOD
+    ),
+};
diff --git a/keyboards/hubble/keymaps/via/rules.mk b/keyboards/hubble/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/hubble/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/hubble/readme.md b/keyboards/hubble/readme.md
new file mode 100644
index 0000000000..3b79a85d0a
--- /dev/null
+++ b/keyboards/hubble/readme.md
@@ -0,0 +1,26 @@
+# hubble
+
+![hubble](https://i.imgur.com/buTSdUqh.jpg)
+
+*ProMicro based 40% keyboard for with nav cluster, underglow and cyrillic layout support*
+
+* Keyboard Maintainer: [Anton Chernenko](https://github.com/ch3rny)
+* Hardware Supported: [Hubble PCB](https://github.com/ch3rny/hubble-keyboard)
+* Hardware Availability: Opensource
+
+Make example for this keyboard (after setting up your build environment):
+
+    make hubble:default
+
+Flashing example for this keyboard:
+
+    make hubble: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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/hubble/rules.mk b/keyboards/hubble/rules.mk
new file mode 100644
index 0000000000..7ff128fa69
--- /dev/null
+++ b/keyboards/hubble/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file