Skip to content

Commit 922314d

Browse files
committed
fl16: Create ANSI Copilot as separate PID
It needs different firmware from the factory, so we need to distinguish it from software in order to be able to update it correctly. Signed-off-by: Daniel Schaefer <dhs@frame.work>
1 parent da3d409 commit 922314d

File tree

10 files changed

+583
-10
lines changed

10 files changed

+583
-10
lines changed

.github/workflows/lotus.yml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,8 @@ jobs:
2525
- name: Lint Framework Laptop 16
2626
run: |
2727
qmk lint -kb framework/ansi -km default
28-
qmk lint -kb framework/ansi -km copilot
28+
qmk lint -kb framework/copilot -km default
2929
qmk lint -kb framework/iso -km default
30-
qmk lint -kb framework/iso -km copilot
3130
qmk lint -kb framework/jis -km default
3231
qmk lint -kb framework/numpad -km default
3332
qmk lint -kb framework/macropad -km default
@@ -36,14 +35,11 @@ jobs:
3635
run: qmk compile -kb framework/ansi -km default
3736

3837
- name: Build Framework Laptop 16 ANSI copilot variant
39-
run: qmk compile -kb framework/ansi -km copilot
38+
run: qmk compile -kb framework/copilot -km default
4039

4140
- name: Build Framework Laptop 16 ISO variant
4241
run: qmk compile -kb framework/iso -km default
4342

44-
- name: Build Framework Laptop 16 ISO variant
45-
run: qmk compile -kb framework/iso -km copilot
46-
4743
- name: Build Framework Laptop 16 JIS variant
4844
run: qmk compile -kb framework/jis -km default
4945

@@ -62,9 +58,8 @@ jobs:
6258
- name: Convert UF2 to bin
6359
run: |
6460
./util/uf2conv.py framework_ansi_default.uf2 --convert --output framework_ansi_default.bin
65-
./util/uf2conv.py framework_ansi_copilot.uf2 --convert --output framework_ansi_copilot.bin
61+
./util/uf2conv.py framework_copilot_default.uf2 --convert --output framework_copilot_default.bin
6662
./util/uf2conv.py framework_iso_default.uf2 --convert --output framework_iso_default.bin
67-
./util/uf2conv.py framework_iso_copilot.uf2 --convert --output framework_iso_copilot.bin
6863
./util/uf2conv.py framework_jis_default.uf2 --convert --output framework_jis_default.bin
6964
./util/uf2conv.py framework_numpad_default.uf2 --convert --output framework_numpad_default.bin
7065
./util/uf2conv.py framework_macropad_default.uf2 --convert --output framework_macropad_default.bin

keyboards/framework/build_all.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
set -e
22
qmk compile -kb framework/ansi -km default
3+
qmk compile -kb framework/copilot -km default
34
qmk compile -kb framework/iso -km default
45
qmk compile -kb framework/jis -km default
56
qmk compile -kb framework/numpad -km default

keyboards/framework/config.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@
3232
// Enable serial number. Calls into dyn_serial_number_string* functions
3333
#define SERIAL_NUMBER
3434

35-
#ifdef KEYBOARD_framework_ansi
35+
#if KEYBOARD_framework_ansi
36+
#define LED_CAPS_LOCK_PIN GP24
37+
#elif KEYBOARD_framework_copilot
3638
#define LED_CAPS_LOCK_PIN GP24
3739
#elif KEYBOARD_framework_iso
3840
#define LED_CAPS_LOCK_PIN GP24
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
// Copyright 2022 Framework Computer
2+
// SPDX-License-Identifier: GPL-2.0-or-later
3+
4+
#define MATRIX_COLS 16
5+
#define MATRIX_ROWS 8
6+
7+
#define DRIVER_COUNT 2
8+
#define DRIVER_ADDR_1 0b0100000
9+
#define DRIVER_ADDR_2 0b0100011
10+
#define DRIVER_1_LED_TOTAL 48
11+
#define DRIVER_2_LED_TOTAL 49
12+
#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
13+
#define ISSI_CONFIGURATION 0x21 // Enable only the first 9 SW and disable software shutdown
14+
15+
// Limit current to ensure max current draw is just about 500mA
16+
// when white att 100% brightness
17+
#define ISSI_GLOBALCURRENT 104

0 commit comments

Comments
 (0)