jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-08-02 23:47:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Sonoff Pow R2 and Sonoff S31

Browse Source 
Fix Sonoff Pow R2 and Sonoff S31 Serial interface hang caused by MP3 driver
This commit is contained in:
Theo Arends 2018-11-11 16:52:09 +01:00
parent 2a2b224a24
commit 0868c72140
2 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sonoff/_changelog.ino
View File

@ -1,5 +1,6 @@
/* 6.3.0.7 20181111 /* 6.3.0.7 20181111
* Fix wifi connection errors using ESP.reset instead of ESP.restart * Fix wifi connection errors using wifi disconnect and ESP.reset instead of ESP.restart
* Fix Sonoff Pow R2 and Sonoff S31 Serial interface hang caused by MP3 driver
* *
* 6.3.0.6 20181110 * 6.3.0.6 20181110
* Change GUI Configure Module by using AJAX for data fetch to cut page size (and memory use) by 40% * Change GUI Configure Module by using AJAX for data fetch to cut page size (and memory use) by 40%

36
sonoff/xdrv_14_mp3.ino
View File

@ -33,7 +33,7 @@
tested - works by MP3Device 1 = USB STick, or MP3Device 2 = SD-Card tested - works by MP3Device 1 = USB STick, or MP3Device 2 = SD-Card
- after power and/or reset the SD-Card(2) is the default device - after power and/or reset the SD-Card(2) is the default device
--- ---
1.0.0.2 20180912 added - again some if-commands to switch() because of new commands 1.0.0.2 20180912 added - again some if-commands to switch() because of new commands
--- ---
1.0.0.1 20180911 added - command eq (equalizer 0..5) 1.0.0.1 20180911 added - command eq (equalizer 0..5)
tested - works in console with MP3EQ 1, the value can be 0..5 tested - works in console with MP3EQ 1, the value can be 0..5
@ -42,13 +42,13 @@
erased - code for USB device about some errors, will be added in a next release erased - code for USB device about some errors, will be added in a next release
--- ---
1.0.0.1 20180910 changed - command real MP3Stop in place of pause/stop used in the original version 1.0.0.1 20180910 changed - command real MP3Stop in place of pause/stop used in the original version
changed - the command MP3Play e.g. 001 to MP3Track e.g. 001, changed - the command MP3Play e.g. 001 to MP3Track e.g. 001,
added - new normal command MP3Play and MP3Pause added - new normal command MP3Play and MP3Pause
--- ---
1.0.0.0 20180907 merged - by arendst 1.0.0.0 20180907 merged - by arendst
changed - the driver name from xdrv_91_mp3.ino to xdrv_14_mp3.ino changed - the driver name from xdrv_91_mp3.ino to xdrv_14_mp3.ino
--- ---
0.9.0.3 20180906 request - Pull Request 0.9.0.3 20180906 request - Pull Request
changed - if-commands to switch() for faster response changed - if-commands to switch() for faster response
--- ---
0.9.0.2 20180906 cleaned - source code for faster reading 0.9.0.2 20180906 cleaned - source code for faster reading
@ -98,7 +98,7 @@ enum MP3_Commands { // commands useable in conso
CMND_MP3_RESET, // MP3Reset, a fresh and default restart CMND_MP3_RESET, // MP3Reset, a fresh and default restart
CMND_MP3_DAC }; // set dac, 1=off, 0=on, DAC is turned on (0) by default CMND_MP3_DAC }; // set dac, 1=off, 0=on, DAC is turned on (0) by default
/*********************************************************************************************\ /*********************************************************************************************\
* command defines * command defines
\*********************************************************************************************/ \*********************************************************************************************/
@ -107,7 +107,7 @@ enum MP3_Commands { // commands useable in conso
// 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_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
#define MP3_CMD_VOLUME 0x06 // specifies the volume and means a console input as 0..100 #define MP3_CMD_VOLUME 0x06 // specifies the volume and means a console input as 0..100
#define MP3_CMD_EQ 0x07 // specify EQ(0/1/2/3/4/5), 0:Normal, 1:Pop, 2:Rock, 3:Jazz, 4:Classic, 5:Bass #define MP3_CMD_EQ 0x07 // specify EQ(0/1/2/3/4/5), 0:Normal, 1:Pop, 2:Rock, 3:Jazz, 4:Classic, 5:Bass
@ -138,7 +138,7 @@ uint16_t MP3_Checksum(uint8_t *array)
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
@ -185,7 +185,7 @@ boolean MP3PlayerCmd(void) {
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_VOLUME: case CMND_MP3_VOLUME:
@ -206,7 +206,7 @@ boolean MP3PlayerCmd(void) {
case CMND_MP3_PAUSE: case CMND_MP3_PAUSE:
case CMND_MP3_STOP: case CMND_MP3_STOP:
case CMND_MP3_RESET: case CMND_MP3_RESET:
// play or re-play after pause, pause, stop, // play or re-play after pause, pause, stop,
if (command_code == CMND_MP3_PLAY) { MP3_CMD(MP3_CMD_PLAY, 0); } if (command_code == CMND_MP3_PLAY) { MP3_CMD(MP3_CMD_PLAY, 0); }
if (command_code == CMND_MP3_PAUSE) { MP3_CMD(MP3_CMD_PAUSE, 0); } if (command_code == CMND_MP3_PAUSE) { MP3_CMD(MP3_CMD_PAUSE, 0); }
if (command_code == CMND_MP3_STOP) { MP3_CMD(MP3_CMD_STOP, 0); } if (command_code == CMND_MP3_STOP) { MP3_CMD(MP3_CMD_STOP, 0); }
@ -230,13 +230,15 @@ boolean Xdrv14(byte function)
{ {
boolean result = false; boolean result = false;
switch (function) { if (pin[GPIO_MP3_DFR562] < 99) {
case FUNC_PRE_INIT: switch (function) {
MP3PlayerInit(); // init and start communication case FUNC_PRE_INIT:
break; MP3PlayerInit(); // init and start communication
case FUNC_COMMAND: break;
result = MP3PlayerCmd(); // return result from mp3 player command case FUNC_COMMAND:
break; result = MP3PlayerCmd(); // return result from mp3 player command
break;
}
} }
return result; return result;
} }