jbrechtel/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: pairing crash on Ergodox

Browse Source
This commit is contained in:
Florian Didron
2022-06-22 10:32:32 +09:00
parent 939bcc5422
commit d54c6c6b14
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
quantum/oryx.c
View File

@@ -105,19 +105,26 @@ void pairing_init_handler(void) {
raw_hid_send(event, RAW_EPSIZE); raw_hid_send(event, RAW_EPSIZE);
} }
void pairing_validate_handler() { bool compare_sequences(keypos_t a[PAIRING_SEQUENCE_SIZE], keypos_t b[PAIRING_SEQUENCE_SIZE]) {
bool valid = true; bool valid = true;
uint8_t event[RAW_EPSIZE];
for (uint8_t i = 0; i < PAIRING_SEQUENCE_SIZE; i++) { for (uint8_t i = 0; i < PAIRING_SEQUENCE_SIZE; i++) {
if (keyboard_pairing_sequence[i].row != host_pairing_sequence[i].row) { if (a[i].row != b[i].row) {
valid = false; valid = false;
break; break;
} }
if (keyboard_pairing_sequence[i].col != host_pairing_sequence[i].col) { if (a[i].col != b[i].col) {
valid = false; valid = false;
break; 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) { if (valid == true) {
event[0] = ORYX_EVT_PAIRING_SUCCESS; event[0] = ORYX_EVT_PAIRING_SUCCESS;
rawhid_state.paired = true; rawhid_state.paired = true;
@@ -126,6 +133,7 @@ void pairing_validate_handler() {
event[0] = ORYX_EVT_PAIRING_FAILED; event[0] = ORYX_EVT_PAIRING_FAILED;
rawhid_state.paired = false; rawhid_state.paired = false;
} }
event[1] = ORYX_STOP_BIT; event[1] = ORYX_STOP_BIT;
rawhid_state.pairing = false; rawhid_state.pairing = false;
raw_hid_send(event, sizeof(event)); raw_hid_send(event, sizeof(event));
@@ -177,6 +185,7 @@ bool process_record_oryx(uint16_t keycode, keyrecord_t *record) {
host_pairing_sequence[pairing_input_index++] = record->event.key; host_pairing_sequence[pairing_input_index++] = record->event.key;
pairing_key_input_event(); pairing_key_input_event();
} }
wait_ms(1000);
if (pairing_input_index == PAIRING_SEQUENCE_SIZE) { if (pairing_input_index == PAIRING_SEQUENCE_SIZE) {
rawhid_state.pairing = false; rawhid_state.pairing = false;
pairing_input_index = 0; pairing_input_index = 0;

3
quantum/oryx.h
View File

@@ -14,7 +14,7 @@
#define PAIRING_BLINK_STEPS 512 #define PAIRING_BLINK_STEPS 512
#define PAIRING_BLINK_END PAIRING_BLINK_STEPS * 60 #define PAIRING_BLINK_END PAIRING_BLINK_STEPS * 60
#define PAIRING_SEQUENCE_SIZE 3 #define PAIRING_SEQUENCE_SIZE 3
#define PAIRING_SEQUENCE_NUM_STORED 5 #define PAIRING_SEQUENCE_NUM_STORED 3
#define PAIRING_STORAGE_SIZE PAIRING_SEQUENCE_SIZE* PAIRING_SEQUENCE_NUM_STORED * sizeof(uint16_t) #define PAIRING_STORAGE_SIZE PAIRING_SEQUENCE_SIZE* PAIRING_SEQUENCE_NUM_STORED * sizeof(uint16_t)
enum Oryx_Command_Code { enum Oryx_Command_Code {
@@ -52,6 +52,7 @@ void pairing_init_handler(void);
void pairing_validate_handler(void); void pairing_validate_handler(void);
void pairing_validate_eeprom_handler(void); void pairing_validate_eeprom_handler(void);
void pairing_init_event(void); void pairing_init_event(void);
bool compare_sequences(keypos_t a[PAIRING_SEQUENCE_SIZE], keypos_t b[PAIRING_SEQUENCE_SIZE]);
void pairing_key_input_event(void); void pairing_key_input_event(void);
void pairing_failed_event(void); void pairing_failed_event(void);
void pairing_succesful_event(void); void pairing_succesful_event(void);