Merge branch 'prusa3d:master' into vscode-sim

prusa3d · Dec 18, 2023 · 9ef109d · 9ef109d
2 parents d1e8a83 + cf299fc
commit 9ef109d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/lib/Marlin/Marlin/src/gcode/feature/input_shaper/M74.cpp b/lib/Marlin/Marlin/src/gcode/feature/input_shaper/M74.cpp
@@ -48,10 +48,10 @@ void GcodeSuite::M74() {
 
     if (parser.seen('W')) {
         const float m = parser.value_float();
-        if (m > 0) {
+        if (m >= 0.f) {
             params.mass = m;
         } else {
-            SERIAL_ECHO_MSG("?Mass (W) must be greater than 0");
+            SERIAL_ECHO_MSG("?Mass (W) must be greater or equal 0");
         }
     }
 

diff --git a/src/gui/dialogs/DialogConnectReg.hpp b/src/gui/dialogs/DialogConnectReg.hpp
@@ -12,7 +12,7 @@ class DialogConnectRegister : public AddSuperWindow<IDialog> {
 private:
     char attempt_buffer[30];
     char detail_buffer[70];
-    char error_buffer[80];
+    char error_buffer[90];
 
     // TODO: Doesn't fit
     constexpr static const char *const headerLabel = N_("PRUSA CONNECT");

diff --git a/src/marlin_stubs/host/M46.cpp b/src/marlin_stubs/host/M46.cpp
@@ -8,12 +8,13 @@ void GcodeSuite::M46() {
     netdev_get_ipv4_addresses(netdev_get_active_id(), &ethconfig);
     uint8_t *ipp = (uint8_t *)&ethconfig.addr_ip4;
     char ip4[17] = { 0 };
-    sprintf(ip4, "%u.%u.%u.%u\n", ipp[0], ipp[1], ipp[2], ipp[3]);
+    snprintf(ip4, sizeof(ip4), "%u.%u.%u.%u\n", ipp[0], ipp[1], ipp[2], ipp[3]);
     serialprintPGM(ip4);
-
     if (parser.seen('M')) {
         mac_address_t mac;
+        char mac_buffer[19] = { 0 };
         get_MAC_address(&mac, netdev_get_active_id());
+        snprintf(mac_buffer, sizeof(mac_buffer), "%s\n", mac);
         serialprintPGM(mac);
     }
 }