di0ib
/
tmk_keyboard_custom
Watch 1
Star 0
Fork 0
Code Releases 0 Activity
Browse Source

Extend reset eeconfig of bootmagic to reset keymap too

led_matrix
Kai Ryu 10 years ago
parent
ef8d032029
commit
8b75dd43ba
4 changed files with 15 additions and 2 deletions
Unified View Show Diff Stats
  1. 1
    0
      common/bootmagic.c
  2. 7
    0
      common/eeconfig.c
  3. 5
    1
      common/keymap_ex.c
  4. 2
    1
      common/keymap_ex.h

+ 1
- 0
common/bootmagic.c View File



/* eeconfig clear */ /* eeconfig clear */
if (bootmagic_scan_keycode(BOOTMAGIC_KEY_EEPROM_CLEAR)) { if (bootmagic_scan_keycode(BOOTMAGIC_KEY_EEPROM_CLEAR)) {
eeconfig_disable();
eeconfig_init(); eeconfig_init();
} }



+ 7
- 0
common/eeconfig.c View File

#include <stdbool.h> #include <stdbool.h>
#include <avr/eeprom.h> #include <avr/eeprom.h>
#include "eeconfig.h" #include "eeconfig.h"
#include "keymap_ex.h"


void eeconfig_init(void) void eeconfig_init(void)
{ {
#ifdef BACKLIGHT_ENABLE #ifdef BACKLIGHT_ENABLE
eeprom_write_byte(EECONFIG_BACKLIGHT, 0); eeprom_write_byte(EECONFIG_BACKLIGHT, 0);
#endif #endif
#ifdef KEYMAP_EX_ENABLE
keymap_ex_init();
#endif
} }


void eeconfig_enable(void) void eeconfig_enable(void)


void eeconfig_disable(void) void eeconfig_disable(void)
{ {
#ifdef KEYMAP_EX_ENABLE
keymap_ex_disable();
#endif
eeprom_write_word(EECONFIG_MAGIC, 0xFFFF); eeprom_write_word(EECONFIG_MAGIC, 0xFFFF);
} }



+ 5
- 1
common/keymap_ex.c View File



#ifdef KEYMAP_EX_ENABLE #ifdef KEYMAP_EX_ENABLE


void keymap_init(void) {
void keymap_ex_init(void) {
if (!check_keymap_in_eeprom()) { if (!check_keymap_in_eeprom()) {
write_keymap_to_eeprom(); write_keymap_to_eeprom();
} }
} }


void keymap_ex_disable(void) {
eeprom_write_word((void*)EECONFIG_KEYMAP_CHECKSUM, eeprom_read_word((void*)EECONFIG_KEYMAP_CHECKSUM) + 1);
}

bool check_keymap_in_eeprom(void) { bool check_keymap_in_eeprom(void) {
uint16_t checksum_in_eeprom = eeprom_read_word(&((keymap_ex_t*)EECONFIG_KEYMAP_EX)->checksum); uint16_t checksum_in_eeprom = eeprom_read_word(&((keymap_ex_t*)EECONFIG_KEYMAP_EX)->checksum);
uint16_t checksum = EECONFIG_MAGIC_NUMBER; uint16_t checksum = EECONFIG_MAGIC_NUMBER;

+ 2
- 1
common/keymap_ex.h View File

#define FN_ACTION_OFFSET(index) (sizeof(uint16_t) * index) #define FN_ACTION_OFFSET(index) (sizeof(uint16_t) * index)
#define KEY_OFFSET(layer, row, col) (sizeof(uint8_t) * (layer * MATRIX_ROWS * MATRIX_COLS + row * MATRIX_COLS + col)) #define KEY_OFFSET(layer, row, col) (sizeof(uint8_t) * (layer * MATRIX_ROWS * MATRIX_COLS + row * MATRIX_COLS + col))


void keymap_init(void);
void keymap_ex_init(void);
void keymap_ex_disable(void);
bool check_keymap_in_eeprom(void); bool check_keymap_in_eeprom(void);
void write_keymap_to_eeprom(void); void write_keymap_to_eeprom(void);
uint8_t eeconfig_read_keymap_key(uint8_t layer, uint8_t row, uint8_t col); uint8_t eeconfig_read_keymap_key(uint8_t layer, uint8_t row, uint8_t col);