From ad31ea3f515630f922ccad54cc879e13a05020fa Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Tue, 19 Apr 2022 05:03:51 -0600
Subject: [PATCH] boardsource/microdox V2 (#16569)
---
keyboards/boardsource/microdox/config.h | 27 ++--
.../microdox/keymaps/cole/keymap.c | 70 +---------
.../microdox/keymaps/cole/rules.mk | 1 -
.../microdox/keymaps/default/keymap.c | 36 ++---
.../boardsource/microdox/keymaps/via/keymap.c | 125 ++++--------------
.../boardsource/microdox/keymaps/via/rules.mk | 3 -
keyboards/boardsource/microdox/microdox.c | 57 ++++++++
keyboards/boardsource/microdox/microdox.h | 25 ++--
keyboards/boardsource/microdox/readme.md | 6 +-
keyboards/boardsource/microdox/rules.mk | 6 +-
keyboards/boardsource/microdox/v2/config.h | 45 +++++++
keyboards/boardsource/microdox/v2/rules.mk | 8 ++
keyboards/boardsource/microdox/v2/v2.c | 62 +++++++++
keyboards/boardsource/microdox/v2/v2.h | 22 +++
14 files changed, 278 insertions(+), 215 deletions(-)
create mode 100644 keyboards/boardsource/microdox/v2/config.h
create mode 100644 keyboards/boardsource/microdox/v2/rules.mk
create mode 100644 keyboards/boardsource/microdox/v2/v2.c
create mode 100644 keyboards/boardsource/microdox/v2/v2.h
diff --git a/keyboards/boardsource/microdox/config.h b/keyboards/boardsource/microdox/config.h
index 7e6347dbda..f2ba806ae7 100644
--- a/keyboards/boardsource/microdox/config.h
+++ b/keyboards/boardsource/microdox/config.h
@@ -19,20 +19,22 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
-#define VENDOR_ID 0xF7E0
-#define PRODUCT_ID 0x0412
-#define DEVICE_VER 0x0000
-#define MANUFACTURER Boardsource
-#define PRODUCT microdox
+#define VENDOR_ID 0xF7E0
+#define PRODUCT_ID 0x0412
+#define DEVICE_VER 0x0000
+#define MANUFACTURER Boardsource
+#define PRODUCT microdox
/* key matrix size */
// Rows are doubled-up
#define MATRIX_ROWS 8
#define MATRIX_COLS 5
-#define MATRIX_ROW_PINS { B2, B6, B4, B5 }
+#define MATRIX_ROW_PINS \
+ { B2, B6, B4, B5 }
// wiring of each half
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1 }
+#define MATRIX_COL_PINS \
+ { F4, F5, F6, F7, B1 }
#define USE_SERIAL
#define SOFT_SERIAL_PIN D2
/* define if matrix has ghost */
@@ -53,12 +55,15 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define LOCKING_RESYNC_ENABLE
/* ws2812 RGB LED */
-#define RGBLIGHT_ANIMATIONS
#define RGB_DI_PIN D3
-#define RGBLED_SPLIT { 6, 6 }
-#define EE_HANDS
#ifdef RGBLIGHT_ENABLE
-#define RGBLED_NUM 12 // Number of LEDs
+# define RGBLED_NUM 12 // Number of LEDs
+# define RGBLED_SPLIT \
+ { 6, 6 }
+# define RGBLIGHT_EFFECT_BREATHING
+# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+# define RGBLIGHT_EFFECT_STATIC_GRADIENT
+
#endif
/*
diff --git a/keyboards/boardsource/microdox/keymaps/cole/keymap.c b/keyboards/boardsource/microdox/keymaps/cole/keymap.c
index 8ff5707478..f4ac92ea0d 100644
--- a/keyboards/boardsource/microdox/keymaps/cole/keymap.c
+++ b/keyboards/boardsource/microdox/keymaps/cole/keymap.c
@@ -16,13 +16,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H
-#include "split_util.h"
enum layers {
_QWERTY,
_RAISE,
- _LOWER,
- _ADJUST
+ _LOWER
};
#define KC_CTSC RCTL_T(KC_SCLN)
@@ -35,83 +33,23 @@ enum layers {
#define PREVWINDOW MT(MOD_LCTL, KC_LEFT)
#define NEXTWINDOW MT(MOD_LCTL, KC_RGHT)
-
-
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_QWERTY] = LAYOUT_split_3x5_3(
KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
CTRL_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_CTSC,
SHFT_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, SHIFT_SLASH,
MO(_LOWER),KC_LGUI, RASE_ENT, RASE_BACK, LOWER_SPC, KC_TAB
- ),
+ ),
[_RAISE] = LAYOUT_split_3x5_3(
KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
KC_ESC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_QUOT,
KC_LSFT, KC_GRV, PREVWINDOW, NEXTWINDOW, XXXXXXX, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,
_______, KC_LGUI, KC_ENT, KC_BSPC, KC_SPC, _______
- ),
+ ),
[_LOWER] = LAYOUT_split_3x5_3(
KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,
KC_ESC, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_DQT,
KC_ESC, KC_TILD, PREVWINDOW, NEXTWINDOW, RGB_MODE_FORWARD, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
_______, KC_LGUI, KC_ENT, KC_BSPC, KC_SPC, _______
- )
+ )
};
-
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
- if (is_keyboard_master())
- return OLED_ROTATION_180;
- return rotation;
-}
-
-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);
-}
-
-static void render_status(void) {
- switch (get_highest_layer(layer_state)) {
- case _QWERTY:
- oled_write_P(PSTR("B R L A O\n"), false);
- oled_write_P(PSTR("^\n"), false);
- oled_write_P(PSTR("Layer: Base\n"), false);
- break;
- case _RAISE:
- oled_write_P(PSTR("B R L A O\n"), false);
- oled_write_P(PSTR(" ^\n"), false);
- oled_write_P(PSTR("Layer: Raise\n"), false);
- break;
- case _LOWER:
- oled_write_P(PSTR("B R L A O\n"), false);
- oled_write_P(PSTR(" ^\n"), false);
- oled_write_P(PSTR("Layer: Lower\n"), false);
- break;
- case _ADJUST:
- oled_write_P(PSTR("B R L A O\n"), false);
- oled_write_P(PSTR(" ^\n"), false);
- oled_write_P(PSTR("Layer: Adjust\n"), false);
- break;
- default:
- oled_write_P(PSTR("B R L A O"), false);
- oled_write_P(PSTR(" ^\n"), false);
- oled_write_P(PSTR("Layer: Other\n"), false);
- }
-}
-
-bool oled_task_user(void) {
- if (is_keyboard_master()) {
- render_status();
- } else {
- render_logo();
- oled_scroll_left();
- }
- return false;
-}
-
-#endif
diff --git a/keyboards/boardsource/microdox/keymaps/cole/rules.mk b/keyboards/boardsource/microdox/keymaps/cole/rules.mk
index d34d066ded..dd68e9d3b0 100644
--- a/keyboards/boardsource/microdox/keymaps/cole/rules.mk
+++ b/keyboards/boardsource/microdox/keymaps/cole/rules.mk
@@ -1,2 +1 @@
OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
diff --git a/keyboards/boardsource/microdox/keymaps/default/keymap.c b/keyboards/boardsource/microdox/keymaps/default/keymap.c
index 06322be0b7..6fe94011f4 100644
--- a/keyboards/boardsource/microdox/keymaps/default/keymap.c
+++ b/keyboards/boardsource/microdox/keymaps/default/keymap.c
@@ -27,24 +27,24 @@ enum layers {
#define LOWER MO(_LOWER)
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_QWERTY] = LAYOUT_split_3x5_3(
- KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
- KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,
- KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,
- KC_LCTL, LOWER, KC_SPC, KC_BSPC, RAISE, KC_ENT
-),
+ [_QWERTY] = LAYOUT_split_3x5_3(
+ KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
+ KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,
+ KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,
+ KC_LCTL, LOWER, KC_SPC, KC_BSPC, RAISE, KC_ENT
+ ),
-[_RAISE] = LAYOUT_split_3x5_3(
- KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
- KC_TAB, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC,
- KC_LCTL, KC_GRV, KC_LGUI, KC_LALT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_BSLS, KC_QUOT,
- XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-),
+ [_RAISE] = LAYOUT_split_3x5_3(
+ KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
+ KC_TAB, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC,
+ KC_LCTL, KC_GRV, KC_LGUI, KC_LALT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_BSLS, KC_QUOT,
+ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
+ ),
-[_LOWER] = LAYOUT_split_3x5_3(
- KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,
- KC_ESC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR,
- KC_CAPS, KC_TILD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PIPE, KC_DQT,
- XXXXXXX, XXXXXXX, XXXXXXX, KC_ENT, XXXXXXX, KC_DEL
-)
+ [_LOWER] = LAYOUT_split_3x5_3(
+ KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,
+ KC_ESC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR,
+ KC_CAPS, KC_TILD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PIPE, KC_DQT,
+ XXXXXXX, XXXXXXX, XXXXXXX, KC_ENT, XXXXXXX, KC_DEL
+ )
};
diff --git a/keyboards/boardsource/microdox/keymaps/via/keymap.c b/keyboards/boardsource/microdox/keymaps/via/keymap.c
index e02fb0b6ee..d9196515cb 100644
--- a/keyboards/boardsource/microdox/keymaps/via/keymap.c
+++ b/keyboards/boardsource/microdox/keymaps/via/keymap.c
@@ -1,105 +1,32 @@
-/*
-Copyright 2020 Jack Sangdahl <@toastedmangoes>
-
-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/>.
-*/
-
+// Copyright 2022 jack (@waffle87)
+// SPDX-License-Identifier: GPL-2.0-or-later
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT_split_3x5_3(
- KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
- SFT_T(KC_A), KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, SFT_T(KC_SCLN),
- CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, CTL_T(KC_SLSH),
- LT(3, KC_LGUI), MO(1), KC_SPC, KC_BSPC, MO(2), KC_ENT
-),
+ [0] = LAYOUT_split_3x5_3(
+ KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
+ SFT_T(KC_A), KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, SFT_T(KC_SCLN),
+ CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, CTL_T(KC_SLSH),
+ LT(3, KC_LGUI), MO(1), KC_SPC, KC_BSPC, MO(2), KC_ENT
+ ),
-[1] = LAYOUT_split_3x5_3(
- KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
- KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,
- KC_ESC, KC_TAB, KC_CAPS, KC_TILD, KC_GRV, KC_QUOT, KC_DQUO, KC_MPRV, KC_MPLY, KC_MNXT,
- KC_LGUI, KC_TRNS, KC_SPC, KC_ENT, KC_TRNS, KC_RALT
-),
+ [1] = LAYOUT_split_3x5_3(
+ KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
+ KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,
+ KC_ESC, KC_TAB, KC_CAPS, KC_TILD, KC_GRV, KC_QUOT, KC_DQUO, KC_MPRV, KC_MPLY, KC_MNXT,
+ KC_LGUI, KC_TRNS, KC_SPC, KC_ENT, KC_TRNS, KC_RALT
+ ),
-[2] = LAYOUT_split_3x5_3(
- KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, KC_PSCR, KC_DEL, KC_INS, KC_HOME, KC_END,
- KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, KC_LEFT, KC_DOWN, KC_RIGHT, KC_UP, KC_VOLU,
- KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_VOLD,
- KC_PGDN, KC_TRNS, KC_SPC, KC_ENT, KC_TRNS, KC_PGUP
-),
-[3] = LAYOUT_split_3x5_3(
- RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, RGB_HUD, RGB_HUI, XXXXXXX, XXXXXXX,
- XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_MOD, RGB_SAD, RGB_SAI, XXXXXXX, XXXXXXX,
- XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_RMOD, RGB_VAD, RGB_VAI, XXXXXXX, XXXXXXX,
- KC_TRNS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-)
+ [2] = LAYOUT_split_3x5_3(
+ KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, KC_PSCR, KC_DEL, KC_INS, KC_HOME, KC_END,
+ KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, KC_LEFT, KC_DOWN, KC_RIGHT, KC_UP, KC_VOLU,
+ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_VOLD,
+ KC_PGDN, KC_TRNS, KC_SPC, KC_ENT, KC_TRNS, KC_PGUP
+ ),
+ [3] = LAYOUT_split_3x5_3(
+ RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, RGB_HUD, RGB_HUI, XXXXXXX, XXXXXXX,
+ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_MOD, RGB_SAD, RGB_SAI, XXXXXXX, XXXXXXX,
+ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_RMOD, RGB_VAD, RGB_VAI, XXXXXXX, XXXXXXX,
+ KC_TRNS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
+ )
};
-
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
- if (is_keyboard_master())
- return OLED_ROTATION_180;
- return rotation;
-}
-
-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);
-}
-
-static void render_status(void) {
- switch (get_highest_layer(layer_state)) {
- case 0:
- oled_write_P(PSTR("B R L A O\n"), false);
- oled_write_P(PSTR("^\n"), false);
- oled_write_P(PSTR("Layer: Base\n"), false);
- break;
- case 1:
- oled_write_P(PSTR("B R L A O\n"), false);
- oled_write_P(PSTR(" ^\n"), false);
- oled_write_P(PSTR("Layer: Raise\n"), false);
- break;
- case 2:
- oled_write_P(PSTR("B R L A O\n"), false);
- oled_write_P(PSTR(" ^\n"), false);
- oled_write_P(PSTR("Layer: Lower\n"), false);
- break;
- case 3:
- oled_write_P(PSTR("B R L A O\n"), false);
- oled_write_P(PSTR(" ^\n"), false);
- oled_write_P(PSTR("Layer: Adjust\n"), false);
- break;
- default:
- oled_write_P(PSTR("B R L A O"), false);
- oled_write_P(PSTR(" ^\n"), false);
- oled_write_P(PSTR("Layer: Other\n"), false);
- }
-}
-
-bool oled_task_user(void) {
- if (is_keyboard_master()) {
- render_status();
- } else {
- render_logo();
- oled_scroll_left();
- }
- return false;
-}
-
-#endif
diff --git a/keyboards/boardsource/microdox/keymaps/via/rules.mk b/keyboards/boardsource/microdox/keymaps/via/rules.mk
index c84c1f4176..7fad85c015 100644
--- a/keyboards/boardsource/microdox/keymaps/via/rules.mk
+++ b/keyboards/boardsource/microdox/keymaps/via/rules.mk
@@ -1,6 +1,3 @@
OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
VIA_ENABLE = yes
-EXTRAKEY_ENABLE = yes
-RGBLIGHT_ENABLE = yes
LTO_ENABLE = yes
diff --git a/keyboards/boardsource/microdox/microdox.c b/keyboards/boardsource/microdox/microdox.c
index eef981297a..abfe65a2bd 100644
--- a/keyboards/boardsource/microdox/microdox.c
+++ b/keyboards/boardsource/microdox/microdox.c
@@ -17,3 +17,60 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "microdox.h"
+#ifdef OLED_ENABLE
+oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
+ if (is_keyboard_master())
+ return OLED_ROTATION_180;
+ return rotation;
+}
+
+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);
+}
+
+static void render_status(void) {
+ switch (get_highest_layer(layer_state)) {
+ case 0:
+ oled_write_P(PSTR("B R L A O\n"), false);
+ oled_write_P(PSTR("^\n"), false);
+ oled_write_P(PSTR("Layer: Base\n"), false);
+ break;
+ case 1:
+ oled_write_P(PSTR("B R L A O\n"), false);
+ oled_write_P(PSTR(" ^\n"), false);
+ oled_write_P(PSTR("Layer: Raise\n"), false);
+ break;
+ case 2:
+ oled_write_P(PSTR("B R L A O\n"), false);
+ oled_write_P(PSTR(" ^\n"), false);
+ oled_write_P(PSTR("Layer: Lower\n"), false);
+ break;
+ case 3:
+ oled_write_P(PSTR("B R L A O\n"), false);
+ oled_write_P(PSTR(" ^\n"), false);
+ oled_write_P(PSTR("Layer: Adjust\n"), false);
+ break;
+ default:
+ oled_write_P(PSTR("B R L A O"), false);
+ oled_write_P(PSTR(" ^\n"), false);
+ oled_write_P(PSTR("Layer: Other\n"), false);
+ }
+}
+
+bool oled_task_kb(void) {
+ if (!oled_task_user()) { return false; }
+ if (is_keyboard_master()) {
+ render_status();
+ } else {
+ render_logo();
+ oled_scroll_left();
+ }
+ return false;
+}
+#endif
diff --git a/keyboards/boardsource/microdox/microdox.h b/keyboards/boardsource/microdox/microdox.h
index 950d46d99f..8b63b46415 100644
--- a/keyboards/boardsource/microdox/microdox.h
+++ b/keyboards/boardsource/microdox/microdox.h
@@ -18,20 +18,21 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#include "quantum.h"
+#define xxx KC_NO
#define LAYOUT_split_3x5_3(\
- k01, k02, k03, k04, k05, k45, k44, k43, k42, k41, \
- k11, k12, k13, k14, k15, k55, k54, k53, k52, k51, \
- k21, k22, k23, k24, k25, k65, k64, k63, k62, k61, \
- k33, k34, k35, k75, k74, k73 \
+ k00, k01, k02, k03, k04, k44, k43, k42, k41, k40, \
+ k10, k11, k12, k13, k14, k54, k53, k52, k51, k50, \
+ k20, k21, k22, k23, k24, k64, k63, k62, k61, k60, \
+ k32, k33, k34, k74, k73, k72 \
) \
{ \
- { k01, k02, k03, k04, k05 }, \
- { k11, k12, k13, k14, k15 }, \
- { k21, k22, k23, k24, k25 }, \
- { KC_NO,KC_NO, k33, k34, k35 }, \
- { k41, k42, k43, k44, k45 }, \
- { k51, k52, k53, k54, k55 }, \
- { k61, k62, k63, k64, k65 }, \
- { KC_NO, KC_NO, k73, k74, k75 } \
+ { k00, k01, k02, k03, k04 }, \
+ { k10, k11, k12, k13, k14 }, \
+ { k20, k21, k22, k23, k24 }, \
+ { xxx, xxx, k32, k33, k34 }, \
+ { k40, k41, k42, k43, k44 }, \
+ { k50, k51, k52, k53, k54 }, \
+ { k60, k61, k62, k63, k64 }, \
+ { xxx, xxx, k72, k73, k74 } \
}
diff --git a/keyboards/boardsource/microdox/readme.md b/keyboards/boardsource/microdox/readme.md
index 7b54283674..0a468bd4a3 100644
--- a/keyboards/boardsource/microdox/readme.md
+++ b/keyboards/boardsource/microdox/readme.md
@@ -3,11 +3,13 @@
* Keyboard Maintainer: [Boardsource](https://github.com/daysgobye)
-* Hardware Supported: microdox v1
+* Hardware Supported: Pro Micro and compatible alternatives
* Hardware Availability: this keyboard is available from the [Boardsource store](https://boardsource.xyz/store/5f2e7e4a2902de7151494f92)
Make example for this keyboard (after setting up your build environment):
- make boardsource/microdox:default
+ make boardsource/microdox/v2:default
+
+Remove `v2` from above command if you purchased your PCBs prior to April 2022
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/boardsource/microdox/rules.mk b/keyboards/boardsource/microdox/rules.mk
index 52f90150ee..a15c5aded1 100644
--- a/keyboards/boardsource/microdox/rules.mk
+++ b/keyboards/boardsource/microdox/rules.mk
@@ -7,12 +7,12 @@ BOOTLOADER = caterina
# Build Options
# change yes to no to disable
#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
+BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = no # Audio control and System control
+EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
+NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/boardsource/microdox/v2/config.h b/keyboards/boardsource/microdox/v2/config.h
new file mode 100644
index 0000000000..1f8bc7c3d9
--- /dev/null
+++ b/keyboards/boardsource/microdox/v2/config.h
@@ -0,0 +1,45 @@
+// Copyright 2022 jack (@waffle87)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+#undef MATRIX_ROW_PINS
+#undef MATRIX_COL_PINS
+#define MATRIX_ROW_PINS \
+ { F4, D2, C6, B1 }
+#define MATRIX_COL_PINS \
+ { D4, D7, B3, F7, F6 }
+#define MATRIX_ROW_PINS_RIGHT \
+ { F5, F7, F6, E6 }
+#define MATRIX_COL_PINS_RIGHT \
+ { F4, B1, D7, C6, B3 }
+#undef SOFT_SERIAL_PIN
+#define SOFT_SERIAL_PIN D3
+#undef RGB_DI_PIN
+#define RGB_DI_PIN B5
+#ifdef RGBLIGHT_ENABLE
+# undef RGBLED_NUM
+# undef RGBLED_SPLIT
+# define RGBLED_NUM 8
+# define RGBLED_SPLIT { 4, 4 } // underglow only
+# define RGBLIGHT_SLEEP
+# define RGBLIGHT_EFFECT_BREATHING
+# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+# define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#endif
+#ifdef RGB_MATRIX_ENABLE
+# define DRIVER_LED_TOTAL 44
+# define RGB_MATRIX_SPLIT { 22, 22 }
+# define RGB_DISABLE_WHEN_USB_SUSPENDED
+# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
+# define ENABLE_RGB_MATRIX_ALPHAS_MODS
+# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+# define ENABLE_RGB_MATRIX_BREATHING
+# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#endif
+#ifdef ENCODER_ENABLE
+# define ENCODERS_PAD_A { E6 }
+# define ENCODERS_PAD_B { B2 }
+# define ENCODERS_PAD_A_RIGHT { B6 }
+# define ENCODERS_PAD_B_RIGHT { B2 }
+#endif
diff --git a/keyboards/boardsource/microdox/v2/rules.mk b/keyboards/boardsource/microdox/v2/rules.mk
new file mode 100644
index 0000000000..0d57a06d1e
--- /dev/null
+++ b/keyboards/boardsource/microdox/v2/rules.mk
@@ -0,0 +1,8 @@
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
+RGB_MATRIX_SUPPORTED = yes
+RGBLIGHT_ENABLE = no
+OLED_ENABLE = yes
+OLED_DRIVER = SSD1306
+ENCODER_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/boardsource/microdox/v2/v2.c b/keyboards/boardsource/microdox/v2/v2.c
new file mode 100644
index 0000000000..11476a6ea2
--- /dev/null
+++ b/keyboards/boardsource/microdox/v2/v2.c
@@ -0,0 +1,62 @@
+// Copyright 2022 jack (@waffle87)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include "v2.h"
+
+#ifdef RGB_MATRIX_ENABLE
+led_config_t g_led_config = {
+ {
+ { 13, 14, 15, 16, 17 },
+ { 12, 11, 10, 9, 8 },
+ { 3, 4, 5, 6, 7 },
+ { NO_LED, NO_LED, 2, 1, 0 },
+ //18-21 left underglow
+ { 35, 36, 37, 38, 39 },
+ { 34, 33, 32, 31, 30 },
+ { 25, 26, 27, 28, 29 },
+ { NO_LED, NO_LED, 24, 23, 22 }
+ //40-44 right underglow
+ }, {
+ {99,64}, {74,64}, {49,64}, //0-2
+ {0,42}, {24,42}, {49,42}, {74,42}, {99,42}, //3-7
+ {99,21}, {74,21}, {49,21}, {24,21}, {0,21}, //8-12
+ {0,0}, {24,0}, {49,0}, {74,0}, {99,0}, //13-17
+ {12,11}, {86,11}, {86,53}, {0,64}, //18-21
+ {124,64}, {149,64}, {174,64}, //22-24
+ {224,42}, {199,42}, {174,42}, {149,42}, {124,42}, //25-29
+ {124,21}, {149,21}, {174,21}, {199,21}, {224,21}, //30-34
+ {224,0}, {199,0}, {174,0}, {149,0}, {124,0}, //35-39
+ {211,11}, {136,11}, {136,53}, {224,64} //40-44
+ }, {
+ 1, 1, 1,
+ 4, 4, 4, 4, 4,
+ 4, 4, 4, 4, 4,
+ 4, 4, 4, 4, 4,
+ 2, 2, 2, 2,
+ 1, 1, 1,
+ 4, 4, 4, 4, 4,
+ 4, 4, 4, 4, 4,
+ 4, 4, 4, 4, 4,
+ 2, 2, 2, 2
+ }
+};
+#endif
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+ if (!encoder_update_user(index, clockwise)) { return false; }
+ if (index == 0) {
+ if (clockwise) {
+ tap_code_delay(KC_VOLU, 10);
+ } else {
+ tap_code_delay(KC_VOLD, 10);
+ }
+ } else {
+ if (clockwise) {
+ tap_code(KC_MNXT);
+ } else {
+ tap_code(KC_MPRV);
+ }
+ }
+ return false;
+}
+#endif
diff --git a/keyboards/boardsource/microdox/v2/v2.h b/keyboards/boardsource/microdox/v2/v2.h
new file mode 100644
index 0000000000..400660fffa
--- /dev/null
+++ b/keyboards/boardsource/microdox/v2/v2.h
@@ -0,0 +1,22 @@
+// Copyright 2022 jack (@waffle87)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+#include "quantum.h"
+#define xxx KC_NO
+
+#define LAYOUT_split_3x5_3(\
+ k00, k01, k02, k03, k04, k44, k43, k42, k41, k40, \
+ k10, k11, k12, k13, k14, k54, k53, k52, k51, k50, \
+ k20, k21, k22, k23, k24, k64, k63, k62, k61, k60, \
+ k32, k33, k34, k74, k73, k72 \
+ ) \
+ { \
+ { k00, k01, k02, k03, k04 }, \
+ { k10, k11, k12, k13, k14 }, \
+ { k20, k21, k22, k23, k24 }, \
+ { xxx, xxx, k32, k33, k34 }, \
+ { k40, k41, k42, k43, k44 }, \
+ { k50, k51, k52, k53, k54 }, \
+ { k60, k61, k62, k63, k64 }, \
+ { xxx, xxx, k72, k73, k74 } \
+ }