Add control from ESP400/ESP401 on tft polling

luc-github · Jun 11, 2024 · b86c781 · b86c781
1 parent ed0a325
commit b86c781
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 3 deletions.
diff --git a/main/core/commands/esp400.cpp b/main/core/commands/esp400.cpp
@@ -433,6 +433,17 @@ void ESP3DCommands::ESP400(int cmd_params_pos, ESP3DMessage* msg) {
                        false, target, requestId)) {
     esp3d_log_e("Error sending response to clients");
   }
+#if ESP3D_DISPLAY_FEATURE
+  //Polling on
+  if (!dispatchSetting(json, "service/gcodehost",
+                       ESP3DSettingIndex::esp3d_polling_on, "polling_on",
+                       YesNoValues, YesNoLabels,
+                       sizeof(YesNoValues) / sizeof(char*), -1, -1, -1, nullptr,
+                       false, target, requestId)) {
+    esp3d_log_e("Error sending response to clients");
+  }
+#endif  // ESP3D_DISPLAY_FEATURE
+
 #if ESP3D_SD_CARD_FEATURE
 #if ESP3D_SD_IS_SPI
   // SPI Divider factor

diff --git a/main/core/commands/esp401.cpp b/main/core/commands/esp401.cpp
@@ -35,6 +35,9 @@
 #if ESP3D_TIMESTAMP_FEATURE
 #include "time/esp3d_time_service.h"
 #endif  // ESP3D_TIMESTAMP_FEATURE
+#if ESP3D_DISPLAY_FEATURE
+#include "rendering/esp3d_rendering_client.h"
+#endif  // ESP3D_DISPLAY_FEATURE
 #if ESP3D_WEBDAV_SERVICES_FEATURE
 #include "http/esp3d_http_service.h"
 #endif  // ESP3D_WEBDAV_SERVICES_FEATURE
@@ -251,6 +254,11 @@ void ESP3DCommands::ESP401(int cmd_params_pos, ESP3DMessage* msg) {
         case ESP3DSettingIndex::esp3d_resume_script:
           gcodeHostService.updateScripts();
           break;
+#if ESP3D_DISPLAY_FEATURE
+        case ESP3DSettingIndex::esp3d_polling_on:
+          renderingClient.setPolling(valueb);
+          break;
+#endif
         case ESP3DSettingIndex::esp3d_target_firmware:
           esp3dTftstream.getTargetFirmware(true);
 

diff --git a/main/core/includes/esp3d_version.h b/main/core/includes/esp3d_version.h
@@ -23,7 +23,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-#define ESP3D_TFT_VERSION "1.0.0.a23"
+#define ESP3D_TFT_VERSION "1.0.0.a24"
 #define ESP3D_TFT_FW_URL "https://github.com/luc-github/ESP3D-TFT"
 
 #ifdef __cplusplus

diff --git a/main/display/cnc/grbl/screens/informations_screen.cpp b/main/display/cnc/grbl/screens/informations_screen.cpp
@@ -79,12 +79,12 @@ void addInformationToList(lv_obj_t *list, ESP3DLabel label, const char *info) {
   lv_list_add_btn(list, "", infoStr.c_str());
 }
 
-void addInformationToList(lv_obj_t *list, ESP3DLabel label, ESP3DLabel info) {
+/*void addInformationToList(lv_obj_t *list, ESP3DLabel label, ESP3DLabel info) {
   std::string infoStr = esp3dTranslationService.translate(label);
   infoStr += ": ";
   infoStr += esp3dTranslationService.translate(info);
   lv_list_add_btn(list, "", infoStr.c_str());
-}
+}*/
 
 void create() {
   esp3dTftui.set_current_screen(ESP3DScreenType::none);

diff --git a/main/modules/rendering/esp3d_rendering_client.h b/main/modules/rendering/esp3d_rendering_client.h
@@ -43,6 +43,7 @@ class ESP3DRenderingClient : public ESP3DClient {
   void flush();
   bool started() { return _started; }
   void setPolling(bool polling_on) { _polling_on = polling_on; }
+  bool isPolling() { return _polling_on; }
 
  private:
   TaskHandle_t _xHandle;