Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

boardsource/microdox data driven #17675

Merged
merged 1 commit into from
Jul 19, 2022
Merged

boardsource/microdox data driven #17675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file removed keyboards/boardsource/microdox/.noci
View file
Open in desktop
Empty file.
83 changes: 0 additions & 83 deletions keyboards/boardsource/microdox/config.h
View file
Open in desktop

This file was deleted.

118 changes: 67 additions & 51 deletions keyboards/boardsource/microdox/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,54 +1,70 @@
{
"keyboard_name": "microdox",
"url": "https://boardsource.xyz/store/5f2e7e4a2902de7151494f92",
"maintainer": "boardsource",
"layouts": {
"LAYOUT_split_3x5_3": {
"layout": [
{ "label": "Q", "x": 0, "y": 0.3 },
{ "label": "W", "x": 1, "y": 0.1 },
{ "label": "E", "x": 2, "y": 0 },
{ "label": "R", "x": 3, "y": 0.1 },
{ "label": "T", "x": 4, "y": 0.2 },

{ "label": "Y", "x": 8, "y": 0.2 },
{ "label": "U", "x": 9, "y": 0.1 },
{ "label": "I", "x": 10, "y": 0 },
{ "label": "O", "x": 11, "y": 0.1 },
{ "label": "P", "x": 12, "y": 0.3 },

{ "label": "A", "x": 0, "y": 1.3 },
{ "label": "S", "x": 1, "y": 1.1 },
{ "label": "D", "x": 2, "y": 1 },
{ "label": "F", "x": 3, "y": 1.1 },
{ "label": "G", "x": 4, "y": 1.2 },

{ "label": "H", "x": 8, "y": 1.2 },
{ "label": "J", "x": 9, "y": 1.1 },
{ "label": "K", "x": 10, "y": 1 },
{ "label": "L", "x": 11, "y": 1.1 },
{ "label": ";", "x": 12, "y": 1.3 },

{ "label": "Z", "x": 0, "y": 2.3 },
{ "label": "X", "x": 1, "y": 2.1 },
{ "label": "C", "x": 2, "y": 2 },
{ "label": "V", "x": 3, "y": 2.1 },
{ "label": "B", "x": 4, "y": 2.2 },

{ "label": "N", "x": 8, "y": 2.2 },
{ "label": "M", "x": 9, "y": 2.1 },
{ "label": ",", "x": 10, "y": 2 },
{ "label": ".", "x": 11, "y": 2.1 },
{ "label": "/", "x": 12, "y": 2.3 },

{ "label": "GUI / KC_HANJ", "x": 3, "y": 3.7 },
{ "label": "Lower", "x": 4, "y": 3.7 },
{ "label": "Space", "x": 5, "y": 3.2 },

{ "label": "Enter", "x": 7, "y": 3.2 },
{ "label": "Raise", "x": 8, "y": 3.7 },
{ "label": "Alt / KC_HAEN", "x": 9, "y": 3.7 }
]
}
"manufacturer": "Boardsource",
"keyboard_name": "microdox",
"maintainer": "waffle87",
"development_board": "promicro",
"diode_direction": "COL2ROW",
"build": {
"lto": true
},
"features": {
"bootmagic": true,
"extrakey": true,
"mousekey": true,
"nkro": true,
"oled": true
},
"url": "https://boardsource.xyz/store/5f2e7e4a2902de7151494f92",
"usb": {
"pid": "0x0412",
"vid": "0xF7E0"
},
"split": {
"enabled": true
},
"community_layouts": [
"split_3x5_3"
],
"layouts": {
"LAYOUT_split_3x5_3": {
"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": [4, 4], "x": 5, "y": 0 },
{ "matrix": [4, 3], "x": 6, "y": 0 },
{ "matrix": [4, 2], "x": 7, "y": 0 },
{ "matrix": [4, 1], "x": 8, "y": 0 },
{ "matrix": [4, 0], "x": 9, "y": 0 },
{ "matrix": [1, 0], "x": 10, "y": 0 },
{ "matrix": [1, 1], "x": 11, "y": 0 },
{ "matrix": [1, 2], "x": 12, "y": 0 },
{ "matrix": [1, 3], "x": 13, "y": 0 },
{ "matrix": [1, 4], "x": 14, "y": 0 },
{ "matrix": [5, 4], "x": 15, "y": 0 },
{ "matrix": [5, 3], "x": 16, "y": 0 },
{ "matrix": [5, 2], "x": 17, "y": 0 },
{ "matrix": [5, 1], "x": 18, "y": 0 },
{ "matrix": [5, 0], "x": 19, "y": 0 },
{ "matrix": [2, 0], "x": 20, "y": 0 },
{ "matrix": [2, 1], "x": 21, "y": 0 },
{ "matrix": [2, 2], "x": 22, "y": 0 },
{ "matrix": [2, 3], "x": 23, "y": 0 },
{ "matrix": [2, 4], "x": 24, "y": 0 },
{ "matrix": [6, 4], "x": 25, "y": 0 },
{ "matrix": [6, 3], "x": 26, "y": 0 },
{ "matrix": [6, 2], "x": 27, "y": 0 },
{ "matrix": [6, 1], "x": 28, "y": 0 },
{ "matrix": [6, 0], "x": 29, "y": 0 },
{ "matrix": [3, 2], "x": 30, "y": 0 },
{ "matrix": [3, 3], "x": 31, "y": 0 },
{ "matrix": [3, 4], "x": 32, "y": 0 },
{ "matrix": [7, 4], "x": 33, "y": 0 },
{ "matrix": [7, 3], "x": 34, "y": 0 },
{ "matrix": [7, 2], "x": 35, "y": 0 }
]
}
}
}
2 changes: 1 addition & 1 deletion keyboards/boardsource/microdox/keymaps/cole/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2020 Cole Smith <[email protected]>
Copyright 2022 Cole Smith <[email protected]>

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
Expand Down
1 change: 0 additions & 1 deletion keyboards/boardsource/microdox/keymaps/cole/rules.mk
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion keyboards/boardsource/microdox/keymaps/default/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2020 Cole Smith <[email protected]>
Copyright 2022 Cole Smith <[email protected]>

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
Expand Down
2 changes: 0 additions & 2 deletions keyboards/boardsource/microdox/keymaps/via/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
OLED_ENABLE = yes
VIA_ENABLE = yes
LTO_ENABLE = yes
37 changes: 29 additions & 8 deletions keyboards/boardsource/microdox/microdox.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2020 Cole Smith <[email protected]>
Copyright 2022 Cole Smith <[email protected]>

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
Expand All @@ -15,9 +15,11 @@ 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 "microdox.h"

