Add support for M117 and M73, and display progress and messages on th…

…e OctoPrint screen
matthewlloyd · Jun 27, 2021 · 951a65d · 951a65d
1 parent 286b7d2
commit 951a65d
Show file tree

Hide file tree

Showing 11 changed files with 260 additions and 22,641 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -557,6 +557,7 @@ target_sources(
           src/common/llama.cpp
           $<$<STREQUAL:${PRINTER},MINI>:src/common/minda_broken_cable_detection.cpp>
           $<$<STREQUAL:${PRINTER},MINI>:src/common/MindaRedscreen.cpp>
+          src/marlin_stubs/M117.cpp
           src/marlin_stubs/M300.cpp
           src/marlin_stubs/M330.cpp
           src/marlin_stubs/M50.cpp
@@ -625,6 +626,7 @@ if(GUI)
             src/gui/resource.c
             src/gui/gui_time.cpp
             src/gui/window_print_progress.cpp
+            src/gui/window_lcd_message.cpp
             src/gui/window_file_list.cpp
             src/gui/window_temp_graph.cpp
             src/gui/screen_menu_settings.cpp

diff --git a/src/common/marlin_server.cpp b/src/common/marlin_server.cpp
@@ -1118,6 +1118,8 @@ static uint64_t _server_update_vars(uint64_t update) {
             uint8_t progress = 0;
             if (oProgressData.oPercentDone.mIsActual(marlin_server.vars.print_duration))
                 progress = static_cast<uint8_t>(oProgressData.oPercentDone.mGetValue());
+            else if (oProgressData.oPercentDirectControl.mIsActual(marlin_server.vars.print_duration))
+                progress = static_cast<uint8_t>(oProgressData.oPercentDirectControl.mGetValue());
             else
                 progress = static_cast<uint8_t>(media_print_get_percent_done());
             if (marlin_server.vars.sd_percent_done != progress) {