Register Uart and macro clients before configuration so log_ works

Also check SD after other clients so it does not lock out '?'
bdring · Sep 13, 2021 · af40e77 · af40e77
1 parent b37188c
commit af40e77
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 26 deletions.
diff --git a/FluidNC/src/Main.cpp b/FluidNC/src/Main.cpp
@@ -16,6 +16,8 @@
 #include "MotionControl.h"
 #include "Platform.h"
 
+#include "WebUI/TelnetServer.h"
+#include "WebUI/Serial2Socket.h"
 #include "WebUI/InputBuffer.h"
 
 #ifdef ENABLE_WIFI
@@ -38,6 +40,10 @@ void setup() {
         WiFi.mode(WIFI_OFF);
 #endif
 
+        // Setup input polling loop after loading the configuration,
+        // because the polling may depend on the config
+        client_init();
+
         display_init();
 
         // Load settings from non-volatile storage
@@ -53,10 +59,6 @@ void setup() {
         bool configOkay = config->load(config_filename->get());
         make_user_commands();
 
-        // Setup input polling loop after loading the configuration,
-        // because the polling may depend on the config
-        client_init();
-
         if (configOkay) {
             log_info("Machine " << config->_name);
             log_info("Board " << config->_board);
@@ -119,10 +121,13 @@ void setup() {
 
 #ifdef ENABLE_WIFI
         WebUI::wifi_config.begin();
+        register_client(&WebUI::Serial2Socket);
+        register_client(&WebUI::telnet_server);
 #endif
 #ifdef ENABLE_BLUETOOTH
         if (config->_comms->_bluetoothConfig) {
             config->_comms->_bluetoothConfig->begin();
+            register_client(&WebUI::SerialBT);
         }
 #endif
         WebUI::inputBuffer.begin();

diff --git a/FluidNC/src/Serial.cpp b/FluidNC/src/Serial.cpp
@@ -41,8 +41,6 @@
 #include "Uart.h"
 #include "Machine/MachineConfig.h"
 #include "WebUI/InputBuffer.h"
-#include "WebUI/TelnetServer.h"
-#include "WebUI/Serial2Socket.h"
 #include "WebUI/Commands.h"
 #include "WebUI/WifiServices.h"
 #include "MotionControl.h"
@@ -205,29 +203,9 @@ void register_client(Stream* client_stream) {
 void client_init() {
     register_client(&Uart0);               // USB Serial
     register_client(&WebUI::inputBuffer);  // Macros
-#ifdef ENABLE_WIFI
-    register_client(&WebUI::Serial2Socket);
-    register_client(&WebUI::telnet_server);
-#endif
-#ifdef ENABLE_BT
-    register_client(&WebUI::SerialBT);
-#endif
 }
 
 InputClient* pollClients() {
-    auto sdcard = config->_sdCard;
-    // _readyNext indicates that input is coming from a file and
-    // the GCode system is ready for another line.
-    if (sdcard && sdcard->_readyNext) {
-        Error res = sdcard->readFileLine(sdClient->_line, InputClient::maxLine);
-        if (res == Error::Ok) {
-            sdClient->_out     = &sdcard->getClient();
-            sdcard->_readyNext = false;
-            return sdClient;
-        }
-        report_status_message(res, sdcard->getClient());
-    }
-
     for (auto client : clientq) {
         auto source = client->_in;
         int  c      = source->read();
@@ -284,6 +262,19 @@ InputClient* pollClients() {
     WebUI::wifi_services.handle();  // OTA, web_server, telnet_server polling
 #endif
 
+    auto sdcard = config->_sdCard;
+    // _readyNext indicates that input is coming from a file and
+    // the GCode system is ready for another line.
+    if (sdcard && sdcard->_readyNext) {
+        Error res = sdcard->readFileLine(sdClient->_line, InputClient::maxLine);
+        if (res == Error::Ok) {
+            sdClient->_out     = &sdcard->getClient();
+            sdcard->_readyNext = false;
+            return sdClient;
+        }
+        report_status_message(res, sdcard->getClient());
+    }
+
     return nullptr;
 }
 

diff --git a/FluidNC/src/Serial.h b/FluidNC/src/Serial.h
@@ -78,4 +78,6 @@ class AllClients : public Print {
     size_t write(const uint8_t* buffer, size_t length) override;
 };
 
+void register_client(Stream* client_stream);
+
 extern AllClients allClients;