astyle. no code changes.

pull/18/head
Jesse Vincent 9 years ago
parent 13576ae1fe
commit 75205f28c3

@ -39,10 +39,10 @@ void Model01::led_set_crgb_at(uint8_t i, cRGB crgb) {
leftHand.ledData.leds[i] = crgb; leftHand.ledData.leds[i] = crgb;
// controller2.ledData.leds[i] = color; // controller2.ledData.leds[i] = color;
} else { } else {
rightHand.ledData.leds[i-32] = crgb; rightHand.ledData.leds[i-32] = crgb;
} }
} }
@ -68,19 +68,19 @@ void Model01::led_sync() {
} }
void debug_key_event(keydata_t state, keydata_t previousState, uint8_t keynum, uint8_t row, uint8_t col) { void debug_key_event(keydata_t state, keydata_t previousState, uint8_t keynum, uint8_t row, uint8_t col) {
if (bitRead(state.all, keynum) != bitRead(previousState.all, keynum )) { if (bitRead(state.all, keynum) != bitRead(previousState.all, keynum )) {
Serial.print("Looking at row "); Serial.print("Looking at row ");
Serial.print(row); Serial.print(row);
Serial.print(", col "); Serial.print(", col ");
Serial.print(col); Serial.print(col);
Serial.print(" key # "); Serial.print(" key # ");
Serial.print(keynum); Serial.print(keynum);
Serial.print(" "); Serial.print(" ");
Serial.print(bitRead(previousState.all, keynum)); Serial.print(bitRead(previousState.all, keynum));
Serial.print(" -> "); Serial.print(" -> ");
Serial.print(bitRead(state.all, keynum )); Serial.print(bitRead(state.all, keynum ));
Serial.println(); Serial.println();
} }
} }
void Model01::scan_matrix() { void Model01::scan_matrix() {
previousLeftHandState = leftHandState; previousLeftHandState = leftHandState;

@ -54,8 +54,7 @@ void handle_key_event(byte row, byte col, uint8_t currentState, uint8_t previous
if (keymaps[primary_keymap][row][col].flags & SWITCH_TO_KEYMAP) { if (keymaps[primary_keymap][row][col].flags & SWITCH_TO_KEYMAP) {
handle_keymap_key_event(keymaps[primary_keymap][row][col], currentState, previousState); handle_keymap_key_event(keymaps[primary_keymap][row][col], currentState, previousState);
} } else if (mappedKey.flags & SYNTHETIC_KEY) {
else if (mappedKey.flags & SYNTHETIC_KEY) {
handle_synthetic_key_event( mappedKey, currentState, previousState); handle_synthetic_key_event( mappedKey, currentState, previousState);
} else if (key_is_pressed(currentState, previousState)) { } else if (key_is_pressed(currentState, previousState)) {
press_key(mappedKey); press_key(mappedKey);

Loading…
Cancel
Save