From a1c27aec8671577b00b4c4cd701a2b04a61c5cea Mon Sep 17 00:00:00 2001 From: jonylee1986 <2532487686@qq.com> Date: Sat, 10 Jun 2023 15:57:49 +0800 Subject: [PATCH 01/44] add mod007_c3 keyboard --- keyboards/akko/mod007_v3/config.h | 42 +++ keyboards/akko/mod007_v3/halconf.h | 23 ++ keyboards/akko/mod007_v3/info.json | 301 ++++++++++++++++++ .../akko/mod007_v3/keymaps/default/keymap.c | 91 ++++++ keyboards/akko/mod007_v3/keymaps/via/keymap.c | 91 ++++++ keyboards/akko/mod007_v3/keymaps/via/rules.mk | 2 + keyboards/akko/mod007_v3/mcuconf.h | 24 ++ keyboards/akko/mod007_v3/mod007_v3.c | 50 +++ keyboards/akko/mod007_v3/readme.md | 19 ++ keyboards/akko/mod007_v3/rules.mk | 2 + 10 files changed, 645 insertions(+) create mode 100644 keyboards/akko/mod007_v3/config.h create mode 100644 keyboards/akko/mod007_v3/halconf.h create mode 100644 keyboards/akko/mod007_v3/info.json create mode 100644 keyboards/akko/mod007_v3/keymaps/default/keymap.c create mode 100644 keyboards/akko/mod007_v3/keymaps/via/keymap.c create mode 100644 keyboards/akko/mod007_v3/keymaps/via/rules.mk create mode 100644 keyboards/akko/mod007_v3/mcuconf.h create mode 100644 keyboards/akko/mod007_v3/mod007_v3.c create mode 100644 keyboards/akko/mod007_v3/readme.md create mode 100644 keyboards/akko/mod007_v3/rules.mk diff --git a/keyboards/akko/mod007_v3/config.h b/keyboards/akko/mod007_v3/config.h new file mode 100644 index 00000000000..4be78c5d448 --- /dev/null +++ b/keyboards/akko/mod007_v3/config.h @@ -0,0 +1,42 @@ +/* Copyright (C) 2022 jonylee@hfd + * + * 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 . + */ + +#pragma once + +/* Use 6 dynamic keymap layers */ +#define DYNAMIC_KEYMAP_LAYER_COUNT 6 + +#define RGB_TRIGGER_ON_KEYDOWN + +/* encoder */ +#define ENCODER_DEFAULT_POS 0x3 + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +/* SPI Config for spi flash*/ +#define SPI_DRIVER SPIDQ +#define SPI_SCK_PIN B3 +#define SPI_MOSI_PIN B5 +#define SPI_MISO_PIN B4 +#define SPI_MOSI_PAL_MODE 5 + +#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12 +#define WEAR_LEVELING_BACKING_SIZE (8 * 1024) + +//#define DISABLE_M1_KEYCODES /*If you need to change or restore the default QMK button function, please open it*/ diff --git a/keyboards/akko/mod007_v3/halconf.h b/keyboards/akko/mod007_v3/halconf.h new file mode 100644 index 00000000000..2f64e65393a --- /dev/null +++ b/keyboards/akko/mod007_v3/halconf.h @@ -0,0 +1,23 @@ +/* Copyright (C) 2022 jonylee@hfd + * + * 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 . + */ +#pragma once + +#define HAL_USE_I2C TRUE +#define HAL_USE_SPI TRUE +#define SPI_USE_WAIT TRUE +#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD + +#include_next diff --git a/keyboards/akko/mod007_v3/info.json b/keyboards/akko/mod007_v3/info.json new file mode 100644 index 00000000000..85cc25e128a --- /dev/null +++ b/keyboards/akko/mod007_v3/info.json @@ -0,0 +1,301 @@ +{ + "keyboard_name": "MOD007_V3", + "manufacturer": "Akko", + "url":"https://www.akkogear.com", + "maintainer": "jonylee@hfd", + "usb": { + "vid": "0xFFFE", + "pid": "0x000F", + "device_version": "1.0.3", + "force_nkro": true, + "suspend_wakeup_delay": 400 + }, + "processor": "WB32FQ95", + "bootloader": "wb32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": false, + "command": false, + "nkro": true, + "encoder": true, + "rgb_matrix": false + }, + "matrix_pins": { + "cols": [ "C1", "C2", "C3", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B2"], + "rows": [ "B15", "C6", "C7", "C8", "C9", "A8"] + }, + "diode_direction": "ROW2COL", + "encoder": { + "rotary": [ + { "pin_a": "B14", "pin_b": "B13" } + ] + }, + "layouts": { + "LAYOUT_all": { + "layout": [ + { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0 }, + { "label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0 }, + { "label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0 }, + { "label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0 }, + { "label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0 }, + { "label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0 }, + { "label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0 }, + { "label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0 }, + { "label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0 }, + { "label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0 }, + { "label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0 }, + { "label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0 }, + { "label": "Del", "matrix": [0, 13], "x": 14, "y": 0 }, + { "label": "Mute", "matrix": [0, 15], "x": 15.5, "y": 0 }, + { "label": "~", "matrix": [1, 0], "x": 0, "y": 1.25 }, + { "label": "!", "matrix": [1, 1], "x": 1, "y": 1.25 }, + { "label": "@", "matrix": [1, 2], "x": 2, "y": 1.25 }, + { "label": "#", "matrix": [1, 3], "x": 3, "y": 1.25 }, + { "label": "$", "matrix": [1, 4], "x": 4, "y": 1.25 }, + { "label": "%", "matrix": [1, 5], "x": 5, "y": 1.25 }, + { "label": "^", "matrix": [1, 6], "x": 6, "y": 1.25 }, + { "label": "&", "matrix": [1, 7], "x": 7, "y": 1.25 }, + { "label": "*", "matrix": [1, 8], "x": 8, "y": 1.25 }, + { "label": "(", "matrix": [1, 9], "x": 9, "y": 1.25 }, + { "label": ")", "matrix": [1, 10], "x": 10, "y": 1.25 }, + { "label": "_", "matrix": [1, 11], "x": 11, "y": 1.25 }, + { "label": "+", "matrix": [1, 12], "x": 12, "y": 1.25 }, + { "label": "Bksp", "matrix": [1, 13], "w": 2, "x": 13, "y": 1.25 }, + { "label": "Home", "matrix": [1, 15], "x": 15.5, "y": 1.25 }, + { "label": "Tab", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 }, + { "label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25 }, + { "label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25 }, + { "label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25 }, + { "label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25 }, + { "label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25 }, + { "label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25 }, + { "label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25 }, + { "label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25 }, + { "label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25 }, + { "label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25 }, + { "label": "{", "matrix": [2, 11], "x": 11.5, "y": 2.25 }, + { "label": "}", "matrix": [2, 12], "x": 12.5, "y": 2.25 }, + { "label": "|", "matrix": [2, 13], "w": 1.5, "x": 13.5, "y": 2.25 }, + { "label": "PageUp", "matrix": [2, 15], "x": 15.5, "y": 2.25 }, + { "label": "Caps Lock", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 }, + { "label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25 }, + { "label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25 }, + { "label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25 }, + { "label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25 }, + { "label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25 }, + { "label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25 }, + { "label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25 }, + { "label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25 }, + { "label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25 }, + { "label": ":", "matrix": [3, 10], "x": 10.75, "y": 3.25 }, + { "label": "\"", "matrix": [3, 11], "x": 11.75, "y": 3.25 }, + { "label": ":", "matrix": [3, 12], "x": 12.75, "y": 3.25 }, + { "label": "Enter", "matrix": [3, 13], "w": 1.25, "x": 13.75, "y": 3.25 }, + { "label": "PageDn", "matrix": [3, 15], "x": 15.5, "y": 3.25 }, + { "label": "Shift", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4.25 }, + { "label": ":", "matrix": [4, 11], "x": 1.25, "y": 4.25 }, + { "label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25 }, + { "label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25 }, + { "label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25 }, + { "label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25 }, + { "label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25 }, + { "label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25 }, + { "label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25 }, + { "label": "<", "matrix": [4, 8], "x": 9.25, "y": 4.25 }, + { "label": ">", "matrix": [4, 9], "x": 10.25, "y": 4.25 }, + { "label": "?", "matrix": [4, 10], "x": 11.25, "y": 4.25 }, + { "label": "Shift", "matrix": [4, 13], "w": 1.75, "x": 12.25, "y": 4.25 }, + { "label": "Up", "matrix": [4, 14], "x": 14.25, "y": 4.25 }, + { "label": "End", "matrix": [4, 15], "x": 15.5, "y": 4.25 }, + { "label": "Ctrl", "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.25 }, + { "label": "Win", "matrix": [5, 1], "w": 1.25, "x": 1.25, "y": 5.25 }, + { "label": "Alt", "matrix": [5, 2], "w": 1.25, "x": 2.5, "y": 5.25 }, + { "label": "Space", "matrix": [5, 5], "w": 6.25, "x": 3.75, "y": 5.25 }, + { "label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25 }, + { "label": "Fn", "matrix": [5, 10], "x": 11, "y": 5.25 }, + { "label": "Ctrl", "matrix": [5, 11], "x": 12, "y": 5.25 }, + { "label": "Left", "matrix": [5, 13], "x": 13.25, "y": 5.25 }, + { "label": "Down", "matrix": [5, 14], "x": 14.25, "y": 5.25 }, + { "label": "Right", "matrix": [5, 15], "x": 15.25, "y": 5.25 } + ] + }, + "LAYOUT_ansi": { + "layout": [ + { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0 }, + { "label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0 }, + { "label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0 }, + { "label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0 }, + { "label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0 }, + { "label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0 }, + { "label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0 }, + { "label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0 }, + { "label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0 }, + { "label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0 }, + { "label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0 }, + { "label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0 }, + { "label": "Del", "matrix": [0, 13], "x": 14, "y": 0 }, + { "label": "Mute", "matrix": [0, 15], "x": 15.5, "y": 0 }, + { "label": "~", "matrix": [1, 0], "x": 0, "y": 1.25 }, + { "label": "!", "matrix": [1, 1], "x": 1, "y": 1.25 }, + { "label": "@", "matrix": [1, 2], "x": 2, "y": 1.25 }, + { "label": "#", "matrix": [1, 3], "x": 3, "y": 1.25 }, + { "label": "$", "matrix": [1, 4], "x": 4, "y": 1.25 }, + { "label": "%", "matrix": [1, 5], "x": 5, "y": 1.25 }, + { "label": "^", "matrix": [1, 6], "x": 6, "y": 1.25 }, + { "label": "&", "matrix": [1, 7], "x": 7, "y": 1.25 }, + { "label": "*", "matrix": [1, 8], "x": 8, "y": 1.25 }, + { "label": "(", "matrix": [1, 9], "x": 9, "y": 1.25 }, + { "label": ")", "matrix": [1, 10], "x": 10, "y": 1.25 }, + { "label": "_", "matrix": [1, 11], "x": 11, "y": 1.25 }, + { "label": "+", "matrix": [1, 12], "x": 12, "y": 1.25 }, + { "label": "Bksp", "matrix": [1, 13], "w": 2, "x": 13, "y": 1.25 }, + { "label": "Home", "matrix": [1, 15], "x": 15.5, "y": 1.25 }, + { "label": "Tab", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 }, + { "label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25 }, + { "label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25 }, + { "label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25 }, + { "label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25 }, + { "label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25 }, + { "label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25 }, + { "label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25 }, + { "label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25 }, + { "label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25 }, + { "label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25 }, + { "label": "{", "matrix": [2, 11], "x": 11.5, "y": 2.25 }, + { "label": "}", "matrix": [2, 12], "x": 12.5, "y": 2.25 }, + { "label": "|", "matrix": [2, 13], "w": 1.5, "x": 13.5, "y": 2.25 }, + { "label": "PageUp", "matrix": [2, 15], "x": 15.5, "y": 2.25 }, + { "label": "Caps Lock", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 }, + { "label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25 }, + { "label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25 }, + { "label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25 }, + { "label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25 }, + { "label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25 }, + { "label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25 }, + { "label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25 }, + { "label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25 }, + { "label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25 }, + { "label": ":", "matrix": [3, 10], "x": 10.75, "y": 3.25 }, + { "label": "\"", "matrix": [3, 11], "x": 11.75, "y": 3.25 }, + { "label": "Enter", "matrix": [3, 13], "w": 2.25, "x": 12.75, "y": 3.25 }, + { "label": "PageDn", "matrix": [3, 15], "x": 15.5, "y": 3.25 }, + { "label": "Shift", "matrix": [4, 0], "w": 2.25, "x": 0, "y": 4.25 }, + { "label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25 }, + { "label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25 }, + { "label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25 }, + { "label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25 }, + { "label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25 }, + { "label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25 }, + { "label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25 }, + { "label": "<", "matrix": [4, 8], "x": 9.25, "y": 4.25 }, + { "label": ">", "matrix": [4, 9], "x": 10.25, "y": 4.25 }, + { "label": "?", "matrix": [4, 10], "x": 11.25, "y": 4.25 }, + { "label": "Shift", "matrix": [4, 13], "w": 1.75, "x": 12.25, "y": 4.25 }, + { "label": "Up", "matrix": [4, 14], "x": 14.25, "y": 4.25 }, + { "label": "End", "matrix": [4, 15], "x": 15.5, "y": 4.25 }, + { "label": "Ctrl", "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.25 }, + { "label": "Win", "matrix": [5, 1], "w": 1.25, "x": 1.25, "y": 5.25 }, + { "label": "Alt", "matrix": [5, 2], "w": 1.25, "x": 2.5, "y": 5.25 }, + { "label": "Space", "matrix": [5, 5], "w": 6.25, "x": 3.75, "y": 5.25 }, + { "label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25 }, + { "label": "Fn", "matrix": [5, 10], "x": 11, "y": 5.25 }, + { "label": "Ctrl", "matrix": [5, 11], "x": 12, "y": 5.25 }, + { "label": "Left", "matrix": [5, 13], "x": 13.25, "y": 5.25 }, + { "label": "Down", "matrix": [5, 14], "x": 14.25, "y": 5.25 }, + { "label": "Right", "matrix": [5, 15], "x": 15.25, "y": 5.25 } + ] + }, + "LAYOUT_iso": { + "layout": [ + { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0 }, + { "label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0 }, + { "label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0 }, + { "label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0 }, + { "label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0 }, + { "label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0 }, + { "label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0 }, + { "label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0 }, + { "label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0 }, + { "label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0 }, + { "label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0 }, + { "label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0 }, + { "label": "Del", "matrix": [0, 13], "x": 14, "y": 0 }, + { "label": "Mute", "matrix": [0, 15], "x": 15.5, "y": 0 }, + { "label": "~", "matrix": [1, 0], "x": 0, "y": 1.25 }, + { "label": "!", "matrix": [1, 1], "x": 1, "y": 1.25 }, + { "label": "@", "matrix": [1, 2], "x": 2, "y": 1.25 }, + { "label": "#", "matrix": [1, 3], "x": 3, "y": 1.25 }, + { "label": "$", "matrix": [1, 4], "x": 4, "y": 1.25 }, + { "label": "%", "matrix": [1, 5], "x": 5, "y": 1.25 }, + { "label": "^", "matrix": [1, 6], "x": 6, "y": 1.25 }, + { "label": "&", "matrix": [1, 7], "x": 7, "y": 1.25 }, + { "label": "*", "matrix": [1, 8], "x": 8, "y": 1.25 }, + { "label": "(", "matrix": [1, 9], "x": 9, "y": 1.25 }, + { "label": ")", "matrix": [1, 10], "x": 10, "y": 1.25 }, + { "label": "_", "matrix": [1, 11], "x": 11, "y": 1.25 }, + { "label": "+", "matrix": [1, 12], "x": 12, "y": 1.25 }, + { "label": "Bksp", "matrix": [1, 13], "w": 2, "x": 13, "y": 1.25 }, + { "label": "Home", "matrix": [1, 15], "x": 15.5, "y": 1.25 }, + { "label": "Tab", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 }, + { "label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25 }, + { "label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25 }, + { "label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25 }, + { "label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25 }, + { "label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25 }, + { "label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25 }, + { "label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25 }, + { "label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25 }, + { "label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25 }, + { "label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25 }, + { "label": "{", "matrix": [2, 11], "x": 11.5, "y": 2.25 }, + { "label": "}", "matrix": [2, 12], "x": 12.5, "y": 2.25 }, + { "label": "PageUp", "matrix": [2, 15], "x": 15.5, "y": 2.25 }, + { "label": "Caps Lock", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 }, + { "label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25 }, + { "label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25 }, + { "label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25 }, + { "label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25 }, + { "label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25 }, + { "label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25 }, + { "label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25 }, + { "label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25 }, + { "label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25 }, + { "label": ":", "matrix": [3, 10], "x": 10.75, "y": 3.25 }, + { "label": "\"", "matrix": [3, 11], "x": 11.75, "y": 3.25 }, + { "label": ":", "matrix": [3, 12], "x": 12.75, "y": 3.25 }, + { "label": "Enter", "matrix": [3, 13], "w": 1.25, "h": 2, "x": 13.75, "y": 2.25 }, + { "label": "PageDn", "matrix": [3, 15], "x": 15.5, "y": 3.25 }, + { "label": "Shift", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4.25 }, + { "label": ":", "matrix": [4, 11], "x": 1.25, "y": 4.25 }, + { "label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25 }, + { "label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25 }, + { "label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25 }, + { "label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25 }, + { "label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25 }, + { "label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25 }, + { "label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25 }, + { "label": "<", "matrix": [4, 8], "x": 9.25, "y": 4.25 }, + { "label": ">", "matrix": [4, 9], "x": 10.25, "y": 4.25 }, + { "label": "?", "matrix": [4, 10], "x": 11.25, "y": 4.25 }, + { "label": "Shift", "matrix": [4, 13], "w": 1.75, "x": 12.25, "y": 4.25 }, + { "label": "Up", "matrix": [4, 14], "x": 14.25, "y": 4.25 }, + { "label": "End", "matrix": [4, 15], "x": 15.5, "y": 4.25 }, + { "label": "Ctrl", "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.25 }, + { "label": "Win", "matrix": [5, 1], "w": 1.25, "x": 1.25, "y": 5.25 }, + { "label": "Alt", "matrix": [5, 2], "w": 1.25, "x": 2.5, "y": 5.25 }, + { "label": "Space", "matrix": [5, 5], "w": 6.25, "x": 3.75, "y": 5.25 }, + { "label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25 }, + { "label": "Fn", "matrix": [5, 10], "x": 11, "y": 5.25 }, + { "label": "Ctrl", "matrix": [5, 11], "x": 12, "y": 5.25 }, + { "label": "Left", "matrix": [5, 13], "x": 13.25, "y": 5.25 }, + { "label": "Down", "matrix": [5, 14], "x": 14.25, "y": 5.25 }, + { "label": "Right", "matrix": [5, 15], "x": 15.25, "y": 5.25 } + ] + } + } +} diff --git a/keyboards/akko/mod007_v3/keymaps/default/keymap.c b/keyboards/akko/mod007_v3/keymaps/default/keymap.c new file mode 100644 index 00000000000..639c9f7b950 --- /dev/null +++ b/keyboards/akko/mod007_v3/keymaps/default/keymap.c @@ -0,0 +1,91 @@ +/* Copyright (C) 2023 jonylee@hfd + * + * 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 +enum __layers { + WIN_B, + WIN_W, + WIN_FN, + MAC_B, + MAC_W, + MAC_FN +}; +#define KC_TASK LGUI(KC_TAB) +#define KC_FLXP LGUI(KC_E) +#define KC_SIRI LGUI(KC_SPC) +// clang-format off +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [WIN_B] = LAYOUT_all( /* Base */ + 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_DEL, KC_MUTE, + 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_HOME, + 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_PGUP, + 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_NUHS, KC_ENT, KC_PGDN, + KC_LSFT, KC_NUBS, 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_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + + [WIN_W] = LAYOUT_all( /* Base */ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_W, _______, + _______, _______, _______, _______, _______, MO(WIN_FN), _______, KC_A, KC_S, KC_D), + + [WIN_FN] = LAYOUT_all( /* FN */ + _______, KC_MYCM, KC_MAIL, KC_WSCH, KC_WHOM, KC_MSEL, KC_MPLY, KC_MPRV, KC_MNXT, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______,TG(WIN_W),_______, _______, _______, _______, _______, KC_INS, DF(MAC_B),KC_PSCR,_______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, + _______, GU_TOGG, _______, _______, _______, _______, _______, _______, _______, _______), + + [MAC_B] = LAYOUT_all( /* Base */ + KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_SIRI, KC_F5, KC_F6, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,KC_VOLU, KC_DEL, KC_MUTE, + 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_HOME, + 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_PGUP, + 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_NUHS, KC_ENT, KC_PGDN, + KC_LSFT, KC_NUBS, 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_END, + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(MAC_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + + [MAC_W] = LAYOUT_all( /* Base */ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_W, _______, + _______, _______, _______, _______, _______, MO(MAC_FN), _______, KC_A, KC_S, KC_D), + + [MAC_FN] = LAYOUT_all( /* FN */ + _______, KC_F1, KC_F2, KC_F3, KC_F4, _______, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______,TG(MAC_W),_______, _______, _______, _______, _______, KC_INS, DF(WIN_B),KC_PSCR,_______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______) +}; + +// clang-format off +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [WIN_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, + [WIN_W] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, + [WIN_FN] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, + [MAC_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, + [MAC_W] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, + [MAC_FN] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) } +}; +#endif diff --git a/keyboards/akko/mod007_v3/keymaps/via/keymap.c b/keyboards/akko/mod007_v3/keymaps/via/keymap.c new file mode 100644 index 00000000000..639c9f7b950 --- /dev/null +++ b/keyboards/akko/mod007_v3/keymaps/via/keymap.c @@ -0,0 +1,91 @@ +/* Copyright (C) 2023 jonylee@hfd + * + * 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 +enum __layers { + WIN_B, + WIN_W, + WIN_FN, + MAC_B, + MAC_W, + MAC_FN +}; +#define KC_TASK LGUI(KC_TAB) +#define KC_FLXP LGUI(KC_E) +#define KC_SIRI LGUI(KC_SPC) +// clang-format off +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [WIN_B] = LAYOUT_all( /* Base */ + 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_DEL, KC_MUTE, + 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_HOME, + 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_PGUP, + 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_NUHS, KC_ENT, KC_PGDN, + KC_LSFT, KC_NUBS, 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_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + + [WIN_W] = LAYOUT_all( /* Base */ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_W, _______, + _______, _______, _______, _______, _______, MO(WIN_FN), _______, KC_A, KC_S, KC_D), + + [WIN_FN] = LAYOUT_all( /* FN */ + _______, KC_MYCM, KC_MAIL, KC_WSCH, KC_WHOM, KC_MSEL, KC_MPLY, KC_MPRV, KC_MNXT, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______,TG(WIN_W),_______, _______, _______, _______, _______, KC_INS, DF(MAC_B),KC_PSCR,_______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, + _______, GU_TOGG, _______, _______, _______, _______, _______, _______, _______, _______), + + [MAC_B] = LAYOUT_all( /* Base */ + KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_SIRI, KC_F5, KC_F6, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,KC_VOLU, KC_DEL, KC_MUTE, + 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_HOME, + 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_PGUP, + 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_NUHS, KC_ENT, KC_PGDN, + KC_LSFT, KC_NUBS, 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_END, + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(MAC_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + + [MAC_W] = LAYOUT_all( /* Base */ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_W, _______, + _______, _______, _______, _______, _______, MO(MAC_FN), _______, KC_A, KC_S, KC_D), + + [MAC_FN] = LAYOUT_all( /* FN */ + _______, KC_F1, KC_F2, KC_F3, KC_F4, _______, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______,TG(MAC_W),_______, _______, _______, _______, _______, KC_INS, DF(WIN_B),KC_PSCR,_______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______) +}; + +// clang-format off +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [WIN_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, + [WIN_W] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, + [WIN_FN] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, + [MAC_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, + [MAC_W] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, + [MAC_FN] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) } +}; +#endif diff --git a/keyboards/akko/mod007_v3/keymaps/via/rules.mk b/keyboards/akko/mod007_v3/keymaps/via/rules.mk new file mode 100644 index 00000000000..4253f570f0b --- /dev/null +++ b/keyboards/akko/mod007_v3/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +ENCODER_MAP_ENABLE = yes \ No newline at end of file diff --git a/keyboards/akko/mod007_v3/mcuconf.h b/keyboards/akko/mod007_v3/mcuconf.h new file mode 100644 index 00000000000..0d16f4f04e4 --- /dev/null +++ b/keyboards/akko/mod007_v3/mcuconf.h @@ -0,0 +1,24 @@ +/* Copyright (C) 2022 jonylee@hfd + * + * 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 . + */ +#pragma once + +#include_next + +#undef WB32_SPI_USE_QSPI +#define WB32_SPI_USE_QSPI TRUE + +#undef WB32_I2C_USE_I2C1 +#define WB32_I2C_USE_I2C1 TRUE diff --git a/keyboards/akko/mod007_v3/mod007_v3.c b/keyboards/akko/mod007_v3/mod007_v3.c new file mode 100644 index 00000000000..57a2b7f3f96 --- /dev/null +++ b/keyboards/akko/mod007_v3/mod007_v3.c @@ -0,0 +1,50 @@ +/* Copyright (C) 2022 jonylee@hfd + * + * 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 "quantum.h" + +// clang-format off +enum __layers { + WIN_B, + WIN_W, + WIN_FN, + MAC_B, + MAC_W, + MAC_FN +}; +bool process_record_kb(uint16_t keycode, keyrecord_t *record) { + if (!process_record_user(keycode, record)) { + return false; + } + switch (keycode) { + case DF(WIN_B): + if ( record->event.pressed) { + set_single_persistent_default_layer(WIN_B); + layer_state_set(1<event.pressed) { + set_single_persistent_default_layer(MAC_B); + layer_state_set(1< Date: Mon, 12 Jun 2023 11:36:34 +0800 Subject: [PATCH 02/44] Update keyboards/akko/mod007_v3/config.h Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/akko/mod007_v3/config.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/akko/mod007_v3/config.h b/keyboards/akko/mod007_v3/config.h index 4be78c5d448..7df8cac67ab 100644 --- a/keyboards/akko/mod007_v3/config.h +++ b/keyboards/akko/mod007_v3/config.h @@ -38,5 +38,3 @@ #define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12 #define WEAR_LEVELING_BACKING_SIZE (8 * 1024) - -//#define DISABLE_M1_KEYCODES /*If you need to change or restore the default QMK button function, please open it*/ From 253528eec3262cc984f7be780331e913fbb6b827 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Mon, 12 Jun 2023 11:36:41 +0800 Subject: [PATCH 03/44] Update keyboards/akko/mod007_v3/info.json Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/akko/mod007_v3/info.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/akko/mod007_v3/info.json b/keyboards/akko/mod007_v3/info.json index 85cc25e128a..4337063f9c2 100644 --- a/keyboards/akko/mod007_v3/info.json +++ b/keyboards/akko/mod007_v3/info.json @@ -19,8 +19,7 @@ "console": false, "command": false, "nkro": true, - "encoder": true, - "rgb_matrix": false + "encoder": true }, "matrix_pins": { "cols": [ "C1", "C2", "C3", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B2"], From 236e93472b2cf46303bba9390af68a26a60098e3 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Mon, 12 Jun 2023 11:37:00 +0800 Subject: [PATCH 04/44] Update keyboards/akko/mod007_v3/keymaps/default/keymap.c Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/akko/mod007_v3/keymaps/default/keymap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/akko/mod007_v3/keymaps/default/keymap.c b/keyboards/akko/mod007_v3/keymaps/default/keymap.c index 639c9f7b950..36e619586ab 100644 --- a/keyboards/akko/mod007_v3/keymaps/default/keymap.c +++ b/keyboards/akko/mod007_v3/keymaps/default/keymap.c @@ -23,8 +23,7 @@ enum __layers { MAC_W, MAC_FN }; -#define KC_TASK LGUI(KC_TAB) -#define KC_FLXP LGUI(KC_E) + #define KC_SIRI LGUI(KC_SPC) // clang-format off const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { From c608f65599146d2b020076775f20994e5e0e1cb3 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Mon, 12 Jun 2023 11:37:06 +0800 Subject: [PATCH 05/44] Update keyboards/akko/mod007_v3/keymaps/via/keymap.c Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/akko/mod007_v3/keymaps/via/keymap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/akko/mod007_v3/keymaps/via/keymap.c b/keyboards/akko/mod007_v3/keymaps/via/keymap.c index 639c9f7b950..36e619586ab 100644 --- a/keyboards/akko/mod007_v3/keymaps/via/keymap.c +++ b/keyboards/akko/mod007_v3/keymaps/via/keymap.c @@ -23,8 +23,7 @@ enum __layers { MAC_W, MAC_FN }; -#define KC_TASK LGUI(KC_TAB) -#define KC_FLXP LGUI(KC_E) + #define KC_SIRI LGUI(KC_SPC) // clang-format off const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { From b8372fa02ed990b6bde399cfcea3c37cfd2042ac Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Mon, 12 Jun 2023 11:37:25 +0800 Subject: [PATCH 06/44] Update keyboards/akko/mod007_v3/keymaps/default/keymap.c Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/akko/mod007_v3/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/akko/mod007_v3/keymaps/default/keymap.c b/keyboards/akko/mod007_v3/keymaps/default/keymap.c index 36e619586ab..0208a2522a6 100644 --- a/keyboards/akko/mod007_v3/keymaps/default/keymap.c +++ b/keyboards/akko/mod007_v3/keymaps/default/keymap.c @@ -77,7 +77,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______) }; -// clang-format off +// clang-format on #if defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { [WIN_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, From 70ebb09ab876a407eb3a6a0c9f25efae692f40db Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Mon, 12 Jun 2023 11:37:31 +0800 Subject: [PATCH 07/44] Update keyboards/akko/mod007_v3/keymaps/via/keymap.c Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/akko/mod007_v3/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/akko/mod007_v3/keymaps/via/keymap.c b/keyboards/akko/mod007_v3/keymaps/via/keymap.c index 36e619586ab..0208a2522a6 100644 --- a/keyboards/akko/mod007_v3/keymaps/via/keymap.c +++ b/keyboards/akko/mod007_v3/keymaps/via/keymap.c @@ -77,7 +77,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______) }; -// clang-format off +// clang-format on #if defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { [WIN_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, From b02fb95690482e43df94fa4bac5b7abf1872e5c2 Mon Sep 17 00:00:00 2001 From: jonylee1986 <2532487686@qq.com> Date: Mon, 12 Jun 2023 11:41:35 +0800 Subject: [PATCH 08/44] add keymap/default/rules.mk --- keyboards/akko/mod007_v3/keymaps/default/rules.mk | 1 + 1 file changed, 1 insertion(+) create mode 100644 keyboards/akko/mod007_v3/keymaps/default/rules.mk diff --git a/keyboards/akko/mod007_v3/keymaps/default/rules.mk b/keyboards/akko/mod007_v3/keymaps/default/rules.mk new file mode 100644 index 00000000000..a40474b4d5c --- /dev/null +++ b/keyboards/akko/mod007_v3/keymaps/default/rules.mk @@ -0,0 +1 @@ +ENCODER_MAP_ENABLE = yes \ No newline at end of file From af541ce2d0d1899fb6606a70926f6d6863a8c245 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Tue, 13 Jun 2023 17:01:17 +0800 Subject: [PATCH 09/44] Update mod007_v3.c --- keyboards/akko/mod007_v3/mod007_v3.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/keyboards/akko/mod007_v3/mod007_v3.c b/keyboards/akko/mod007_v3/mod007_v3.c index 57a2b7f3f96..f5b51d8a888 100644 --- a/keyboards/akko/mod007_v3/mod007_v3.c +++ b/keyboards/akko/mod007_v3/mod007_v3.c @@ -33,13 +33,11 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { case DF(WIN_B): if ( record->event.pressed) { set_single_persistent_default_layer(WIN_B); - layer_state_set(1<event.pressed) { set_single_persistent_default_layer(MAC_B); - layer_state_set(1< Date: Thu, 15 Jun 2023 10:03:28 +0800 Subject: [PATCH 10/44] Update keyboards/akko/mod007_v3/readme.md Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/akko/mod007_v3/readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/akko/mod007_v3/readme.md b/keyboards/akko/mod007_v3/readme.md index 8017d037bef..84f1b893c19 100644 --- a/keyboards/akko/mod007_v3/readme.md +++ b/keyboards/akko/mod007_v3/readme.md @@ -8,11 +8,11 @@ A customizable 75% encoder keyboard. Make example for this keyboard (after setting up your build environment): - make monsgeek/mod007_v3:default + make akko/mod007_v3:default Flashing example for this keyboard: - make monsgeek/mod007_v3:default:flash + make akko/mod007_v3:default:flash **Reset Key**: Hold down the key located at *K01*, which programmed as *Esc* while plugging in the keyboard. From 05e111d61f633112a9b7fd57905b71f2b9b57555 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Fri, 16 Jun 2023 11:25:14 +0800 Subject: [PATCH 11/44] Update info.json --- keyboards/akko/mod007_v3/info.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/akko/mod007_v3/info.json b/keyboards/akko/mod007_v3/info.json index 4337063f9c2..7fe622b8f7f 100644 --- a/keyboards/akko/mod007_v3/info.json +++ b/keyboards/akko/mod007_v3/info.json @@ -7,7 +7,6 @@ "vid": "0xFFFE", "pid": "0x000F", "device_version": "1.0.3", - "force_nkro": true, "suspend_wakeup_delay": 400 }, "processor": "WB32FQ95", From 84178a12d9b78a273f3249cd3e0c5f1566385de6 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Mon, 18 Sep 2023 12:20:16 +0800 Subject: [PATCH 12/44] Update keyboards/akko/mod007_v3/keymaps/via/keymap.c Co-authored-by: Ryan --- keyboards/akko/mod007_v3/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/akko/mod007_v3/keymaps/via/keymap.c b/keyboards/akko/mod007_v3/keymaps/via/keymap.c index 0208a2522a6..1e71dde8019 100644 --- a/keyboards/akko/mod007_v3/keymaps/via/keymap.c +++ b/keyboards/akko/mod007_v3/keymaps/via/keymap.c @@ -79,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // clang-format on #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [WIN_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, [WIN_W] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, [WIN_FN] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, From 3a813588bf4e4c8f9ae2927cb2b37dc50a338ddc Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Mon, 18 Sep 2023 12:20:36 +0800 Subject: [PATCH 13/44] Update keyboards/akko/mod007_v3/keymaps/default/keymap.c Co-authored-by: Ryan --- keyboards/akko/mod007_v3/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/akko/mod007_v3/keymaps/default/keymap.c b/keyboards/akko/mod007_v3/keymaps/default/keymap.c index 0208a2522a6..1e71dde8019 100644 --- a/keyboards/akko/mod007_v3/keymaps/default/keymap.c +++ b/keyboards/akko/mod007_v3/keymaps/default/keymap.c @@ -79,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // clang-format on #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [WIN_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, [WIN_W] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, [WIN_FN] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, From 4b95eec63edb651370b08aee80eba35ad76d984e Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Wed, 27 Sep 2023 10:40:29 +0800 Subject: [PATCH 14/44] Update keyboards/akko/mod007_v3/config.h Co-authored-by: Drashna Jaelre --- keyboards/akko/mod007_v3/config.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/akko/mod007_v3/config.h b/keyboards/akko/mod007_v3/config.h index 7df8cac67ab..30d1636a19c 100644 --- a/keyboards/akko/mod007_v3/config.h +++ b/keyboards/akko/mod007_v3/config.h @@ -16,8 +16,6 @@ #pragma once -/* Use 6 dynamic keymap layers */ -#define DYNAMIC_KEYMAP_LAYER_COUNT 6 #define RGB_TRIGGER_ON_KEYDOWN From 704d4905c6806edd588478b77c96297703950292 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Wed, 27 Sep 2023 10:41:06 +0800 Subject: [PATCH 15/44] Update keyboards/akko/mod007_v3/info.json Co-authored-by: Drashna Jaelre --- keyboards/akko/mod007_v3/info.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keyboards/akko/mod007_v3/info.json b/keyboards/akko/mod007_v3/info.json index 7fe622b8f7f..77b2e729767 100644 --- a/keyboards/akko/mod007_v3/info.json +++ b/keyboards/akko/mod007_v3/info.json @@ -20,7 +20,10 @@ "nkro": true, "encoder": true }, - "matrix_pins": { + "dynamic_keymap": { + "layer_count": 6 + }, + "matrix_pins": { "cols": [ "C1", "C2", "C3", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B2"], "rows": [ "B15", "C6", "C7", "C8", "C9", "A8"] }, From 052a3609dec88a735af8ad345341c555faed7700 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Wed, 27 Sep 2023 10:57:54 +0800 Subject: [PATCH 16/44] Update keymap.c replace the tabs with spaces --- .../akko/mod007_v3/keymaps/default/keymap.c | 72 +++++++++---------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/keyboards/akko/mod007_v3/keymaps/default/keymap.c b/keyboards/akko/mod007_v3/keymaps/default/keymap.c index 1e71dde8019..9a1e0fceb33 100644 --- a/keyboards/akko/mod007_v3/keymaps/default/keymap.c +++ b/keyboards/akko/mod007_v3/keymaps/default/keymap.c @@ -29,52 +29,52 @@ enum __layers { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [WIN_B] = LAYOUT_all( /* Base */ - 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_DEL, KC_MUTE, - 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_HOME, - 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_PGUP, - 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_NUHS, KC_ENT, KC_PGDN, - KC_LSFT, KC_NUBS, 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_END, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + 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_DEL, KC_MUTE, + 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_HOME, + 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_PGUP, + 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_NUHS, KC_ENT, KC_PGDN, + KC_LSFT, KC_NUBS, 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_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [WIN_W] = LAYOUT_all( /* Base */ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_W, _______, - _______, _______, _______, _______, _______, MO(WIN_FN), _______, KC_A, KC_S, KC_D), + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_W, _______, + _______, _______, _______, _______, _______, MO(WIN_FN), _______, KC_A, KC_S, KC_D), [WIN_FN] = LAYOUT_all( /* FN */ - _______, KC_MYCM, KC_MAIL, KC_WSCH, KC_WHOM, KC_MSEL, KC_MPLY, KC_MPRV, KC_MNXT, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______,TG(WIN_W),_______, _______, _______, _______, _______, KC_INS, DF(MAC_B),KC_PSCR,_______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, - _______, GU_TOGG, _______, _______, _______, _______, _______, _______, _______, _______), + _______, KC_MYCM, KC_MAIL, KC_WSCH, KC_WHOM, KC_MSEL, KC_MPLY, KC_MPRV, KC_MNXT, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______,TG(WIN_W),_______, _______, _______, _______, _______, KC_INS, DF(MAC_B),KC_PSCR,_______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, + _______, GU_TOGG, _______, _______, _______, _______, _______, _______, _______, _______), [MAC_B] = LAYOUT_all( /* Base */ - KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_SIRI, KC_F5, KC_F6, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,KC_VOLU, KC_DEL, KC_MUTE, - 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_HOME, - 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_PGUP, - 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_NUHS, KC_ENT, KC_PGDN, - KC_LSFT, KC_NUBS, 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_END, - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(MAC_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_SIRI, KC_F5, KC_F6, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,KC_VOLU, KC_DEL, KC_MUTE, + 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_HOME, + 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_PGUP, + 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_NUHS, KC_ENT, KC_PGDN, + KC_LSFT, KC_NUBS, 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_END, + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(MAC_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [MAC_W] = LAYOUT_all( /* Base */ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_W, _______, - _______, _______, _______, _______, _______, MO(MAC_FN), _______, KC_A, KC_S, KC_D), + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_W, _______, + _______, _______, _______, _______, _______, MO(MAC_FN), _______, KC_A, KC_S, KC_D), [MAC_FN] = LAYOUT_all( /* FN */ - _______, KC_F1, KC_F2, KC_F3, KC_F4, _______, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______,TG(MAC_W),_______, _______, _______, _______, _______, KC_INS, DF(WIN_B),KC_PSCR,_______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______) + _______, KC_F1, KC_F2, KC_F3, KC_F4, _______, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______,TG(MAC_W),_______, _______, _______, _______, _______, KC_INS, DF(WIN_B),KC_PSCR,_______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______) }; // clang-format on From ab51bcd01411d631077085f0c3efd3bd417336af Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Wed, 27 Sep 2023 10:58:55 +0800 Subject: [PATCH 17/44] Update keymap.c replace the tabs with spaces --- keyboards/akko/mod007_v3/keymaps/via/keymap.c | 72 +++++++++---------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/keyboards/akko/mod007_v3/keymaps/via/keymap.c b/keyboards/akko/mod007_v3/keymaps/via/keymap.c index 1e71dde8019..9a1e0fceb33 100644 --- a/keyboards/akko/mod007_v3/keymaps/via/keymap.c +++ b/keyboards/akko/mod007_v3/keymaps/via/keymap.c @@ -29,52 +29,52 @@ enum __layers { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [WIN_B] = LAYOUT_all( /* Base */ - 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_DEL, KC_MUTE, - 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_HOME, - 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_PGUP, - 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_NUHS, KC_ENT, KC_PGDN, - KC_LSFT, KC_NUBS, 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_END, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + 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_DEL, KC_MUTE, + 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_HOME, + 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_PGUP, + 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_NUHS, KC_ENT, KC_PGDN, + KC_LSFT, KC_NUBS, 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_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [WIN_W] = LAYOUT_all( /* Base */ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_W, _______, - _______, _______, _______, _______, _______, MO(WIN_FN), _______, KC_A, KC_S, KC_D), + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_W, _______, + _______, _______, _______, _______, _______, MO(WIN_FN), _______, KC_A, KC_S, KC_D), [WIN_FN] = LAYOUT_all( /* FN */ - _______, KC_MYCM, KC_MAIL, KC_WSCH, KC_WHOM, KC_MSEL, KC_MPLY, KC_MPRV, KC_MNXT, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______,TG(WIN_W),_______, _______, _______, _______, _______, KC_INS, DF(MAC_B),KC_PSCR,_______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, - _______, GU_TOGG, _______, _______, _______, _______, _______, _______, _______, _______), + _______, KC_MYCM, KC_MAIL, KC_WSCH, KC_WHOM, KC_MSEL, KC_MPLY, KC_MPRV, KC_MNXT, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______,TG(WIN_W),_______, _______, _______, _______, _______, KC_INS, DF(MAC_B),KC_PSCR,_______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, + _______, GU_TOGG, _______, _______, _______, _______, _______, _______, _______, _______), [MAC_B] = LAYOUT_all( /* Base */ - KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_SIRI, KC_F5, KC_F6, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,KC_VOLU, KC_DEL, KC_MUTE, - 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_HOME, - 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_PGUP, - 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_NUHS, KC_ENT, KC_PGDN, - KC_LSFT, KC_NUBS, 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_END, - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(MAC_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_SIRI, KC_F5, KC_F6, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,KC_VOLU, KC_DEL, KC_MUTE, + 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_HOME, + 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_PGUP, + 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_NUHS, KC_ENT, KC_PGDN, + KC_LSFT, KC_NUBS, 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_END, + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(MAC_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [MAC_W] = LAYOUT_all( /* Base */ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_W, _______, - _______, _______, _______, _______, _______, MO(MAC_FN), _______, KC_A, KC_S, KC_D), + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_W, _______, + _______, _______, _______, _______, _______, MO(MAC_FN), _______, KC_A, KC_S, KC_D), [MAC_FN] = LAYOUT_all( /* FN */ - _______, KC_F1, KC_F2, KC_F3, KC_F4, _______, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______,TG(MAC_W),_______, _______, _______, _______, _______, KC_INS, DF(WIN_B),KC_PSCR,_______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______) + _______, KC_F1, KC_F2, KC_F3, KC_F4, _______, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______,TG(MAC_W),_______, _______, _______, _______, _______, KC_INS, DF(WIN_B),KC_PSCR,_______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______) }; // clang-format on From 57cf8d0b22e93c6a883a89d78e75cd22f6d6868b Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Tue, 31 Oct 2023 17:32:03 +0800 Subject: [PATCH 18/44] Update keyboards/akko/mod007_v3/config.h Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/akko/mod007_v3/config.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/keyboards/akko/mod007_v3/config.h b/keyboards/akko/mod007_v3/config.h index 30d1636a19c..a493d3cf56c 100644 --- a/keyboards/akko/mod007_v3/config.h +++ b/keyboards/akko/mod007_v3/config.h @@ -16,9 +16,6 @@ #pragma once - -#define RGB_TRIGGER_ON_KEYDOWN - /* encoder */ #define ENCODER_DEFAULT_POS 0x3 From e1eefb35a748968e30b7b62edd4ea31e8c795679 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Tue, 31 Oct 2023 17:32:10 +0800 Subject: [PATCH 19/44] Update keyboards/akko/mod007_v3/info.json Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/akko/mod007_v3/info.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/akko/mod007_v3/info.json b/keyboards/akko/mod007_v3/info.json index 77b2e729767..fa94abad24a 100644 --- a/keyboards/akko/mod007_v3/info.json +++ b/keyboards/akko/mod007_v3/info.json @@ -15,8 +15,6 @@ "bootmagic": true, "mousekey": true, "extrakey": true, - "console": false, - "command": false, "nkro": true, "encoder": true }, From 4308f888a139f1a867213a526ac6315d5c57fa50 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Wed, 17 Jan 2024 11:25:33 +0800 Subject: [PATCH 20/44] Update config.h --- keyboards/akko/mod007_v3/config.h | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/keyboards/akko/mod007_v3/config.h b/keyboards/akko/mod007_v3/config.h index a493d3cf56c..438a4fa5d66 100644 --- a/keyboards/akko/mod007_v3/config.h +++ b/keyboards/akko/mod007_v3/config.h @@ -1,18 +1,6 @@ -/* Copyright (C) 2022 jonylee@hfd - * - * 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 . - */ +// Copyright 2024 jonylee@hfd (@jonylee1986) +// SPDX-License-Identifier: GPL-2.0-or-later + #pragma once From e6019a81aee1ed0a905f033e1626eeb0900753af Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Wed, 17 Jan 2024 11:25:52 +0800 Subject: [PATCH 21/44] Update halconf.h --- keyboards/akko/mod007_v3/halconf.h | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/keyboards/akko/mod007_v3/halconf.h b/keyboards/akko/mod007_v3/halconf.h index 2f64e65393a..93ff3a7af86 100644 --- a/keyboards/akko/mod007_v3/halconf.h +++ b/keyboards/akko/mod007_v3/halconf.h @@ -1,18 +1,6 @@ -/* Copyright (C) 2022 jonylee@hfd - * - * 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 . - */ +// Copyright 2024 jonylee@hfd (@jonylee1986) +// SPDX-License-Identifier: GPL-2.0-or-later + #pragma once #define HAL_USE_I2C TRUE From ebcd0483393c729a6cd2d2cbc91793fb5b45c436 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Wed, 17 Jan 2024 11:26:16 +0800 Subject: [PATCH 22/44] Update keymap.c --- .../akko/mod007_v3/keymaps/default/keymap.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/keyboards/akko/mod007_v3/keymaps/default/keymap.c b/keyboards/akko/mod007_v3/keymaps/default/keymap.c index 9a1e0fceb33..6c40ae81f28 100644 --- a/keyboards/akko/mod007_v3/keymaps/default/keymap.c +++ b/keyboards/akko/mod007_v3/keymaps/default/keymap.c @@ -1,18 +1,5 @@ -/* Copyright (C) 2023 jonylee@hfd - * - * 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 . - */ +// Copyright 2024 jonylee@hfd (@jonylee1986) +// SPDX-License-Identifier: GPL-2.0-or-later #include QMK_KEYBOARD_H enum __layers { From 840fa90cd10207cce3d45450027bd26d7273b77b Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Wed, 17 Jan 2024 11:26:37 +0800 Subject: [PATCH 23/44] Update keymap.c --- keyboards/akko/mod007_v3/keymaps/via/keymap.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/keyboards/akko/mod007_v3/keymaps/via/keymap.c b/keyboards/akko/mod007_v3/keymaps/via/keymap.c index 9a1e0fceb33..6c40ae81f28 100644 --- a/keyboards/akko/mod007_v3/keymaps/via/keymap.c +++ b/keyboards/akko/mod007_v3/keymaps/via/keymap.c @@ -1,18 +1,5 @@ -/* Copyright (C) 2023 jonylee@hfd - * - * 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 . - */ +// Copyright 2024 jonylee@hfd (@jonylee1986) +// SPDX-License-Identifier: GPL-2.0-or-later #include QMK_KEYBOARD_H enum __layers { From e4909e7f63c9575d42efb23ff0012fa801a6aedc Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Wed, 17 Jan 2024 11:26:55 +0800 Subject: [PATCH 24/44] Update mcuconf.h --- keyboards/akko/mod007_v3/mcuconf.h | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/keyboards/akko/mod007_v3/mcuconf.h b/keyboards/akko/mod007_v3/mcuconf.h index 0d16f4f04e4..c3eada466f6 100644 --- a/keyboards/akko/mod007_v3/mcuconf.h +++ b/keyboards/akko/mod007_v3/mcuconf.h @@ -1,18 +1,5 @@ -/* Copyright (C) 2022 jonylee@hfd - * - * 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 . - */ +// Copyright 2024 jonylee@hfd (@jonylee1986) +// SPDX-License-Identifier: GPL-2.0-or-later #pragma once #include_next From 76352715109a6c0dc2febc7ad33b44e9512fbdfd Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Wed, 17 Jan 2024 11:27:09 +0800 Subject: [PATCH 25/44] Update mod007_v3.c --- keyboards/akko/mod007_v3/mod007_v3.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/keyboards/akko/mod007_v3/mod007_v3.c b/keyboards/akko/mod007_v3/mod007_v3.c index f5b51d8a888..42bbb6b881f 100644 --- a/keyboards/akko/mod007_v3/mod007_v3.c +++ b/keyboards/akko/mod007_v3/mod007_v3.c @@ -1,18 +1,5 @@ -/* Copyright (C) 2022 jonylee@hfd - * - * 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 . - */ +// Copyright 2024 jonylee@hfd (@jonylee1986) +// SPDX-License-Identifier: GPL-2.0-or-later #include "quantum.h" From 7d2095ffeef0fcdc63a62c9f7223f7ee82fd02a6 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Wed, 17 Jan 2024 11:33:25 +0800 Subject: [PATCH 26/44] Update info.json --- keyboards/akko/mod007_v3/info.json | 49 ++++++++++++++++-------------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/keyboards/akko/mod007_v3/info.json b/keyboards/akko/mod007_v3/info.json index fa94abad24a..0d16e60bb0c 100644 --- a/keyboards/akko/mod007_v3/info.json +++ b/keyboards/akko/mod007_v3/info.json @@ -1,36 +1,39 @@ { - "keyboard_name": "MOD007_V3", "manufacturer": "Akko", - "url":"https://www.akkogear.com", + "keyboard_name": "MOD007_V3", "maintainer": "jonylee@hfd", - "usb": { - "vid": "0xFFFE", - "pid": "0x000F", - "device_version": "1.0.3", - "suspend_wakeup_delay": 400 - }, - "processor": "WB32FQ95", "bootloader": "wb32-dfu", - "features": { - "bootmagic": true, - "mousekey": true, - "extrakey": true, - "nkro": true, - "encoder": true - }, + "diode_direction": "ROW2COL", "dynamic_keymap": { "layer_count": 6 }, - "matrix_pins": { - "cols": [ "C1", "C2", "C3", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B2"], - "rows": [ "B15", "C6", "C7", "C8", "C9", "A8"] - }, - "diode_direction": "ROW2COL", "encoder": { "rotary": [ - { "pin_a": "B14", "pin_b": "B13" } + { + "pin_a": "B14", + "pin_b": "B13" + } ] }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "matrix_pins": { + "cols": ["C1", "C2", "C3", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B2"], + "rows": ["B15", "C6", "C7", "C8", "C9", "A8"] + }, + "processor": "WB32FQ95", + "url": "https://www.akkogear.com", + "usb": { + "device_version": "1.0.3", + "pid": "0x000F", + "suspend_wakeup_delay": 400, + "vid": "0xFFFE" + }, "layouts": { "LAYOUT_all": { "layout": [ @@ -267,7 +270,7 @@ { "label": ":", "matrix": [3, 10], "x": 10.75, "y": 3.25 }, { "label": "\"", "matrix": [3, 11], "x": 11.75, "y": 3.25 }, { "label": ":", "matrix": [3, 12], "x": 12.75, "y": 3.25 }, - { "label": "Enter", "matrix": [3, 13], "w": 1.25, "h": 2, "x": 13.75, "y": 2.25 }, + { "h": 2, "label": "Enter", "matrix": [3, 13], "w": 1.25, "x": 13.75, "y": 2.25 }, { "label": "PageDn", "matrix": [3, 15], "x": 15.5, "y": 3.25 }, { "label": "Shift", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4.25 }, { "label": ":", "matrix": [4, 11], "x": 1.25, "y": 4.25 }, From 6cbdcf4e2249b43a97b8f478308af70dd5fa7cc8 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Mon, 22 Jan 2024 10:09:44 +0800 Subject: [PATCH 27/44] Update keyboards/akko/mod007_v3/config.h Co-authored-by: Joel Challis --- keyboards/akko/mod007_v3/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/akko/mod007_v3/config.h b/keyboards/akko/mod007_v3/config.h index 438a4fa5d66..4f2b4431ff8 100644 --- a/keyboards/akko/mod007_v3/config.h +++ b/keyboards/akko/mod007_v3/config.h @@ -20,4 +20,3 @@ #define SPI_MOSI_PAL_MODE 5 #define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12 -#define WEAR_LEVELING_BACKING_SIZE (8 * 1024) From 7a90ba92e69dd53cb4a652e5606f8f0e2dafe9dc Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Mon, 22 Jan 2024 10:09:53 +0800 Subject: [PATCH 28/44] Update keyboards/akko/mod007_v3/rules.mk Co-authored-by: Joel Challis --- keyboards/akko/mod007_v3/rules.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/akko/mod007_v3/rules.mk b/keyboards/akko/mod007_v3/rules.mk index 24d5f6f52ec..6e7633bfe01 100644 --- a/keyboards/akko/mod007_v3/rules.mk +++ b/keyboards/akko/mod007_v3/rules.mk @@ -1,2 +1 @@ -EEPROM_DRIVER = wear_leveling -WEAR_LEVELING_DRIVER = spi_flash +# This file intentionally left blank From c7c7f11587de897f9a23a15f5b28b1d5d0c7fb46 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Mon, 22 Jan 2024 10:09:59 +0800 Subject: [PATCH 29/44] Update keyboards/akko/mod007_v3/mcuconf.h Co-authored-by: Joel Challis --- keyboards/akko/mod007_v3/mcuconf.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/keyboards/akko/mod007_v3/mcuconf.h b/keyboards/akko/mod007_v3/mcuconf.h index c3eada466f6..bb3c7a50812 100644 --- a/keyboards/akko/mod007_v3/mcuconf.h +++ b/keyboards/akko/mod007_v3/mcuconf.h @@ -6,6 +6,3 @@ #undef WB32_SPI_USE_QSPI #define WB32_SPI_USE_QSPI TRUE - -#undef WB32_I2C_USE_I2C1 -#define WB32_I2C_USE_I2C1 TRUE From 9bee24103de93637fe907d78ae93c4c2be8afe2d Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Mon, 22 Jan 2024 10:10:15 +0800 Subject: [PATCH 30/44] Update keyboards/akko/mod007_v3/info.json Co-authored-by: Joel Challis --- keyboards/akko/mod007_v3/info.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/keyboards/akko/mod007_v3/info.json b/keyboards/akko/mod007_v3/info.json index 0d16e60bb0c..7b0c4ea5e53 100644 --- a/keyboards/akko/mod007_v3/info.json +++ b/keyboards/akko/mod007_v3/info.json @@ -7,6 +7,13 @@ "dynamic_keymap": { "layer_count": 6 }, + "eeprom": { + "driver": "wear_leveling", + "wear_leveling": { + "driver": "spi_flash", + "backing_size": 8192 + } + }, "encoder": { "rotary": [ { From 514202d25a542442ef87e5273a40427903a5963c Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Mon, 22 Jan 2024 10:10:23 +0800 Subject: [PATCH 31/44] Update keyboards/akko/mod007_v3/halconf.h Co-authored-by: Joel Challis --- keyboards/akko/mod007_v3/halconf.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/akko/mod007_v3/halconf.h b/keyboards/akko/mod007_v3/halconf.h index 93ff3a7af86..1355670b147 100644 --- a/keyboards/akko/mod007_v3/halconf.h +++ b/keyboards/akko/mod007_v3/halconf.h @@ -3,7 +3,6 @@ #pragma once -#define HAL_USE_I2C TRUE #define HAL_USE_SPI TRUE #define SPI_USE_WAIT TRUE #define SPI_SELECT_MODE SPI_SELECT_MODE_PAD From f5ab2801b345218cc0a2cd52c53855c677ae3e11 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Mon, 22 Jan 2024 10:10:29 +0800 Subject: [PATCH 32/44] Update keyboards/akko/mod007_v3/readme.md Co-authored-by: Joel Challis --- keyboards/akko/mod007_v3/readme.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/keyboards/akko/mod007_v3/readme.md b/keyboards/akko/mod007_v3/readme.md index 84f1b893c19..503a6fb0c53 100644 --- a/keyboards/akko/mod007_v3/readme.md +++ b/keyboards/akko/mod007_v3/readme.md @@ -14,6 +14,11 @@ Flashing example for this keyboard: make akko/mod007_v3:default:flash -**Reset Key**: Hold down the key located at *K01*, which programmed as *Esc* while plugging in the keyboard. - 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 at *K01*, which programmed as *Esc* and plug in the keyboard +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available From 52ae84dd7ccaf89ec94531845971827f8a23c01c Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Tue, 23 Jan 2024 10:00:12 +0800 Subject: [PATCH 33/44] Update info.json --- keyboards/akko/mod007_v3/info.json | 516 ++++++++++++++--------------- 1 file changed, 253 insertions(+), 263 deletions(-) diff --git a/keyboards/akko/mod007_v3/info.json b/keyboards/akko/mod007_v3/info.json index 7b0c4ea5e53..3f3bb70925e 100644 --- a/keyboards/akko/mod007_v3/info.json +++ b/keyboards/akko/mod007_v3/info.json @@ -7,19 +7,9 @@ "dynamic_keymap": { "layer_count": 6 }, - "eeprom": { - "driver": "wear_leveling", - "wear_leveling": { - "driver": "spi_flash", - "backing_size": 8192 - } - }, "encoder": { "rotary": [ - { - "pin_a": "B14", - "pin_b": "B13" - } + {"pin_a": "B14", "pin_b": "B13"} ] }, "features": { @@ -44,266 +34,266 @@ "layouts": { "LAYOUT_all": { "layout": [ - { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, - { "label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0 }, - { "label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0 }, - { "label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0 }, - { "label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0 }, - { "label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0 }, - { "label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0 }, - { "label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0 }, - { "label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0 }, - { "label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0 }, - { "label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0 }, - { "label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0 }, - { "label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0 }, - { "label": "Del", "matrix": [0, 13], "x": 14, "y": 0 }, - { "label": "Mute", "matrix": [0, 15], "x": 15.5, "y": 0 }, - { "label": "~", "matrix": [1, 0], "x": 0, "y": 1.25 }, - { "label": "!", "matrix": [1, 1], "x": 1, "y": 1.25 }, - { "label": "@", "matrix": [1, 2], "x": 2, "y": 1.25 }, - { "label": "#", "matrix": [1, 3], "x": 3, "y": 1.25 }, - { "label": "$", "matrix": [1, 4], "x": 4, "y": 1.25 }, - { "label": "%", "matrix": [1, 5], "x": 5, "y": 1.25 }, - { "label": "^", "matrix": [1, 6], "x": 6, "y": 1.25 }, - { "label": "&", "matrix": [1, 7], "x": 7, "y": 1.25 }, - { "label": "*", "matrix": [1, 8], "x": 8, "y": 1.25 }, - { "label": "(", "matrix": [1, 9], "x": 9, "y": 1.25 }, - { "label": ")", "matrix": [1, 10], "x": 10, "y": 1.25 }, - { "label": "_", "matrix": [1, 11], "x": 11, "y": 1.25 }, - { "label": "+", "matrix": [1, 12], "x": 12, "y": 1.25 }, - { "label": "Bksp", "matrix": [1, 13], "w": 2, "x": 13, "y": 1.25 }, - { "label": "Home", "matrix": [1, 15], "x": 15.5, "y": 1.25 }, - { "label": "Tab", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 }, - { "label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25 }, - { "label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25 }, - { "label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25 }, - { "label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25 }, - { "label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25 }, - { "label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25 }, - { "label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25 }, - { "label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25 }, - { "label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25 }, - { "label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25 }, - { "label": "{", "matrix": [2, 11], "x": 11.5, "y": 2.25 }, - { "label": "}", "matrix": [2, 12], "x": 12.5, "y": 2.25 }, - { "label": "|", "matrix": [2, 13], "w": 1.5, "x": 13.5, "y": 2.25 }, - { "label": "PageUp", "matrix": [2, 15], "x": 15.5, "y": 2.25 }, - { "label": "Caps Lock", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 }, - { "label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25 }, - { "label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25 }, - { "label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25 }, - { "label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25 }, - { "label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25 }, - { "label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25 }, - { "label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25 }, - { "label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25 }, - { "label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25 }, - { "label": ":", "matrix": [3, 10], "x": 10.75, "y": 3.25 }, - { "label": "\"", "matrix": [3, 11], "x": 11.75, "y": 3.25 }, - { "label": ":", "matrix": [3, 12], "x": 12.75, "y": 3.25 }, - { "label": "Enter", "matrix": [3, 13], "w": 1.25, "x": 13.75, "y": 3.25 }, - { "label": "PageDn", "matrix": [3, 15], "x": 15.5, "y": 3.25 }, - { "label": "Shift", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4.25 }, - { "label": ":", "matrix": [4, 11], "x": 1.25, "y": 4.25 }, - { "label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25 }, - { "label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25 }, - { "label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25 }, - { "label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25 }, - { "label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25 }, - { "label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25 }, - { "label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25 }, - { "label": "<", "matrix": [4, 8], "x": 9.25, "y": 4.25 }, - { "label": ">", "matrix": [4, 9], "x": 10.25, "y": 4.25 }, - { "label": "?", "matrix": [4, 10], "x": 11.25, "y": 4.25 }, - { "label": "Shift", "matrix": [4, 13], "w": 1.75, "x": 12.25, "y": 4.25 }, - { "label": "Up", "matrix": [4, 14], "x": 14.25, "y": 4.25 }, - { "label": "End", "matrix": [4, 15], "x": 15.5, "y": 4.25 }, - { "label": "Ctrl", "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.25 }, - { "label": "Win", "matrix": [5, 1], "w": 1.25, "x": 1.25, "y": 5.25 }, - { "label": "Alt", "matrix": [5, 2], "w": 1.25, "x": 2.5, "y": 5.25 }, - { "label": "Space", "matrix": [5, 5], "w": 6.25, "x": 3.75, "y": 5.25 }, - { "label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25 }, - { "label": "Fn", "matrix": [5, 10], "x": 11, "y": 5.25 }, - { "label": "Ctrl", "matrix": [5, 11], "x": 12, "y": 5.25 }, - { "label": "Left", "matrix": [5, 13], "x": 13.25, "y": 5.25 }, - { "label": "Down", "matrix": [5, 14], "x": 14.25, "y": 5.25 }, - { "label": "Right", "matrix": [5, 15], "x": 15.25, "y": 5.25 } + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0}, + {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0}, + {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0}, + {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0}, + {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0}, + {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0}, + {"label": "Del", "matrix": [0, 13], "x": 14, "y": 0}, + {"label": "Mute", "matrix": [0, 15], "x": 15.5, "y": 0}, + {"label": "~", "matrix": [1, 0], "x": 0, "y": 1.25}, + {"label": "!", "matrix": [1, 1], "x": 1, "y": 1.25}, + {"label": "@", "matrix": [1, 2], "x": 2, "y": 1.25}, + {"label": "#", "matrix": [1, 3], "x": 3, "y": 1.25}, + {"label": "$", "matrix": [1, 4], "x": 4, "y": 1.25}, + {"label": "%", "matrix": [1, 5], "x": 5, "y": 1.25}, + {"label": "^", "matrix": [1, 6], "x": 6, "y": 1.25}, + {"label": "&", "matrix": [1, 7], "x": 7, "y": 1.25}, + {"label": "*", "matrix": [1, 8], "x": 8, "y": 1.25}, + {"label": "(", "matrix": [1, 9], "x": 9, "y": 1.25}, + {"label": ")", "matrix": [1, 10], "x": 10, "y": 1.25}, + {"label": "_", "matrix": [1, 11], "x": 11, "y": 1.25}, + {"label": "+", "matrix": [1, 12], "x": 12, "y": 1.25}, + {"label": "Bksp", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2}, + {"label": "Home", "matrix": [1, 15], "x": 15.5, "y": 1.25}, + {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"label": "{", "matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"label": "}", "matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"label": "|", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + {"label": "PageUp", "matrix": [2, 15], "x": 15.5, "y": 2.25}, + {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"label": ":", "matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"label": "\"", "matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"label": ":", "matrix": [3, 12], "x": 12.75, "y": 3.25}, + {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25}, + {"label": "PageDn", "matrix": [3, 15], "x": 15.5, "y": 3.25}, + {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25}, + {"label": ":", "matrix": [4, 11], "x": 1.25, "y": 4.25}, + {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25}, + {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25}, + {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25}, + {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25}, + {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25}, + {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25}, + {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25}, + {"label": "<", "matrix": [4, 8], "x": 9.25, "y": 4.25}, + {"label": ">", "matrix": [4, 9], "x": 10.25, "y": 4.25}, + {"label": "?", "matrix": [4, 10], "x": 11.25, "y": 4.25}, + {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75}, + {"label": "Up", "matrix": [4, 14], "x": 14.25, "y": 4.25}, + {"label": "End", "matrix": [4, 15], "x": 15.5, "y": 4.25}, + {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"label": "Win", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"label": "Space", "matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25}, + {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25}, + {"label": "Fn", "matrix": [5, 10], "x": 11, "y": 5.25}, + {"label": "Ctrl", "matrix": [5, 11], "x": 12, "y": 5.25}, + {"label": "Left", "matrix": [5, 13], "x": 13.25, "y": 5.25}, + {"label": "Down", "matrix": [5, 14], "x": 14.25, "y": 5.25}, + {"label": "Right", "matrix": [5, 15], "x": 15.25, "y": 5.25} ] }, "LAYOUT_ansi": { "layout": [ - { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, - { "label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0 }, - { "label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0 }, - { "label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0 }, - { "label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0 }, - { "label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0 }, - { "label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0 }, - { "label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0 }, - { "label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0 }, - { "label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0 }, - { "label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0 }, - { "label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0 }, - { "label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0 }, - { "label": "Del", "matrix": [0, 13], "x": 14, "y": 0 }, - { "label": "Mute", "matrix": [0, 15], "x": 15.5, "y": 0 }, - { "label": "~", "matrix": [1, 0], "x": 0, "y": 1.25 }, - { "label": "!", "matrix": [1, 1], "x": 1, "y": 1.25 }, - { "label": "@", "matrix": [1, 2], "x": 2, "y": 1.25 }, - { "label": "#", "matrix": [1, 3], "x": 3, "y": 1.25 }, - { "label": "$", "matrix": [1, 4], "x": 4, "y": 1.25 }, - { "label": "%", "matrix": [1, 5], "x": 5, "y": 1.25 }, - { "label": "^", "matrix": [1, 6], "x": 6, "y": 1.25 }, - { "label": "&", "matrix": [1, 7], "x": 7, "y": 1.25 }, - { "label": "*", "matrix": [1, 8], "x": 8, "y": 1.25 }, - { "label": "(", "matrix": [1, 9], "x": 9, "y": 1.25 }, - { "label": ")", "matrix": [1, 10], "x": 10, "y": 1.25 }, - { "label": "_", "matrix": [1, 11], "x": 11, "y": 1.25 }, - { "label": "+", "matrix": [1, 12], "x": 12, "y": 1.25 }, - { "label": "Bksp", "matrix": [1, 13], "w": 2, "x": 13, "y": 1.25 }, - { "label": "Home", "matrix": [1, 15], "x": 15.5, "y": 1.25 }, - { "label": "Tab", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 }, - { "label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25 }, - { "label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25 }, - { "label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25 }, - { "label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25 }, - { "label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25 }, - { "label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25 }, - { "label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25 }, - { "label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25 }, - { "label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25 }, - { "label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25 }, - { "label": "{", "matrix": [2, 11], "x": 11.5, "y": 2.25 }, - { "label": "}", "matrix": [2, 12], "x": 12.5, "y": 2.25 }, - { "label": "|", "matrix": [2, 13], "w": 1.5, "x": 13.5, "y": 2.25 }, - { "label": "PageUp", "matrix": [2, 15], "x": 15.5, "y": 2.25 }, - { "label": "Caps Lock", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 }, - { "label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25 }, - { "label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25 }, - { "label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25 }, - { "label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25 }, - { "label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25 }, - { "label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25 }, - { "label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25 }, - { "label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25 }, - { "label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25 }, - { "label": ":", "matrix": [3, 10], "x": 10.75, "y": 3.25 }, - { "label": "\"", "matrix": [3, 11], "x": 11.75, "y": 3.25 }, - { "label": "Enter", "matrix": [3, 13], "w": 2.25, "x": 12.75, "y": 3.25 }, - { "label": "PageDn", "matrix": [3, 15], "x": 15.5, "y": 3.25 }, - { "label": "Shift", "matrix": [4, 0], "w": 2.25, "x": 0, "y": 4.25 }, - { "label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25 }, - { "label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25 }, - { "label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25 }, - { "label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25 }, - { "label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25 }, - { "label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25 }, - { "label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25 }, - { "label": "<", "matrix": [4, 8], "x": 9.25, "y": 4.25 }, - { "label": ">", "matrix": [4, 9], "x": 10.25, "y": 4.25 }, - { "label": "?", "matrix": [4, 10], "x": 11.25, "y": 4.25 }, - { "label": "Shift", "matrix": [4, 13], "w": 1.75, "x": 12.25, "y": 4.25 }, - { "label": "Up", "matrix": [4, 14], "x": 14.25, "y": 4.25 }, - { "label": "End", "matrix": [4, 15], "x": 15.5, "y": 4.25 }, - { "label": "Ctrl", "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.25 }, - { "label": "Win", "matrix": [5, 1], "w": 1.25, "x": 1.25, "y": 5.25 }, - { "label": "Alt", "matrix": [5, 2], "w": 1.25, "x": 2.5, "y": 5.25 }, - { "label": "Space", "matrix": [5, 5], "w": 6.25, "x": 3.75, "y": 5.25 }, - { "label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25 }, - { "label": "Fn", "matrix": [5, 10], "x": 11, "y": 5.25 }, - { "label": "Ctrl", "matrix": [5, 11], "x": 12, "y": 5.25 }, - { "label": "Left", "matrix": [5, 13], "x": 13.25, "y": 5.25 }, - { "label": "Down", "matrix": [5, 14], "x": 14.25, "y": 5.25 }, - { "label": "Right", "matrix": [5, 15], "x": 15.25, "y": 5.25 } + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0}, + {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0}, + {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0}, + {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0}, + {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0}, + {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0}, + {"label": "Del", "matrix": [0, 13], "x": 14, "y": 0}, + {"label": "Mute", "matrix": [0, 15], "x": 15.5, "y": 0}, + {"label": "~", "matrix": [1, 0], "x": 0, "y": 1.25}, + {"label": "!", "matrix": [1, 1], "x": 1, "y": 1.25}, + {"label": "@", "matrix": [1, 2], "x": 2, "y": 1.25}, + {"label": "#", "matrix": [1, 3], "x": 3, "y": 1.25}, + {"label": "$", "matrix": [1, 4], "x": 4, "y": 1.25}, + {"label": "%", "matrix": [1, 5], "x": 5, "y": 1.25}, + {"label": "^", "matrix": [1, 6], "x": 6, "y": 1.25}, + {"label": "&", "matrix": [1, 7], "x": 7, "y": 1.25}, + {"label": "*", "matrix": [1, 8], "x": 8, "y": 1.25}, + {"label": "(", "matrix": [1, 9], "x": 9, "y": 1.25}, + {"label": ")", "matrix": [1, 10], "x": 10, "y": 1.25}, + {"label": "_", "matrix": [1, 11], "x": 11, "y": 1.25}, + {"label": "+", "matrix": [1, 12], "x": 12, "y": 1.25}, + {"label": "Bksp", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2}, + {"label": "Home", "matrix": [1, 15], "x": 15.5, "y": 1.25}, + {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"label": "{", "matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"label": "}", "matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"label": "|", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + {"label": "PageUp", "matrix": [2, 15], "x": 15.5, "y": 2.25}, + {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"label": ":", "matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"label": "\"", "matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25}, + {"label": "PageDn", "matrix": [3, 15], "x": 15.5, "y": 3.25}, + {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25}, + {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25}, + {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25}, + {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25}, + {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25}, + {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25}, + {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25}, + {"label": "<", "matrix": [4, 8], "x": 9.25, "y": 4.25}, + {"label": ">", "matrix": [4, 9], "x": 10.25, "y": 4.25}, + {"label": "?", "matrix": [4, 10], "x": 11.25, "y": 4.25}, + {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75}, + {"label": "Up", "matrix": [4, 14], "x": 14.25, "y": 4.25}, + {"label": "End", "matrix": [4, 15], "x": 15.5, "y": 4.25}, + {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"label": "Win", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"label": "Space", "matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25}, + {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25}, + {"label": "Fn", "matrix": [5, 10], "x": 11, "y": 5.25}, + {"label": "Ctrl", "matrix": [5, 11], "x": 12, "y": 5.25}, + {"label": "Left", "matrix": [5, 13], "x": 13.25, "y": 5.25}, + {"label": "Down", "matrix": [5, 14], "x": 14.25, "y": 5.25}, + {"label": "Right", "matrix": [5, 15], "x": 15.25, "y": 5.25} ] }, "LAYOUT_iso": { "layout": [ - { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, - { "label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0 }, - { "label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0 }, - { "label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0 }, - { "label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0 }, - { "label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0 }, - { "label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0 }, - { "label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0 }, - { "label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0 }, - { "label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0 }, - { "label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0 }, - { "label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0 }, - { "label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0 }, - { "label": "Del", "matrix": [0, 13], "x": 14, "y": 0 }, - { "label": "Mute", "matrix": [0, 15], "x": 15.5, "y": 0 }, - { "label": "~", "matrix": [1, 0], "x": 0, "y": 1.25 }, - { "label": "!", "matrix": [1, 1], "x": 1, "y": 1.25 }, - { "label": "@", "matrix": [1, 2], "x": 2, "y": 1.25 }, - { "label": "#", "matrix": [1, 3], "x": 3, "y": 1.25 }, - { "label": "$", "matrix": [1, 4], "x": 4, "y": 1.25 }, - { "label": "%", "matrix": [1, 5], "x": 5, "y": 1.25 }, - { "label": "^", "matrix": [1, 6], "x": 6, "y": 1.25 }, - { "label": "&", "matrix": [1, 7], "x": 7, "y": 1.25 }, - { "label": "*", "matrix": [1, 8], "x": 8, "y": 1.25 }, - { "label": "(", "matrix": [1, 9], "x": 9, "y": 1.25 }, - { "label": ")", "matrix": [1, 10], "x": 10, "y": 1.25 }, - { "label": "_", "matrix": [1, 11], "x": 11, "y": 1.25 }, - { "label": "+", "matrix": [1, 12], "x": 12, "y": 1.25 }, - { "label": "Bksp", "matrix": [1, 13], "w": 2, "x": 13, "y": 1.25 }, - { "label": "Home", "matrix": [1, 15], "x": 15.5, "y": 1.25 }, - { "label": "Tab", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 }, - { "label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25 }, - { "label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25 }, - { "label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25 }, - { "label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25 }, - { "label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25 }, - { "label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25 }, - { "label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25 }, - { "label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25 }, - { "label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25 }, - { "label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25 }, - { "label": "{", "matrix": [2, 11], "x": 11.5, "y": 2.25 }, - { "label": "}", "matrix": [2, 12], "x": 12.5, "y": 2.25 }, - { "label": "PageUp", "matrix": [2, 15], "x": 15.5, "y": 2.25 }, - { "label": "Caps Lock", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 }, - { "label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25 }, - { "label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25 }, - { "label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25 }, - { "label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25 }, - { "label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25 }, - { "label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25 }, - { "label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25 }, - { "label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25 }, - { "label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25 }, - { "label": ":", "matrix": [3, 10], "x": 10.75, "y": 3.25 }, - { "label": "\"", "matrix": [3, 11], "x": 11.75, "y": 3.25 }, - { "label": ":", "matrix": [3, 12], "x": 12.75, "y": 3.25 }, - { "h": 2, "label": "Enter", "matrix": [3, 13], "w": 1.25, "x": 13.75, "y": 2.25 }, - { "label": "PageDn", "matrix": [3, 15], "x": 15.5, "y": 3.25 }, - { "label": "Shift", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4.25 }, - { "label": ":", "matrix": [4, 11], "x": 1.25, "y": 4.25 }, - { "label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25 }, - { "label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25 }, - { "label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25 }, - { "label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25 }, - { "label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25 }, - { "label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25 }, - { "label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25 }, - { "label": "<", "matrix": [4, 8], "x": 9.25, "y": 4.25 }, - { "label": ">", "matrix": [4, 9], "x": 10.25, "y": 4.25 }, - { "label": "?", "matrix": [4, 10], "x": 11.25, "y": 4.25 }, - { "label": "Shift", "matrix": [4, 13], "w": 1.75, "x": 12.25, "y": 4.25 }, - { "label": "Up", "matrix": [4, 14], "x": 14.25, "y": 4.25 }, - { "label": "End", "matrix": [4, 15], "x": 15.5, "y": 4.25 }, - { "label": "Ctrl", "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.25 }, - { "label": "Win", "matrix": [5, 1], "w": 1.25, "x": 1.25, "y": 5.25 }, - { "label": "Alt", "matrix": [5, 2], "w": 1.25, "x": 2.5, "y": 5.25 }, - { "label": "Space", "matrix": [5, 5], "w": 6.25, "x": 3.75, "y": 5.25 }, - { "label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25 }, - { "label": "Fn", "matrix": [5, 10], "x": 11, "y": 5.25 }, - { "label": "Ctrl", "matrix": [5, 11], "x": 12, "y": 5.25 }, - { "label": "Left", "matrix": [5, 13], "x": 13.25, "y": 5.25 }, - { "label": "Down", "matrix": [5, 14], "x": 14.25, "y": 5.25 }, - { "label": "Right", "matrix": [5, 15], "x": 15.25, "y": 5.25 } + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0}, + {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0}, + {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0}, + {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0}, + {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0}, + {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0}, + {"label": "Del", "matrix": [0, 13], "x": 14, "y": 0}, + {"label": "Mute", "matrix": [0, 15], "x": 15.5, "y": 0}, + {"label": "~", "matrix": [1, 0], "x": 0, "y": 1.25}, + {"label": "!", "matrix": [1, 1], "x": 1, "y": 1.25}, + {"label": "@", "matrix": [1, 2], "x": 2, "y": 1.25}, + {"label": "#", "matrix": [1, 3], "x": 3, "y": 1.25}, + {"label": "$", "matrix": [1, 4], "x": 4, "y": 1.25}, + {"label": "%", "matrix": [1, 5], "x": 5, "y": 1.25}, + {"label": "^", "matrix": [1, 6], "x": 6, "y": 1.25}, + {"label": "&", "matrix": [1, 7], "x": 7, "y": 1.25}, + {"label": "*", "matrix": [1, 8], "x": 8, "y": 1.25}, + {"label": "(", "matrix": [1, 9], "x": 9, "y": 1.25}, + {"label": ")", "matrix": [1, 10], "x": 10, "y": 1.25}, + {"label": "_", "matrix": [1, 11], "x": 11, "y": 1.25}, + {"label": "+", "matrix": [1, 12], "x": 12, "y": 1.25}, + {"label": "Bksp", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2}, + {"label": "Home", "matrix": [1, 15], "x": 15.5, "y": 1.25}, + {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"label": "{", "matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"label": "}", "matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"label": "PageUp", "matrix": [2, 15], "x": 15.5, "y": 2.25}, + {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"label": ":", "matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"label": "\"", "matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"label": ":", "matrix": [3, 12], "x": 12.75, "y": 3.25}, + {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2}, + {"label": "PageDn", "matrix": [3, 15], "x": 15.5, "y": 3.25}, + {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25}, + {"label": ":", "matrix": [4, 11], "x": 1.25, "y": 4.25}, + {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25}, + {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25}, + {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25}, + {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25}, + {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25}, + {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25}, + {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25}, + {"label": "<", "matrix": [4, 8], "x": 9.25, "y": 4.25}, + {"label": ">", "matrix": [4, 9], "x": 10.25, "y": 4.25}, + {"label": "?", "matrix": [4, 10], "x": 11.25, "y": 4.25}, + {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75}, + {"label": "Up", "matrix": [4, 14], "x": 14.25, "y": 4.25}, + {"label": "End", "matrix": [4, 15], "x": 15.5, "y": 4.25}, + {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"label": "Win", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"label": "Space", "matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25}, + {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25}, + {"label": "Fn", "matrix": [5, 10], "x": 11, "y": 5.25}, + {"label": "Ctrl", "matrix": [5, 11], "x": 12, "y": 5.25}, + {"label": "Left", "matrix": [5, 13], "x": 13.25, "y": 5.25}, + {"label": "Down", "matrix": [5, 14], "x": 14.25, "y": 5.25}, + {"label": "Right", "matrix": [5, 15], "x": 15.25, "y": 5.25} ] } } From 4d9e15678792d28213f4ac687da5a068372aea68 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Tue, 23 Jan 2024 19:56:17 +0800 Subject: [PATCH 34/44] Update info.json --- keyboards/akko/mod007_v3/info.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/keyboards/akko/mod007_v3/info.json b/keyboards/akko/mod007_v3/info.json index 3f3bb70925e..0c4d11fe76f 100644 --- a/keyboards/akko/mod007_v3/info.json +++ b/keyboards/akko/mod007_v3/info.json @@ -7,6 +7,13 @@ "dynamic_keymap": { "layer_count": 6 }, + "eeprom": { + "driver": "wear_leveling", + "wear_leveling": { + "driver": "spi_flash", + "backing_size": 8192 + } + }, "encoder": { "rotary": [ {"pin_a": "B14", "pin_b": "B13"} From 5ce65def675a912d7745ef4dab07f054185dc3b1 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Wed, 15 May 2024 11:12:36 +0800 Subject: [PATCH 35/44] Update keymap.c --- keyboards/akko/mod007_v3/keymaps/default/keymap.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/keyboards/akko/mod007_v3/keymaps/default/keymap.c b/keyboards/akko/mod007_v3/keymaps/default/keymap.c index 6c40ae81f28..e854490bc09 100644 --- a/keyboards/akko/mod007_v3/keymaps/default/keymap.c +++ b/keyboards/akko/mod007_v3/keymaps/default/keymap.c @@ -67,11 +67,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // clang-format on #if defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { - [WIN_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, - [WIN_W] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, - [WIN_FN] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, - [MAC_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, - [MAC_W] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, - [MAC_FN] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) } + [WIN_B] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [WIN_W] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [WIN_FN] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [MAC_B] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [MAC_W] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [MAC_FN] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) } }; #endif From d5b17130e0d2d3366395afb48db68d73ae3c1cf4 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Wed, 15 May 2024 11:13:00 +0800 Subject: [PATCH 36/44] Update keymap.c --- keyboards/akko/mod007_v3/keymaps/via/keymap.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/keyboards/akko/mod007_v3/keymaps/via/keymap.c b/keyboards/akko/mod007_v3/keymaps/via/keymap.c index 6c40ae81f28..20cfbfc1977 100644 --- a/keyboards/akko/mod007_v3/keymaps/via/keymap.c +++ b/keyboards/akko/mod007_v3/keymaps/via/keymap.c @@ -67,11 +67,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // clang-format on #if defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { - [WIN_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, - [WIN_W] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, - [WIN_FN] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, - [MAC_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, - [MAC_W] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, - [MAC_FN] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) } + [WIN_B] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [WIN_W] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [WIN_FN] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [MAC_B] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [MAC_W] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [MAC_FN] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) } + }; #endif From fbfe13197d50a6743bb3d69081bbc39ba2b47a16 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Wed, 15 May 2024 11:13:26 +0800 Subject: [PATCH 37/44] Update info.json --- keyboards/akko/mod007_v3/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/akko/mod007_v3/info.json b/keyboards/akko/mod007_v3/info.json index 0c4d11fe76f..d3a264281fd 100644 --- a/keyboards/akko/mod007_v3/info.json +++ b/keyboards/akko/mod007_v3/info.json @@ -16,7 +16,7 @@ }, "encoder": { "rotary": [ - {"pin_a": "B14", "pin_b": "B13"} + {"pin_a": "B13", "pin_b": "B14"} ] }, "features": { From 0b2421de37790a595a40abab6b5cbd2cad70fcaa Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Wed, 5 Jun 2024 11:18:19 +0800 Subject: [PATCH 38/44] Delete keyboards/akko/mod007_v3/rules.mk --- keyboards/akko/mod007_v3/rules.mk | 1 - 1 file changed, 1 deletion(-) delete mode 100644 keyboards/akko/mod007_v3/rules.mk diff --git a/keyboards/akko/mod007_v3/rules.mk b/keyboards/akko/mod007_v3/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/akko/mod007_v3/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank From 76191147821f0379cffcefef076bb16e702c585e Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Wed, 5 Jun 2024 11:18:36 +0800 Subject: [PATCH 39/44] Rename info.json to keyboard.json --- keyboards/akko/mod007_v3/{info.json => keyboard.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename keyboards/akko/mod007_v3/{info.json => keyboard.json} (100%) diff --git a/keyboards/akko/mod007_v3/info.json b/keyboards/akko/mod007_v3/keyboard.json similarity index 100% rename from keyboards/akko/mod007_v3/info.json rename to keyboards/akko/mod007_v3/keyboard.json From be904f37ef81ec47912bee156fab211fbca5d393 Mon Sep 17 00:00:00 2001 From: jonylee1986 <2532487686@qq.com> Date: Fri, 20 Sep 2024 15:32:26 +0800 Subject: [PATCH 40/44] delete via keymap. --- keyboards/akko/mod007_v3/keymaps/via/keymap.c | 78 ------------------- keyboards/akko/mod007_v3/keymaps/via/rules.mk | 2 - 2 files changed, 80 deletions(-) delete mode 100644 keyboards/akko/mod007_v3/keymaps/via/keymap.c delete mode 100644 keyboards/akko/mod007_v3/keymaps/via/rules.mk diff --git a/keyboards/akko/mod007_v3/keymaps/via/keymap.c b/keyboards/akko/mod007_v3/keymaps/via/keymap.c deleted file mode 100644 index 20cfbfc1977..00000000000 --- a/keyboards/akko/mod007_v3/keymaps/via/keymap.c +++ /dev/null @@ -1,78 +0,0 @@ -// Copyright 2024 jonylee@hfd (@jonylee1986) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include QMK_KEYBOARD_H -enum __layers { - WIN_B, - WIN_W, - WIN_FN, - MAC_B, - MAC_W, - MAC_FN -}; - -#define KC_SIRI LGUI(KC_SPC) -// clang-format off -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - [WIN_B] = LAYOUT_all( /* Base */ - 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_DEL, KC_MUTE, - 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_HOME, - 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_PGUP, - 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_NUHS, KC_ENT, KC_PGDN, - KC_LSFT, KC_NUBS, 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_END, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), - - [WIN_W] = LAYOUT_all( /* Base */ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_W, _______, - _______, _______, _______, _______, _______, MO(WIN_FN), _______, KC_A, KC_S, KC_D), - - [WIN_FN] = LAYOUT_all( /* FN */ - _______, KC_MYCM, KC_MAIL, KC_WSCH, KC_WHOM, KC_MSEL, KC_MPLY, KC_MPRV, KC_MNXT, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______,TG(WIN_W),_______, _______, _______, _______, _______, KC_INS, DF(MAC_B),KC_PSCR,_______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, - _______, GU_TOGG, _______, _______, _______, _______, _______, _______, _______, _______), - - [MAC_B] = LAYOUT_all( /* Base */ - KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_SIRI, KC_F5, KC_F6, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,KC_VOLU, KC_DEL, KC_MUTE, - 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_HOME, - 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_PGUP, - 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_NUHS, KC_ENT, KC_PGDN, - KC_LSFT, KC_NUBS, 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_END, - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(MAC_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), - - [MAC_W] = LAYOUT_all( /* Base */ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_W, _______, - _______, _______, _______, _______, _______, MO(MAC_FN), _______, KC_A, KC_S, KC_D), - - [MAC_FN] = LAYOUT_all( /* FN */ - _______, KC_F1, KC_F2, KC_F3, KC_F4, _______, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______,TG(MAC_W),_______, _______, _______, _______, _______, KC_INS, DF(WIN_B),KC_PSCR,_______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______) -}; - -// clang-format on -#if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { - [WIN_B] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [WIN_W] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [WIN_FN] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [MAC_B] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [MAC_W] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [MAC_FN] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) } - -}; -#endif diff --git a/keyboards/akko/mod007_v3/keymaps/via/rules.mk b/keyboards/akko/mod007_v3/keymaps/via/rules.mk deleted file mode 100644 index 4253f570f0b..00000000000 --- a/keyboards/akko/mod007_v3/keymaps/via/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -VIA_ENABLE = yes -ENCODER_MAP_ENABLE = yes \ No newline at end of file From 18dc3b3449ebaf725ca83f09d2907bb44eb1b63b Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Tue, 12 Nov 2024 14:54:20 +0800 Subject: [PATCH 41/44] Update mod007_v3.c --- keyboards/akko/mod007_v3/mod007_v3.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/akko/mod007_v3/mod007_v3.c b/keyboards/akko/mod007_v3/mod007_v3.c index 42bbb6b881f..45640141b7f 100644 --- a/keyboards/akko/mod007_v3/mod007_v3.c +++ b/keyboards/akko/mod007_v3/mod007_v3.c @@ -25,8 +25,6 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { case DF(MAC_B): if (record->event.pressed) { set_single_persistent_default_layer(MAC_B); - keymap_config.no_gui = 0; - eeconfig_update_keymap(keymap_config.raw); } return false; default: From e1ddef51e71aa7eb3847333b12709259ac7a2ca2 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Wed, 15 Jan 2025 17:35:36 +0800 Subject: [PATCH 42/44] Update keyboards/akko/mod007_v3/mod007_v3.c Co-authored-by: Drashna Jaelre --- keyboards/akko/mod007_v3/mod007_v3.c | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/keyboards/akko/mod007_v3/mod007_v3.c b/keyboards/akko/mod007_v3/mod007_v3.c index 45640141b7f..98edafb31d6 100644 --- a/keyboards/akko/mod007_v3/mod007_v3.c +++ b/keyboards/akko/mod007_v3/mod007_v3.c @@ -12,22 +12,3 @@ enum __layers { MAC_W, MAC_FN }; -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - if (!process_record_user(keycode, record)) { - return false; - } - switch (keycode) { - case DF(WIN_B): - if ( record->event.pressed) { - set_single_persistent_default_layer(WIN_B); - } - return false; - case DF(MAC_B): - if (record->event.pressed) { - set_single_persistent_default_layer(MAC_B); - } - return false; - default: - return true; - } -} From b26acc166462340a6bdef3a76dcc3ee05504ced2 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Wed, 15 Jan 2025 17:35:46 +0800 Subject: [PATCH 43/44] Update keyboards/akko/mod007_v3/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre --- keyboards/akko/mod007_v3/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/akko/mod007_v3/keymaps/default/keymap.c b/keyboards/akko/mod007_v3/keymaps/default/keymap.c index e854490bc09..812adb07a23 100644 --- a/keyboards/akko/mod007_v3/keymaps/default/keymap.c +++ b/keyboards/akko/mod007_v3/keymaps/default/keymap.c @@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [MAC_FN] = LAYOUT_all( /* FN */ _______, KC_F1, KC_F2, KC_F3, KC_F4, _______, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______,TG(MAC_W),_______, _______, _______, _______, _______, KC_INS, DF(WIN_B),KC_PSCR,_______, _______, _______, _______, + _______, _______,TG(MAC_W),_______, _______, _______, _______, _______, KC_INS, PDF(WIN_B),KC_PSCR,_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______) From f58612ee6eeac6461dfcd683d9fe67c73e884b70 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Wed, 15 Jan 2025 17:35:54 +0800 Subject: [PATCH 44/44] Update keyboards/akko/mod007_v3/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre --- keyboards/akko/mod007_v3/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/akko/mod007_v3/keymaps/default/keymap.c b/keyboards/akko/mod007_v3/keymaps/default/keymap.c index 812adb07a23..f3b605c5887 100644 --- a/keyboards/akko/mod007_v3/keymaps/default/keymap.c +++ b/keyboards/akko/mod007_v3/keymaps/default/keymap.c @@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [WIN_FN] = LAYOUT_all( /* FN */ _______, KC_MYCM, KC_MAIL, KC_WSCH, KC_WHOM, KC_MSEL, KC_MPLY, KC_MPRV, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______,TG(WIN_W),_______, _______, _______, _______, _______, KC_INS, DF(MAC_B),KC_PSCR,_______, _______, _______, _______, + _______, _______,TG(WIN_W),_______, _______, _______, _______, _______, KC_INS, PDF(MAC_B),KC_PSCR, _______,_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, _______, GU_TOGG, _______, _______, _______, _______, _______, _______, _______, _______),