Skip to content

Commit

Permalink
chore: remove pairing code
Browse files Browse the repository at this point in the history
  • Loading branch information
@fdidron
fdidron committed Dec 21, 2023
1 parent 47c470e commit cfd8ed8
Show file tree
Hide file tree
Showing 6 changed files with 44 additions and 257 deletions.
32 changes: 0 additions & 32 deletions keyboards/ergodox_ez/ergodox_ez.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -389,11 +389,6 @@ void eeconfig_init_kb(void) { // EEPROM is getting reset!
eeconfig_init_user();
}

#ifdef ORYX_ENABLE
static uint16_t loops = 0;
static bool is_on = false;
#endif

#ifdef DYNAMIC_MACRO_ENABLE
static bool is_dynamic_recording = false;
static uint16_t dynamic_loop_timer;
Expand All @@ -411,33 +406,6 @@ void dynamic_macro_record_end_user(int8_t direction) {
#endif

void matrix_scan_kb(void) {
#ifdef ORYX_ENABLE
if(rawhid_state.pairing == true) {
if(loops == 0) {
ergodox_right_led_1_off();
ergodox_right_led_2_off();
ergodox_right_led_3_off();
}
if(loops % PAIRING_BLINK_STEPS == 0) {
if(is_on) {
ergodox_right_led_2_off();
} else {
ergodox_right_led_2_on();
}
is_on ^= 1;
}
if(loops > PAIRING_BLINK_END) {
rawhid_state.pairing = false;
layer_state_set_user(layer_state);
loops = 0;
}
loops++;
} else if(loops > 0) {
loops = 0;
layer_state_set_user(layer_state);
}
#endif

#ifdef DYNAMIC_MACRO_ENABLE
if (is_dynamic_recording) {
ergodox_right_led_1_off();
Expand Down
35 changes: 0 additions & 35 deletions keyboards/planck/ez/ez.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -301,11 +301,6 @@ bool music_mask_kb(uint16_t keycode) {
}
#endif

#ifdef ORYX_ENABLE
static uint16_t loops = 0;
static bool is_on = false;
#endif

#ifdef DYNAMIC_MACRO_ENABLE
static bool is_dynamic_recording = false;
static uint16_t dynamic_loop_timer;
Expand All @@ -323,36 +318,6 @@ void dynamic_macro_record_end_user(int8_t direction) {
#endif

void matrix_scan_kb(void) {
#ifdef ORYX_ENABLE
if(rawhid_state.pairing == true) {
if(loops == 0) {
//lights off
}
if(loops % PAIRING_BLINK_STEPS == 0) {
if(is_on) {
planck_ez_left_led_on();
planck_ez_right_led_off();
}
else {
planck_ez_left_led_off();
planck_ez_right_led_on();
}
is_on ^= 1;
}
if(loops > PAIRING_BLINK_END * 2) {
rawhid_state.pairing = false;
loops = 0;
planck_ez_left_led_off();
planck_ez_right_led_off();
}
loops++;
}
else if(loops > 0) {
loops = 0;
planck_ez_left_led_off();
planck_ez_right_led_off();
}
#endif
#ifdef DYNAMIC_MACRO_ENABLE
if (is_dynamic_recording) {
if (timer_elapsed(dynamic_loop_timer) > 1)
Expand Down
203 changes: 38 additions & 165 deletions quantum/oryx.c
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
#include <string.h>
#include "oryx.h"
#include "eeprom.h"
#ifdef KEYBOARD_voyager
# include "voyager.h"
#endif

rawhid_state_t rawhid_state = {.pairing = false, .paired = false};
rawhid_state_t rawhid_state = {.paired = false, .rgb_control = false};

keypos_t keyboard_pairing_sequence[PAIRING_SEQUENCE_SIZE];
keypos_t host_pairing_sequence[PAIRING_SEQUENCE_SIZE];
uint8_t pairing_input_index = 0;

void oryx_error(uint8_t code) {
Expand All @@ -18,10 +15,35 @@ void oryx_error(uint8_t code) {
raw_hid_send(event, RAW_EPSIZE);
}

void oryx_layer_event(void) {
uint8_t layer;
uint8_t event[RAW_EPSIZE];
layer = get_highest_layer(layer_state);
event[0] = ORYX_EVT_LAYER;
event[1] = layer;
event[2] = ORYX_STOP_BIT;
raw_hid_send(event, sizeof(event));
}

void pairing_failed_event(void) {
rawhid_state.paired = false;
uint8_t event[RAW_EPSIZE];
event[0] = ORYX_EVT_PAIRING_FAILED;
event[1] = ORYX_STOP_BIT;
raw_hid_send(event, sizeof(event));
}

void pairing_success_event(void) {
rawhid_state.paired = true;
uint8_t event[RAW_EPSIZE];
event[0] = ORYX_EVT_PAIRING_SUCCESS;
event[1] = ORYX_STOP_BIT;
raw_hid_send(event, sizeof(event));
}

void raw_hid_receive(uint8_t *data, uint8_t length) {
uint8_t command = data[0];
uint8_t *param = &data[1];
uint8_t cmd_index = 0;

switch (command) {
case ORYX_CMD_GET_FW_VERSION: {
Expand All @@ -40,18 +62,17 @@ void raw_hid_receive(uint8_t *data, uint8_t length) {
}

case ORYX_CMD_PAIRING_INIT:
pairing_init_handler();
store_pairing_sequence(&keyboard_pairing_sequence[0]);
if (rawhid_state.paired == true)
pairing_failed_event();
else
pairing_success_event();
break;

case ORYX_CMD_PAIRING_VALIDATE:
for (uint8_t i = 0; i < PAIRING_SEQUENCE_SIZE; i++) {
keypos_t pos;
pos.col = param[cmd_index++];
pos.row = param[cmd_index++];
host_pairing_sequence[i] = pos;
}
pairing_validate_eeprom_handler();
if (rawhid_state.paired == true)
pairing_failed_event();
else
pairing_success_event();
break;

case ORYX_SET_LAYER:
Expand Down Expand Up @@ -137,7 +158,7 @@ void raw_hid_receive(uint8_t *data, uint8_t length) {
}
break;
case ORYX_UPDATE_BRIGHTNESS:
#if defined(RGB_MATRIX_ENABLE) && !defined(KEYBOARD_ergodox_ez_glow)
#if defined(RGB_MATRIX_ENABLE) && !defined(PROTOCOL_LUFA)
if (param[0]) {
rgb_matrix_increase_val_noeeprom();
} else {
Expand All @@ -152,158 +173,8 @@ void raw_hid_receive(uint8_t *data, uint8_t length) {
}
}

void pairing_validate_eeprom_handler(void) {
bool match = false;
uint8_t event[RAW_EPSIZE];
uint8_t stored_sequences[sizeof(uint16_t) * PAIRING_SEQUENCE_SIZE * PAIRING_SEQUENCE_NUM_STORED];

eeprom_read_block(&stored_sequences, (uint8_t *)EECONFIG_SIZE, PAIRING_STORAGE_SIZE);
match = true;

if (match == true) {
event[0] = ORYX_EVT_PAIRING_SUCCESS;
rawhid_state.paired = true;

} else {
event[0] = ORYX_EVT_PAIRING_FAILED;
rawhid_state.paired = false;
}
event[1] = ORYX_STOP_BIT;
rawhid_state.pairing = false;
raw_hid_send(event, sizeof(event));
}

bool store_pairing_sequence(keypos_t *pairing_sequence) {
uint8_t stored_sequences[sizeof(uint16_t) * PAIRING_SEQUENCE_SIZE * PAIRING_SEQUENCE_NUM_STORED];

eeprom_read_block(&stored_sequences, (uint8_t *)EECONFIG_SIZE, PAIRING_STORAGE_SIZE);

uint8_t shiftLen = sizeof(&pairing_sequence);

for (int8_t i = PAIRING_STORAGE_SIZE; i >= 0; i--) {
if (i > shiftLen) {
stored_sequences[i] = stored_sequences[i - 1];
} else {
stored_sequences[i] = 0;
}
}
eeprom_update_block(stored_sequences, (uint8_t *)EECONFIG_SIZE, PAIRING_STORAGE_SIZE);
return true;
}

void pairing_init_handler(void) {
create_pairing_code();
uint8_t event[RAW_EPSIZE];
uint8_t event_index = 0;
event[event_index++] = ORYX_EVT_PAIRING_INPUT;
for (uint8_t i = 0; i < PAIRING_SEQUENCE_SIZE; i++) {
event[event_index++] = keyboard_pairing_sequence[i].col;
event[event_index++] = keyboard_pairing_sequence[i].row;
}
event[event_index++] = ORYX_STOP_BIT;
rawhid_state.pairing = true;
raw_hid_send(event, RAW_EPSIZE);
}

bool compare_sequences(keypos_t a[PAIRING_SEQUENCE_SIZE], keypos_t b[PAIRING_SEQUENCE_SIZE]) {
bool valid = true;
for (uint8_t i = 0; i < PAIRING_SEQUENCE_SIZE; i++) {
if (a[i].row != b[i].row) {
valid = false;
break;
}
if (a[i].col != b[i].col) {
valid = false;
break;
}
}
return valid;
}

void pairing_validate_handler() {
uint8_t event[RAW_EPSIZE];
bool valid = compare_sequences(keyboard_pairing_sequence, host_pairing_sequence);

if (valid == true) {
event[0] = ORYX_EVT_PAIRING_SUCCESS;
rawhid_state.paired = true;

} else {
event[0] = ORYX_EVT_PAIRING_FAILED;
rawhid_state.paired = false;
}

event[1] = ORYX_STOP_BIT;
rawhid_state.pairing = false;
raw_hid_send(event, sizeof(event));
}

keypos_t get_random_keypos(void) {
uint8_t col = rand() % MATRIX_COLS;
uint8_t row = rand() % MATRIX_ROWS;
keypos_t pos = {.col = col, .row = row};

uint16_t keycode = keymap_key_to_keycode(0, pos);
if (keycode >= KC_A && keycode <= KC_SLASH) {
return pos;
} else {
return get_random_keypos();
}
}

keypos_t *pairing_sequence(void) {
// The pairing sequence is derived from Oryx's layout id declared
// in the generated source config file with the FIRMWARE_VERSION define.
keypos_t *sequence = (keypos_t *)&host_pairing_sequence[0];
for (uint8_t i = 0; i < PAIRING_SEQUENCE_SIZE; i++) {
}

return sequence;
}

void create_pairing_code(void) {
for (uint8_t i = 0; i < PAIRING_SEQUENCE_SIZE; i++) {
keypos_t pos = get_random_keypos();
keyboard_pairing_sequence[i] = pos;
}
}

void pairing_key_input_event(void) {
uint8_t event[RAW_EPSIZE];
event[0] = ORYX_EVT_PAIRING_KEY_INPUT;
raw_hid_send(event, sizeof(event));
}

void oryx_layer_event(void) {
uint8_t layer;
uint8_t event[RAW_EPSIZE];
layer = get_highest_layer(layer_state);
event[0] = ORYX_EVT_LAYER;
event[1] = layer;
event[2] = ORYX_STOP_BIT;
raw_hid_send(event, sizeof(event));
}

bool process_record_oryx(uint16_t keycode, keyrecord_t *record) {
// In pairing mode, key events are absorbed, and the host pairing sequence is filled.
// Once filled, the keyboard and host sequence are compaired, pairing state set to false
// and the proper pairing validation event is sent to the host
if (rawhid_state.pairing == true) {
// The host pairing sequence is filled on key up only
if (!record->event.pressed) {
if (pairing_input_index < PAIRING_SEQUENCE_SIZE) {
host_pairing_sequence[pairing_input_index++] = record->event.key;
pairing_key_input_event();
}
wait_ms(1000);
if (pairing_input_index == PAIRING_SEQUENCE_SIZE) {
rawhid_state.pairing = false;
pairing_input_index = 0;
pairing_validate_handler();
}
}
return false;
}
// While paired, the keyboard sends keystrokes positions to the host
if (rawhid_state.paired == true) {
uint8_t event[RAW_EPSIZE];
Expand All @@ -318,7 +189,9 @@ bool process_record_oryx(uint16_t keycode, keyrecord_t *record) {

void layer_state_set_oryx(layer_state_t state) {
if (rawhid_state.paired) {
#ifdef PROTOCOL_LUFA
wait_ms(50);
#endif
uint8_t event[RAW_EPSIZE];
event[0] = ORYX_EVT_LAYER;
event[1] = get_highest_layer(state);
Expand Down
Loading

0 comments on commit cfd8ed8

Please sign in to comment.