Revision 2:fa9a64f4935d, committed 2016-01-28

Comitter:

alustig3

Date:

Thu Jan 28 16:37:49 2016 +0000

Parent:

1:bfb321f3d233

Commit message:

Added playTrackNum function to match SOMO library, therefore making sound modules interchangeable. Commented out all of the functions not being used by stateScript

Changed in this revision

diff -r bfb321f3d233 -r fa9a64f4935d SMARTWAV.cpp
--- a/SMARTWAV.cpp	Tue May 19 15:43:42 2015 +0000
+++ b/SMARTWAV.cpp	Thu Jan 28 16:37:49 2016 +0000
@@ -32,51 +32,9 @@
     _serialSMARTWAV.baud(9600);
     _resetPin=1;               //set the pin to 3.3v to avoid reset 
 }
- 
-void SMARTWAV::reset(){        //Reset the SMARTWAV board
-    _resetPin=0;               //set the pin to GND to reset 
-    wait_ms(500);
-    _resetPin=1;               //set the pin to 3.3v to end reset
-    wait_ms(500);    
-}
-
-unsigned char SMARTWAV::sleep(){       //Send SMARTWAV to sleep mode / awake from sleep mode
-  _serialSMARTWAV.putc('Z'); 
-  return _serialSMARTWAV.getc();
-}
-
-unsigned char SMARTWAV::getStatus(){       //Check active status
-  unsigned char status;
-  
-  _serialSMARTWAV.putc('A');
-  status  = _serialSMARTWAV.getc();
-  _serialSMARTWAV.getc();
-  return status;
-}
-
-unsigned char SMARTWAV::playTracks(){       //Start playing any song on current Folder/Dir
-  _serialSMARTWAV.putc('T'); 
-  return _serialSMARTWAV.getc();
-}
-
-unsigned char SMARTWAV::pausePlay(){       //Pause / play song
-  _serialSMARTWAV.putc('P'); 
-  return _serialSMARTWAV.getc();
-}
-
-unsigned char SMARTWAV::rewindTrack(){       //Rewind Track
-  _serialSMARTWAV.putc('R'); 
-  return _serialSMARTWAV.getc();
-}
-
-unsigned char SMARTWAV::nextTrack(){       //Next Track
-  _serialSMARTWAV.putc('N'); 
-  return _serialSMARTWAV.getc();
-}
 
 unsigned char SMARTWAV::playTrackName(char name[]){        //play an Audio file contained on the micro SD card with the given name.
-  unsigned char counter=0;
-  
+  unsigned char counter=0;  
   //if (_serialSMARTWAV.writeable()) {
   _serialSMARTWAV.putc('F'); 
   //}
@@ -90,14 +48,15 @@
       break;
     }    
     counter++;
-  }
-  
+  }  
   return _serialSMARTWAV.getc();
   //return 1;
 }
 
+void SMARTWAV::playTrackNum(unsigned char trackNum){  //added so SOMO and smartWAV have same functions and can therefore be used interchangeably
+}
+
 unsigned char SMARTWAV::stopTrack(){       //Stop playing any active song
-  
   //if (_serialSMARTWAV.writeable()) {
   _serialSMARTWAV.putc('S'); 
   //}
@@ -105,16 +64,6 @@
   //return 1;
 }
 
-unsigned char SMARTWAV::continuousPlay(unsigned char enable){       //Enable/Disable continuous play, also disabled by calling stopTrack()
-  unsigned char status;
-  
-  _serialSMARTWAV.putc('C');
-  _serialSMARTWAV.putc(enable);
-  status  = _serialSMARTWAV.getc();
-  _serialSMARTWAV.getc();
-  return status;
-}
-
 unsigned char SMARTWAV::volume(unsigned char vol){       //Set Volume 0-255
   _serialSMARTWAV.putc('V'); 
   _serialSMARTWAV.putc(vol); 
@@ -122,89 +71,144 @@
   return 1;
 }
 
