Merge upstream master

3 files changed, 205 insertions, 0 deletions

diff --git a/keyboards/10bleoledhub/config.h b/keyboards/10bleoledhub/config.h
new file mode 100644
index 0000000000..83f83914d0
--- /dev/null
+++ b/keyboards/10bleoledhub/config.h
@@ -0,0 +1,53 @@
+/*
+Copyright 2020 haierwangwei2005
+
+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"
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 3
+#define MATRIX_ROW_PINS { F0, F5, F4, F6 }
+#define MATRIX_COL_PINS { D6, D7, B5 }
+
+#define DIODE_DIRECTION ROW2COL
+
+#define SSD1306OLED
+#define RGB_DI_PIN B7
+
+#define RGBLED_NUM 4
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+#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 OLED_FONT_H "./lib/glcdfont.c"
+
+#define ENCODERS_PAD_A { C7 }
+#define ENCODERS_PAD_B { F7 }
+
+#define ENCODER_RESOLUTION 4
diff --git a/keyboards/10bleoledhub/keymaps/default/keymap.c b/keyboards/10bleoledhub/keymaps/default/keymap.c
new file mode 100644
index 0000000000..baeba01026
--- /dev/null
+++ b/keyboards/10bleoledhub/keymaps/default/keymap.c
@@ -0,0 +1,76 @@
+ /*
+Copyright 2020 haierwangwei2005
+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/>.*/
+/* Keymap _0: (Base Layer) Default Layer
+
+   * .-----.
+   * |PGUP |
+   * |-----------------.
+   * |  7  |  8  |  9  |
+   * |-----|-----|-----|
+   * |  4  |  5  |  6  |
+   * |-----|-----|-----|
+   * |  1  |  2  |  3  |
+   * .-----------------.
+   */
+     /* Keymap _1: (Second Layer) second Layer
+
+   * .-------.
+   * |NUMLOCK|
+   * |-----------------------.
+   * |RGB_TOG|RGB_MOD|RGB_M_K|
+   * |-------|-------|-------|
+   * |RGB_SAI|RGB_SAD|RGB_HUI|
+   * |-------|-------|-------|
+   * |RGB_VAI|RGB_VAD|RGB_SPI|
+   * .-----------------------.
+*/
+
+#include QMK_KEYBOARD_H
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+	    KC_PGUP,
+        KC_KP_7, KC_KP_8, MO(1),
+        KC_P4,   KC_P5,    KC_P6,
+        KC_P1,   KC_P2,    KC_P3),
+    [1] = LAYOUT(
+        KC_NUM,
+		RGB_TOG, RGB_MOD, RGB_M_K,
+        RGB_SAI, RGB_SAD, RGB_HUI,
+        RGB_VAI, RGB_VAD, RGB_SPI),
+};
+
+static void render_logo(void) {
+    static const char PROGMEM qmk_logo[] = {0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4,  0};
+    oled_write_P(qmk_logo, false);
+}
+
+#ifdef OLED_ENABLE
+bool oled_task_user(void) {
+    render_logo();
+    return false;
+}
+#endif
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0) { /* First encoder */
+        if (clockwise) {
+            tap_code(KC_PGDN);
+        } else {
+            tap_code(KC_PGUP);
+        }
+    }
+    return true;
+}
+
+
+void matrix_init_user(void) { render_logo(); }
diff --git a/keyboards/10bleoledhub/keymaps/via/keymap.c b/keyboards/10bleoledhub/keymaps/via/keymap.c
new file mode 100644
index 0000000000..09c53df5bd
--- /dev/null
+++ b/keyboards/10bleoledhub/keymaps/via/keymap.c
@@ -0,0 +1,76 @@
+/*
+Copyright 2020 haierwangwei2005
+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/>.*/
+/* Keymap _0: (Base Layer) Default Layer
+
+   * .-----.
+   * |PGUP |
+   * |-----------------.
+   * |  7  |  8  |  9  |
+   * |-----|-----|-----|
+   * |  4  |  5  |  6  |
+   * |-----|-----|-----|
+   * |  1  |  2  |  3  |
+   * .-----------------.
+   */
+     /* Keymap _1: (Second Layer) second Layer
+
+   * .-------.
+   * |NUMLOCK|
+   * |-----------------------.
+   * |RGB_TOG|RGB_MOD|RGB_M_K|
+   * |-------|-------|-------|
+   * |RGB_SAI|RGB_SAD|RGB_HUI|
+   * |-------|-------|-------|
+   * |RGB_VAI|RGB_VAD|RGB_SPI|
+   * .-----------------------.
+*/
+
+#include QMK_KEYBOARD_H
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+	    KC_PGUP,
+        KC_KP_7, KC_KP_8, MO(1),
+        KC_P4,   KC_P5,    KC_P6,
+        KC_P1,   KC_P2,    KC_P3),
+    [1] = LAYOUT(
+        KC_NUM,
+		RGB_TOG, RGB_MOD, RGB_M_K,
+        RGB_SAI, RGB_SAD, RGB_HUI,
+        RGB_VAI, RGB_VAD, RGB_SPI),
+};
+
+static void render_logo(void) {
+    static const char PROGMEM qmk_logo[] = {0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4,  0};
+    oled_write_P(qmk_logo, false);
+}
+
+#ifdef OLED_ENABLE
+bool oled_task_user(void) {
+    render_logo();
+    return false;
+}
+#endif
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0) { /* First encoder */
+        if (clockwise) {
+            tap_code(KC_PGDN);
+        } else {
+            tap_code(KC_PGUP);
+        }
+    }
+    return true;
+}
+
+
+void matrix_init_user(void) { render_logo(); }