From ad0354f6387088249841a9eef970a9a1ee5e58ba Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Tue, 11 Jul 2023 04:35:45 +0800 Subject: [PATCH] fl16: Rename gridpad to macropad Signed-off-by: Daniel Schaefer --- .github/workflows/lotus.yml | 6 +++--- keyboards/framework/build_all.sh | 2 +- keyboards/framework/config.h | 2 +- keyboards/framework/dyn_serial.h | 2 +- keyboards/framework/framework.h | 4 ++-- keyboards/framework/kle/README.md | 14 +++++++------- keyboards/framework/led.py | 4 ++-- .../framework/{gridpad => macropad}/config.h | 0 .../framework/{gridpad => macropad}/info.json | 0 .../keymaps/default/keymap.c | 0 .../{gridpad/gridpad.h => macropad/macropad.h} | 0 .../framework/{gridpad => macropad}/rules.mk | 0 keyboards/framework/numpad/numpad.h | 2 +- keyboards/framework/readme.md | 18 +++++++++--------- keyboards/framework/rules.mk | 2 +- 15 files changed, 28 insertions(+), 28 deletions(-) rename keyboards/framework/{gridpad => macropad}/config.h (100%) rename keyboards/framework/{gridpad => macropad}/info.json (100%) rename keyboards/framework/{gridpad => macropad}/keymaps/default/keymap.c (100%) rename keyboards/framework/{gridpad/gridpad.h => macropad/macropad.h} (100%) rename keyboards/framework/{gridpad => macropad}/rules.mk (100%) diff --git a/.github/workflows/lotus.yml b/.github/workflows/lotus.yml index 894fac90d9..998d22cec5 100644 --- a/.github/workflows/lotus.yml +++ b/.github/workflows/lotus.yml @@ -27,7 +27,7 @@ jobs: qmk lint -kb framework/iso -km default qmk lint -kb framework/jis -km default qmk lint -kb framework/numpad -km default - qmk lint -kb framework/gridpad -km default + qmk lint -kb framework/macropad -km default - name: Build Framework Laptop 16 ANSI variant run: qmk compile -kb framework/ansi -km default @@ -41,8 +41,8 @@ jobs: - name: Build Framework Laptop 16 Numpad run: qmk compile -kb framework/numpad -km default - - name: Build Framework Laptop 16 Gridpad - run: qmk compile -kb framework/gridpad -km default + - name: Build Framework Laptop 16 Macropad + run: qmk compile -kb framework/macropad -km default - uses: actions/upload-artifact@v3 with: diff --git a/keyboards/framework/build_all.sh b/keyboards/framework/build_all.sh index 547ff84d4f..adc5097084 100755 --- a/keyboards/framework/build_all.sh +++ b/keyboards/framework/build_all.sh @@ -3,4 +3,4 @@ qmk compile -kb framework/ansi -km default qmk compile -kb framework/iso -km default qmk compile -kb framework/jis -km default qmk compile -kb framework/numpad -km default -qmk compile -kb framework/gridpad -km default +qmk compile -kb framework/macropad -km default diff --git a/keyboards/framework/config.h b/keyboards/framework/config.h index a76674d659..76e451b090 100644 --- a/keyboards/framework/config.h +++ b/keyboards/framework/config.h @@ -26,7 +26,7 @@ #define LED_CAPS_LOCK_PIN GP24 #elif KEYBOARD_framework_numpad #define LED_NUM_LOCK_PIN GP24 -#elif KEYBOARD_framework_gridpad +#elif KEYBOARD_framework_macropad #endif // PWM single one backlight configuration diff --git a/keyboards/framework/dyn_serial.h b/keyboards/framework/dyn_serial.h index dcd2f3b4fb..2a4a23cae8 100644 --- a/keyboards/framework/dyn_serial.h +++ b/keyboards/framework/dyn_serial.h @@ -15,7 +15,7 @@ uint16_t dyn_serial_number_string_len(void); // Must be wide-string (UTF-16) // KDK = Keyboard RGB Backlight // KDW = Keyboard White Backlight -// KDN = Keyboard RGB Gridpad +// KDN = Keyboard RGB Macropad // KDM = Keyboard White Numpad #define FALLBACK_SERIAL_NUMBER L"FRAKDKEN0100000000" _Static_assert(sizeof(FALLBACK_SERIAL_NUMBER) == (SERIALNUM_LEN+1)*2, "Fallback serial number must be same length"); diff --git a/keyboards/framework/framework.h b/keyboards/framework/framework.h index 2d66cb70e0..68fd53b5c1 100644 --- a/keyboards/framework/framework.h +++ b/keyboards/framework/framework.h @@ -13,8 +13,8 @@ #include "jis.h" #elif KEYBOARD_framework_numpad #include "numpad.h" -#elif KEYBOARD_framework_gridpad - #include "gridpad.h" +#elif KEYBOARD_framework_macropad + #include "macropad.h" #endif enum framework_keycodes { diff --git a/keyboards/framework/kle/README.md b/keyboards/framework/kle/README.md index cf96ed2e1b..9df8a071c4 100644 --- a/keyboards/framework/kle/README.md +++ b/keyboards/framework/kle/README.md @@ -4,13 +4,13 @@ These files are generated by modeling our keyboard layouts in [KLE](http://www.k That is then exported and converted to the format for `info.json`. But to continue editing them, I kept the files here. Might be useful for the future. -| Layout | Standard KLE Layout | VIA KLE Layout | VIA Design | -| ------ | --------------------- | ------------------ | ------------------------- | -| ANSI | `ansi_layout.json` | `ansi_via.json` | `via_ansi_design.json` | -| ISO | `iso_layout.json` | `iso_layout.json` | `via_iso_design.json` | -| JIS | `jis_layout.json` | `jis_via.json` | `via_jis_design.json` | -| Numpad | `numpad_layout.json` | `numpad_via.json` | `via_numpad_design.json` | -| Gridpad| `gridpad_layout.json` | `gridpad_via.json` | `via_gridpad_design.json` | +| Layout | Standard KLE Layout | VIA KLE Layout | VIA Design | +| -------- | ---------------------- | ------------------- | -------------------------- | +| ANSI | `ansi_layout.json` | `ansi_via.json` | `via_ansi_design.json` | +| ISO | `iso_layout.json` | `iso_layout.json` | `via_iso_design.json` | +| JIS | `jis_layout.json` | `jis_via.json` | `via_jis_design.json` | +| Numpad | `numpad_layout.json` | `numpad_via.json` | `via_numpad_design.json` | +| Macropad | `macropad_layout.json` | `macropad_via.json` | `via_macropad_design.json` | - The Standard KLE Layout is just downloaded from KLE. - The VIA KLE Layout has matrix positions as labels instead of the actual key labels. diff --git a/keyboards/framework/led.py b/keyboards/framework/led.py index ae0c41efd3..f1fcc628c7 100755 --- a/keyboards/framework/led.py +++ b/keyboards/framework/led.py @@ -18,7 +18,7 @@ from collections import OrderedDict # Keyboard MATRIX_ROWS = 8 MATRIX_COLS = 16 -# Gridpad +# Macropad #MATRIX_ROWS = 4 #MATRIX_COLS = 8 @@ -155,7 +155,7 @@ ansi = [ { "id": "92", "x":1120, "y": 542, "matrix": (15,2) }, ] -gridpad = [ +macropad = [ { "id": "6", "x":1332, "y": 158, "matrix": (1,2) }, { "id": "3", "x":1395, "y": 158, "matrix": (2,2) }, { "id": "23", "x":1460, "y": 158, "matrix": (4,3) }, diff --git a/keyboards/framework/gridpad/config.h b/keyboards/framework/macropad/config.h similarity index 100% rename from keyboards/framework/gridpad/config.h rename to keyboards/framework/macropad/config.h diff --git a/keyboards/framework/gridpad/info.json b/keyboards/framework/macropad/info.json similarity index 100% rename from keyboards/framework/gridpad/info.json rename to keyboards/framework/macropad/info.json diff --git a/keyboards/framework/gridpad/keymaps/default/keymap.c b/keyboards/framework/macropad/keymaps/default/keymap.c similarity index 100% rename from keyboards/framework/gridpad/keymaps/default/keymap.c rename to keyboards/framework/macropad/keymaps/default/keymap.c diff --git a/keyboards/framework/gridpad/gridpad.h b/keyboards/framework/macropad/macropad.h similarity index 100% rename from keyboards/framework/gridpad/gridpad.h rename to keyboards/framework/macropad/macropad.h diff --git a/keyboards/framework/gridpad/rules.mk b/keyboards/framework/macropad/rules.mk similarity index 100% rename from keyboards/framework/gridpad/rules.mk rename to keyboards/framework/macropad/rules.mk diff --git a/keyboards/framework/numpad/numpad.h b/keyboards/framework/numpad/numpad.h index f762c5467a..942f0e1104 100644 --- a/keyboards/framework/numpad/numpad.h +++ b/keyboards/framework/numpad/numpad.h @@ -1,7 +1,7 @@ // Copyright 2022 Framework Computer // SPDX-License-Identifier: GPL-2.0-or-later -// Same as gridpad with a few keys removed +// Same as macropad with a few keys removed #define LAYOUT( \ H1, H2, H3, H4, \ K90, K95, K100, K105, \ diff --git a/keyboards/framework/readme.md b/keyboards/framework/readme.md index f8bbdd8449..9fc7ed292d 100644 --- a/keyboards/framework/readme.md +++ b/keyboards/framework/readme.md @@ -3,7 +3,7 @@ Keyboard input modules for the Framework Laptop 16. * Keyboard Maintainer: [Daniel Schaefer](https://github.com/JohnAZoidberg) -* Hardware Supported: Framework Laptop 16 Keyboard, Numpad and Gridpad +* Hardware Supported: Framework Laptop 16 Keyboard, Numpad and Macropad * Hardware Availability: Soon available at https://frame.work/marketplace ## Variants @@ -11,13 +11,13 @@ Keyboard input modules for the Framework Laptop 16. There are 5 different hardware variants with different number of keys and backlight options. -| Name | Size | Backlight | Keys | -| ------- | -------- | ---------- | ---- | -| ansi | Keyboard | RGB/White | 78 | -| iso | Keyboard | White | 79 | -| jis | Keyboard | White | 83 | -| numpad | Numpad | White | 21 | -| gridpad | Numpad | RGB | 24 | +| Name | Size | Backlight | Keys | +| -------- | -------- | ---------- | ---- | +| ansi | Keyboard | RGB/White | 78 | +| iso | Keyboard | White | 79 | +| jis | Keyboard | White | 83 | +| numpad | Numpad | White | 21 | +| macropad | Numpad | RGB | 24 | Make example for this keyboard (after setting up your build environment): @@ -25,7 +25,7 @@ Make example for this keyboard (after setting up your build environment): qmk compile -kb framework/iso -km default qmk compile -kb framework/jis -km default qmk compile -kb framework/numpad -km default - qmk compile -kb framework/gridpad -km default + qmk compile -kb framework/macropad -km default Flashing example for the ANSI keyboard: diff --git a/keyboards/framework/rules.mk b/keyboards/framework/rules.mk index 6f62193729..46338448ea 100644 --- a/keyboards/framework/rules.mk +++ b/keyboards/framework/rules.mk @@ -6,7 +6,7 @@ RAW_ENABLE = no # Enabled in info.json # EXTRAKEY_ENABLE = yes # Audio control and System control -# Enable for all. ANSI keyboard supports RGB and white, gridpad only RGB, all others only white. +# Enable for all. ANSI keyboard supports RGB and white, macropad only RGB, all others only white. # No harm in enabling it for all. # Also RP pico has the built-in LED wired to the same GPIO. Good for prototyping BACKLIGHT_ENABLE = yes