"make astyle"

pull/18/head
Jesse Vincent 11 years ago
parent 9ab7688e4f
commit 103faafa1a

@ -8,8 +8,8 @@
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
void loop(); void loop();
void setup(); void setup();
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"
#endif #endif

@ -60,13 +60,15 @@ float carriedOverY =0;
#define EEPROM_LAYER_LOCATION 0 #define EEPROM_LAYER_LOCATION 0
void save_current_layer(byte layer) { void save_current_layer(byte layer)
{
Serial.print("telling eeprom thinks we're on layer "); Serial.print("telling eeprom thinks we're on layer ");
Serial.println(layer); Serial.println(layer);
EEPROM.write(EEPROM_LAYER_LOCATION, layer); EEPROM.write(EEPROM_LAYER_LOCATION, layer);
} }
byte load_current_layer() { byte load_current_layer()
{
byte layer = EEPROM.read(EEPROM_LAYER_LOCATION); byte layer = EEPROM.read(EEPROM_LAYER_LOCATION);
Serial.print("eeprom thinks we're on layer "); Serial.print("eeprom thinks we're on layer ");
Serial.println(layer); Serial.println(layer);
@ -227,8 +229,7 @@ void send_key_events(byte layer)
Keyboard.print("Keyboard.IO keyboard driver v0.00"); Keyboard.print("Keyboard.IO keyboard driver v0.00");
} }
} }
} } else if (mappedKey.rawKey == KEY_MOUSE_BTN_L || mappedKey.rawKey == KEY_MOUSE_BTN_M|| mappedKey.rawKey == KEY_MOUSE_BTN_R) {
else if (mappedKey.rawKey == KEY_MOUSE_BTN_L || mappedKey.rawKey == KEY_MOUSE_BTN_M|| mappedKey.rawKey == KEY_MOUSE_BTN_R) {
if (key_toggled_on (switchState)) { if (key_toggled_on (switchState)) {
Mouse.press(mappedKey.rawKey); Mouse.press(mappedKey.rawKey);
} else if (key_is_pressed(switchState)) { } else if (key_is_pressed(switchState)) {
@ -313,8 +314,7 @@ void scan_matrix()
active_layer = keymaps[current_layer][row][col].rawKey; active_layer = keymaps[current_layer][row][col].rawKey;
} }
} }
} } else if (! (keymaps[active_layer][row][col].flags ^ ( SWITCH_TO_LAYER))) {
else if (! (keymaps[active_layer][row][col].flags ^ ( SWITCH_TO_LAYER))) {
// switch layer and stay there // switch layer and stay there
if (key_toggled_on(matrixState[row][col])) { if (key_toggled_on(matrixState[row][col])) {
current_layer = active_layer = keymaps[current_layer][row][col].rawKey; current_layer = active_layer = keymaps[current_layer][row][col].rawKey;

Loading…
Cancel
Save