melissa/zsa_qmk_firmware
1
0
Fork 0
mirror of https://github.com/zsa/qmk_firmware.git synced 2026-04-26 09:26:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: updates rgb / led control over hid

Browse Source
This commit is contained in:
Florian
2024-06-13 16:33:50 +07:00
parent cf038f510a
commit b8258500a9
10 changed files with 194 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
keyboards/moonlander/keymaps/default/config.h
View File

@@ -1,21 +1,13 @@
/* Copyright 2020 ZSA Technology Labs, Inc <@zsa>
* Copyright 2020 Jack Humbert <jack.humb@gmail.com>
* Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) <drashna@live.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
/*
Set any config.h overrides for your specific keymap here.
See config.h options at https://docs.qmk.fm/#/config_options?id=the-configh-file
*/
#define ORYX_CONFIGURATOR
#define USB_SUSPEND_WAKEUP_DELAY 0
#define FIRMWARE_VERSION u8"xbJpL/aByb5"
#define RAW_USAGE_PAGE 0xFF60
#define RAW_USAGE_ID 0x61
#define LAYER_STATE_8BIT
#define RGB_MATRIX_STARTUP_SPD 60

131
keyboards/moonlander/keymaps/default/keymap.c
View File

@@ -1,73 +1,84 @@
/* Copyright 2020 ZSA Technology Labs, Inc <@zsa>
* Copyright 2020 Jack Humbert <jack.humb@gmail.com>
* Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) <drashna@live.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H
#include "version.h"
enum layers {
BASE, // default layer
SYMB, // symbols
MDIA, // media keys
};
#define MOON_LED_LEVEL LED_LEVEL
enum custom_keycodes {
VRSN = SAFE_RANGE,
RGB_SLD = ML_SAFE_RANGE,
HSV_0_245_245,
HSV_74_255_206,
HSV_152_255_255,
};
// clang-format off
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[BASE] = LAYOUT_moonlander(
KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_LEFT, KC_RGHT, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
KC_DEL, KC_Q, KC_W, KC_E, KC_R, KC_T, TG(SYMB), TG(SYMB), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
KC_BSPC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_HYPR, KC_MEH, KC_H, KC_J, KC_K, KC_L, LT(MDIA, KC_SCLN), LGUI_T(KC_QUOT),
KC_LSFT, LCTL_T(KC_Z),KC_X,KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, RCTL_T(KC_SLSH), KC_RSFT,
LT(SYMB,KC_GRV),KC_NO,A(KC_LSFT),KC_LEFT, KC_RGHT, LALT_T(KC_APP), RCTL_T(KC_ESC), KC_UP, KC_DOWN, KC_LBRC, KC_RBRC, MO(SYMB),
KC_SPC, KC_BSPC, KC_LGUI, KC_LALT, KC_TAB, KC_ENT
),
[SYMB] = LAYOUT_moonlander(
VRSN, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
_______, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE, _______, _______, KC_UP, KC_7, KC_8, KC_9, KC_ASTR, KC_F12,
_______, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_GRV, _______, _______, KC_DOWN, KC_4, KC_5, KC_6, KC_PLUS, _______,
_______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD, KC_AMPR, KC_1, KC_2, KC_3, KC_BSLS, _______,
EE_CLR, _______, _______, _______, _______, RGB_VAI, RGB_TOG, _______, KC_DOT, KC_0, KC_EQL, _______,
RGB_HUD, RGB_VAD, RGB_HUI, TOGGLE_LAYER_COLOR,_______, _______
),
[MDIA] = LAYOUT_moonlander(
LED_LEVEL,_______,_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
_______, _______, _______, KC_MS_U, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY,
_______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MNXT, _______, _______,
_______, _______, _______, KC_BTN1, KC_BTN2, _______, _______, KC_VOLU, KC_VOLD, KC_MUTE, _______, _______,
_______, _______, _______, _______, _______, _______
),
[0] = LAYOUT_moonlander(
KC_EQUAL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_LEFT, KC_RIGHT, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS,
KC_DELETE, KC_Q, KC_W, KC_E, KC_R, KC_T, TG(1), TG(1), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
KC_BSPC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_HYPR, KC_MEH, KC_H, KC_J, KC_K, KC_L, LT(2,KC_SCLN), MT(MOD_LGUI, KC_QUOTE),
KC_LEFT_SHIFT, MT(MOD_LCTL, KC_Z),KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, MT(MOD_RCTL, KC_SLASH),KC_RIGHT_SHIFT,
LT(1,KC_GRAVE), CW_TOGG, KC_TRANSPARENT, KC_LEFT, KC_RIGHT, MT(MOD_LALT, KC_APPLICATION), MT(MOD_LCTL, KC_ESCAPE),KC_UP, KC_DOWN, KC_LBRC, KC_RBRC, MO(1),
KC_SPACE, KC_BSPC, KC_LEFT_GUI, KC_LEFT_ALT, KC_TAB, KC_ENTER
),
[1] = LAYOUT_moonlander(
KC_ESCAPE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRANSPARENT, KC_TRANSPARENT, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
KC_TRANSPARENT, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE, KC_TRANSPARENT, KC_TRANSPARENT, KC_UP, KC_7, KC_8, KC_9, KC_ASTR, KC_F12,
KC_TRANSPARENT, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_GRAVE, KC_TRANSPARENT, KC_TRANSPARENT, KC_DOWN, KC_4, KC_5, KC_6, KC_KP_PLUS, KC_TRANSPARENT,
KC_TRANSPARENT, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD, KC_AMPR, KC_1, KC_2, KC_3, KC_BSLS, KC_TRANSPARENT,
KC_TRANSPARENT, KC_COMMA, HSV_0_245_245, HSV_74_255_206, HSV_152_255_255,RGB_MODE_FORWARD, RGB_TOG, KC_TRANSPARENT, KC_DOT, KC_0, KC_EQUAL, KC_TRANSPARENT,
RGB_VAD, RGB_VAI, TOGGLE_LAYER_COLOR, RGB_SLD, RGB_HUD, RGB_HUI
),
[2] = LAYOUT_moonlander(
AU_TOGG, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, QK_BOOT,
MU_TOGG, KC_TRANSPARENT, KC_TRANSPARENT, KC_MS_UP, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
MU_NEXT, KC_TRANSPARENT, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_MEDIA_PLAY_PAUSE,
KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_MEDIA_PREV_TRACK,KC_MEDIA_NEXT_TRACK,KC_TRANSPARENT, KC_TRANSPARENT,
KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_MS_BTN1, KC_MS_BTN2, KC_TRANSPARENT, KC_TRANSPARENT, KC_AUDIO_VOL_UP,KC_AUDIO_VOL_DOWN,KC_AUDIO_MUTE, KC_TRANSPARENT, KC_TRANSPARENT,
KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_WWW_BACK
),
};
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
if (record->event.pressed) {
switch (keycode) {
case VRSN:
SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
switch (keycode) {
case RGB_SLD:
if (rawhid_state.rgb_control) {
return false;
}
}
return true;
if (record->event.pressed) {
rgblight_mode(1);
}
return false;
case HSV_0_245_245:
if (rawhid_state.rgb_control) {
return false;
}
if (record->event.pressed) {
rgblight_mode(1);
rgblight_sethsv(0,245,245);
}
return false;
case HSV_74_255_206:
if (rawhid_state.rgb_control) {
return false;
}
if (record->event.pressed) {
rgblight_mode(1);
rgblight_sethsv(74,255,206);
}
return false;
case HSV_152_255_255:
if (rawhid_state.rgb_control) {
return false;
}
if (record->event.pressed) {
rgblight_mode(1);
rgblight_sethsv(152,255,255);
}
return false;
}
return true;
}

14
keyboards/moonlander/matrix.c
View File

@@ -213,12 +213,12 @@ void matrix_power_up(void) {
is_launching = temp_launching;
if (!temp_launching) {
ML_LED_1(false);
ML_LED_2(false);
ML_LED_3(false);
ML_LED_4(false);
ML_LED_5(false);
ML_LED_6(false);
STATUS_LED_1(false);
STATUS_LED_2(false);
STATUS_LED_3(false);
STATUS_LED_4(false);
STATUS_LED_5(false);
STATUS_LED_6(false);
}
// initialize matrix state: all keys off
@@ -230,4 +230,4 @@ void matrix_power_up(void) {
bool is_transport_connected(void) {
return mcp23018_initd;
}
}

74
keyboards/moonlander/moonlander.c
View File

@@ -33,51 +33,54 @@ void dynamic_macro_record_start_user(int8_t direction) {
void dynamic_macro_record_end_user(int8_t direction) {
is_dynamic_recording = false;
ML_LED_3(false);
STATUS_LED_3(false);
}
#endif
void moonlander_led_task(void) {
#ifdef ORYX_ENABLE
if (rawhid_state.status_led_control) return;
#endif
if (is_launching) {
ML_LED_1(false);
ML_LED_2(false);
ML_LED_3(false);
ML_LED_4(false);
ML_LED_5(false);
ML_LED_6(false);
STATUS_LED_1(false);
STATUS_LED_2(false);
STATUS_LED_3(false);
STATUS_LED_4(false);
STATUS_LED_5(false);
STATUS_LED_6(false);
ML_LED_1(true);
STATUS_LED_1(true);
wait_ms(250);
ML_LED_2(true);
STATUS_LED_2(true);
wait_ms(250);
ML_LED_3(true);
STATUS_LED_3(true);
wait_ms(250);
ML_LED_4(true);
STATUS_LED_4(true);
wait_ms(250);
ML_LED_5(true);
STATUS_LED_5(true);
wait_ms(250);
ML_LED_6(true);
STATUS_LED_6(true);
wait_ms(250);
ML_LED_1(false);
STATUS_LED_1(false);
wait_ms(250);
ML_LED_2(false);
STATUS_LED_2(false);
wait_ms(250);
ML_LED_3(false);
STATUS_LED_3(false);
wait_ms(250);
ML_LED_4(false);
STATUS_LED_4(false);
wait_ms(250);
ML_LED_5(false);
STATUS_LED_5(false);
wait_ms(250);
ML_LED_6(false);
STATUS_LED_6(false);
wait_ms(250);
is_launching = false;
layer_state_set_kb(layer_state);
}
#ifdef DYNAMIC_MACRO_ENABLE
else if (is_dynamic_recording) {
ML_LED_3(true);
STATUS_LED_3(true);
wait_ms(100);
ML_LED_3(false);
STATUS_LED_3(false);
wait_ms(155);
}
#endif
@@ -120,6 +123,9 @@ void keyboard_pre_init_kb(void) {
layer_state_t layer_state_set_kb(layer_state_t state) {
state = layer_state_set_user(state);
if (is_launching || !keyboard_config.led_level) return state;
#ifdef ORYX_ENABLE
if (rawhid_state.status_led_control) return state;
#endif
bool LED_1 = false;
bool LED_2 = false;
bool LED_3 = false;
@@ -160,13 +166,13 @@ layer_state_t layer_state_set_kb(layer_state_t state) {
break;
}
ML_LED_1(LED_1);
ML_LED_2(LED_2);
ML_LED_3(LED_3);
ML_LED_4(LED_4);
ML_LED_5(LED_5);
STATUS_LED_1(LED_1);
STATUS_LED_2(LED_2);
STATUS_LED_3(LED_3);
STATUS_LED_4(LED_4);
STATUS_LED_5(LED_5);
# if !defined(CAPS_LOCK_STATUS)
ML_LED_6(LED_6);
STATUS_LED_6(LED_6);
# endif
return state;
}
@@ -401,7 +407,7 @@ const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = {
#ifdef CAPS_LOCK_STATUS
void led_update_ports(led_t led_state) {
ML_LED_6(led_state.caps_lock);
STATUS_LED_6(led_state.caps_lock);
}
#endif
@@ -418,12 +424,12 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
if (keyboard_config.led_level) {
layer_state_set_kb(layer_state);
} else {
ML_LED_1(false);
ML_LED_2(false);
ML_LED_3(false);
ML_LED_4(false);
ML_LED_5(false);
ML_LED_6(false);
STATUS_LED_1(false);
STATUS_LED_2(false);
STATUS_LED_3(false);
STATUS_LED_4(false);
STATUS_LED_5(false);
STATUS_LED_6(false);
}
}
break;

12
keyboards/moonlander/moonlander.h
View File

@@ -24,13 +24,13 @@ extern bool mcp23018_leds[];
#define MCP23018_DEFAULT_ADDRESS 0b0100000
#define ML_LED_1(status) writePin(B5, (bool)status)
#define ML_LED_2(status) writePin(B4, (bool)status)
#define ML_LED_3(status) writePin(B3, (bool)status)
#define STATUS_LED_1(status) writePin(B5, (bool)status)
#define STATUS_LED_2(status) writePin(B4, (bool)status)
#define STATUS_LED_3(status) writePin(B3, (bool)status)
#define ML_LED_4(status) mcp23018_leds[0] = (bool)status
#define ML_LED_5(status) mcp23018_leds[1] = (bool)status
#define ML_LED_6(status) mcp23018_leds[2] = (bool)status
#define STATUS_LED_4(status) mcp23018_leds[0] = (bool)status
#define STATUS_LED_5(status) mcp23018_leds[1] = (bool)status
#define STATUS_LED_6(status) mcp23018_leds[2] = (bool)status
// clang-format off
#define LED_LAYOUT_moonlander( \

9
keyboards/moonlander/rgb_matrix_kb.inc
View File

@@ -4,14 +4,6 @@ RGB_MATRIX_EFFECT(oryx_webhid_effect)
extern RGB webhid_leds[RGB_MATRIX_LED_COUNT];
static void oryx_webhid_effect_init(void) {
// Paint it black
for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; ++i) {
webhid_leds[i] = (RGB){0, 0, 0};
}
}
static bool oryx_webhid_effect_run(effect_params_t* params) {
RGB_MATRIX_USE_LIMITS(led_min, led_max);
for (uint8_t i = led_min; i < led_max; ++i) {
@@ -21,7 +13,6 @@ static bool oryx_webhid_effect_run(effect_params_t* params) {
}
static bool oryx_webhid_effect(effect_params_t* params) {
if (params->init) oryx_webhid_effect_init();
return oryx_webhid_effect_run(params);
}

8
keyboards/voyager/rgb_matrix_kb.inc
View File

@@ -4,13 +4,6 @@ RGB_MATRIX_EFFECT(oryx_webhid_effect)
RGB webhid_leds[RGB_MATRIX_LED_COUNT];
static void oryx_webhid_effect_init(void) {
// Paint it black
for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; ++i) {
webhid_leds[i] = (RGB){0, 0, 0};
}
}
static bool oryx_webhid_effect_run(effect_params_t* params) {
RGB_MATRIX_USE_LIMITS(led_min, led_max);
uint8_t val = rgb_matrix_get_val() * 100 / 175;
@@ -26,7 +19,6 @@ static bool oryx_webhid_effect_run(effect_params_t* params) {
}
static bool oryx_webhid_effect(effect_params_t* params) {
if (params->init) oryx_webhid_effect_init();
return oryx_webhid_effect_run(params);
}

4
keyboards/voyager/voyager.c
View File

@@ -39,7 +39,7 @@ void dynamic_macro_record_end_user(int8_t direction) {
void voyager_led_task(void) {
#ifdef ORYX_ENABLE
if (rawhid_state.rgb_control) return;
if (rawhid_state.status_led_control) return;
#endif
if (is_launching) {
STATUS_LED_1(false);
@@ -113,7 +113,7 @@ layer_state_t layer_state_set_kb(layer_state_t state) {
state = layer_state_set_user(state);
if (is_launching || !keyboard_config.led_level) return state;
#ifdef ORYX_ENABLE
if (rawhid_state.rgb_control) return state;
if (rawhid_state.status_led_control) return state;
#endif
uint8_t layer = get_highest_layer(state);

50
quantum/oryx.c
View File

@@ -1,8 +1,5 @@
#include <string.h>
#include "oryx.h"
#ifdef KEYBOARD_voyager
# include "voyager.h"
#endif
rawhid_state_t rawhid_state = {.paired = false, .rgb_control = false};
@@ -55,6 +52,20 @@ void trigger_smart_layer(void) {
raw_hid_send(event, sizeof(event));
}
void set_webhid_effect(void) {
rgb_matrix_mode_noeeprom(RGB_MATRIX_CUSTOM_oryx_webhid_effect);
rawhid_state.rgb_control = true;
}
void clear_webhid_effect(void) {
// Clear the pattern
for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
webhid_leds[i] = (RGB){.r = 0, .g = 0, .b = 0};
}
rgb_matrix_reload_from_eeprom();
rawhid_state.rgb_control = false;
}
void raw_hid_receive(uint8_t *data, uint8_t length) {
uint8_t command = data[0];
uint8_t *param = &data[1];
@@ -106,11 +117,9 @@ void raw_hid_receive(uint8_t *data, uint8_t length) {
case ORYX_RGB_CONTROL:
#if defined(RGB_MATRIX_ENABLE) && !defined(KEYBOARD_ergodox_ez_glow)
if (param[0] == 0) {
rgb_matrix_reload_from_eeprom();
rawhid_state.rgb_control = false;
clear_webhid_effect();
} else {
rgb_matrix_mode_noeeprom(RGB_MATRIX_CUSTOM_oryx_webhid_effect);
rawhid_state.rgb_control = true;
set_webhid_effect();
}
uint8_t event[RAW_EPSIZE];
event[0] = ORYX_EVT_RGB_CONTROL;
@@ -124,11 +133,27 @@ void raw_hid_receive(uint8_t *data, uint8_t length) {
case ORYX_SET_RGB_LED:
#if defined(RGB_MATRIX_ENABLE) && !defined(KEYBOARD_ergodox_ez_glow)
webhid_leds[param[0]] = (RGB){.r = param[1], .g = param[2], .b = param[3]};
if (rawhid_state.rgb_control == false) {
set_webhid_effect();
}
#else
oryx_error(ORYX_ERR_RGB_MATRIX_NOT_ENABLED);
#endif
break;
case ORYX_SET_RGB_LED_ALL:
#if defined(RGB_MATRIX_ENABLE) && !defined(KEYBOARD_ergodox_ez_glow)
for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
webhid_leds[i] = (RGB){.r = param[0], .g = param[1], .b = param[2]};
}
if (rawhid_state.rgb_control == false) {
set_webhid_effect();
}
#else
oryx_error(ORYX_ERR_RGB_MATRIX_NOT_ENABLED);
#endif
break;
case ORYX_SET_STATUS_LED:
rawhid_state.status_led_control = true; // Eagerly take control of the status LEDs
switch (param[0]) {
case 0:
#ifdef STATUS_LED_1
@@ -178,7 +203,7 @@ void raw_hid_receive(uint8_t *data, uint8_t length) {
break;
}
break;
case ORYX_UPDATE_BRIGHTNESS:
case ORYX_UPDATE_BRIGHTNESS: {
#if defined(RGB_MATRIX_ENABLE) && !defined(PROTOCOL_LUFA)
if (param[0]) {
rgb_matrix_increase_val_noeeprom();
@@ -189,6 +214,15 @@ void raw_hid_receive(uint8_t *data, uint8_t length) {
oryx_error(ORYX_ERR_RGB_MATRIX_NOT_ENABLED);
#endif
break;
}
case ORYX_STATUS_LED_CONTROL: {
rawhid_state.status_led_control = param[0];
uint8_t event[RAW_EPSIZE];
event[0] = ORYX_EVT_STATUS_LED_CONTROL;
event[1] = rawhid_state.status_led_control;
raw_hid_send(event, RAW_EPSIZE);
break;
}
default:
oryx_error(ORYX_ERR_UNKNOWN_COMMAND);
}

15
quantum/oryx.h
View File

@@ -13,6 +13,13 @@ Once the host has paired, it can freely use the commands define in the Oryx_Comm
#include "quantum.h"
#include "raw_hid.h"
#ifdef KEYBOARD_voyager
# include "voyager.h"
#endif
#ifdef KEYBOARD_moonlander
# include "moonlander.h"
#endif
#ifndef RAW_ENABLE
# error "Raw hid needs to be enabled, please enable it!"
@@ -21,7 +28,7 @@ Once the host has paired, it can freely use the commands define in the Oryx_Comm
# define RAW_EPSIZE 32
#endif
#define ORYX_PROTOCOL_VERSION 0x03
#define ORYX_PROTOCOL_VERSION 0x04
#define ORYX_STOP_BIT -2
enum Oryx_Command_Code {
@@ -34,6 +41,8 @@ enum Oryx_Command_Code {
ORYX_SET_RGB_LED,
ORYX_SET_STATUS_LED,
ORYX_UPDATE_BRIGHTNESS,
ORYX_SET_RGB_LED_ALL,
ORYX_STATUS_LED_CONTROL,
ORYX_GET_PROTOCOL_VERSION = 0xFE,
};
@@ -49,6 +58,7 @@ enum Oryx_Event_Code {
ORYX_EVT_RGB_CONTROL,
ORYX_EVT_TOGGLE_SMART_LAYER,
ORYX_EVT_TRIGGER_SMART_LAYER,
ORYX_EVT_STATUS_LED_CONTROL,
ORYX_EVT_GET_PROTOCOL_VERSION = 0XFE,
ORYX_EVT_ERROR = 0xFF,
};
@@ -68,6 +78,7 @@ extern bool oryx_state_live_training_enabled;
typedef struct {
bool paired;
bool rgb_control;
bool status_led_control;
} rawhid_state_t;
extern rawhid_state_t rawhid_state;
@@ -77,11 +88,13 @@ void pairing_failed_event(void);
void pairing_succesful_event(void);
void toggle_smart_layer(void);
void trigger_smart_layer(void);
void set_webhid_effect(void);
void oryx_layer_event(void);
bool process_record_oryx(uint16_t keycode, keyrecord_t* record);
void layer_state_set_oryx(layer_state_t state);
#if defined(RGB_MATRIX_ENABLE) && !defined(KEYBOARD_ergodox_ez_glow)
RGB webhid_leds[RGB_MATRIX_LED_COUNT];
#endif