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

Fixup doio/kb16 #22921

Merged
merged 4 commits into from
Feb 1, 2024
+118 −512
Merged

Fixup doio/kb16 #22921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4ac5e59
initial
waffle87 Jan 19, 2024
3a26232
remove keymaps
waffle87 Jan 19, 2024
122c9dd
localise rev1 changes
waffle87 Jan 19, 2024
1b942da
Update keyboards/doio/kb16/rev1/info.json
waffle87 Jan 25, 2024
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
0 keyboards/doio/kb16/rev1/config.h → keyboards/doio/kb16/config.h
View file
Open in desktop
File renamed without changes.
109 changes: 109 additions & 0 deletions keyboards/doio/kb16/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
{
"keyboard_name": "KB16-01",
"manufacturer": "DOIO",
"maintainer": "HorrorTroll",
"usb": {
"vid": "0xD010",
"pid": "0x1601",
"force_nkro": true
},
"diode_direction": "COL2ROW",
"features": {
"bootmagic": true,
"mousekey": true,
"extrakey": true,
"nkro": true,
"oled": true,
"rgb_matrix": true,
"encoder": true
},
"build": {
"lto": true
},
"rgb_matrix": {
"driver": "ws2812",
"max_brightness": 200,
"default": {
"animation": "cycle_up_down"
},
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
{"matrix": [0, 1], "x": 75, "y": 0, "flags": 1},
{"matrix": [0, 2], "x": 149, "y": 0, "flags": 1},
{"matrix": [0, 3], "x": 224, "y": 0, "flags": 1},
{"matrix": [1, 0], "x": 0, "y": 21, "flags": 1},
{"matrix": [1, 1], "x": 75, "y": 21, "flags": 4},
{"matrix": [1, 2], "x": 149, "y": 21, "flags": 4},
{"matrix": [1, 3], "x": 224, "y": 21, "flags": 1},
{"matrix": [2, 0], "x": 0, "y": 43, "flags": 1},
{"matrix": [2, 1], "x": 75, "y": 43, "flags": 4},
{"matrix": [2, 2], "x": 149, "y": 43, "flags": 4},
{"matrix": [2, 3], "x": 224, "y": 43, "flags": 1},
{"matrix": [3, 0], "x": 0, "y": 64, "flags": 1},
{"matrix": [3, 1], "x": 75, "y": 64, "flags": 1},
{"matrix": [3, 2], "x": 149, "y": 64, "flags": 1},
{"matrix": [3, 3], "x": 224, "y": 64, "flags": 1}
],
"animations": {
"alphas_mods": true,
"gradient_up_down": true,
"breathing": true,
"band_sat": true,
"band_val": true,
"band_pinwheel_sat": true,
"band_pinwheel_val": true,
"cycle_all": true,
"cycle_up_down": true,
"cycle_out_in": true,
"cycle_pinwheel": true,
"dual_beacon": true,
"rainbow_pinwheels": true,
"raindrops": true,
"jellybean_raindrops": true,
"hue_breathing": true,
"hue_pendulum": true,
"hue_wave": true,
"pixel_fractal": true,
"pixel_flow": true,
"pixel_rain": true,
"solid_reactive_simple": true,
"solid_reactive": true,
"solid_reactive_multiwide": true,
"solid_reactive_multicross": true,
"solid_reactive_multinexus": true,
"multisplash": true,
"solid_multisplash": true
}
},
"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.75, "y": 0},

{"matrix": [1, 0], "x": 0, "y": 1},
{"matrix": [1, 1], "x": 1, "y": 1},
{"matrix": [1, 2], "x": 2, "y": 1},
{"matrix": [1, 3], "x": 3, "y": 1},

{"matrix": [1, 4], "x": 6, "y": 0},

{"matrix": [2, 0], "x": 0, "y": 2},
{"matrix": [2, 1], "x": 1, "y": 2},
{"matrix": [2, 2], "x": 2, "y": 2},
{"matrix": [2, 3], "x": 3, "y": 2},

{"matrix": [2, 4], "x": 5.375, "y": 2.5},

{"matrix": [3, 0], "x": 0, "y": 3},
{"matrix": [3, 1], "x": 1, "y": 3},
{"matrix": [3, 2], "x": 2, "y": 3},
{"matrix": [3, 3], "x": 3, "y": 3}
]
}
}
}
21 changes: 1 addition & 20 deletions keyboards/doio/kb16/kb16.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#endif

#ifdef OLED_ENABLE
uint16_t startup_timer;
uint16_t startup_timer;

oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
startup_timer = timer_read();
Expand All @@ -48,22 +48,3 @@
return true;
}
#endif

#ifdef RGB_MATRIX_ENABLE
led_config_t g_led_config = { {
{ 0, 1, 2, 3, NO_LED },
{ 4, 5, 6, 7, NO_LED },
{ 8, 9, 10, 11, NO_LED },
{ 12, 13, 14, 15, NO_LED }
}, {
{0 , 0}, {75 , 0}, {149, 0}, {224, 0},
{0 , 21}, {75 , 21}, {149, 21}, {224, 21},
{0 , 43}, {75 , 43}, {149, 43}, {224, 43},
{0 , 64}, {75 , 64}, {149, 64}, {224, 64},
}, {
1, 1, 1, 1,
1, 4, 4, 1,
1, 4, 4, 1,
1, 1, 1, 1,
} };
#endif
0 ...oards/doio/kb16/rev1/keymaps/via/keymap.c → keyboards/doio/kb16/keymaps/default/keymap.c
View file
Open in desktop
File renamed without changes.
0 ...s/doio/kb16/rev1/keymaps/default/rules.mk → keyboards/doio/kb16/keymaps/default/rules.mk
View file
Open in desktop
File renamed without changes.
0 ...oards/doio/kb16/rev2/keymaps/via/keymap.c → keyboards/doio/kb16/keymaps/via/keymap.c
View file
Open in desktop
File renamed without changes.
0 ...oards/doio/kb16/rev1/keymaps/via/rules.mk → keyboards/doio/kb16/keymaps/via/rules.mk
View file
Open in desktop
File renamed without changes.
83 changes: 6 additions & 77 deletions keyboards/doio/kb16/rev1/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,56 +1,16 @@
{
"keyboard_name": "KB16-01",
"manufacturer": "DOIO",
"url": "",
"maintainer": "HorrorTroll",
"usb": {
"vid": "0xD010",
"pid": "0x1601",
"device_version": "0.0.1",
"force_nkro": true
"device_version": "0.0.1"
},
"rgb_matrix": {
"animations": {
"alphas_mods": true,
"gradient_up_down": true,
"breathing": true,
"band_sat": true,
"band_val": true,
"band_pinwheel_sat": true,
"band_pinwheel_val": true,
"cycle_all": true,
"cycle_up_down": true,
"cycle_out_in": true,
"cycle_pinwheel": true,
"dual_beacon": true,
"rainbow_pinwheels": true,
"raindrops": true,
"jellybean_raindrops": true,
"hue_breathing": true,
"hue_pendulum": true,
"hue_wave": true,
"pixel_rain": true,
"pixel_flow": true,
"pixel_fractal": true,
"solid_reactive_simple": true,
"solid_reactive": true,
"solid_reactive_multiwide": true,
"solid_reactive_multicross": true,
"solid_reactive_multinexus": true,
"multisplash": true,
"solid_multisplash": true
},
"default": {
"animation": "cycle_up_down"
},
"driver": "ws2812",
"max_brightness": 200
"features": {
"grave_esc": false,
"space_cadet": false,
waffle87 marked this conversation as resolved.
Show resolved Hide resolved
"magic": false
},
"matrix_pins": {
"cols": ["F5", "F4", "F1", "F0", "B7"],
"rows": ["D5", "D4", "D3", "D2"]
},
"diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "F7", "pin_b": "E6"},
Expand All @@ -62,36 +22,5 @@
"pin": "F6"
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"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.75, "y": 0},

{"matrix": [1, 0], "x": 0, "y": 1},
{"matrix": [1, 1], "x": 1, "y": 1},
{"matrix": [1, 2], "x": 2, "y": 1},
{"matrix": [1, 3], "x": 3, "y": 1},

{"matrix": [1, 4], "x": 6, "y": 0},

{"matrix": [2, 0], "x": 0, "y": 2},
{"matrix": [2, 1], "x": 1, "y": 2},
{"matrix": [2, 2], "x": 2, "y": 2},
{"matrix": [2, 3], "x": 3, "y": 2},

{"matrix": [2, 4], "x": 5.375, "y": 2.5},

{"matrix": [3, 0], "x": 0, "y": 3},
{"matrix": [3, 1], "x": 1, "y": 3},
{"matrix": [3, 2], "x": 2, "y": 3},
{"matrix": [3, 3], "x": 3, "y": 3}
]
}
}
"bootloader": "atmel-dfu"
}
140 changes: 0 additions & 140 deletions keyboards/doio/kb16/rev1/keymaps/default/keymap.c
View file
Open in desktop

This file was deleted.

Loading
Loading