Add timeout to Philips Wiz packet receive so that it doesn't hang on rescan

Controllers/PhilipsWizController/PhilipsWizController.cpp

@@ -152,10 +152,12 @@ void PhilipsWizController::ReceiveThreadFunction()
     while(ReceiveThreadRun.load())
     {
         /*-----------------------------------------------------------------*\
-        | Receive up to 1024 bytes from the device                          |
+        | Receive up to 1024 bytes from the device with a 1s timeout        |
         \*-----------------------------------------------------------------*/
-        int size = port.udp_listen(recv_buf, 1024);
+        int size = port.udp_listen_timeout(recv_buf, 1024, 1, 0);
 
+        if(size > 0)
+        {
             /*-----------------------------------------------------------------*\
             | Responses are not null-terminated, so add termination             |
             \*-----------------------------------------------------------------*/
@@ -200,6 +202,7 @@ void PhilipsWizController::ReceiveThreadFunction()
                 }
             }
         }
+    }
 }
 
 void PhilipsWizController::RequestSystemConfig()
@@ -219,7 +222,15 @@ void PhilipsWizController::RequestSystemConfig()
     port.udp_write((char *)command_str.c_str(), command_str.length() + 1);
 
     /*-----------------------------------------------------------------*\
-    | Sleep for 100ms to give it time to receive and process response   |
+    | Wait up to 1s to give it time to receive and process response     |
     \*-----------------------------------------------------------------*/
-    std::this_thread::sleep_for(100ms);
+    for(unsigned int wait_count = 0; wait_count < 100; wait_count++)
+    {
+        if(firmware_version != "")
+        {
+            return;
+        }
+
+        std::this_thread::sleep_for(10ms);
+    }
 }

net_port/net_port.cpp

@@ -94,6 +94,25 @@ int net_port::udp_listen(char * recv_data, int length)
     return(recvfrom(sock, recv_data, length, 0, NULL, NULL));
 }
 
+int net_port::udp_listen_timeout(char * recv_data, int length, int sec, int usec)
+{
+    fd_set fds;
+    struct timeval tv;
+
+    FD_ZERO(&fds);
+    FD_SET(sock, &fds);
+
+    tv.tv_sec   = sec;
+    tv.tv_usec  = usec;
+
+    if(select(sock, &fds, NULL, NULL, &tv) <= 0)
+    {
+        return(0);
+    }
+
+    return(recvfrom(sock, recv_data, length, 0, NULL, NULL));
+}
+
 int net_port::udp_write(char * buffer, int length)
 {
     return(sendto(sock, buffer, length, 0, (sockaddr *)&addrDest, sizeof(addrDest)));

net_port/net_port.h

@@ -65,6 +65,7 @@ public:
     SOCKET *    tcp_server_listen();
 
     int udp_listen(char * recv_data, int length);
+    int udp_listen_timeout(char * recv_data, int length, int sec, int usec);
     int tcp_listen(char * recv_data, int length);
 
     //Function to write data to the serial port