initial commit

rwpalmer · Aug 29, 2018 · f29a812 · f29a812
1 parent 198a3ae
commit f29a812
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 10 deletions.
diff --git a/examples/PlayList.ino b/examples/PlayList.ino
@@ -21,7 +21,7 @@
     uint16_t plx = 0; // <-- playList index                                                                        
     Selection emptySelection = {0,0,0,0,0}; // <-- empty selection object for clearing Selection objects (as used on the next line) 
     Selection selection = emptySelection;   // <-- selection specified by the "setSelection" Particle Function ...
-
+    bool playFailureHandled = false;
 
 void setup() {
     Particle.function("Selection", setSelection);       // <-- this function is used to enter Selection objects
@@ -36,8 +36,16 @@ void loop() {
 
     // -------------------------------------------------  Decides what to play next based on Particle Function dfCommand() input
     if (dfPlay.isIdle()) {
+        // if the last play failed, delete the Selection from the playlist
+        if ((dfPlay.playFailure()) && (!playFailureHandled)) {
+            playlist.erase(playlist.begin() + --plx);
+            Serial.printf("                                         playFailure is true: Selection %d deleted\n\r", plx+1);
+            playFailureHandled = true;
+        }
+        // Play the next Selection in the playlist
 		if (plx < playlist.size()) {
 			dfPlay.play(playlist[plx]);
+			playFailureHandled = false;
 			Serial.printf("\n\r---------------------------------------- Playing Selection %d:{%d,%d,%d,%d,%d}\n\r", plx+1,
 				playlist[plx].media,playlist[plx].folder, playlist[plx].track, playlist[plx].volAdj, playlist[plx].equalizer); 
 			plx++;

diff --git a/src/DFPlay.cpp b/src/DFPlay.cpp
@@ -29,6 +29,7 @@ void DFPlay::begin(void) {    //  initialize class members and query DFPlayer to
     this->cState.volume = 30;
     this->cState.media = 0;
     this->cState.playType = TBD;
+	this->cState.playFailure = false;
     this->cState.usbAttached = false;
     this->cState.sdAttached = false;
     this->cState.noSubmitsTil = 0;
@@ -53,6 +54,7 @@ void DFPlay::play(Selection& sel) {
     this->dState.skip = false;
 	this->cState.tracks = 0;
 	this->cState.changePending = true;
+	this->cState.playFailure = false;
     return;
 }
 void DFPlay::pause(void)  {
@@ -140,6 +142,7 @@ bool DFPlay::isPlaying(void)			{ if (this->dState.playState == PLAYING)	return t
 bool DFPlay::isPaused(void) 			{ if (this->dState.playState == PAUSED) 	return true;    else return false; }
 bool DFPlay::isRepeating(void)       { if (this->dState.repeat) return true; else return false; }
 bool DFPlay::isSleeping(void)         { return this->cState.sleeping; }
+bool DFPlay::playFailure(void)			{ return this->cState.playFailure; }
 
 
 // ----------------------------------------------------------------------------------------------------------------		
@@ -284,6 +287,7 @@ void DFPlay::manageDevice(void) {
 						this->cState.idleMillis = millis();
 						this->dState.playState = IDLE;
                         this->cState.changePending = true;
+						this->cState.playFailure = true;
 			            #ifdef LOGGING
 			                Serial.println("Play Failure ...");
 			            #endif

diff --git a/src/DFPlay.h b/src/DFPlay.h
@@ -61,15 +61,16 @@ class CurrentState {
         uint8_t		volume;         	// the current volume state (0 to 30)
         uint8_t		media;          	// identifies the currently selected media (USB, SD, SLEEP)  
         uint8_t		playType; 			// the current play type (TBD, MEDIA, FOLDER, or TRACK)      
-        bool	    usbAttached;	    // true indicates that a USB key is attached to the DFPlayer
-        bool		sdAttached;		    // true indicates that an SD card is attached to the DFPlayer
-        bool        sleeping;       	// true indicates that the DFPlayer is in low-power mode
-        bool        changePending;	    // true tells manageDevice() that a state change is pending
-        bool        firstEot;       	// true identifies first End-Of-Track frame 
-		uint32_t	noSubmitsTil;		// the time when the DFPlayer will be ready to accept the next command
-        uint32_t	trackCount;     	// the number of tracks that have been played in a folder or media selection
-        uint32_t    idleMillis;     	// millis when cState.playState was set to IDLE
-		int    	    tracks;         	// the number of tracks in a folder or media selection
+		bool			playFailure;		// true indicates that the last play command returned an error
+		bool	    	usbAttached;	    // true indicates that a USB key is attached to the DFPlayer
+        bool			sdAttached;	    // true indicates that an SD card is attached to the DFPlayer
+        bool        	sleeping;       	// true indicates that the DFPlayer is in low-power mode
+        bool        	changePending;	// true tells manageDevice() that a state change is pending
+        bool        	firstEot;       		// true identifies first End-Of-Track frame 
+		uint32_t		noSubmitsTil;		// the time when the DFPlayer will be ready to accept the next command
+        uint32_t		trackCount;     	// the number of tracks that have been played in a folder or media selection
+        uint32_t    	idleMillis;     		// millis when cState.playState was set to IDLE
+		int    	    	tracks;         		// the number of tracks in a folder or media selection
 };		
 
 class DFPlay {
@@ -117,6 +118,7 @@ class DFPlay {
         bool isPaused(void);
         bool isRepeating(void);
         bool isSleeping(void);
+		bool playFailure(void);
         void manageDevice(void);
 };
 #endif