diff options
| author | Drashna Jael're <drashna@live.com> | 2020-01-30 13:46:57 -0800 |
|---|---|---|
| committer | Florian Didron <fdidron@users.noreply.github.com> | 2020-02-26 10:15:12 +0900 |
| commit | 6198382cb13d1a4208169895fb9449d6021eb204 (patch) | |
| tree | 4735a5a6f8a140071e5c0341a478bb4437faf73a /quantum | |
| parent | d550603b8c64a3fc9befde3c87a81f0f1cc9d6ab (diff) | |
Cleanup magic number and functions
Diffstat (limited to 'quantum')
| -rw-r--r-- | quantum/oryx.c | 14 | ||||
| -rw-r--r-- | quantum/oryx.h | 2 | ||||
| -rw-r--r-- | quantum/quantum.c | 3 |
3 files changed, 10 insertions, 9 deletions
diff --git a/quantum/oryx.c b/quantum/oryx.c index 7650fadc0b..ef4efd1924 100644 --- a/quantum/oryx.c +++ b/quantum/oryx.c @@ -236,18 +236,16 @@ void eeconfig_init_oryx(void) { // reread settings from flash into eeprom dynamic_keymap_reset(); dynamic_keymap_macro_reset(); - eeprom_update_block(FIRMWARE_VERSION, (uint8_t *)EECONFIG_SIZE, sizeof(uint8_t)*17); + eeprom_update_block(FIRMWARE_VERSION, (uint8_t *)EECONFIG_SIZE, sizeof(uint8_t)*FIRMWARE_VERSION_SIZE); } -// since I'm being lazy, ATM -void matrix_setup(void) { - uint8_t temp[17]; - uint8_t firmware[17] = FIRMWARE_VERSION; - eeprom_read_block(&temp, (uint8_t *)EECONFIG_SIZE, sizeof(uint8_t)*17); - if (!memcmp(&temp, &firmware, sizeof(uint8_t)*17)) { +void matrix_init_oryx(void) { + uint8_t temp[FIRMWARE_VERSION_SIZE]; + uint8_t firmware[FIRMWARE_VERSION_SIZE] = FIRMWARE_VERSION; + eeprom_read_block(&temp, (uint8_t *)EECONFIG_SIZE, sizeof(uint8_t)*FIRMWARE_VERSION_SIZE); + if (!memcmp(&temp, &firmware, sizeof(uint8_t)*FIRMWARE_VERSION_SIZE)) { eeconfig_init_oryx(); } } -// FIRMWARE_VERSION #endif diff --git a/quantum/oryx.h b/quantum/oryx.h index 6f53db6ea8..b1fe78a061 100644 --- a/quantum/oryx.h +++ b/quantum/oryx.h @@ -79,4 +79,4 @@ bool is_oryx_live_training_enabled(void); bool process_record_oryx(uint16_t keycode, keyrecord_t *record); void layer_state_set_oryx(layer_state_t state); void eeconfig_init_oryx(void); -void keyboard_pre_init_oryx(void); +void matrix_init_oryx(void); diff --git a/quantum/quantum.c b/quantum/quantum.c index 9e213d065c..70e343b52d 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c @@ -587,6 +587,9 @@ void matrix_init_quantum() { if (!eeconfig_is_enabled()) { eeconfig_init(); } +#ifdef ORYX_ENABLE + matrix_init_oryx(); +#endif #ifdef BACKLIGHT_ENABLE # ifdef LED_MATRIX_ENABLE led_matrix_init(); |