|
|
@ -68,10 +68,6 @@ void set_keymap(Key keymapEntry, byte matrixStateEntry) {
|
|
|
|
if (key_toggled_on(matrixStateEntry)) {
|
|
|
|
if (key_toggled_on(matrixStateEntry)) {
|
|
|
|
temporary_keymap = primary_keymap = keymapEntry.rawKey;
|
|
|
|
temporary_keymap = primary_keymap = keymapEntry.rawKey;
|
|
|
|
save_primary_keymap(primary_keymap);
|
|
|
|
save_primary_keymap(primary_keymap);
|
|
|
|
#ifdef DEBUG_SERIAL
|
|
|
|
|
|
|
|
Serial.print("keymap is now:");
|
|
|
|
|
|
|
|
Serial.print(temporary_keymap);
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -305,37 +301,6 @@ byte load_primary_keymap() {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Debugging Reporting
|
|
|
|
|
|
|
|
//
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void report_matrix() {
|
|
|
|
|
|
|
|
#ifdef DEBUG_SERIAL
|
|
|
|
|
|
|
|
if (reporting_counter++ % 100 == 0 ) {
|
|
|
|
|
|
|
|
for (byte row = 0; row < ROWS; row++) {
|
|
|
|
|
|
|
|
for (byte col = 0; col < COLS; col++) {
|
|
|
|
|
|
|
|
Serial.print(matrixState[row][col], HEX);
|
|
|
|
|
|
|
|
Serial.print(", ");
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
Serial.println("");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
Serial.println("");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void report(byte row, byte col, boolean value) {
|
|
|
|
|
|
|
|
#ifdef DEBUG_SERIAL
|
|
|
|
|
|
|
|
Serial.print("Detected a change on ");
|
|
|
|
|
|
|
|
Serial.print(col);
|
|
|
|
|
|
|
|
Serial.print(" ");
|
|
|
|
|
|
|
|
Serial.print(row);
|
|
|
|
|
|
|
|
Serial.print(" to ");
|
|
|
|
|
|
|
|
Serial.print(value);
|
|
|
|
|
|
|
|
Serial.println(".");
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Sending events to the usb host
|
|
|
|
// Sending events to the usb host
|
|
|
|
|
|
|
|
|
|
|
|