aboutsummaryrefslogtreecommitdiff
path: root/keyboards/system76
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/system76')
-rw-r--r--keyboards/system76/launch_1/keyboard.json (renamed from keyboards/system76/launch_1/info.json)12
-rw-r--r--keyboards/system76/launch_1/rules.mk15
-rw-r--r--keyboards/system76/launch_1/usb_mux.c2
3 files changed, 13 insertions, 16 deletions
diff --git a/keyboards/system76/launch_1/info.json b/keyboards/system76/launch_1/keyboard.json
index 536b310cc0..28a505448e 100644
--- a/keyboards/system76/launch_1/info.json
+++ b/keyboards/system76/launch_1/keyboard.json
@@ -7,6 +7,18 @@
"pid": "0x0001",
"device_version": "0.0.1"
},
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "bootmagic": false,
+ "dynamic_keymap": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true,
+ "raw": true,
+ "rgb_matrix": true
+ },
"ws2812": {
"pin": "E2"
},
diff --git a/keyboards/system76/launch_1/rules.mk b/keyboards/system76/launch_1/rules.mk
index 181976b2dd..6c4999df37 100644
--- a/keyboards/system76/launch_1/rules.mk
+++ b/keyboards/system76/launch_1/rules.mk
@@ -4,22 +4,7 @@ F_CPU = 8000000
# External oscillator is 16 MHz
F_USB = 16000000
-# Build options
-# change yes to no to disable
-BOOTMAGIC_ENABLE = no # Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and system control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-DYNAMIC_KEYMAP_ENABLE = yes # Reconfigurable keyboard without flashing firmware
-NKRO_ENABLE = yes # USB N-key rollover
-RAW_ENABLE = yes # Raw HID commands (used by Keyboard Configurator)
-BACKLIGHT_ENABLE = no # RGB backlight (conflicts with RGB matrix)
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-RGB_MATRIX_ENABLE = yes # RGB matrix
RGB_MATRIX_CUSTOM_KB = yes # Custom keyboard effects
-AUDIO_ENABLE = no # Audio output
-LTO_ENABLE = yes # Link-time optimization for smaller binary
# Add System76 EC command interface as well as I2C and USB mux drivers
SRC += system76_ec.c usb_mux.c
diff --git a/keyboards/system76/launch_1/usb_mux.c b/keyboards/system76/launch_1/usb_mux.c
index dd51b7c4b2..7ce1da07aa 100644
--- a/keyboards/system76/launch_1/usb_mux.c
+++ b/keyboards/system76/launch_1/usb_mux.c
@@ -79,7 +79,7 @@ i2c_status_t usb7206_read_reg(struct USB7206* self, uint32_t addr, uint8_t* data
uint16_t read = 0x0006; // Buffer address 6 to skip header
uint8_t data_with_buffer_length[length];
- status = i2c_readReg16((self->addr << 1), read, data_with_buffer_length, length, I2C_TIMEOUT);
+ status = i2c_read_register16((self->addr << 1), read, data_with_buffer_length, length, I2C_TIMEOUT);
for (uint16_t i = 0; i < (length - 1) && status >= 0; i++) {
data[i] = data_with_buffer_length[i+1];