aboutsummaryrefslogtreecommitdiff
path: root/keyboards/system76
diff options
context:
space:
mode:
authorNick Brassel <[email protected]>2023-08-29 21:24:43 +1000
committerNick Brassel <[email protected]>2023-08-29 21:24:43 +1000
commit31a91add168c956655ace8ec4cf9750db1e2cfc6 (patch)
tree12cea9b5f8e769f9611a31cbaede9537edad71cc /keyboards/system76
parentf07490bc092e365ba03dc685b3fc30ad0bf0b752 (diff)
parentedaf8a87ef3164f8986b0a8eb171d4879b45414c (diff)
downloadqmk_firmware-31a91add168c956655ace8ec4cf9750db1e2cfc6.tar.gz
qmk_firmware-31a91add168c956655ace8ec4cf9750db1e2cfc6.zip
Merge branch 'develop'0.22.0
Diffstat (limited to 'keyboards/system76')
-rw-r--r--keyboards/system76/launch_1/info.json2
-rw-r--r--keyboards/system76/launch_1/rgb_matrix_kb.inc1
-rw-r--r--keyboards/system76/system76_ec.c6
3 files changed, 8 insertions, 1 deletions
diff --git a/keyboards/system76/launch_1/info.json b/keyboards/system76/launch_1/info.json
index 21a8c1fbd9..eba3a115b8 100644
--- a/keyboards/system76/launch_1/info.json
+++ b/keyboards/system76/launch_1/info.json
@@ -11,7 +11,7 @@
"pin": "E2"
},
"rgb_matrix": {
- "driver": "WS2812"
+ "driver": "ws2812"
},
"matrix_pins": {
"cols": ["D7", "C7", "C6", "B6", "B5", "B4", "D6", "D4", "E6", "D5", "D3", "D2", "B7", "B0"],
diff --git a/keyboards/system76/launch_1/rgb_matrix_kb.inc b/keyboards/system76/launch_1/rgb_matrix_kb.inc
index 02de10ed50..f29183dde0 100644
--- a/keyboards/system76/launch_1/rgb_matrix_kb.inc
+++ b/keyboards/system76/launch_1/rgb_matrix_kb.inc
@@ -22,6 +22,7 @@ RGB_MATRIX_EFFECT(unlocked)
#ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
#include "dynamic_keymap.h"
+#include "action_layer.h"
static bool active_keys_initialized = false;
static uint8_t active_keys_table[RGB_MATRIX_LED_COUNT] = {0};
diff --git a/keyboards/system76/system76_ec.c b/keyboards/system76/system76_ec.c
index 6301659072..1b7955e19b 100644
--- a/keyboards/system76/system76_ec.c
+++ b/keyboards/system76/system76_ec.c
@@ -22,6 +22,12 @@
#include "raw_hid.h"
#include "rgb_matrix.h"
#include "version.h"
+#include "keyboard.h"
+#include "eeprom.h"
+#include "matrix.h"
+#include "action_layer.h"
+#include "bootloader.h"
+#include "wait.h"
enum Command {
CMD_PROBE = 1, // Probe for System76 EC protocol