From 68befb07d85303bc31d0298a9938b1d5ea09fa03 Mon Sep 17 00:00:00 2001 From: Vino Rodrigues <366673+vinorodrigues@users.noreply.github.com> Date: Fri, 12 May 2023 14:01:08 +1000 Subject: [PATCH 1/6] Add Moondrop Dash75 --- keyboards/moondrop/dash75/info.json | 119 ++++++++++++++++++ .../dash75/keymaps/default/keymap.json | 26 ++++ .../moondrop/dash75/keymaps/via/config.h | 7 ++ .../moondrop/dash75/keymaps/via/keymap.json | 32 +++++ keyboards/moondrop/dash75/r1/config.h | 24 ++++ keyboards/moondrop/dash75/r1/info.json | 6 + keyboards/moondrop/dash75/r1/rules.mk | 2 + keyboards/moondrop/dash75/readme.md | 29 +++++ 8 files changed, 245 insertions(+) create mode 100644 keyboards/moondrop/dash75/info.json create mode 100644 keyboards/moondrop/dash75/keymaps/default/keymap.json create mode 100644 keyboards/moondrop/dash75/keymaps/via/config.h create mode 100644 keyboards/moondrop/dash75/keymaps/via/keymap.json create mode 100644 keyboards/moondrop/dash75/r1/config.h create mode 100644 keyboards/moondrop/dash75/r1/info.json create mode 100644 keyboards/moondrop/dash75/r1/rules.mk create mode 100644 keyboards/moondrop/dash75/readme.md diff --git a/keyboards/moondrop/dash75/info.json b/keyboards/moondrop/dash75/info.json new file mode 100644 index 000000000000..47d22dcdc8ea --- /dev/null +++ b/keyboards/moondrop/dash75/info.json @@ -0,0 +1,119 @@ +{ + "manufacturer": "Moondrop", + "keyboard_name": "Dash75", + "maintainer": "vinorodrigues", + "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "lto": true + }, + "diode_direction": "COL2ROW", + "matrix_pins": { + "rows": ["B6", "B5", "B4", "D7", "D6", "D4"], + "cols": ["C6", "B2", "B3", "F7", "F6", "F5", "F4", "F1", "F0", "B7", "D5", "D3", "D2", "D0", "D1"] + }, + "processor": "atmega32u4", + "url": "https://moondroplab.com/en/products/dash75", + "usb": { + "vid": "0x6DD4", + "pid": "0x7501", + "device_version": "1.5.0" + }, + "layouts": { + "LAYOUT": { + "layout": [ + { "matrix": [0, 0], "x": 0, "y": 0 }, + { "matrix": [0, 1], "x": 1.5, "y": 0 }, + { "matrix": [0, 2], "x": 2.5, "y": 0 }, + { "matrix": [0, 3], "x": 3.5, "y": 0 }, + { "matrix": [0, 4], "x": 4.5, "y": 0 }, + { "matrix": [0, 6], "x": 6, "y": 0 }, + { "matrix": [0, 7], "x": 7, "y": 0 }, + { "matrix": [0, 8], "x": 8, "y": 0 }, + { "matrix": [0, 9], "x": 9, "y": 0 }, + { "matrix": [0, 10], "x": 10.5, "y": 0 }, + { "matrix": [0, 11], "x": 11.5, "y": 0 }, + { "matrix": [0, 12], "x": 12.5, "y": 0 }, + { "matrix": [0, 13], "x": 13.5, "y": 0 }, + { "matrix": [0, 14], "x": 15, "y": 0 }, + + { "matrix": [1, 0], "x": 0, "y": 1.25 }, + { "matrix": [1, 1], "x": 1, "y": 1.25 }, + { "matrix": [1, 2], "x": 2, "y": 1.25 }, + { "matrix": [1, 3], "x": 3, "y": 1.25 }, + { "matrix": [1, 4], "x": 4, "y": 1.25 }, + { "matrix": [1, 5], "x": 5, "y": 1.25 }, + { "matrix": [1, 6], "x": 6, "y": 1.25 }, + { "matrix": [1, 7], "x": 7, "y": 1.25 }, + { "matrix": [1, 8], "x": 8, "y": 1.25 }, + { "matrix": [1, 9], "x": 9, "y": 1.25 }, + { "matrix": [1, 10], "x": 10, "y": 1.25 }, + { "matrix": [1, 11], "x": 11, "y": 1.25 }, + { "matrix": [1, 12], "x": 12, "y": 1.25 }, + { "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2 }, + { "matrix": [1, 14], "x": 15, "y": 1.25 }, + + { "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5 }, + { "matrix": [2, 1], "x": 1.5, "y": 2.25 }, + { "matrix": [2, 2], "x": 2.5, "y": 2.25 }, + { "matrix": [2, 3], "x": 3.5, "y": 2.25 }, + { "matrix": [2, 4], "x": 4.5, "y": 2.25 }, + { "matrix": [2, 5], "x": 5.5, "y": 2.25 }, + { "matrix": [2, 6], "x": 6.5, "y": 2.25 }, + { "matrix": [2, 7], "x": 7.5, "y": 2.25 }, + { "matrix": [2, 8], "x": 8.5, "y": 2.25 }, + { "matrix": [2, 9], "x": 9.5, "y": 2.25 }, + { "matrix": [2, 10], "x": 10.5, "y": 2.25 }, + { "matrix": [2, 11], "x": 11.5, "y": 2.25 }, + { "matrix": [2, 12], "x": 12.5, "y": 2.25 }, + { "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5 }, + { "matrix": [2, 14], "x": 15, "y": 2.25 }, + + { "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75 }, + { "matrix": [3, 1], "x": 1.75, "y": 3.25 }, + { "matrix": [3, 2], "x": 2.75, "y": 3.25 }, + { "matrix": [3, 3], "x": 3.75, "y": 3.25 }, + { "matrix": [3, 4], "x": 4.75, "y": 3.25 }, + { "matrix": [3, 5], "x": 5.75, "y": 3.25 }, + { "matrix": [3, 6], "x": 6.75, "y": 3.25 }, + { "matrix": [3, 7], "x": 7.75, "y": 3.25 }, + { "matrix": [3, 8], "x": 8.75, "y": 3.25 }, + { "matrix": [3, 9], "x": 9.75, "y": 3.25 }, + { "matrix": [3, 10], "x": 10.75, "y": 3.25 }, + { "matrix": [3, 11], "x": 11.75, "y": 3.25 }, + { "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25 }, + { "matrix": [3, 14], "x": 15, "y": 3.25 }, + + { "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25 }, + { "matrix": [4, 1], "x": 2.25, "y": 4.25 }, + { "matrix": [4, 2], "x": 3.25, "y": 4.25 }, + { "matrix": [4, 3], "x": 4.25, "y": 4.25 }, + { "matrix": [4, 4], "x": 5.25, "y": 4.25 }, + { "matrix": [4, 5], "x": 6.25, "y": 4.25 }, + { "matrix": [4, 6], "x": 7.25, "y": 4.25 }, + { "matrix": [4, 7], "x": 8.25, "y": 4.25 }, + { "matrix": [4, 8], "x": 9.25, "y": 4.25 }, + { "matrix": [4, 9], "x": 10.25, "y": 4.25 }, + { "matrix": [4, 10], "x": 11.25, "y": 4.25 }, + { "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75 }, + { "matrix": [4, 13], "x": 14, "y": 4.25 }, + { "matrix": [4, 14], "x": 15, "y": 4.25 }, + + { "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25 }, + { "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25 }, + { "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25 }, + { "matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25 }, + { "matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25 }, + { "matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25 }, + { "matrix": [5, 12], "x": 13, "y": 5.25 }, + { "matrix": [5, 13], "x": 14, "y": 5.25 }, + { "matrix": [5, 14], "x": 15, "y": 5.25 } + ] + } + } +} diff --git a/keyboards/moondrop/dash75/keymaps/default/keymap.json b/keyboards/moondrop/dash75/keymaps/default/keymap.json new file mode 100644 index 000000000000..8892e5599232 --- /dev/null +++ b/keyboards/moondrop/dash75/keymaps/default/keymap.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "notes": "This file is a keymap.json file for moondrop/dash75", + "keyboard": "moondrop/dash75", + "keymap": "default", + "layout": "LAYOUT", + "author": "vinorodrigues", + "layers": [ + [ + "KC_ESC", "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_F5", "KC_F6", "KC_F7", "KC_F8", "KC_F9", "KC_F10", "KC_F11", "KC_F12", "KC_PSCR", + "KC_GRV", "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0", "KC_MINS", "KC_EQL", "KC_BSPC", "KC_INS", + "KC_TAB", "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P", "KC_LBRC", "KC_RBRC", "KC_BSLS", "KC_DEL", + "KC_CAPS", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN", "KC_QUOT", "KC_ENT", "KC_PGUP", + "KC_LSFT", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "KC_RSFT", "KC_UP", "KC_PGDN", + "KC_LCTL", "KC_LGUI", "KC_LALT", "KC_SPC", "KC_RALT", "KC_APP", "KC_LEFT", "KC_DOWN", "KC_RGHT" + ], + [ + "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", + "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", + "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", + "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", + "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", + "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______" + ] + ] +} diff --git a/keyboards/moondrop/dash75/keymaps/via/config.h b/keyboards/moondrop/dash75/keymaps/via/config.h new file mode 100644 index 000000000000..55db81ed7b41 --- /dev/null +++ b/keyboards/moondrop/dash75/keymaps/via/config.h @@ -0,0 +1,7 @@ +// Copyright 2023 moondroplab (@moondroplab) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#define DYNAMIC_KEYMAP_LAYER_COUNT 2 +#define VIA_FIRMWARE_VERSION 1 diff --git a/keyboards/moondrop/dash75/keymaps/via/keymap.json b/keyboards/moondrop/dash75/keymaps/via/keymap.json new file mode 100644 index 000000000000..1123e46f19bb --- /dev/null +++ b/keyboards/moondrop/dash75/keymaps/via/keymap.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "notes": "This file is a keymap.json file for moondrop/dash75", + "keyboard": "moondrop/dash75", + "keymap": "via", + "layout": "LAYOUT", + "author": "vinorodrigues", + "config": { + "features": { + "via": true, + "lto": true + } + }, + "layers": [ + [ + "KC_ESC", "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_F5", "KC_F6", "KC_F7", "KC_F8", "KC_F9", "KC_F10", "KC_F11", "KC_F12", "KC_PSCR", + "KC_GRV", "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0", "KC_MINS", "KC_EQL", "KC_BSPC", "KC_INS", + "KC_TAB", "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P", "KC_LBRC", "KC_RBRC", "KC_BSLS", "KC_DEL", + "KC_CAPS", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN", "KC_QUOT", "KC_ENT", "KC_PGUP", + "KC_LSFT", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "KC_RSFT", "KC_UP", "KC_PGDN", + "KC_LCTL", "KC_LGUI", "KC_LALT", "KC_SPC", "KC_RALT", "KC_APP", "KC_LEFT", "KC_DOWN", "KC_RGHT" + ], + [ + "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", + "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", + "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", + "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", + "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", + "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______" + ] + ] +} diff --git a/keyboards/moondrop/dash75/r1/config.h b/keyboards/moondrop/dash75/r1/config.h new file mode 100644 index 000000000000..8737aca0ebfe --- /dev/null +++ b/keyboards/moondrop/dash75/r1/config.h @@ -0,0 +1,24 @@ +// Copyright 2023 moondroplab (@moondroplab) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#define USB_SUSPEND_WAKEUP_DELAY 5000 // wait for USB hub to start + +#define HOLD_ON_OTHER_KEY_PRESS + +/* + * 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 diff --git a/keyboards/moondrop/dash75/r1/info.json b/keyboards/moondrop/dash75/r1/info.json new file mode 100644 index 000000000000..b562070dc9d8 --- /dev/null +++ b/keyboards/moondrop/dash75/r1/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x7501", + "device_version": "1.5.0" + } +} diff --git a/keyboards/moondrop/dash75/r1/rules.mk b/keyboards/moondrop/dash75/r1/rules.mk new file mode 100644 index 000000000000..6441046fb6a4 --- /dev/null +++ b/keyboards/moondrop/dash75/r1/rules.mk @@ -0,0 +1,2 @@ +# This file intentionally left blank +# ** Settings are Data Driven and reside in `info.json` ** diff --git a/keyboards/moondrop/dash75/readme.md b/keyboards/moondrop/dash75/readme.md new file mode 100644 index 000000000000..5b015f6d5b0d --- /dev/null +++ b/keyboards/moondrop/dash75/readme.md @@ -0,0 +1,29 @@ +# Moondrop Dash75 + +![Moondrop Dash75](https://i.imgur.com/mxaYcvqh.jpg) + +The 75%, Commodore 64 inspired, keyboard with integrated USB Hub and headphone DAC/Amp + +* Keyboard Maintainer: [vinorodrigues](https://github.com/vinorodrigues) +* Hardware Supported: + * Moondrop Dash75 +* Hardware Availability: [moondroplab.com](https://moondroplab.com/en/products/dash75) + +Make example for this keyboard (after setting up your build environment): + + make moondrop/dash75/r1:default + +Flashing example for this keyboard: + + make moondrop/dash75/r1:default:flash + +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 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available From 259ab9e91843e198c2a5f248cff074597b477a53 Mon Sep 17 00:00:00 2001 From: Vino Rodrigues <366673+vinorodrigues@users.noreply.github.com> Date: Fri, 12 May 2023 15:27:37 +1000 Subject: [PATCH 2/6] Remove unneeded comments Co-authored-by: Drashna Jaelre --- keyboards/moondrop/dash75/r1/config.h | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/keyboards/moondrop/dash75/r1/config.h b/keyboards/moondrop/dash75/r1/config.h index 8737aca0ebfe..494a7dcd9ddc 100644 --- a/keyboards/moondrop/dash75/r1/config.h +++ b/keyboards/moondrop/dash75/r1/config.h @@ -7,18 +7,3 @@ #define HOLD_ON_OTHER_KEY_PRESS -/* - * 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 From 9bdc725b3900e059954009a76f0a047de4e26547 Mon Sep 17 00:00:00 2001 From: Vino Rodrigues <366673+vinorodrigues@users.noreply.github.com> Date: Fri, 12 May 2023 15:49:13 +1000 Subject: [PATCH 3/6] Brand alignment to embed DAC device --- keyboards/moondrop/dash75/info.json | 4 ++-- keyboards/moondrop/dash75/keymaps/via/config.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/keyboards/moondrop/dash75/info.json b/keyboards/moondrop/dash75/info.json index 47d22dcdc8ea..13e28fb32541 100644 --- a/keyboards/moondrop/dash75/info.json +++ b/keyboards/moondrop/dash75/info.json @@ -1,6 +1,6 @@ { - "manufacturer": "Moondrop", - "keyboard_name": "Dash75", + "manufacturer": "MOONDROP", + "keyboard_name": "Dash 75", "maintainer": "vinorodrigues", "bootloader": "atmel-dfu", "features": { diff --git a/keyboards/moondrop/dash75/keymaps/via/config.h b/keyboards/moondrop/dash75/keymaps/via/config.h index 55db81ed7b41..2a8bb1445440 100644 --- a/keyboards/moondrop/dash75/keymaps/via/config.h +++ b/keyboards/moondrop/dash75/keymaps/via/config.h @@ -3,5 +3,6 @@ #pragma once +#define SERIAL_NUM "Dash 75" #define DYNAMIC_KEYMAP_LAYER_COUNT 2 #define VIA_FIRMWARE_VERSION 1 From 926badfc657c4bca21162032d636e7d7cb9bcd0b Mon Sep 17 00:00:00 2001 From: Vino Rodrigues <366673+vinorodrigues@users.noreply.github.com> Date: Fri, 12 May 2023 15:55:36 +1000 Subject: [PATCH 4/6] Brand alignment to embedded DAC device --- keyboards/moondrop/dash75/keymaps/via/config.h | 1 - keyboards/moondrop/dash75/r1/config.h | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/moondrop/dash75/keymaps/via/config.h b/keyboards/moondrop/dash75/keymaps/via/config.h index 2a8bb1445440..55db81ed7b41 100644 --- a/keyboards/moondrop/dash75/keymaps/via/config.h +++ b/keyboards/moondrop/dash75/keymaps/via/config.h @@ -3,6 +3,5 @@ #pragma once -#define SERIAL_NUM "Dash 75" #define DYNAMIC_KEYMAP_LAYER_COUNT 2 #define VIA_FIRMWARE_VERSION 1 diff --git a/keyboards/moondrop/dash75/r1/config.h b/keyboards/moondrop/dash75/r1/config.h index 494a7dcd9ddc..a1f43ffd4562 100644 --- a/keyboards/moondrop/dash75/r1/config.h +++ b/keyboards/moondrop/dash75/r1/config.h @@ -3,7 +3,8 @@ #pragma once +#define SERIAL_NUM "Dash 75" + #define USB_SUSPEND_WAKEUP_DELAY 5000 // wait for USB hub to start #define HOLD_ON_OTHER_KEY_PRESS - From 75d374e4aabc7454d1282172464ac82c7371cda3 Mon Sep 17 00:00:00 2001 From: Vino Rodrigues <366673+vinorodrigues@users.noreply.github.com> Date: Sat, 13 May 2023 03:06:16 +1000 Subject: [PATCH 5/6] post- zvecr review updates --- .../moondrop/dash75/keymaps/default/keymap.json | 8 -------- keyboards/moondrop/dash75/keymaps/via/config.h | 1 - .../moondrop/dash75/keymaps/via/keymap.json | 16 ++++++++++++++++ keyboards/moondrop/dash75/r1/config.h | 2 +- 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/keyboards/moondrop/dash75/keymaps/default/keymap.json b/keyboards/moondrop/dash75/keymaps/default/keymap.json index 8892e5599232..67811c18a376 100644 --- a/keyboards/moondrop/dash75/keymaps/default/keymap.json +++ b/keyboards/moondrop/dash75/keymaps/default/keymap.json @@ -13,14 +13,6 @@ "KC_CAPS", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN", "KC_QUOT", "KC_ENT", "KC_PGUP", "KC_LSFT", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "KC_RSFT", "KC_UP", "KC_PGDN", "KC_LCTL", "KC_LGUI", "KC_LALT", "KC_SPC", "KC_RALT", "KC_APP", "KC_LEFT", "KC_DOWN", "KC_RGHT" - ], - [ - "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", - "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", - "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", - "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", - "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", - "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______" ] ] } diff --git a/keyboards/moondrop/dash75/keymaps/via/config.h b/keyboards/moondrop/dash75/keymaps/via/config.h index 55db81ed7b41..3b36fe3a07ba 100644 --- a/keyboards/moondrop/dash75/keymaps/via/config.h +++ b/keyboards/moondrop/dash75/keymaps/via/config.h @@ -3,5 +3,4 @@ #pragma once -#define DYNAMIC_KEYMAP_LAYER_COUNT 2 #define VIA_FIRMWARE_VERSION 1 diff --git a/keyboards/moondrop/dash75/keymaps/via/keymap.json b/keyboards/moondrop/dash75/keymaps/via/keymap.json index 1123e46f19bb..4b39d7069555 100644 --- a/keyboards/moondrop/dash75/keymaps/via/keymap.json +++ b/keyboards/moondrop/dash75/keymaps/via/keymap.json @@ -20,6 +20,22 @@ "KC_LSFT", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "KC_RSFT", "KC_UP", "KC_PGDN", "KC_LCTL", "KC_LGUI", "KC_LALT", "KC_SPC", "KC_RALT", "KC_APP", "KC_LEFT", "KC_DOWN", "KC_RGHT" ], + [ + "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", + "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", + "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", + "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", + "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", + "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______" + ], + [ + "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", + "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", + "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", + "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", + "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", + "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______" + ], [ "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", diff --git a/keyboards/moondrop/dash75/r1/config.h b/keyboards/moondrop/dash75/r1/config.h index a1f43ffd4562..16b6125a2d89 100644 --- a/keyboards/moondrop/dash75/r1/config.h +++ b/keyboards/moondrop/dash75/r1/config.h @@ -3,7 +3,7 @@ #pragma once -#define SERIAL_NUM "Dash 75" +#define SERIAL_NUMBER "Dash 75" #define USB_SUSPEND_WAKEUP_DELAY 5000 // wait for USB hub to start From d461fc1cc3112ba0312ac29e159e03318cd2640e Mon Sep 17 00:00:00 2001 From: Vino Rodrigues <366673+vinorodrigues@users.noreply.github.com> Date: Sat, 13 May 2023 07:46:40 +1000 Subject: [PATCH 6/6] post- zvecr review updates (2) --- .../moondrop/dash75/keymaps/via/keymap.json | 24 ------------------- 1 file changed, 24 deletions(-) diff --git a/keyboards/moondrop/dash75/keymaps/via/keymap.json b/keyboards/moondrop/dash75/keymaps/via/keymap.json index 4b39d7069555..6d43ee82c80f 100644 --- a/keyboards/moondrop/dash75/keymaps/via/keymap.json +++ b/keyboards/moondrop/dash75/keymaps/via/keymap.json @@ -19,30 +19,6 @@ "KC_CAPS", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN", "KC_QUOT", "KC_ENT", "KC_PGUP", "KC_LSFT", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "KC_RSFT", "KC_UP", "KC_PGDN", "KC_LCTL", "KC_LGUI", "KC_LALT", "KC_SPC", "KC_RALT", "KC_APP", "KC_LEFT", "KC_DOWN", "KC_RGHT" - ], - [ - "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", - "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", - "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", - "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", - "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", - "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______" - ], - [ - "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", - "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", - "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", - "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", - "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", - "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______" - ], - [ - "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", - "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", - "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", - "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", - "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", - "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______" ] ] }