-unsigned char SMARTWAV::setFolder(char name[]){        //Set/Enters inside a folder/path on the micro SD card with the given name.
-  unsigned char counter=0;
-  
-  _serialSMARTWAV.putc('D'); 
-  while(1){
-    _serialSMARTWAV.putc(name[counter]);
-    if(name[counter]==0x00){
-      break;
-    }    
-    counter++;
-  }
-  return _serialSMARTWAV.getc();
-}
-
-unsigned char SMARTWAV::getFileName(char name[]){ //Reads the name of the current/ last audio file being played on the SMARTWAV, and stores it on the name[] buffer.
-  unsigned int i=0;
-  
-  _serialSMARTWAV.putc('I'); 
-  _serialSMARTWAV.putc('S'); 
-   //receive all the file name
-    while(1){
-        name[i]=_serialSMARTWAV.getc();
-        if(name[i]==0x00){
-            break;    
-        }
-        i++;
-    }
-  return _serialSMARTWAV.getc();  
+void SMARTWAV::reset(){        //Reset the SMARTWAV board
+    _resetPin=0;               //set the pin to GND to reset 
+    wait_ms(500);
+    _resetPin=1;               //set the pin to 3.3v to end reset
+    wait_ms(500);    
 }
 
-unsigned char SMARTWAV::getFolderName(char name[]){ //Reads the name of the current folderDir/path name the SMARTWAV, and stores it on the name[] buffer.
-  unsigned int i=0;
-  
-  _serialSMARTWAV.putc('I'); 
-  _serialSMARTWAV.putc('D'); 
-   //receive all the folder/path name
-    while(1){
-        name[i]=_serialSMARTWAV.getc();
-        if(name[i]==0x00){
-            break;    
-        }
-        i++;
-    }
-  return _serialSMARTWAV.getc();  
-}
 
-unsigned char SMARTWAV::getFileList(char list[]){ //Reads all the names of the .WAV files on the current folder/dir on the SMARTWAV, and stores it on the list[] buffer separated by comma ','.
-  unsigned int i=0;
-  
-  _serialSMARTWAV.putc('I'); 
-  _serialSMARTWAV.putc('L'); 
-   //receive all the file names
-    while(1){
-        list[i]=_serialSMARTWAV.getc();
-        if(list[i]==0x00){
-            break;    
-        }
-        i++;
-    }
-  return _serialSMARTWAV.getc();  
-}
+////------------------------Below Functions aren't used in stateScript-----------------------------------------//
+//unsigned char SMARTWAV::sleep(){       //Send SMARTWAV to sleep mode / awake from sleep mode
+//  _serialSMARTWAV.putc('Z'); 
+//  return _serialSMARTWAV.getc();
+//}
+//
+//unsigned char SMARTWAV::getStatus(){       //Check active status
+//  unsigned char status;
+//  
+//  _serialSMARTWAV.putc('A');
+//  status  = _serialSMARTWAV.getc();
+//  _serialSMARTWAV.getc();
+//  return status;
+//}
+//
+//unsigned char SMARTWAV::playTracks(){       //Start playing any song on current Folder/Dir
+//  _serialSMARTWAV.putc('T'); 
+//  return _serialSMARTWAV.getc();
+//}
+//
+//unsigned char SMARTWAV::pausePlay(){       //Pause / play song
+//  _serialSMARTWAV.putc('P'); 
+//  return _serialSMARTWAV.getc();
+//}
+//
+//unsigned char SMARTWAV::rewindTrack(){       //Rewind Track
+//  _serialSMARTWAV.putc('R'); 
+//  return _serialSMARTWAV.getc();
+//}
+//
+//unsigned char SMARTWAV::nextTrack(){       //Next Track
+//  _serialSMARTWAV.putc('N'); 
+//  return _serialSMARTWAV.getc();
+//}
+//
+//unsigned char SMARTWAV::continuousPlay(unsigned char enable){       //Enable/Disable continuous play, also disabled by calling stopTrack()
+//  unsigned char status;
+//  
+//  _serialSMARTWAV.putc('C');
+//  _serialSMARTWAV.putc(enable);
+//  status  = _serialSMARTWAV.getc();
+//  _serialSMARTWAV.getc();
+//  return status;
+//}
+//
+//
+//
+//unsigned char SMARTWAV::setFolder(char name[]){        //Set/Enters inside a folder/path on the micro SD card with the given name.
+//  unsigned char counter=0;
+//  
+//  _serialSMARTWAV.putc('D'); 
+//  while(1){
+//    _serialSMARTWAV.putc(name[counter]);
+//    if(name[counter]==0x00){
+//      break;
+//    }    
+//    counter++;
+//  }
+//  return _serialSMARTWAV.getc();
+//}
+//
+//unsigned char SMARTWAV::getFileName(char name[]){ //Reads the name of the current/ last audio file being played on the SMARTWAV, and stores it on the name[] buffer.
+//  unsigned int i=0;
+//  
+//  _serialSMARTWAV.putc('I'); 
+//  _serialSMARTWAV.putc('S'); 
+//   //receive all the file name
+//    while(1){
+//        name[i]=_serialSMARTWAV.getc();
+//        if(name[i]==0x00){
+//            break;    
+//        }
+//        i++;
+//    }
+//  return _serialSMARTWAV.getc();  
+//}
+//
+//unsigned char SMARTWAV::getFolderName(char name[]){ //Reads the name of the current folderDir/path name the SMARTWAV, and stores it on the name[] buffer.
+//  unsigned int i=0;
+//  
+//  _serialSMARTWAV.putc('I'); 
+//  _serialSMARTWAV.putc('D'); 
+//   //receive all the folder/path name
+//    while(1){
+//        name[i]=_serialSMARTWAV.getc();
+//        if(name[i]==0x00){
+//            break;    
+//        }
+//        i++;
+//    }
+//  return _serialSMARTWAV.getc();  
+//}
+//
+//unsigned char SMARTWAV::getFileList(char list[]){ //Reads all the names of the .WAV files on the current folder/dir on the SMARTWAV, and stores it on the list[] buffer separated by comma ','.
+//  unsigned int i=0;
+//  
+//  _serialSMARTWAV.putc('I'); 
+//  _serialSMARTWAV.putc('L'); 
+//   //receive all the file names
+//    while(1){
+//        list[i]=_serialSMARTWAV.getc();
+//        if(list[i]==0x00){
+//            break;    
+//        }
+//        i++;
+//    }
+//  return _serialSMARTWAV.getc();  
+//}
+//
+//unsigned char SMARTWAV::getFolderList(char list[]){ //Reads all the folders on the current folder/dir on the SMARTWAV, and stores it on the list[] buffer separated by comma ','.
+//  unsigned int i=0;
+//  
+//  _serialSMARTWAV.putc('I'); 
+//  _serialSMARTWAV.putc('X'); 
+//   //receive all the folder names
+//    while(1){
+//        list[i]=_serialSMARTWAV.getc();
+//        if(list[i]==0x00){
+//            break;    
+//        }
+//        i++;
+//    }
+//  return _serialSMARTWAV.getc();  
+//}
+//
+//unsigned char SMARTWAV::playSpeed(unsigned char speed){   //Change current Play Speed: X0.5, X1, X1.5, X2, if track ends, play speed returns to 1.0X
+//  
+//  _serialSMARTWAV.putc('M');
+//  _serialSMARTWAV.putc(speed);
+//  _serialSMARTWAV.getc();
+//  return _serialSMARTWAV.getc();
+//}
 
-unsigned char SMARTWAV::getFolderList(char list[]){ //Reads all the folders on the current folder/dir on the SMARTWAV, and stores it on the list[] buffer separated by comma ','.
-  unsigned int i=0;
-  
-  _serialSMARTWAV.putc('I'); 
-  _serialSMARTWAV.putc('X'); 
-   //receive all the folder names
-    while(1){
-        list[i]=_serialSMARTWAV.getc();
-        if(list[i]==0x00){
-            break;    
-        }
-        i++;
-    }
-  return _serialSMARTWAV.getc();  
-}
-
-unsigned char SMARTWAV::playSpeed(unsigned char speed){   //Change current Play Speed: X0.5, X1, X1.5, X2, if track ends, play speed returns to 1.0X
-  
-  _serialSMARTWAV.putc('M');
-  _serialSMARTWAV.putc(speed);
-  _serialSMARTWAV.getc();
-  return _serialSMARTWAV.getc();
-}
-

diff -r bfb321f3d233 -r fa9a64f4935d SMARTWAV.h
--- a/SMARTWAV.h	Tue May 19 15:43:42 2015 +0000
+++ b/SMARTWAV.h	Thu Jan 28 16:37:49 2016 +0000
@@ -52,40 +52,44 @@
     SMARTWAV(PinName TXPin, PinName RXPin, PinName resetPin);
     
     void init();
-
-    void reset();
     
-    unsigned char sleep();  
-
-    unsigned char getStatus();
-
-    unsigned char playTracks();
-	
-	unsigned char pausePlay();
-	
-	unsigned char rewindTrack();
-	
-	unsigned char nextTrack();
+    void playTrackNum(unsigned char);
     
     unsigned char playTrackName(char[]);
 	
 	unsigned char stopTrack();
 	
-	unsigned char continuousPlay(unsigned char);	
-	
 	unsigned char volume(unsigned char);	
-	
-	unsigned char setFolder(char[]);
+
+    void reset();    
     
-    unsigned char getFileName(char[]);
+//  unsigned char sleep();  
+//
+//  unsigned char getStatus();
+//
+//  unsigned char playTracks();
+//	
+//	unsigned char pausePlay();
+//	
+//	unsigned char rewindTrack();
+//	
+//	unsigned char nextTrack();     
+//	
+//	unsigned char continuousPlay(unsigned char);		
+//	
+//	unsigned char setFolder(char[]);
+//    
+//  unsigned char getFileName(char[]);
+//	
+//	unsigned char getFolderName(char[]);
+//	
+//	unsigned char getFileList(char[]);
+//	
+//	unsigned char getFolderList(char[]);
+//	
+//	unsigned char playSpeed(unsigned char);
 	
-	unsigned char getFolderName(char[]);
 	
-	unsigned char getFileList(char[]);
-	
-	unsigned char getFolderList(char[]);
-	
-	unsigned char playSpeed(unsigned char);
 	
     protected :