Update defaults, fix no LED mode

This commit is contained in:
William Toohey 2015-12-31 01:15:57 +10:00
parent 479c34e22a
commit 789845ae8d
2 changed files with 17 additions and 10 deletions

View File

@ -8,24 +8,28 @@
static tatacon_config_t defaults PROGMEM = {
.switches = {
// SWITCH ORDER: CenterLeft, RimLeft, CenterRight, RimRight
// ---- osu default
HID_KEYBOARD_SC_X,
HID_KEYBOARD_SC_Z,
HID_KEYBOARD_SC_C,
HID_KEYBOARD_SC_V },
// ---- monty
//HID_KEYBOARD_SC_X,
//HID_KEYBOARD_SC_Z,
//HID_KEYBOARD_SC_DOT_AND_GREATER_THAN_SIGN,
//HID_KEYBOARD_SC_SLASH_AND_QUESTION_MARK },
// ---- sand
HID_KEYBOARD_SC_S,
HID_KEYBOARD_SC_A,
HID_KEYBOARD_SC_G,
HID_KEYBOARD_SC_H },
//HID_KEYBOARD_SC_S,
//HID_KEYBOARD_SC_A,
//HID_KEYBOARD_SC_G,
//HID_KEYBOARD_SC_H },
// ---- tobuei
//HID_KEYBOARD_SC_S,
//HID_KEYBOARD_SC_A,
//HID_KEYBOARD_SC_K,
//HID_KEYBOARD_SC_L },
.ledsOn = true,
.debounce = 50,
.version = FIRMWARE_VERSION
.debounce = 30
};
uint8_t firstRun EEMEM; // init to 255
@ -40,6 +44,7 @@ void InitConfig(void) {
eeprom_write_byte(&firstRun, MAGIC_NUMBER); // defaults set
}
eeprom_read_block(&tataConfig, &eeConfig, sizeof(tatacon_config_t));
tataConfig.version = FIRMWARE_VERSION;
}
void SetConfig(uint8_t* config) {

View File

@ -376,10 +376,12 @@ bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDIn
switches[i].lastReport = switches[i].state;
// Update blinkenlights
if(switches[i].state) {
if(i % 2 && tataConfig.ledsOn) { // odd indexes are kat, even don
SET(LED_PORT, KAT_LED_PIN);
} else {
SET(LED_PORT, DON_LED_PIN);
if(tataConfig.ledsOn) {
if(i % 2) { // odd indexes are kat, even don
SET(LED_PORT, KAT_LED_PIN);
} else {
SET(LED_PORT, DON_LED_PIN);
}
}
}
}