jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-21 09:46:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated MP3 Driver with busy and MP3 Folder command

Browse Source
This commit is contained in:
Tom Lafleur 2022-06-22 14:47:32 -07:00
parent 956cc0fdbd
commit 89816e88d4
3 changed files with 117 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tasmota/include/tasmota_template.h
View File

@ -54,6 +54,7 @@ enum UserSelectablePins {
GPIO_SDM630_TX, GPIO_SDM630_RX, // SDM630 Serial interface GPIO_SDM630_TX, GPIO_SDM630_RX, // SDM630 Serial interface
GPIO_TM1638CLK, GPIO_TM1638DIO, GPIO_TM1638STB, // TM1638 interface GPIO_TM1638CLK, GPIO_TM1638DIO, GPIO_TM1638STB, // TM1638 interface
GPIO_MP3_DFR562, // RB-DFR-562, DFPlayer Mini MP3 Player GPIO_MP3_DFR562, // RB-DFR-562, DFPlayer Mini MP3 Player
GPIO_MP3_DFR562_BUSY, // RB-DFR-562, DFPlayer Mini MP3 Player busy flag
GPIO_HX711_SCK, GPIO_HX711_DAT, // HX711 Load Cell interface GPIO_HX711_SCK, GPIO_HX711_DAT, // HX711 Load Cell interface
GPIO_TX2X_TXD_BLACK, // TX20/TX23 Transmission Pin GPIO_TX2X_TXD_BLACK, // TX20/TX23 Transmission Pin
GPIO_TUYA_TX, GPIO_TUYA_RX, // Tuya Serial interface GPIO_TUYA_TX, GPIO_TUYA_RX, // Tuya Serial interface
@ -286,7 +287,7 @@ const char kSensorNames[] PROGMEM =
D_SENSOR_SDM120_TX "|" D_SENSOR_SDM120_RX "|" D_SENSOR_SDM120_TX "|" D_SENSOR_SDM120_RX "|"
D_SENSOR_SDM630_TX "|" D_SENSOR_SDM630_RX "|" D_SENSOR_SDM630_TX "|" D_SENSOR_SDM630_RX "|"
D_SENSOR_TM1638_CLK "|" D_SENSOR_TM1638_DIO "|" D_SENSOR_TM1638_STB "|" D_SENSOR_TM1638_CLK "|" D_SENSOR_TM1638_DIO "|" D_SENSOR_TM1638_STB "|"
D_SENSOR_DFR562 "|" D_SENSOR_DFR562 "|" D_SENSOR_DFR562_BUSY "|"
D_SENSOR_HX711_SCK "|" D_SENSOR_HX711_DAT "|" D_SENSOR_HX711_SCK "|" D_SENSOR_HX711_DAT "|"
D_SENSOR_TX2X_TX "|" D_SENSOR_TX2X_TX "|"
D_SENSOR_TUYA_TX "|" D_SENSOR_TUYA_RX "|" D_SENSOR_TUYA_TX "|" D_SENSOR_TUYA_RX "|"
@ -872,7 +873,8 @@ const uint16_t kGpioNiceList[] PROGMEM = {
#endif #endif
#ifdef USE_MP3_PLAYER #ifdef USE_MP3_PLAYER
AGPIO(GPIO_MP3_DFR562), // RB-DFR-562, DFPlayer Mini MP3 Player Serial interface AGPIO(GPIO_MP3_DFR562), // RB-DFR-562, DFPlayer Mini MP3 Player Serial interface
#endif AGPIO(GPIO_MP3_DFR562_BUSY),// RB-DFR-562, DFPlayer Mini MP3 Player optional Busy flag
#endif
#ifdef USE_AZ7798 #ifdef USE_AZ7798
AGPIO(GPIO_AZ_TXD), // AZ-Instrument 7798 CO2 datalogger Serial interface AGPIO(GPIO_AZ_TXD), // AZ-Instrument 7798 CO2 datalogger Serial interface
AGPIO(GPIO_AZ_RXD), // AZ-Instrument 7798 CO2 datalogger Serial interface AGPIO(GPIO_AZ_RXD), // AZ-Instrument 7798 CO2 datalogger Serial interface

1
tasmota/language/en_GB.h
View File

@ -632,6 +632,7 @@
#define D_SENSOR_I2S_IN_SLCT "I2S In Slct" #define D_SENSOR_I2S_IN_SLCT "I2S In Slct"
#define D_SENSOR_WS2812 "WS2812" #define D_SENSOR_WS2812 "WS2812"
#define D_SENSOR_DFR562 "MP3 Player" #define D_SENSOR_DFR562 "MP3 Player"
#define D_SENSOR_DFR562_BUSY "MP3 Busy"
#define D_SENSOR_IRSEND "IRsend" #define D_SENSOR_IRSEND "IRsend"
#define D_SENSOR_SWITCH "Switch" // Suffix "1" #define D_SENSOR_SWITCH "Switch" // Suffix "1"
#define D_SENSOR_BUTTON "Button" // Suffix "1" #define D_SENSOR_BUTTON "Button" // Suffix "1"

141
tasmota/tasmota_xdrv_driver/xdrv_14_mp3.ino
View File

@ -19,6 +19,14 @@
-------------------------------------------------------------------------------------------- --------------------------------------------------------------------------------------------
Version yyyymmdd Action Description Version yyyymmdd Action Description
-------------------------------------------------------------------------------------------- --------------------------------------------------------------------------------------------
1.0.0.6 22Jun2022 added - Busy flag on optional GPIO pin
added - command for MP3Folder, folder/track format
added - an event so that busy flag can be used in Berry
ToDo - test changes with SV17F
ToDo - change MP3Folder format to use two arguments MP3Folder 3,9
- Tom@lafleur.us
1.0.0.5 20210121 added - support for DY_SV17F Player (#define USE_DY_SV17F) 1.0.0.5 20210121 added - support for DY_SV17F Player (#define USE_DY_SV17F)
- cmds supported: - cmds supported:
- track - track
@ -67,6 +75,27 @@
base - code base from gemu2015 ;-) - https://github.com/gemu2015/Sonoff-Tasmota base - code base from gemu2015 ;-) - https://github.com/gemu2015/Sonoff-Tasmota
forked - from arendst/tasmota - https://github.com/arendst/Tasmota forked - from arendst/tasmota - https://github.com/arendst/Tasmota
Ver 12.1.0.4x
/tasmota/tasmota_template.h
@ line 56
GPIO_MP3_DFR562, // RB-DFR-562, DFPlayer Mini MP3 Player
GPIO_MP3_DFR562_BUSY, // RB-DFR-562, DFPlayer Mini MP3 Player busy flag
@ Line 290
D_SENSOR_DFR562 "|" D_SENSOR_DFR562_BUSY "|"
@ line 870
#ifdef USE_MP3_PLAYER
AGPIO(GPIO_MP3_DFR562), // RB-DFR-562, DFPlayer Mini MP3 Player Serial interface
AGPIO(GPIO_MP3_DFR562_BUSY),// RB-DFR-562, DFPlayer Mini MP3 Player optional Busy flag
#endif
/tasmota/language/el_GB.h
@ line 634
#define D_SENSOR_DFR562 "MP3 Player"
#define D_SENSOR_DFR562_BUSY "MP3 Busy"
*/ */
#ifdef USE_MP3_PLAYER #ifdef USE_MP3_PLAYER
@ -77,10 +106,6 @@
#define XDRV_14 14 #define XDRV_14 14
#ifndef MP3_VOLUME
#define MP3_VOLUME 30 // Set the startup volume on init, the range can be 0..100(max)
#endif
#include <TasmotaSerial.h> #include <TasmotaSerial.h>
TasmotaSerial *MP3Player; TasmotaSerial *MP3Player;
@ -91,9 +116,11 @@ TasmotaSerial *MP3Player;
#define D_CMND_MP3 "MP3" #define D_CMND_MP3 "MP3"
const char S_JSON_MP3_COMMAND_NVALUE[] PROGMEM = "{\"" D_CMND_MP3 "%s\":%d}"; const char S_JSON_MP3_COMMAND_NVALUE[] PROGMEM = "{\"" D_CMND_MP3 "%s\":%d}";
const char S_JSON_MP3_COMMAND[] PROGMEM = "{\"" D_CMND_MP3 "%s\"}"; const char S_JSON_MP3_COMMAND[] PROGMEM = "{\"" D_CMND_MP3 "%s\"}";
const char kMP3_Commands[] PROGMEM = "Track|Play|Pause|Stop|Volume|EQ|Device|Reset|DAC"; const char kMP3_Commands[] PROGMEM = "Track|Folder|Play|Pause|Stop|Volume|EQ|Device|Reset|DAC"; // <-------- trl
uint32_t MP2BusyFlag; // low is busy
/*********************************************************************************************\ /*********************************************************************************************\
* enumerationsines * enumerationsines
@ -101,6 +128,7 @@ const char kMP3_Commands[] PROGMEM = "Track|Play|Pause|Stop|Volume|E
enum MP3_Commands { // commands useable in console or rules enum MP3_Commands { // commands useable in console or rules
CMND_MP3_TRACK, // MP3Track 001...255 CMND_MP3_TRACK, // MP3Track 001...255
CMND_MP3_FOLDER, // MP3Folder folder 01-99, track 0001...0255 // <-------- trl
CMND_MP3_PLAY, // MP3Play, after pause or normal start to play CMND_MP3_PLAY, // MP3Play, after pause or normal start to play
CMND_MP3_PAUSE, // MP3Pause CMND_MP3_PAUSE, // MP3Pause
CMND_MP3_STOP, // MP3Stop, real stop, original version was pause function CMND_MP3_STOP, // MP3Stop, real stop, original version was pause function
@ -115,9 +143,10 @@ enum MP3_Commands { // commands useable in conso
* command defines * command defines
\*********************************************************************************************/ \*********************************************************************************************/
#define MP3_CMD_RESET_VALUE 0 // mp3 reset command value #define MP3_CMD_RESET_VALUE 0x00 // mp3 reset command value
// player commands // player commands
#define MP3_CMD_TRACK 0x03 // specify playback of a track, e.g. MP3Track 003 #define MP3_CMD_TRACK 0x03 // specify playback of a track, e.g. MP3Track 003
#define MP3_CMD_FOLDER 0x0f // specify playback of a track, e.g. MP3Folder 03,0255 <-------------- TRL
#define MP3_CMD_PLAY 0x0d // Play, works as a normal play on a real MP3 Player, starts at 001.mp3 file on the selected device #define MP3_CMD_PLAY 0x0d // Play, works as a normal play on a real MP3 Player, starts at 001.mp3 file on the selected device
#define MP3_CMD_PAUSE 0x0e // Pause, was original designed as stop, see data sheet #define MP3_CMD_PAUSE 0x0e // Pause, was original designed as stop, see data sheet
#define MP3_CMD_STOP 0x16 // Stop, it's a real stop now, in the original version it was a pause command #define MP3_CMD_STOP 0x16 // Stop, it's a real stop now, in the original version it was a pause command
@ -147,16 +176,26 @@ uint16_t MP3_Checksum(uint8_t *array)
* define serial tx port fixed with 9600 baud * define serial tx port fixed with 9600 baud
\*********************************************************************************************/ \*********************************************************************************************/
void MP3PlayerInit(void) { void MP3PlayerInit(void)
{
MP3Player = new TasmotaSerial(-1, Pin(GPIO_MP3_DFR562)); MP3Player = new TasmotaSerial(-1, Pin(GPIO_MP3_DFR562));
// start serial communication fixed to 9600 baud // start serial communication fixed to 9600 baud
if (MP3Player->begin(9600)) { if (MP3Player->begin(9600))
{
MP3Player->flush(); MP3Player->flush();
delay(1000); delay(1000);
MP3_CMD(MP3_CMD_RESET, MP3_CMD_RESET_VALUE); // reset the player to defaults MP3_CMD(MP3_CMD_RESET, MP3_CMD_RESET_VALUE); // reset the player to defaults
delay(3000); delay(3000);
MP3_CMD(MP3_CMD_VOLUME, MP3_VOLUME); // after reset set volume depending on the entry in the my_user_config.h MP3_CMD(MP3_CMD_VOLUME, MP3_VOLUME); // after reset set volume depending on the entry in the my_user_config.h
} }
if (PinUsed(GPIO_MP3_DFR562_BUSY)) // optional MP3 player busy pin...
{
pinMode(Pin(GPIO_MP3_DFR562_BUSY), INPUT); // set pin to Input
}
return; return;
} }
@ -169,32 +208,38 @@ void MP3PlayerInit(void) {
* only track,play,stop and volume supported * only track,play,stop and volume supported
\*********************************************************************************************/ \*********************************************************************************************/
void MP3_SendCmd(uint8_t *scmd, uint8_t len) { void MP3_SendCmd(uint8_t *scmd, uint8_t len)
{
uint16_t sum = 0; uint16_t sum = 0;
for (uint32_t cnt = 0; cnt < len; cnt++) { for (uint32_t cnt = 0; cnt < len; cnt++)
{
sum += scmd[cnt]; sum += scmd[cnt];
} }
scmd[len] = sum; scmd[len] = sum;
MP3Player->write(scmd, len + 1); MP3Player->write(scmd, len + 1);
} }
void MP3_CMD(uint8_t mp3cmd, uint16_t val) { void MP3_CMD(uint8_t mp3cmd, uint16_t val)
{
uint8_t scmd[8]; uint8_t scmd[8];
uint8_t len = 0; uint8_t len = 0;
scmd[0]=0xAA; scmd[0]=0xAA;
switch (mp3cmd) { switch (mp3cmd)
{
case MP3_CMD_TRACK: case MP3_CMD_TRACK:
scmd[1]=0x07; scmd[1]=0x07;
scmd[2]=0x02; scmd[2]=0x02;
scmd[3]=val>>8; scmd[3]=val>>8;
scmd[4]=val; scmd[4]=val;
MP3_SendCmd(scmd, 5); MP3_SendCmd(scmd, 5);
case MP3_CMD_PLAY: case MP3_CMD_PLAY:
scmd[1]=0x02; scmd[1]=0x02;
scmd[2]=0x00; scmd[2]=0x00;
scmd[3]=0xAC; scmd[3]=0xAC;
len = 4; len = 4;
break; break;
case MP3_CMD_STOP: case MP3_CMD_STOP:
scmd[1]=0x10; scmd[1]=0x10;
scmd[2]=0x00; scmd[2]=0x00;
@ -207,6 +252,7 @@ void MP3_CMD(uint8_t mp3cmd, uint16_t val) {
scmd[3]=val; scmd[3]=val;
len = 4; len = 4;
break; break;
default: default:
return; return;
} }
@ -222,7 +268,8 @@ void MP3_CMD(uint8_t mp3cmd, uint16_t val) {
* {0x7e , 0xff , 6 , 0 , 0/1 , 0 , 0 , 0 , 0 , 0xef }; * {0x7e , 0xff , 6 , 0 , 0/1 , 0 , 0 , 0 , 0 , 0xef };
\*********************************************************************************************/ \*********************************************************************************************/
void MP3_CMD(uint8_t mp3cmd,uint16_t val) { void MP3_CMD(uint8_t mp3cmd,uint16_t val)
{
uint8_t i = 0; uint8_t i = 0;
uint8_t cmd[10] = {0x7e,0xff,6,0,0,0,0,0,0,0xef}; // fill array uint8_t cmd[10] = {0x7e,0xff,6,0,0,0,0,0,0,0xef}; // fill array
cmd[3] = mp3cmd; // mp3 command value cmd[3] = mp3cmd; // mp3 command value
@ -234,33 +281,41 @@ void MP3_CMD(uint8_t mp3cmd,uint16_t val) {
cmd[8] = chks; // checksum low byte cmd[8] = chks; // checksum low byte
MP3Player->write(cmd, sizeof(cmd)); // write mp3 data array to player MP3Player->write(cmd, sizeof(cmd)); // write mp3 data array to player
delay(1000); delay(1000);
if (mp3cmd == MP3_CMD_RESET) { if (mp3cmd == MP3_CMD_RESET)
{
MP3_CMD(MP3_CMD_VOLUME, MP3_VOLUME); // after reset set volume depending on the entry in the my_user_config.h MP3_CMD(MP3_CMD_VOLUME, MP3_VOLUME); // after reset set volume depending on the entry in the my_user_config.h
} }
return; return;
} }
#endif // USE_DY_SV17F #endif // USE_DY_SV17F
/*********************************************************************************************\ /*********************************************************************************************\
* check the MP3 commands * check the MP3 commands
\*********************************************************************************************/ \*********************************************************************************************/
bool MP3PlayerCmd(void) { bool MP3PlayerCmd(void)
{
char command[CMDSZ]; char command[CMDSZ];
bool serviced = true; bool serviced = true;
uint8_t disp_len = strlen(D_CMND_MP3); uint8_t disp_len = strlen(D_CMND_MP3);
if (!strncasecmp_P(XdrvMailbox.topic, PSTR(D_CMND_MP3), disp_len)) { // prefix if (!strncasecmp_P(XdrvMailbox.topic, PSTR(D_CMND_MP3), disp_len)) // prefix
{
int command_code = GetCommandCode(command, sizeof(command), XdrvMailbox.topic + disp_len, kMP3_Commands); int command_code = GetCommandCode(command, sizeof(command), XdrvMailbox.topic + disp_len, kMP3_Commands);
switch (command_code) { switch (command_code)
{
case CMND_MP3_TRACK: case CMND_MP3_TRACK:
case CMND_MP3_FOLDER: // <-------- trl
case CMND_MP3_VOLUME: case CMND_MP3_VOLUME:
case CMND_MP3_EQ: case CMND_MP3_EQ:
case CMND_MP3_DEVICE: case CMND_MP3_DEVICE:
case CMND_MP3_DAC: case CMND_MP3_DAC:
// play a track, set volume, select EQ, sepcify file device // play a track, set volume, select EQ, specify file device
if (XdrvMailbox.data_len > 0) { if (XdrvMailbox.data_len > 0)
{
if (command_code == CMND_MP3_TRACK) { MP3_CMD(MP3_CMD_TRACK, XdrvMailbox.payload); } if (command_code == CMND_MP3_TRACK) { MP3_CMD(MP3_CMD_TRACK, XdrvMailbox.payload); }
if (command_code == CMND_MP3_FOLDER) { MP3_CMD(MP3_CMD_FOLDER, XdrvMailbox.payload); } // <-------- trl
if (command_code == CMND_MP3_VOLUME) { MP3_CMD(MP3_CMD_VOLUME, XdrvMailbox.payload * 30 / 100); } if (command_code == CMND_MP3_VOLUME) { MP3_CMD(MP3_CMD_VOLUME, XdrvMailbox.payload * 30 / 100); }
if (command_code == CMND_MP3_EQ) { MP3_CMD(MP3_CMD_EQ, XdrvMailbox.payload); } if (command_code == CMND_MP3_EQ) { MP3_CMD(MP3_CMD_EQ, XdrvMailbox.payload); }
if (command_code == CMND_MP3_DEVICE) { MP3_CMD(MP3_CMD_DEVICE, XdrvMailbox.payload); } if (command_code == CMND_MP3_DEVICE) { MP3_CMD(MP3_CMD_DEVICE, XdrvMailbox.payload); }
@ -268,6 +323,7 @@ bool MP3PlayerCmd(void) {
} }
Response_P(S_JSON_MP3_COMMAND_NVALUE, command, XdrvMailbox.payload); Response_P(S_JSON_MP3_COMMAND_NVALUE, command, XdrvMailbox.payload);
break; break;
#ifndef USE_DY_SV17F #ifndef USE_DY_SV17F
case CMND_MP3_PLAY: case CMND_MP3_PLAY:
#endif // USE_DY_SV17F #endif // USE_DY_SV17F
@ -284,7 +340,8 @@ bool MP3PlayerCmd(void) {
#ifdef USE_DY_SV17F #ifdef USE_DY_SV17F
case CMND_MP3_PLAY: case CMND_MP3_PLAY:
if (XdrvMailbox.data_len > 0) { if (XdrvMailbox.data_len > 0)
{
uint8_t scmd[64]; uint8_t scmd[64];
scmd[0] = 0xAA; scmd[0] = 0xAA;
scmd[1] = 0x08; scmd[1] = 0x08;
@ -301,23 +358,39 @@ bool MP3PlayerCmd(void) {
} }
MP3_SendCmd(scmd, XdrvMailbox.data_len + 4); MP3_SendCmd(scmd, XdrvMailbox.data_len + 4);
Response_P(S_JSON_COMMAND_SVALUE, command, XdrvMailbox.data); Response_P(S_JSON_COMMAND_SVALUE, command, XdrvMailbox.data);
} else { } else
{
MP3_CMD(MP3_CMD_PLAY, 0); MP3_CMD(MP3_CMD_PLAY, 0);
Response_P(S_JSON_MP3_COMMAND, command, XdrvMailbox.payload); Response_P(S_JSON_MP3_COMMAND, command, XdrvMailbox.payload)
} }
break; break;
#endif // USE_DY_SV17F #endif // USE_DY_SV17F
default: default:
// else for Unknown command // else for Unknown command
serviced = false; serviced = false;
break; break;
} }
} else { } else
return false; {
} return false;
}
return serviced; return serviced;
} }
void MP3_EVERY_SECOND(void)
{
if (PinUsed(GPIO_MP3_DFR562_BUSY)) // optional MP3 player busy pin... // <-------- trl
{
// Low is busy... we are using this format to allow Berry to receive a busy event
MP2BusyFlag = digitalRead(Pin(GPIO_MP3_DFR562_BUSY));
Response_P(PSTR("{\"MP3Player\":{\"MP3Busy\":%u}}"), MP2BusyFlag);
XdrvRulesProcess(0);
}
}
/*********************************************************************************************\ /*********************************************************************************************\
* Interface * Interface
\*********************************************************************************************/ \*********************************************************************************************/
@ -326,14 +399,24 @@ bool Xdrv14(uint8_t function)
{ {
bool result = false; bool result = false;
if (PinUsed(GPIO_MP3_DFR562)) { if (PinUsed(GPIO_MP3_DFR562))
switch (function) { {
switch (function)
{
case FUNC_PRE_INIT: case FUNC_PRE_INIT:
MP3PlayerInit(); // init and start communication MP3PlayerInit(); // init and start communication
break; break;
case FUNC_COMMAND: case FUNC_COMMAND:
result = MP3PlayerCmd(); // return result from mp3 player command result = MP3PlayerCmd(); // return result from mp3 player command
break; break;
case FUNC_EVERY_SECOND:
TasmotaGlobal.seriallog_timer = 600; // DEBUG Tool <---------- TRL
MP3_EVERY_SECOND();
break;
} }
} }
return result; return result;