fl16: Rename gridpad to macropad
Signed-off-by: Daniel Schaefer <dhs@frame.work>
This commit is contained in:
Daniel Schaefer
parent
be3d3eed91
commit
ad0354f638
6
.github/workflows/lotus.yml
vendored
6
.github/workflows/lotus.yml
vendored
@ -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:
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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");
|
||||
|
||||
@ -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 {
|
||||
|
||||
@ -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.
|
||||
|
||||
@ -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) },
|
||||
|
||||
@ -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, \
|
||||
|
||||
@ -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:
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user