v0.9.259

yoRadio/src/core/display.cpp

@@ -18,6 +18,10 @@ DspCore dsp;
 
 Page *pages[] = { new Page(), new Page(), new Page() };
 
+#ifndef DSQ_SEND_DELAY
+	#define DSQ_SEND_DELAY portMAX_DELAY
+#endif
+
 #ifndef CORE_STACK_SIZE
   #define CORE_STACK_SIZE  1024*3
 #endif
@@ -298,7 +302,7 @@ void Display::_swichMode(displayMode_e newmode) {
 }
 
 void Display::resetQueue(){
-  xQueueReset(displayQueue);
+  if(displayQueue!=NULL) xQueueReset(displayQueue);
 }
 
 void Display::_drawPlaylist() {
@@ -321,7 +325,7 @@ void Display::putRequest(displayRequestType_e type, int payload){
   requestParams_t request;
   request.type = type;
   request.payload = payload;
-  xQueueSend(displayQueue, &request, portMAX_DELAY);
+  xQueueSend(displayQueue, &request, DSQ_SEND_DELAY);
   #ifdef USE_NEXTION
     nextion.putRequest(request);
   #endif

yoRadio/src/core/netserver.cpp

@@ -15,6 +15,9 @@
 #ifndef MIN_MALLOC
 #define MIN_MALLOC 24112
 #endif
+#ifndef NSQ_SEND_DELAY
+	#define NSQ_SEND_DELAY 			(TickType_t)100	//portMAX_DELAY?
+#endif
 
 #ifdef USE_SD
 	#define CARDLOCK() sdog.tm()
@@ -710,11 +713,11 @@ void NetServer::requestOnChange(requestType_e request, uint8_t clientId) {
   nsRequestParams_t nsrequest;
   nsrequest.type = request;
   nsrequest.clientId = clientId;
-  xQueueSend(nsQueue, &nsrequest, portMAX_DELAY);
+  xQueueSend(nsQueue, &nsrequest, NSQ_SEND_DELAY);
 }
 
 void NetServer::resetQueue(){
-  xQueueReset(nsQueue);
+  if(nsQueue!=NULL) xQueueReset(nsQueue);
 }
 
 String processor(const String& var) { // %Templates%

yoRadio/src/core/options.h

@@ -1,7 +1,7 @@
 #ifndef options_h
 #define options_h
 
-#define YOVERSION "0.9.250"
+#define YOVERSION "0.9.259"
 
 /*******************************************************
 DO NOT EDIT THIS FILE. 

yoRadio/src/core/player.cpp

@@ -72,7 +72,11 @@ void Player::init() {
 
 void Player::sendCommand(playerRequestParams_t request){
   if(playerQueue==NULL) return;
-  xQueueSend(playerQueue, &request, portMAX_DELAY);
+  xQueueSend(playerQueue, &request, PLQ_SEND_DELAY);
+}
+
+void Player::resetQueue(){
+	if(playerQueue!=NULL) xQueueReset(playerQueue);
 }
 
 void Player::stopInfo() {

yoRadio/src/core/player.h

@@ -12,6 +12,10 @@
   #define MQTT_BURL_SIZE  512
 #endif
 
+#ifndef PLQ_SEND_DELAY
+	#define PLQ_SEND_DELAY portMAX_DELAY
+#endif
+
 #define PLERR_LN        64
 #define SET_PLAY_ERROR(...) {char buff[512 + 64]; sprintf(buff,__VA_ARGS__); setError(buff);}
 
@@ -51,6 +55,7 @@ class Player: public Audio {
     void setError(const char *e);
     bool hasError() { return strlen(_plError)>0; }
     void sendCommand(playerRequestParams_t request);
+    void resetQueue();
     #ifdef MQTT_ROOT_TOPIC
     void browseUrl();
     #endif