#ifdef OLED_ENABLE
#include "oled_driver.h"
#include "bitwise.h"
#include "action_layer.h"

oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
if (is_keyboard_master())
return OLED_ROTATION_180;
Expand All @@ -26,14 +28,12 @@ oled_rotation_t oled_init_kb(oled_rotation_t 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
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, 0x00
};
oled_write_P(qmk_logo, false);
}

static void render_status(void) {
switch (get_highest_layer(layer_state)) {
case 0:
Expand Down Expand Up @@ -74,3 +74,24 @@ bool oled_task_kb(void) {
return false;
}
#endif

#ifdef ENCODER_ENABLE
#include "encoder.h"
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 true;
}
#endif
38 changes: 0 additions & 38 deletions keyboards/boardsource/microdox/microdox.h
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion keyboards/boardsource/microdox/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@

Make example for this keyboard (after setting up your build environment):

make boardsource/microdox/v1:default
make boardsource/microdox/v2:default

Remove `v2` from above command if you purchased your PCBs prior to April 2022
Compile `v1` firmware 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).
21 changes: 0 additions & 21 deletions keyboards/boardsource/microdox/rules.mk
View file
Open in desktop

This file was deleted.

20 changes: 20 additions & 0 deletions keyboards/boardsource/microdox/v1/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// Copyright 2022 jack (@waffle87)
// SPDX-License-Identifier: GPL-2.0-or-later

#pragma once

/*
* Feature disable options
* These options are also useful to firmware size reduction.
*/

/* disable debug print */
//#define NO_DEBUG

/* disable print */
//#define NO_PRINT

/* disable action features */
//#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT
Loading