mirror/TonUINO
1
0
Fork 0
mirror of https://github.com/xfjx/TonUINO.git synced 2025-08-22 12:13:33 +02:00
Code Issues Releases Wiki Activity

Bug fixes

Browse Source
This commit is contained in:
Thorsten Voß
2019-04-17 20:28:10 +02:00
parent 0b75d7c5a6
commit a1dcb46dbf
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Tonuino.ino
View File

@@ -160,7 +160,7 @@ void resetSettings() {
writeSettingsToFlash(); writeSettingsToFlash();
} }
void migradeSettings(int oldVersion) { void migrateSettings(int oldVersion) {
if (oldVersion == 1) { if (oldVersion == 1) {
Serial.println(F("=== resetSettings()")); Serial.println(F("=== resetSettings()"));
Serial.println(F("1 -> 2")); Serial.println(F("1 -> 2"));
@@ -180,7 +180,7 @@ void loadSettingsFromFlash() {
EEPROM.get(address, mySettings); EEPROM.get(address, mySettings);
if (mySettings.cookie != cardCookie) if (mySettings.cookie != cardCookie)
resetSettings(); resetSettings();
migradeSettings(mySettings.version); migrateSettings(mySettings.version);
Serial.print(F("Version: ")); Serial.print(F("Version: "));
Serial.println(mySettings.version); Serial.println(mySettings.version);
@@ -322,8 +322,8 @@ class Locked: public Modifier {
Serial.println(F("== Locked::handlePause() -> LOCKED!")); Serial.println(F("== Locked::handlePause() -> LOCKED!"));
return true; return true;
} }
virtual bool handeNextButton() { virtual bool handleNextButton() {
Serial.println(F("== Locked::handeNextButton() -> LOCKED!")); Serial.println(F("== Locked::handleNextButton() -> LOCKED!"));
return true; return true;
} }
virtual bool handlePreviousButton() { virtual bool handlePreviousButton() {
@@ -358,8 +358,8 @@ class ToddlerMode: public Modifier {
Serial.println(F("== ToddlerMode::handlePause() -> LOCKED!")); Serial.println(F("== ToddlerMode::handlePause() -> LOCKED!"));
return true; return true;
} }
virtual bool handeNextButton() { virtual bool handleNextButton() {
Serial.println(F("== ToddlerMode::handeNextButton() -> LOCKED!")); Serial.println(F("== ToddlerMode::handleNextButton() -> LOCKED!"));
return true; return true;
} }
virtual bool handlePreviousButton() { virtual bool handlePreviousButton() {
@@ -408,7 +408,7 @@ class KindergardenMode: public Modifier {
return false; return false;
} }
virtual bool handleNextButton() { virtual bool handleNextButton() {
Serial.println(F("== KindergardenMode::handeNextButton() -> LOCKED!")); Serial.println(F("== KindergardenMode::handleNextButton() -> LOCKED!"));
return true; return true;
} }
virtual bool handlePreviousButton() { virtual bool handlePreviousButton() {
@@ -726,6 +726,7 @@ void setup() {
pinMode(shutdownPin, OUTPUT); pinMode(shutdownPin, OUTPUT);
digitalWrite(shutdownPin, LOW); digitalWrite(shutdownPin, LOW);
// RESET --- ALLE DREI KNÖPFE BEIM STARTEN GEDRÜCKT HALTEN -> alle EINSTELLUNGEN werden gelöscht // RESET --- ALLE DREI KNÖPFE BEIM STARTEN GEDRÜCKT HALTEN -> alle EINSTELLUNGEN werden gelöscht
if (digitalRead(buttonPause) == LOW && digitalRead(buttonUp) == LOW && if (digitalRead(buttonPause) == LOW && digitalRead(buttonUp) == LOW &&
digitalRead(buttonDown) == LOW) { digitalRead(buttonDown) == LOW) {
@@ -733,8 +734,10 @@ void setup() {
for (int i = 0; i < EEPROM.length(); i++) { for (int i = 0; i < EEPROM.length(); i++) {
EEPROM.update(i, 0); EEPROM.update(i, 0);
} }
loadSettingsFromFlash();
} }
// Start Shortcut "at Startup" - e.g. Welcome Sound // Start Shortcut "at Startup" - e.g. Welcome Sound
playShortCut(3); playShortCut(3);
} }
@@ -1311,7 +1314,7 @@ uint8_t voiceMenu(int numberOfOptions, int startMessage, int messageOffset,
if (pauseButton.pressedFor(LONG_PRESS)) { if (pauseButton.pressedFor(LONG_PRESS)) {
mp3.playMp3FolderTrack(802); mp3.playMp3FolderTrack(802);
ignorePauseButton = true; ignorePauseButton = true;
return 0; return defaultValue;
} }
if (pauseButton.wasReleased()) { if (pauseButton.wasReleased()) {
if (returnValue != 0) { if (returnValue != 0) {