From 2bf08660a55dd27dab000587c9b055b9f8a2947f Mon Sep 17 00:00:00 2001 From: Micah <45813290+micahyy@users.noreply.github.com> Date: Mon, 23 Jun 2025 20:35:23 +0800 Subject: [PATCH 01/10] upload ds17r3 --- keyboards/czmao/a17_ds17r3/keyboard.json | 143 ++++++++++++++++++ .../czmao/a17_ds17r3/keymaps/default/keymap.c | 108 +++++++++++++ keyboards/czmao/a17_ds17r3/readme.md | 31 ++++ 3 files changed, 282 insertions(+) create mode 100644 keyboards/czmao/a17_ds17r3/keyboard.json create mode 100644 keyboards/czmao/a17_ds17r3/keymaps/default/keymap.c create mode 100644 keyboards/czmao/a17_ds17r3/readme.md diff --git a/keyboards/czmao/a17_ds17r3/keyboard.json b/keyboards/czmao/a17_ds17r3/keyboard.json new file mode 100644 index 00000000000..3468d1072f3 --- /dev/null +++ b/keyboards/czmao/a17_ds17r3/keyboard.json @@ -0,0 +1,143 @@ +{ + "keyboard_name": "mao_DS17R3_R", + "manufacturer": "CZMAO", + "url": "https://github.com/micahyy/czmao/tree/main/ds17_solder", + "maintainer": "MAOKB", + "diode_direction": "COL2ROW", + "processor": "STM32F103", + "bootloader": "stm32duino", + "usb": { + "vid": "0x4A17", + "pid": "0x4A18", + "device_version": "1.0.0", + "force_nkro": true + }, + "features": { + "bootmagic": true, + "commands": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, + "dynamic_keymap": { + "layer_count": 8 + }, + "matrix_pins": { + "cols": ["B12", "B14", "B15", "A8"], + "rows": ["A9", "A10", "A15", "B3", "B4"] + }, + + "ws2812": { + "pin": "B13" + }, + + "rgb_matrix": { + "animations": { + "gradient_left_right": true, + "breathing": true, + "band_sat": true, + "band_val": true, + "band_pinwheel_sat": true, + "band_pinwheel_val": true, + "band_spiral_sat": true, + "band_spiral_val": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_up_down": true, + "rainbow_moving_chevron": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "dual_beacon": true, + "rainbow_beacon": true, + "rainbow_pinwheels": true, + "raindrops": true, + "jellybean_raindrops": true, + "hue_breathing": true, + "hue_pendulum": true, + "hue_wave": true, + "typing_heatmap": true, + "solid_reactive_simple": true, + "solid_reactive": true, + "solid_reactive_wide": true, + "solid_reactive_multiwide": true, + "solid_reactive_cross": true, + "solid_reactive_multicross": true, + "solid_reactive_nexus": true, + "solid_reactive_multinexus": true, + "splash": true, + "multisplash": true, + "solid_splash": true, + "solid_multisplash": true + }, + "driver": "ws2812", + "max_brightness":180, + "default":{ + "animation":"cycle_up_down" + }, + "layout": [ + { "flags": 2, "matrix": [0, 0], "x": 0, "y": 0 }, + { "flags": 2, "matrix": [0, 1], "x": 75, "y": 0 }, + { "flags": 2, "matrix": [0, 2], "x": 150, "y": 0 }, + { "flags": 2, "matrix": [0, 3], "x": 224, "y": 0 }, + + { "flags": 2, "matrix": [1, 0], "x": 0, "y": 16 }, + { "flags": 2, "matrix": [1, 1], "x": 75, "y": 16 }, + { "flags": 2, "matrix": [1, 2], "x": 150, "y": 16 }, + { "flags": 2, "matrix": [1, 3], "x": 224, "y": 24 }, + + { "flags": 2, "matrix": [2, 0], "x": 0, "y": 32 }, + { "flags": 2, "matrix": [2, 1], "x": 75, "y": 32 }, + { "flags": 2, "matrix": [2, 2], "x": 150, "y": 32 }, + + + { "flags": 2, "matrix": [3, 0], "x": 0, "y": 48 }, + { "flags": 2, "matrix": [3, 1], "x": 75, "y": 48 }, + { "flags": 2, "matrix": [3, 2], "x": 150, "y": 48 }, + { "flags": 2, "matrix": [3, 3], "x": 224, "y": 56 }, + + { "flags": 2, "matrix": [4, 0], "x": 75, "y": 64 }, + { "flags": 2, "matrix": [4, 2], "x": 150, "y": 64 } + + ], + "sleep": true + }, + + "layouts": { + "LAYOUT_numberpad_5x4": { + "layout": [ + {"label":"FN", "matrix": [ 0,0],"x":0,"y":0}, + {"label":"PSLS", "matrix": [ 0,1],"x":1,"y":0}, + {"label":"PAST", "matrix": [ 0,2],"x":2,"y":0}, + {"label":"PMNS", "matrix": [ 0,3],"x":3,"y":0}, + + {"label":"P7", "matrix": [ 1,0],"x":0,"y":1}, + {"label":"P8", "matrix": [ 1,1],"x":1,"y":1}, + {"label":"P9", "matrix": [ 1,2],"x":2,"y":1}, + + + {"label":"P4", "matrix": [2,0],"x":2,"y":1}, + {"label":"P5", "matrix": [2,1],"x":3,"y":1}, + {"label":"P6", "matrix": [2,2],"x":4,"y":1}, + {"label":"PPLS", "matrix": [1,3],"x":3,"y":1,"h":2}, + + {"label":"P1", "matrix": [ 3,0],"x":0,"y":2}, + {"label":"P2", "matrix": [ 3,1],"x":1,"y":2}, + {"label":"P3", "matrix": [ 3,2],"x":2,"y":2}, + + + {"label":"P0", "matrix": [ 4,0],"x":0,"y":3}, + {"label":"PDOT", "matrix": [ 4,2],"x":1,"y":3}, + {"label":"PENT", "matrix": [ 3,3],"x":3,"y":2,"h":2} + + + + + ] + } + } + + } diff --git a/keyboards/czmao/a17_ds17r3/keymaps/default/keymap.c b/keyboards/czmao/a17_ds17r3/keymaps/default/keymap.c new file mode 100644 index 00000000000..d968a7601be --- /dev/null +++ b/keyboards/czmao/a17_ds17r3/keymaps/default/keymap.c @@ -0,0 +1,108 @@ +/* +Copyright 2012,2013 Jun Wako + +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 . +*/ +// 在文件顶部添加这些辅助函数 + +#include QMK_KEYBOARD_H + + + + + +// Each layer gets a name for readability, which is then used in the keymap matrix below. +// The underscores don't mean anything - you can have a layer called STUFF or any other name. +// Layer names don't all need to be of the same length, obviously, and you can also skip them +// entirely and just use numbers. + +// enum custom_keycodes { +// QWERTY = SAFE_RANGE, +// LOWER, +// RAISE +// }; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_numberpad_5x4( +//1 2 3 4 +LT(1,KC_NUM), LT(2,KC_PSLS), LT(3,KC_PAST), LT(4,KC_PMNS), +KC_P7, KC_P8, KC_P9, +KC_P4, KC_P5, KC_P6, KC_PPLS, +KC_P1, KC_P2, KC_P3, +KC_P0, KC_PDOT, KC_PENT + ), + [1] = LAYOUT_numberpad_5x4( +KC_TRNS, KC_NUM, MO(2), KC_CALC, +KC_HOME, KC_UP, KC_PGUP, +KC_LEFT, KC_TRNS, KC_RGHT, KC_TRNS, +KC_END, KC_DOWN, KC_PGDN, +KC_LSFT, KC_RSFT, KC_N + ), + [2] = LAYOUT_numberpad_5x4( +KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, +RGB_TOG, RGB_SAI, KC_TRNS, +RGB_HUD, EE_CLR, RGB_HUI, RGB_VAD, +KC_TRNS, RGB_SAD, KC_TRNS, +RGB_MOD, KC_TRNS, KC_TRNS + ), + [3] = LAYOUT_numberpad_5x4( +KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, +KC_TRNS, KC_TRNS, KC_TRNS, +KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, +KC_TRNS, KC_TRNS, KC_TRNS, +KC_TRNS, KC_TRNS, KC_TRNS + ) + + +}; + + +bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { + // caps lock cyan + + // num lock cyan + if (host_keyboard_led_state().num_lock) { + RGB_MATRIX_INDICATOR_SET_COLOR(0, 255, 255, 255); + } + + + + // layer state + switch (get_highest_layer(layer_state)) { + case 1: + RGB_MATRIX_INDICATOR_SET_COLOR(11, 255, 255, 255); + break; + case 2: + RGB_MATRIX_INDICATOR_SET_COLOR(12, 255, 255, 255); + break; + case 3: + RGB_MATRIX_INDICATOR_SET_COLOR(13, 255, 255, 255); + break; + case 4: + RGB_MATRIX_INDICATOR_SET_COLOR(8, 255, 255, 255); + break; + case 5: + RGB_MATRIX_INDICATOR_SET_COLOR(9, 255, 255, 255); + break; + case 6: + RGB_MATRIX_INDICATOR_SET_COLOR(10, 255, 255, 255); + break; + case 7: + RGB_MATRIX_INDICATOR_SET_COLOR(4, 255, 255, 255); + break; + + } + return false; +} + diff --git a/keyboards/czmao/a17_ds17r3/readme.md b/keyboards/czmao/a17_ds17r3/readme.md new file mode 100644 index 00000000000..ca4970e681f --- /dev/null +++ b/keyboards/czmao/a17_ds17r3/readme.md @@ -0,0 +1,31 @@ +# mao ds 17r3 Righthand + + +A 17keys numberpad keyboard with RGB backlight. +This keyboard use 16mhz HSE and APM32F103CBT6(STM32F103CBT6) as MCU. + +- Keyboard Maintainer: https://github.com/micahyy +- Hardware Supported: CZMAO +- Hardware Availability: [TaoBao](https://item.taobao.com/item.htm?ft=t&id=819874589305) + + make czmao/ds17r3l:default + +Make example for this keyboard (after setting up your build environment): + + make czmao/ds17r3r:default + + + +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 2 ways: + +* **Bootmagic reset**: Hold down the key Number Lock and plug in the keyboard +* **Physical reset button**: Briefly short the reset keys on the back of the PCB + + + + + From 078958a4cc38f1e49cb5ee4d64efd5c6afde441b Mon Sep 17 00:00:00 2001 From: Micah <45813290+micahyy@users.noreply.github.com> Date: Mon, 23 Jun 2025 20:36:56 +0800 Subject: [PATCH 02/10] upload pic --- keyboards/czmao/a17_ds17r3/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/czmao/a17_ds17r3/readme.md b/keyboards/czmao/a17_ds17r3/readme.md index ca4970e681f..56f397361e9 100644 --- a/keyboards/czmao/a17_ds17r3/readme.md +++ b/keyboards/czmao/a17_ds17r3/readme.md @@ -1,5 +1,5 @@ # mao ds 17r3 Righthand - +![alt text](image.png) A 17keys numberpad keyboard with RGB backlight. This keyboard use 16mhz HSE and APM32F103CBT6(STM32F103CBT6) as MCU. From a49e28f7cf577254cbcff1357b7030f2ec03162b Mon Sep 17 00:00:00 2001 From: Micah <45813290+micahyy@users.noreply.github.com> Date: Mon, 23 Jun 2025 21:05:01 +0800 Subject: [PATCH 03/10] form --- keyboards/czmao/a17_ds17r3/keyboard.json | 32 ++++--------------- .../czmao/a17_ds17r3/keymaps/default/keymap.c | 18 ----------- 2 files changed, 6 insertions(+), 44 deletions(-) diff --git a/keyboards/czmao/a17_ds17r3/keyboard.json b/keyboards/czmao/a17_ds17r3/keyboard.json index 3468d1072f3..76d2ae9fc4b 100644 --- a/keyboards/czmao/a17_ds17r3/keyboard.json +++ b/keyboards/czmao/a17_ds17r3/keyboard.json @@ -28,11 +28,9 @@ "cols": ["B12", "B14", "B15", "A8"], "rows": ["A9", "A10", "A15", "B3", "B4"] }, - "ws2812": { "pin": "B13" }, - "rgb_matrix": { "animations": { "gradient_left_right": true, @@ -77,35 +75,28 @@ "max_brightness":180, "default":{ "animation":"cycle_up_down" - }, + }, "layout": [ { "flags": 2, "matrix": [0, 0], "x": 0, "y": 0 }, { "flags": 2, "matrix": [0, 1], "x": 75, "y": 0 }, { "flags": 2, "matrix": [0, 2], "x": 150, "y": 0 }, { "flags": 2, "matrix": [0, 3], "x": 224, "y": 0 }, - { "flags": 2, "matrix": [1, 0], "x": 0, "y": 16 }, { "flags": 2, "matrix": [1, 1], "x": 75, "y": 16 }, { "flags": 2, "matrix": [1, 2], "x": 150, "y": 16 }, { "flags": 2, "matrix": [1, 3], "x": 224, "y": 24 }, - { "flags": 2, "matrix": [2, 0], "x": 0, "y": 32 }, { "flags": 2, "matrix": [2, 1], "x": 75, "y": 32 }, { "flags": 2, "matrix": [2, 2], "x": 150, "y": 32 }, - - { "flags": 2, "matrix": [3, 0], "x": 0, "y": 48 }, { "flags": 2, "matrix": [3, 1], "x": 75, "y": 48 }, { "flags": 2, "matrix": [3, 2], "x": 150, "y": 48 }, { "flags": 2, "matrix": [3, 3], "x": 224, "y": 56 }, - { "flags": 2, "matrix": [4, 0], "x": 75, "y": 64 }, { "flags": 2, "matrix": [4, 2], "x": 150, "y": 64 } - ], "sleep": true }, - "layouts": { "LAYOUT_numberpad_5x4": { "layout": [ @@ -113,31 +104,20 @@ {"label":"PSLS", "matrix": [ 0,1],"x":1,"y":0}, {"label":"PAST", "matrix": [ 0,2],"x":2,"y":0}, {"label":"PMNS", "matrix": [ 0,3],"x":3,"y":0}, - {"label":"P7", "matrix": [ 1,0],"x":0,"y":1}, {"label":"P8", "matrix": [ 1,1],"x":1,"y":1}, {"label":"P9", "matrix": [ 1,2],"x":2,"y":1}, - - {"label":"P4", "matrix": [2,0],"x":2,"y":1}, {"label":"P5", "matrix": [2,1],"x":3,"y":1}, {"label":"P6", "matrix": [2,2],"x":4,"y":1}, - {"label":"PPLS", "matrix": [1,3],"x":3,"y":1,"h":2}, - + {"label":"PPLS", "matrix": [1,3],"x":3,"y":1,"h":2}, {"label":"P1", "matrix": [ 3,0],"x":0,"y":2}, {"label":"P2", "matrix": [ 3,1],"x":1,"y":2}, - {"label":"P3", "matrix": [ 3,2],"x":2,"y":2}, - - + {"label":"P3", "matrix": [ 3,2],"x":2,"y":2}, {"label":"P0", "matrix": [ 4,0],"x":0,"y":3}, {"label":"PDOT", "matrix": [ 4,2],"x":1,"y":3}, {"label":"PENT", "matrix": [ 3,3],"x":3,"y":2,"h":2} - - - - - ] + ] + } } - } - - } +} diff --git a/keyboards/czmao/a17_ds17r3/keymaps/default/keymap.c b/keyboards/czmao/a17_ds17r3/keymaps/default/keymap.c index d968a7601be..4c2807c03be 100644 --- a/keyboards/czmao/a17_ds17r3/keymaps/default/keymap.c +++ b/keyboards/czmao/a17_ds17r3/keymaps/default/keymap.c @@ -14,14 +14,7 @@ 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 . */ -// 在文件顶部添加这些辅助函数 - #include QMK_KEYBOARD_H - - - - - // Each layer gets a name for readability, which is then used in the keymap matrix below. // The underscores don't mean anything - you can have a layer called STUFF or any other name. // Layer names don't all need to be of the same length, obviously, and you can also skip them @@ -32,7 +25,6 @@ along with this program. If not, see . // LOWER, // RAISE // }; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_numberpad_5x4( //1 2 3 4 @@ -63,21 +55,12 @@ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) - - }; - - bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { - // caps lock cyan - // num lock cyan if (host_keyboard_led_state().num_lock) { RGB_MATRIX_INDICATOR_SET_COLOR(0, 255, 255, 255); } - - - // layer state switch (get_highest_layer(layer_state)) { case 1: @@ -101,7 +84,6 @@ bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { case 7: RGB_MATRIX_INDICATOR_SET_COLOR(4, 255, 255, 255); break; - } return false; } From 8f3d018e666ae3dc265165f2cda1c267870afbc2 Mon Sep 17 00:00:00 2001 From: Micah <45813290+micahyy@users.noreply.github.com> Date: Mon, 23 Jun 2025 21:34:30 +0800 Subject: [PATCH 04/10] 3 --- keyboards/czmao/a17_ds17r3/keyboard.json | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/czmao/a17_ds17r3/keyboard.json b/keyboards/czmao/a17_ds17r3/keyboard.json index 76d2ae9fc4b..213b60c8f04 100644 --- a/keyboards/czmao/a17_ds17r3/keyboard.json +++ b/keyboards/czmao/a17_ds17r3/keyboard.json @@ -6,6 +6,7 @@ "diode_direction": "COL2ROW", "processor": "STM32F103", "bootloader": "stm32duino", + "community_layouts": ["numpad_5x4"], "usb": { "vid": "0x4A17", "pid": "0x4A18", From 49ab4a297554e667b6c78553f4722dfece2404b8 Mon Sep 17 00:00:00 2001 From: Micah <45813290+micahyy@users.noreply.github.com> Date: Mon, 23 Jun 2025 22:43:58 +0800 Subject: [PATCH 05/10] yes --- keyboards/czmao/a17_ds17r3/keyboard.json | 4 ++-- keyboards/czmao/a17_ds17r3/keymaps/default/keymap.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/keyboards/czmao/a17_ds17r3/keyboard.json b/keyboards/czmao/a17_ds17r3/keyboard.json index 213b60c8f04..a1fb706719a 100644 --- a/keyboards/czmao/a17_ds17r3/keyboard.json +++ b/keyboards/czmao/a17_ds17r3/keyboard.json @@ -6,7 +6,6 @@ "diode_direction": "COL2ROW", "processor": "STM32F103", "bootloader": "stm32duino", - "community_layouts": ["numpad_5x4"], "usb": { "vid": "0x4A17", "pid": "0x4A18", @@ -98,8 +97,9 @@ ], "sleep": true }, + "community_layouts": ["numpad_5x4"], "layouts": { - "LAYOUT_numberpad_5x4": { + "LAYOUT_numpad_5x4": { "layout": [ {"label":"FN", "matrix": [ 0,0],"x":0,"y":0}, {"label":"PSLS", "matrix": [ 0,1],"x":1,"y":0}, diff --git a/keyboards/czmao/a17_ds17r3/keymaps/default/keymap.c b/keyboards/czmao/a17_ds17r3/keymaps/default/keymap.c index 4c2807c03be..da1c1e4d806 100644 --- a/keyboards/czmao/a17_ds17r3/keymaps/default/keymap.c +++ b/keyboards/czmao/a17_ds17r3/keymaps/default/keymap.c @@ -26,7 +26,7 @@ along with this program. If not, see . // RAISE // }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_numberpad_5x4( + [0] = LAYOUT_numpad_5x4( //1 2 3 4 LT(1,KC_NUM), LT(2,KC_PSLS), LT(3,KC_PAST), LT(4,KC_PMNS), KC_P7, KC_P8, KC_P9, @@ -34,21 +34,21 @@ KC_P4, KC_P5, KC_P6, KC_PPLS, KC_P1, KC_P2, KC_P3, KC_P0, KC_PDOT, KC_PENT ), - [1] = LAYOUT_numberpad_5x4( + [1] = LAYOUT_numpad_5x4( KC_TRNS, KC_NUM, MO(2), KC_CALC, KC_HOME, KC_UP, KC_PGUP, KC_LEFT, KC_TRNS, KC_RGHT, KC_TRNS, KC_END, KC_DOWN, KC_PGDN, KC_LSFT, KC_RSFT, KC_N ), - [2] = LAYOUT_numberpad_5x4( + [2] = LAYOUT_numpad_5x4( KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, RGB_TOG, RGB_SAI, KC_TRNS, RGB_HUD, EE_CLR, RGB_HUI, RGB_VAD, KC_TRNS, RGB_SAD, KC_TRNS, RGB_MOD, KC_TRNS, KC_TRNS ), - [3] = LAYOUT_numberpad_5x4( + [3] = LAYOUT_numpad_5x4( KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, From 539b6d0369573d693f17fcae2234d3b41353bab6 Mon Sep 17 00:00:00 2001 From: Micah <45813290+micahyy@users.noreply.github.com> Date: Mon, 23 Jun 2025 22:45:40 +0800 Subject: [PATCH 06/10] readme --- keyboards/czmao/a17_ds17r3/readme.md | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/czmao/a17_ds17r3/readme.md b/keyboards/czmao/a17_ds17r3/readme.md index 56f397361e9..f2f3ef0e403 100644 --- a/keyboards/czmao/a17_ds17r3/readme.md +++ b/keyboards/czmao/a17_ds17r3/readme.md @@ -1,5 +1,4 @@ # mao ds 17r3 Righthand -![alt text](image.png) A 17keys numberpad keyboard with RGB backlight. This keyboard use 16mhz HSE and APM32F103CBT6(STM32F103CBT6) as MCU. From 62b99da18d8897e0cf29d8fd96046cc4835b5780 Mon Sep 17 00:00:00 2001 From: Micah <45813290+micahyy@users.noreply.github.com> Date: Mon, 23 Jun 2025 23:30:15 +0800 Subject: [PATCH 07/10] update keymap --- keyboards/czmao/a17_ds17r3/keymaps/default/keymap.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/keyboards/czmao/a17_ds17r3/keymaps/default/keymap.c b/keyboards/czmao/a17_ds17r3/keymaps/default/keymap.c index da1c1e4d806..b17e76e28cf 100644 --- a/keyboards/czmao/a17_ds17r3/keymaps/default/keymap.c +++ b/keyboards/czmao/a17_ds17r3/keymaps/default/keymap.c @@ -15,16 +15,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ #include QMK_KEYBOARD_H -// Each layer gets a name for readability, which is then used in the keymap matrix below. -// The underscores don't mean anything - you can have a layer called STUFF or any other name. -// Layer names don't all need to be of the same length, obviously, and you can also skip them -// entirely and just use numbers. - -// enum custom_keycodes { -// QWERTY = SAFE_RANGE, -// LOWER, -// RAISE -// }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_numpad_5x4( //1 2 3 4 From 265a324c200d6ee5adfde4beedb0aae7b7072b72 Mon Sep 17 00:00:00 2001 From: Micah <45813290+micahyy@users.noreply.github.com> Date: Tue, 24 Jun 2025 10:35:32 +0800 Subject: [PATCH 08/10] update json --- keyboards/czmao/a17_ds17r3/keyboard.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/keyboards/czmao/a17_ds17r3/keyboard.json b/keyboards/czmao/a17_ds17r3/keyboard.json index a1fb706719a..dafc536516a 100644 --- a/keyboards/czmao/a17_ds17r3/keyboard.json +++ b/keyboards/czmao/a17_ds17r3/keyboard.json @@ -108,16 +108,16 @@ {"label":"P7", "matrix": [ 1,0],"x":0,"y":1}, {"label":"P8", "matrix": [ 1,1],"x":1,"y":1}, {"label":"P9", "matrix": [ 1,2],"x":2,"y":1}, - {"label":"P4", "matrix": [2,0],"x":2,"y":1}, - {"label":"P5", "matrix": [2,1],"x":3,"y":1}, - {"label":"P6", "matrix": [2,2],"x":4,"y":1}, + {"label":"P4", "matrix": [2,0],"x":0,"y":2}, + {"label":"P5", "matrix": [2,1],"x":1,"y":2}, + {"label":"P6", "matrix": [2,2],"x":2,"y":2}, {"label":"PPLS", "matrix": [1,3],"x":3,"y":1,"h":2}, - {"label":"P1", "matrix": [ 3,0],"x":0,"y":2}, - {"label":"P2", "matrix": [ 3,1],"x":1,"y":2}, - {"label":"P3", "matrix": [ 3,2],"x":2,"y":2}, - {"label":"P0", "matrix": [ 4,0],"x":0,"y":3}, - {"label":"PDOT", "matrix": [ 4,2],"x":1,"y":3}, - {"label":"PENT", "matrix": [ 3,3],"x":3,"y":2,"h":2} + {"label":"P1", "matrix": [ 3,0],"x":0,"y":3}, + {"label":"P2", "matrix": [ 3,1],"x":1,"y":3}, + {"label":"P3", "matrix": [ 3,2],"x":2,"y":3}, + {"label":"P0", "matrix": [ 4,0],"x":0,"y":4, "w": 2}, + {"label":"PDOT", "matrix": [ 4,2],"x":2,"y":4}, + {"label":"PENT", "matrix": [ 3,3],"x":3,"y":3,"h":2} ] } } From 276312dce70c50b567038c60e02aeb047f9199df Mon Sep 17 00:00:00 2001 From: Micah <45813290+micahyy@users.noreply.github.com> Date: Fri, 27 Jun 2025 11:59:21 +0800 Subject: [PATCH 09/10] update 0627 --- keyboards/czmao/a17_ds17r3/keyboard.json | 84 +++++++++++++----------- keyboards/czmao/a17_ds17r3/readme.md | 8 +-- 2 files changed, 48 insertions(+), 44 deletions(-) diff --git a/keyboards/czmao/a17_ds17r3/keyboard.json b/keyboards/czmao/a17_ds17r3/keyboard.json index dafc536516a..958235156ed 100644 --- a/keyboards/czmao/a17_ds17r3/keyboard.json +++ b/keyboards/czmao/a17_ds17r3/keyboard.json @@ -9,20 +9,24 @@ "usb": { "vid": "0x4A17", "pid": "0x4A18", - "device_version": "1.0.0", - "force_nkro": true + "device_version": "1.0.0" + }, + "host": { + "default": { + "nkro": true + } }, "features": { - "bootmagic": true, - "commands": true, - "console": true, - "extrakey": true, - "mousekey": true, - "nkro": true, - "rgb_matrix": true + "bootmagic":true, + "commands":true, + "console":true, + "extrakey":true, + "mousekey":true, + "nkro":true, + "rgb_matrix":true }, "dynamic_keymap": { - "layer_count": 8 + "layer_count":8 }, "matrix_pins": { "cols": ["B12", "B14", "B15", "A8"], @@ -77,23 +81,23 @@ "animation":"cycle_up_down" }, "layout": [ - { "flags": 2, "matrix": [0, 0], "x": 0, "y": 0 }, - { "flags": 2, "matrix": [0, 1], "x": 75, "y": 0 }, - { "flags": 2, "matrix": [0, 2], "x": 150, "y": 0 }, - { "flags": 2, "matrix": [0, 3], "x": 224, "y": 0 }, - { "flags": 2, "matrix": [1, 0], "x": 0, "y": 16 }, - { "flags": 2, "matrix": [1, 1], "x": 75, "y": 16 }, - { "flags": 2, "matrix": [1, 2], "x": 150, "y": 16 }, - { "flags": 2, "matrix": [1, 3], "x": 224, "y": 24 }, - { "flags": 2, "matrix": [2, 0], "x": 0, "y": 32 }, - { "flags": 2, "matrix": [2, 1], "x": 75, "y": 32 }, - { "flags": 2, "matrix": [2, 2], "x": 150, "y": 32 }, - { "flags": 2, "matrix": [3, 0], "x": 0, "y": 48 }, - { "flags": 2, "matrix": [3, 1], "x": 75, "y": 48 }, - { "flags": 2, "matrix": [3, 2], "x": 150, "y": 48 }, - { "flags": 2, "matrix": [3, 3], "x": 224, "y": 56 }, - { "flags": 2, "matrix": [4, 0], "x": 75, "y": 64 }, - { "flags": 2, "matrix": [4, 2], "x": 150, "y": 64 } + { "flags": 4, "matrix": [0, 0], "x": 0, "y": 0 }, + { "flags": 4, "matrix": [0, 1], "x": 75, "y": 0 }, + { "flags": 4, "matrix": [0, 2], "x": 150, "y": 0 }, + { "flags": 4, "matrix": [0, 3], "x": 224, "y": 0 }, + { "flags": 4, "matrix": [1, 0], "x": 0, "y": 16 }, + { "flags": 4, "matrix": [1, 1], "x": 75, "y": 16 }, + { "flags": 4, "matrix": [1, 2], "x": 150, "y": 16 }, + { "flags": 4, "matrix": [1, 3], "x": 224, "y": 24 }, + { "flags": 4, "matrix": [2, 0], "x": 0, "y": 32 }, + { "flags": 4, "matrix": [2, 1], "x": 75, "y": 32 }, + { "flags": 4, "matrix": [2, 2], "x": 150, "y": 32 }, + { "flags": 4, "matrix": [3, 0], "x": 0, "y": 48 }, + { "flags": 4, "matrix": [3, 1], "x": 75, "y": 48 }, + { "flags": 4, "matrix": [3, 2], "x": 150, "y": 48 }, + { "flags": 4, "matrix": [3, 3], "x": 224, "y": 56 }, + { "flags": 4, "matrix": [4, 0], "x": 75, "y": 64 }, + { "flags": 4, "matrix": [4, 2], "x": 150, "y": 64 } ], "sleep": true }, @@ -101,23 +105,23 @@ "layouts": { "LAYOUT_numpad_5x4": { "layout": [ - {"label":"FN", "matrix": [ 0,0],"x":0,"y":0}, - {"label":"PSLS", "matrix": [ 0,1],"x":1,"y":0}, - {"label":"PAST", "matrix": [ 0,2],"x":2,"y":0}, - {"label":"PMNS", "matrix": [ 0,3],"x":3,"y":0}, - {"label":"P7", "matrix": [ 1,0],"x":0,"y":1}, - {"label":"P8", "matrix": [ 1,1],"x":1,"y":1}, - {"label":"P9", "matrix": [ 1,2],"x":2,"y":1}, + {"label":"FN", "matrix": [0,0],"x":0,"y":0}, + {"label":"PSLS", "matrix": [0,1],"x":1,"y":0}, + {"label":"PAST", "matrix": [0,2],"x":2,"y":0}, + {"label":"PMNS", "matrix": [0,3],"x":3,"y":0}, + {"label":"P7", "matrix": [1,0],"x":0,"y":1}, + {"label":"P8", "matrix": [1,1],"x":1,"y":1}, + {"label":"P9", "matrix": [1,2],"x":2,"y":1}, {"label":"P4", "matrix": [2,0],"x":0,"y":2}, {"label":"P5", "matrix": [2,1],"x":1,"y":2}, {"label":"P6", "matrix": [2,2],"x":2,"y":2}, {"label":"PPLS", "matrix": [1,3],"x":3,"y":1,"h":2}, - {"label":"P1", "matrix": [ 3,0],"x":0,"y":3}, - {"label":"P2", "matrix": [ 3,1],"x":1,"y":3}, - {"label":"P3", "matrix": [ 3,2],"x":2,"y":3}, - {"label":"P0", "matrix": [ 4,0],"x":0,"y":4, "w": 2}, - {"label":"PDOT", "matrix": [ 4,2],"x":2,"y":4}, - {"label":"PENT", "matrix": [ 3,3],"x":3,"y":3,"h":2} + {"label":"P1", "matrix": [3,0],"x":0,"y":3}, + {"label":"P2", "matrix": [3,1],"x":1,"y":3}, + {"label":"P3", "matrix": [3,2],"x":2,"y":3}, + {"label":"P0", "matrix": [4,0],"x":0,"y":4, "w": 2}, + {"label":"PDOT", "matrix": [4,2],"x":2,"y":4}, + {"label":"PENT", "matrix": [3,3],"x":3,"y":3,"h":2} ] } } diff --git a/keyboards/czmao/a17_ds17r3/readme.md b/keyboards/czmao/a17_ds17r3/readme.md index f2f3ef0e403..527d5afb314 100644 --- a/keyboards/czmao/a17_ds17r3/readme.md +++ b/keyboards/czmao/a17_ds17r3/readme.md @@ -1,17 +1,17 @@ # mao ds 17r3 Righthand A 17keys numberpad keyboard with RGB backlight. -This keyboard use 16mhz HSE and APM32F103CBT6(STM32F103CBT6) as MCU. +This keyboard use APM32F103CBT6(STM32F103CBT6) as MCU. - Keyboard Maintainer: https://github.com/micahyy - Hardware Supported: CZMAO - Hardware Availability: [TaoBao](https://item.taobao.com/item.htm?ft=t&id=819874589305) - make czmao/ds17r3l:default + make czmao/a17_ds17r3:default -Make example for this keyboard (after setting up your build environment): +- Flashing example for this keyboard: + make czmao/a17_ds17r3:default:flash - make czmao/ds17r3r:default From 3568c8bedeb6e7a0a302280cf1b8ee01f09c7447 Mon Sep 17 00:00:00 2001 From: Micah <45813290+micahyy@users.noreply.github.com> Date: Fri, 27 Jun 2025 13:39:24 +0800 Subject: [PATCH 10/10] delete all --- {keyboards/czmao => czmao}/a17_ds17r3/keyboard.json | 0 {keyboards/czmao => czmao}/a17_ds17r3/keymaps/default/keymap.c | 0 {keyboards/czmao => czmao}/a17_ds17r3/readme.md | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename {keyboards/czmao => czmao}/a17_ds17r3/keyboard.json (100%) rename {keyboards/czmao => czmao}/a17_ds17r3/keymaps/default/keymap.c (100%) rename {keyboards/czmao => czmao}/a17_ds17r3/readme.md (100%) diff --git a/keyboards/czmao/a17_ds17r3/keyboard.json b/czmao/a17_ds17r3/keyboard.json similarity index 100% rename from keyboards/czmao/a17_ds17r3/keyboard.json rename to czmao/a17_ds17r3/keyboard.json diff --git a/keyboards/czmao/a17_ds17r3/keymaps/default/keymap.c b/czmao/a17_ds17r3/keymaps/default/keymap.c similarity index 100% rename from keyboards/czmao/a17_ds17r3/keymaps/default/keymap.c rename to czmao/a17_ds17r3/keymaps/default/keymap.c diff --git a/keyboards/czmao/a17_ds17r3/readme.md b/czmao/a17_ds17r3/readme.md similarity index 100% rename from keyboards/czmao/a17_ds17r3/readme.md rename to czmao/a17_ds17r3/readme.md