added support for USB Disks (#18)

* added support for USB Disks * tiny update * followed naming convention
Makuna · Apr 13, 2019 · 2461622 · 2461622
1 parent 13af1e0
commit 2461622
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 2 deletions.
diff --git a/examples/PlayAdvertisements/PlayAdvertisements.ino b/examples/PlayAdvertisements/PlayAdvertisements.ino
@@ -31,14 +31,26 @@ public:
   {
     Serial.println("Card online ");
   }
+  static void OnUsbOnline(uint16_t code)
+  {
+    Serial.println("USB Disk online ");
+  }
   static void OnCardInserted(uint16_t code)
   {
     Serial.println("Card inserted ");
   }
+  static void OnUsbInserted(uint16_t code)
+  {
+    Serial.println("USB Disk inserted ");
+  }
   static void OnCardRemoved(uint16_t code)
   {
     Serial.println("Card removed ");
   }
+  static void OnUsbRemoved(uint16_t code)
+  {
+    Serial.println("USB Disk removed ");
+  }
 };
 
 // instance a DFMiniMp3 object, 

diff --git a/examples/PlayMp3/PlayMp3.ino b/examples/PlayMp3/PlayMp3.ino
@@ -39,19 +39,40 @@ public:
     Serial.println(code);     
   }
 
+  static void OnUsbOnline(uint16_t code)
+  {
+    Serial.println();
+    Serial.print("USB Disk online ");
+    Serial.println(code);     
+  }
+
   static void OnCardInserted(uint16_t code)
   {
     Serial.println();
     Serial.print("Card inserted ");
     Serial.println(code); 
   }
 
+  static void OnUsbInserted(uint16_t code)
+  {
+    Serial.println();
+    Serial.print("USB Disk inserted ");
+    Serial.println(code); 
+  }
+
   static void OnCardRemoved(uint16_t code)
   {
     Serial.println();
     Serial.print("Card removed ");
     Serial.println(code);  
   }
+
+  static void OnUsbRemoved(uint16_t code)
+  {
+    Serial.println();
+    Serial.print("USB Disk removed ");
+    Serial.println(code);  
+  }
 };
 
 // instance a DFMiniMp3 object, 

diff --git a/examples/PlayRandom/PlayRandom.ino b/examples/PlayRandom/PlayRandom.ino
@@ -27,14 +27,26 @@ public:
   {
     Serial.println("Card online ");
   }
+  static void OnUsbOnline(uint16_t code)
+  {
+    Serial.println("USB Disk online ");
+  }
   static void OnCardInserted(uint16_t code)
   {
     Serial.println("Card inserted ");
   }
+  static void OnUsbInserted(uint16_t code)
+  {
+    Serial.println("USB Disk inserted ");
+  }
   static void OnCardRemoved(uint16_t code)
   {
     Serial.println("Card removed ");
   }
+  static void OnUsbRemoved(uint16_t code)
+  {
+    Serial.println("USB Disk removed ");
+  }
 };
 
 // instance a DFMiniMp3 object, 

diff --git a/src/DFMiniMp3.h b/src/DFMiniMp3.h
@@ -65,7 +65,7 @@ enum DfMp3_Eq
 
 enum DfMp3_PlaySource
 {
-    DfMp3_PlaySource_U,
+    DfMp3_PlaySource_Usb,
     DfMp3_PlaySource_Sd,
     DfMp3_PlaySource_Aux,
     DfMp3_PlaySource_Sleep,
@@ -404,7 +404,8 @@ template<class T_SERIAL_METHOD, class T_NOTIFICATION_METHOD> class DFMiniMp3
                 {
                     switch (replyCommand)
                     {
-                    case 0x3d:
+		    case 0x3d: // micro sd
+		    case 0x3c: // usb
                         T_NOTIFICATION_METHOD::OnPlayFinished(replyArg);
                         break;
 
@@ -414,20 +415,34 @@ template<class T_SERIAL_METHOD, class T_NOTIFICATION_METHOD> class DFMiniMp3
                             _isOnline = true;
                             T_NOTIFICATION_METHOD::OnCardOnline(replyArg);
                         }
+			else if (replyArg & 0x01)
+                        {
+			    _isOnline = true;
+                            T_NOTIFICATION_METHOD::OnUsbOnline(replyArg);
+                        }
                         break;
 
                     case 0x3A:
                         if (replyArg & 0x02)
                         {
                             T_NOTIFICATION_METHOD::OnCardInserted(replyArg);
                         }
+			else if (replyArg & 0x01)
+                        {
+                            T_NOTIFICATION_METHOD::OnUsbInserted(replyArg);
+                        }
                         break;
 
                     case 0x3B:
                         if (replyArg & 0x02)
                         {
                             T_NOTIFICATION_METHOD::OnCardRemoved(replyArg);
                         }
+			else if (replyArg & 0x01)
+                        {
+                            T_NOTIFICATION_METHOD::OnUsbRemoved(replyArg);
+                        }
+
                         break;
 
                     case 0x40: