mirror/TonUINO
1
0
Fork 0
mirror of https://github.com/xfjx/TonUINO.git synced 2025-08-26 21:44:21 +02:00
Code Issues Releases Wiki Activity

Update Tonuino.ino

Browse Source
This commit is contained in:
Thorsten Voß
2018-12-10 12:43:12 +01:00
committed by GitHub
parent 2f75fe90d2
commit 890ce6d941
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Tonuino.ino
View File

@@ -39,7 +39,7 @@ struct adminSettings {
uint8_t initVolume;
uint8_t eq;
bool locked;
long sleepTimer;
long standbyTimer;
bool invertVolumeButtons;
folderSettings shortCuts[3];
};
@@ -120,7 +120,7 @@ void resetSettings() {
mySettings.initVolume = 10;
mySettings.eq = 1;
mySettings.locked = false;
mySettings.sleepTimer = 5;
mySettings.standbyTimer = 5;
mySettings.invertVolumeButtons = false;
mySettings.shortCuts[0].folder = 0;
mySettings.shortCuts[1].folder = 0;
@@ -159,23 +159,23 @@ void loadSettingsFromFlash() {
Serial.println(mySettings.locked);
Serial.print(F("Sleep Timer: "));
Serial.println(mySettings.sleepTimer);
Serial.println(mySettings.standbyTimer);
Serial.print(F("Inverted Volume Buttons: "));
Serial.println(mySettings.invertVolumeButtons);
}
void setSleepTimer() {
if (mySettings.sleepTimer != 0)
sleepAtMillis = millis() + (mySettings.sleepTimer * 1000);
void setstandbyTimer() {
if (mySettings.standbyTimer != 0)
sleepAtMillis = millis() + (mySettings.standbyTimer * 1000);
}
void disableSleepTimer() {
void disablestandbyTimer() {
sleepAtMillis = 0;
}
void checkSleepAtMillis() {
void checkStandbyAtMillis() {
if (sleepAtMillis != 0 && millis() > sleepAtMillis) {
// enter sleep state
}
@@ -197,7 +197,7 @@ static void nextTrack(uint16_t track) {
if (myCard.mode == 1 || myCard.mode == 7) {
Serial.println(F("Hörspielmodus ist aktiv -> keinen neuen Track spielen"));
setSleepTimer();
setstandbyTimer();
// mp3.sleep(); // Je nach Modul kommt es nicht mehr zurück aus dem Sleep!
}
if (myCard.mode == 2 || myCard.mode == 8) {
@@ -208,7 +208,7 @@ static void nextTrack(uint16_t track) {
Serial.print(currentTrack);
} else
// mp3.sleep(); // Je nach Modul kommt es nicht mehr zurück aus dem Sleep!
setSleepTimer();
setstandbyTimer();
{ }
}
if (myCard.mode == 3 || myCard.mode == 9) {
@@ -229,7 +229,7 @@ static void nextTrack(uint16_t track) {
if (myCard.mode == 4) {
Serial.println(F("Einzel Modus aktiv -> Strom sparen"));
// mp3.sleep(); // Je nach Modul kommt es nicht mehr zurück aus dem Sleep!
setSleepTimer();
setstandbyTimer();
}
if (myCard.mode == 5) {
if (currentTrack != numTracksInFolder) {
@@ -244,7 +244,7 @@ static void nextTrack(uint16_t track) {
// mp3.sleep(); // Je nach Modul kommt es nicht mehr zurück aus dem Sleep!
// Fortschritt zurück setzen
EEPROM.update(myCard.folder, 1);
setSleepTimer();
setstandbyTimer();
}
}
}
@@ -402,10 +402,10 @@ void loop() {
if (ignorePauseButton == false)
if (isPlaying()) {
mp3.pause();
setSleepTimer();
setstandbyTimer();
}
else if (knownCard) {
disableSleepTimer();
disablestandbyTimer();
mp3.start();
}
ignorePauseButton = false;