Merge pull request #140: Issue 132: Support DF Player MP3-TF-16P V3.0…

… with the chip MH2024K-24SS
tonuino · Nov 21, 2023 · e61110c · e61110c
2 parents 6d225ea + cd4b951
commit e61110c
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -41,7 +41,7 @@ Allgemeine Anleitungen zum Einrichten der IDE findet man hier [www.tonuino.de/TN
 - Es müssen folgende Versionen der Libraries verwendet werden:  
     - jchristensen/JC_Button: 2.1.2  
     - miguelbalboa/MFRC522: 1.4.10  
-    - makuna/DFPlayer Mini Mp3 by Makuna: 1.2.2
+    - makuna/DFPlayer Mini Mp3 by Makuna: 1.2.3
     - adafruit/Adafruit NeoPixel: 1.11.0 (optional, nur bei Feature NEO_RING notwendig)
 
 
@@ -51,10 +51,12 @@ Die SD Karte (Ordner mp3 und advert) hat sich gegenüber der Version 3.1.2 geän
 
 # Change Log
 
+## Version 3.1.5 (21.11.2023)
+- [Issue 132](https://github.com/tonuino/TonUINO-TNG/issues/132): Support DF Player MP3-TF-16P V3.0 with the chip MH2024K-24SS
+
 ## Version 3.1.4 (20.11.2023)
 - [Issue 138](https://github.com/tonuino/TonUINO-TNG/issues/138): Two new options for when the same RFID card is inserted
-
-## Version 3.1.4 (16.11.2023)
+- [Issue 130](https://github.com/tonuino/TonUINO-TNG/issues/130): Add circuit diagram
 - [Issue 133](https://github.com/tonuino/TonUINO-TNG/issues/133): Cards with version 1 don't work
 - [Issue 125](https://github.com/tonuino/TonUINO-TNG/issues/125): platform.local.txt on MacOS
 - [Issue 126](https://github.com/tonuino/TonUINO-TNG/issues/126): Support Speaker on/off for Classic Variant to suppress Noise on startup and shutdown 

diff --git a/TonUINO-TNG.ino b/TonUINO-TNG.ino
@@ -35,7 +35,7 @@ void setup()
   LOG(init_log, s_error, F("TonUINO Version 3.1 - refactored by Boerge1\n"));
   LOG(init_log, s_error, F("created by Thorsten Voß and licensed under GNU/GPL."));
   LOG(init_log, s_error, F("Information and contribution at https://tonuino.de.\n"));
-  LOG(init_log, s_error, F("V3.1.4 20.11.23\n"));
+  LOG(init_log, s_error, F("V3.1.5 21.11.23\n"));
 
   Tonuino::getTonuino().setup();
 }

diff --git a/platformio.ini b/platformio.ini
@@ -12,7 +12,7 @@
 lib_deps = 
 	jchristensen/JC_Button@^2.1.2
 	miguelbalboa/MFRC522@^1.4.10
-	makuna/DFPlayer Mini Mp3 by [email protected].2
+	makuna/DFPlayer Mini Mp3 by [email protected].3
 	adafruit/Adafruit NeoPixel@^1.11.0
 
 build_flags = 

diff --git a/src/mp3.hpp b/src/mp3.hpp
@@ -30,9 +30,9 @@ class Mp3Notify;
 
 // define a handy type using serial and our notify class
 #ifdef DFMiniMp3_T_CHIP_VARIANT
-using DfMp3 = DFMiniMp3<SerialType, Mp3Notify, DFMiniMp3_T_CHIP_VARIANT>;
+using DfMp3 = DFMiniMp3<SerialType, Mp3Notify, DFMiniMp3_T_CHIP_VARIANT, 1500>;
 #else
-using DfMp3 = DFMiniMp3<SerialType, Mp3Notify>;
+using DfMp3 = DFMiniMp3<SerialType, Mp3Notify, Mp3ChipOriginal         , 1500>;
 #endif
 
 enum class mp3Tracks: uint16_t {

diff --git a/test/libs/DFMiniMp3.h b/test/libs/DFMiniMp3.h
@@ -96,7 +96,7 @@ class Mp3ChipIncongruousNoAck
 {
 };
 
-template <class T_SERIAL_METHOD, class T_NOTIFICATION_METHOD, class T_CHIP_VARIANT = Mp3ChipOriginal>
+template <class T_SERIAL_METHOD, class T_NOTIFICATION_METHOD, class T_CHIP_VARIANT = Mp3ChipOriginal, uint32_t C_ACK_TIMEOUT = 900>
 class DFMiniMp3
 {
 public:
-Original file line number
+Diff line change
@@ Expand Up / @@ -96,7 +96,7 @@ class Mp3ChipIncongruousNoAck @@
     {
     };
-    template <class T_SERIAL_METHOD, class T_NOTIFICATION_METHOD, class T_CHIP_VARIANT = Mp3ChipOriginal>
+    template <class T_SERIAL_METHOD, class T_NOTIFICATION_METHOD, class T_CHIP_VARIANT = Mp3ChipOriginal, uint32_t C_ACK_TIMEOUT = 900>
     class DFMiniMp3
     {
     public:
@@ Expand Down @@