Merge branch 'master' into developer

This commit is contained in:
TuxSH 2016-08-15 16:51:36 +02:00
commit a4531b01d5
3 changed files with 4 additions and 2 deletions

View File

@ -205,6 +205,4 @@ void configureCFW(const char *configPath)
//Wait for the pressed buttons to change
while(HID_PAD == BUTTON_START);
chrono(2);
}

View File

@ -151,6 +151,8 @@ void main(void)
if(!pinExists && CONFIG(7)) pin = newPin();
chrono(2);
//Update pressed buttons
pressed = HID_PAD;
}

View File

@ -168,4 +168,6 @@ void verifyPin(PINData *in, bool allowQuit)
else break;
}
}
while(HID_PAD & PIN_BUTTONS);
}