network/time: Add option to set ntp ip address or to set ntp via dhcp

.vscode/launch.json

@@ -9,15 +9,25 @@
             "type": "cortex-debug",
             "servertype": "openocd",
             "armToolchainPath": "${workspaceRoot}/.dependencies/gcc-arm-none-eabi-13.2.1/bin",
-            "openOCDPreConfigLaunchCommands": ["set bbf_over_debugger_path ./build-vscode-buddy/firmware.bbf"],
-            "configFiles": ["${workspaceRoot}/utils/debug/00_common.cfg", "${workspaceRoot}/utils/debug/10_custom_config.cfg", "${workspaceRoot}/utils/debug/20_board_buddy.cfg", "${workspaceRoot}/utils/debug/30_rtt_workaround.cfg"],
+            "openOCDPreConfigLaunchCommands": [
+                "set bbf_over_debugger_path ./build-vscode-buddy/firmware.bbf"
+            ],
+            "configFiles": [
+                "${workspaceRoot}/utils/debug/00_common.cfg",
+                "${workspaceRoot}/utils/debug/10_custom_config.cfg",
+                "${workspaceRoot}/utils/debug/20_board_buddy.cfg",
+                "${workspaceRoot}/utils/debug/30_rtt_workaround.cfg"
+            ],
             "toolchainPrefix": "arm-none-eabi",
             "device": "STM32F427ZI",
             // swd file is disabled, it is known to cause issues in some cases. Enable it if you need to see register view.
             //"svdFile": "${workspaceRoot}/.dependencies/cmsis-svd-0.4.9999/STM32F427.svd",
             "rtos": "FreeRTOS",
             "breakAfterReset": false,
             "preLaunchTask": "Backup current ELF",
+            "liveWatch": {
+                "enabled": true,
+            },
             "rttConfig": {
                 "enabled": true,
                 "address": "auto",
@@ -43,13 +53,23 @@
             "type": "cortex-debug",
             "servertype": "openocd",
             "armToolchainPath": "${workspaceRoot}/.dependencies/gcc-arm-none-eabi-13.2.1/bin",
-            "openOCDPreConfigLaunchCommands": ["set bbf_over_debugger_path ./build-vscode-buddy/firmware.bbf"],
-            "configFiles": ["${workspaceRoot}/utils/debug/00_common.cfg", "${workspaceRoot}/utils/debug/10_custom_config.cfg", "${workspaceRoot}/utils/debug/20_board_buddy.cfg", "${workspaceRoot}/utils/debug/30_rtt_workaround.cfg"],
+            "openOCDPreConfigLaunchCommands": [
+                "set bbf_over_debugger_path ./build-vscode-buddy/firmware.bbf"
+            ],
+            "configFiles": [
+                "${workspaceRoot}/utils/debug/00_common.cfg",
+                "${workspaceRoot}/utils/debug/10_custom_config.cfg",
+                "${workspaceRoot}/utils/debug/20_board_buddy.cfg",
+                "${workspaceRoot}/utils/debug/30_rtt_workaround.cfg"
+            ],
             "toolchainPrefix": "arm-none-eabi",
             "device": "STM32F427ZI",
             // swd file is disabled, it is known to cause issues in some cases. Enable it if you need to see register view.
             //"svdFile": "${workspaceRoot}/.dependencies/cmsis-svd-0.4.9999/STM32F427.svd",
             "rtos": "FreeRTOS",
+            "liveWatch": {
+                "enabled": true,
+            },
             "rttConfig": {
                 "enabled": true,
                 "address": "auto",
@@ -75,8 +95,15 @@
             "type": "cortex-debug",
             "servertype": "openocd",
             "armToolchainPath": "${workspaceRoot}/.dependencies/gcc-arm-none-eabi-13.2.1/bin",
-            "openOCDPreConfigLaunchCommands": ["set PUPPY_TYPE dwarf"],
-            "configFiles": ["${workspaceRoot}/utils/debug/00_common.cfg", "${workspaceRoot}/utils/debug/10_custom_config.cfg", "${workspaceRoot}/utils/debug/20_board_puppy.cfg", "${workspaceRoot}/utils/debug/30_rtt_workaround.cfg"],
+            "openOCDPreConfigLaunchCommands": [
+                "set PUPPY_TYPE dwarf"
+            ],
+            "configFiles": [
+                "${workspaceRoot}/utils/debug/00_common.cfg",
+                "${workspaceRoot}/utils/debug/10_custom_config.cfg",
+                "${workspaceRoot}/utils/debug/20_board_puppy.cfg",
+                "${workspaceRoot}/utils/debug/30_rtt_workaround.cfg"
+            ],
             "toolchainPrefix": "arm-none-eabi",
             "device": "STM32G07",
             "svdFile": "${workspaceRoot}/.dependencies/cmsis-svd-0.4.9999/STM32G07x.svd",
@@ -110,8 +137,15 @@
             "type": "cortex-debug",
             "servertype": "openocd",
             "armToolchainPath": "${workspaceRoot}/.dependencies/gcc-arm-none-eabi-13.2.1/bin",
-            "openOCDPreConfigLaunchCommands": ["set PUPPY_TYPE dwarf"],
-            "configFiles": ["${workspaceRoot}/utils/debug/00_common.cfg", "${workspaceRoot}/utils/debug/10_custom_config.cfg", "${workspaceRoot}/utils/debug/20_board_puppy.cfg", "${workspaceRoot}/utils/debug/30_rtt_workaround.cfg"],
+            "openOCDPreConfigLaunchCommands": [
+                "set PUPPY_TYPE dwarf"
+            ],
+            "configFiles": [
+                "${workspaceRoot}/utils/debug/00_common.cfg",
+                "${workspaceRoot}/utils/debug/10_custom_config.cfg",
+                "${workspaceRoot}/utils/debug/20_board_puppy.cfg",
+                "${workspaceRoot}/utils/debug/30_rtt_workaround.cfg"
+            ],
             "toolchainPrefix": "arm-none-eabi",
             "device": "STM32G07",
             "svdFile": "${workspaceRoot}/.dependencies/cmsis-svd-0.4.9999/STM32G07x.svd",
@@ -141,8 +175,15 @@
             "type": "cortex-debug",
             "servertype": "openocd",
             "armToolchainPath": "${workspaceRoot}/.dependencies/gcc-arm-none-eabi-13.2.1/bin",
-            "openOCDPreConfigLaunchCommands": ["set PUPPY_TYPE modularbed"],
-            "configFiles": ["${workspaceRoot}/utils/debug/00_common.cfg", "${workspaceRoot}/utils/debug/10_custom_config.cfg", "${workspaceRoot}/utils/debug/20_board_puppy.cfg", "${workspaceRoot}/utils/debug/30_rtt_workaround.cfg"],
+            "openOCDPreConfigLaunchCommands": [
+                "set PUPPY_TYPE modularbed"
+            ],
+            "configFiles": [
+                "${workspaceRoot}/utils/debug/00_common.cfg",
+                "${workspaceRoot}/utils/debug/10_custom_config.cfg",
+                "${workspaceRoot}/utils/debug/20_board_puppy.cfg",
+                "${workspaceRoot}/utils/debug/30_rtt_workaround.cfg"
+            ],
             "toolchainPrefix": "arm-none-eabi",
             "device": "STM32G07",
             "svdFile": "${workspaceRoot}/.dependencies/cmsis-svd-0.4.9999/STM32G07x.svd",
@@ -160,8 +201,15 @@
             "type": "cortex-debug",
             "servertype": "openocd",
             "armToolchainPath": "${workspaceRoot}/.dependencies/gcc-arm-none-eabi-13.2.1/bin",
-            "openOCDPreConfigLaunchCommands": ["set PUPPY_TYPE modularbed"],
-            "configFiles": ["${workspaceRoot}/utils/debug/00_common.cfg", "${workspaceRoot}/utils/debug/10_custom_config.cfg", "${workspaceRoot}/utils/debug/20_board_puppy.cfg", "${workspaceRoot}/utils/debug/30_rtt_workaround.cfg"],
+            "openOCDPreConfigLaunchCommands": [
+                "set PUPPY_TYPE modularbed"
+            ],
+            "configFiles": [
+                "${workspaceRoot}/utils/debug/00_common.cfg",
+                "${workspaceRoot}/utils/debug/10_custom_config.cfg",
+                "${workspaceRoot}/utils/debug/20_board_puppy.cfg",
+                "${workspaceRoot}/utils/debug/30_rtt_workaround.cfg"
+            ],
             "toolchainPrefix": "arm-none-eabi",
             "device": "STM32G07",
             "svdFile": "${workspaceRoot}/.dependencies/cmsis-svd-0.4.9999/STM32G07x.svd",
@@ -188,7 +236,9 @@
             "type": "cortex-debug",
             "servertype": "qemu",
             "serverpath": "${workspaceRoot}/.venv/bin/simulator_as_qemu",
-            "serverArgs": ["--scripted"],
+            "serverArgs": [
+                "--scripted"
+            ],
             "windows": {
                 "serverpath": "${workspaceRoot}/.venv/Scripts/simulator_as_qemu"
             },
@@ -221,7 +271,11 @@
     "compounds": [
         {
             "name": "XL - ALL",
-            "configurations": ["Launch Buddy","Launch Dwarf", "Launch ModularBed"],
+            "configurations": [
+                "Launch Buddy",
+                "Launch Dwarf",
+                "Launch ModularBed"
+            ],
             "presentation": {
                 "group": "XL Puppies",
             },

ProjectOptions.cmake

@@ -327,6 +327,9 @@ set(PRINTERS_WITH_REMOTE_ACCELEROMETER "XL" "XL_DEV_KIT")
 
 set(PRINTERS_WITH_COLDPULL "MK4")
 
+set(PRINTERS_WITH_BED_LEVEL_CORRECTION "MK3.5" "MINI")
+
+set(PRINTERS_WITH_SHEET_SUPPORT "MINI" "MK3.5")
 # Set printer board
 set(BOARDS_WITH_ADVANCED_POWER "XBUDDY" "XLBUDDY" "DWARF")
 set(BOARDS_WITH_ILI9488 "XBUDDY" "XLBUDDY")
@@ -722,6 +725,12 @@ else()
   define_boolean_option(HAS_COLDPULL NO)
 endif()
 
+if(${PRINTER} IN_LIST PRINTERS_WITH_SHEET_SUPPORT)
+  define_boolean_option(HAS_SHEET_SUPPORT YES)
+else()
+  define_boolean_option(HAS_SHEET_SUPPORT NO)
+endif()
+
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
   set(DEBUG YES)
   define_boolean_option(NETWORKING_BENCHMARK_ENABLED YES)

doc/logging_components.md

@@ -17,7 +17,6 @@ This file is generated automatically so don't edit it directly
 - EEPROM: LOG_SEVERITY_INFO, src/persistent_stores/store_instances/config_store/store_c_api.cpp
 - ESPIF: LOG_SEVERITY_INFO, lib/WUI/espif.cpp
 - EspFlash: LOG_SEVERITY_DEBUG, lib/WUI/esp_flash.cpp
-- FSM: LOG_SEVERITY_INFO, src/common/fsm_types.cpp
 - FSensor: LOG_SEVERITY_INFO, src/common/filament_sensors_handler.cpp
 - FileSystem: LOG_SEVERITY_INFO, src/buddy/filesystem.cpp
 - GUI: LOG_SEVERITY_DEBUG, src/gui/logger.cpp

doc/prusa_printer_settings.ini

@@ -5,6 +5,8 @@ hostname=prusa
 # Printer support two dns servers. If variables are not empty, they will be used
 # even is DHCP pr AUTO type is set.
 dns4=192.168.0.1;192.168.0.2
+# ip or dns name for NTP server
+ntp=prusa3d.pool.ntp.org
 
 [eth::ipv4]
 # Type could be DHCP, STATIC or OFF.

include/buddy/lwipopts.h

@@ -15,19 +15,30 @@ extern "C" {
 #define CHECKSUM_BY_HARDWARE 0
 #define LWIP_DHCP            1
 #define MEM_ALIGNMENT        4
-// TODO: Investigate why we suddenly need so many timeouts BFW-5183
-#define MEMP_NUM_SYS_TIMEOUT 13
 #define LWIP_ETHERNET        1
 #define LWIP_DNS_SECURE      7
 #define DNS_MAX_NAME_LENGTH  128
 
 #if MDNS()
+    #define MDNS_MAX_STORED_PKTS 1
+    // Each interface takes up to 6 timeouts (in addition to the packets).
+    // One is the "main" one, the other 5 deal with some delayed answering (and
+    // probably can be lowered, a lot of these could come in sequence instead
+    // of starting them in parallel).
+    //
+    // We limit ourselves to only one active interface and don't do mdns on the
+    // other.
+    #define MDNS_EXTRA_TIMEOUTS 6 + MDNS_MAX_STORED_PKTS
     #define LWIP_MDNS_RESPONDER 1
     // For MDNS
     #define LWIP_IGMP                      1
     #define LWIP_NUM_NETIF_CLIENT_DATA     1
     #define LWIP_NETIF_EXT_STATUS_CALLBACK 1
+#else
+    // No extra timeouts if no MDNS
+    #define MDNS_EXTRA_TIMEOUTS 0
 #endif
+#define MEMP_NUM_SYS_TIMEOUT 8 + MDNS_EXTRA_TIMEOUTS
 
 #define TCP_MSS                1024
 #define TCP_WND                (8 * TCP_MSS)
@@ -40,6 +51,12 @@ extern "C" {
 #define TCPIP_THREAD_STACKSIZE 1248
 #define TCPIP_MBOX_SIZE        PBUF_POOL_SIZE + PBUF_POOL_SMALL_SIZE
 
+#define SNTP_SERVER_DNS              1
+#define SNTP_GET_SERVERS_FROM_DHCP   1
+#define SNTP_GET_SERVERS_FROM_DHCPV6 1
+#define LWIP_DHCP_GET_NTP_SRV        1
+#define SNTP_MAX_SERVERS             2
+
 #define DEFAULT_UDP_RECVMBOX_SIZE TCPIP_MBOX_SIZE
 #define DEFAULT_TCP_RECVMBOX_SIZE TCPIP_MBOX_SIZE
 #define DEFAULT_ACCEPTMBOX_SIZE   TCPIP_MBOX_SIZE

include/buddy/lwippools.h

@@ -4,7 +4,7 @@ LWIP_MEMPOOL(PBUF_POOL_SMALL, PBUF_POOL_SMALL_SIZE, (LWIP_MEM_ALIGN_SIZE(sizeof(
 
 LWIP_MALLOC_MEMPOOL_START
 #if MDNS()
-LWIP_MALLOC_MEMPOOL(8, 128)
+LWIP_MALLOC_MEMPOOL(7, 128)
 #else
 LWIP_MALLOC_MEMPOOL(6, 128)
 #endif

include/common/fsm_base_types.hpp

@@ -36,12 +36,8 @@ class BaseData {
         SetPhase(phase);
         SetData(data);
     }
-    constexpr bool operator==(const BaseData &other) const {
-        return GetPhase() == other.GetPhase() && GetData() == other.GetData();
-    }
-    constexpr bool operator!=(const BaseData &other) const {
-        return !((*this) == other);
-    }
+
+    constexpr auto operator<=>(const BaseData &) const = default;
 };
 static_assert(sizeof(BaseData) == BaseDataSZ, "Wrong size of BaseData");
 

include/common/hotend_type.hpp

@@ -31,7 +31,7 @@ static constexpr EnumArray<HotendType, const char *, HotendType::_cnt> hotend_ty
 /// Some hotend types are only supported by some printers, but the enum is the same for all -> hence this filtering array
 static constexpr EnumArray<HotendType, bool, HotendType::_cnt> hotend_type_supported {
     { HotendType::stock, true },
-    { HotendType::stock_with_sock, true },
+    { HotendType::stock_with_sock, PRINTER_IS_PRUSA_MK4 || PRINTER_IS_PRUSA_MK3_5 || PRINTER_IS_PRUSA_iX },
     { HotendType::e3d_revo, PRINTER_IS_PRUSA_MK3_5 },
 };
 

include/guiconfig/GuiDefaults.hpp

@@ -173,7 +173,7 @@ struct GuiDefaults {
     static constexpr padding_ui8_t MenuPaddingSpecial = padding_ui8_t({ 0, 6, 0, 0 });
 #elif defined(USE_ILI9488)
     static constexpr size_t MenuUseFixedUnitWidth = 0; // 0 == calculate in runtime
-    static constexpr Rect16::Width_t MenuScrollbarWidth = 4;
+    static constexpr Rect16::Width_t MenuScrollbarWidth = 8;
     static constexpr uint8_t MenuItemCornerRadius = 5; //
     static constexpr padding_ui8_t MenuItemDelimiterPadding = padding_ui8_t({ 41, 0, 37, 0 });
     static constexpr padding_ui8_t MenuPaddingItems = padding_ui8_t({ 6, 10, 6, 10 });

include/marlin/Configuration_MINI.h

@@ -687,6 +687,12 @@
 #define DEFAULT_MAX_FEEDRATE \
     { 180, 180, 12, 80 }
 
+/// HW limits of feed rate
+#define HWLIMIT_NORMAL_MAX_FEEDRATE \
+    { 400, 400, 12, 80 }
+#define HWLIMIT_STEALTH_MAX_FEEDRATE \
+    { 180, 180, 12, 80 }
+
 /**
  * Default Max Acceleration (change/s) change = mm/s
  * (Maximum start speed for accelerated moves)
@@ -696,6 +702,12 @@
 #define DEFAULT_MAX_ACCELERATION \
     { 1250, 1250, 400, 4000 }
 
+/// HW limits of max acceleration
+#define HWLIMIT_NORMAL_MAX_ACCELERATION \
+    { 4000, 4000, 400, 5000 }
+#define HWLIMIT_STEALTH_MAX_ACCELERATION \
+    { 2500, 2500, 400, 5000 }
+
 /**
  * Default Acceleration (change/s) change = mm/s
  * Override with M204
@@ -708,6 +720,14 @@
 #define DEFAULT_RETRACT_ACCELERATION 1250 // E acceleration for retracts
 #define DEFAULT_TRAVEL_ACCELERATION 1250 // X, Y, Z acceleration for travel (non printing) moves
 
+/// HW limits of Acceleration
+#define HWLIMIT_NORMAL_ACCELERATION 4000
+#define HWLIMIT_STEALTH_ACCELERATION 2500
+#define HWLIMIT_NORMAL_RETRACT_ACCELERATION 1250
+#define HWLIMIT_STEALTH_RETRACT_ACCELERATION 1250
+#define HWLIMIT_NORMAL_TRAVEL_ACCELERATION 4000
+#define HWLIMIT_STEALTH_TRAVEL_ACCELERATION 2500
+
 //
 // Use Junction Deviation instead of traditional Jerk Limiting
 //
@@ -734,6 +754,10 @@
 
 #define DEFAULT_EJERK 10 // May be used by Linear Advance
 
+/// HW limits of Jerk
+#define HWLIMIT_NORMAL_JERK { 8, 8, 2, 10 }
+#define HWLIMIT_STEALTH_JERK { 8, 8, 2, 10 }
+
 /**
  * S-Curve Acceleration
  *

include/marlin/Configuration_MK3.5.h

@@ -751,6 +751,12 @@
 #define DEFAULT_MAX_FEEDRATE \
     { 200, 200, 40, 45 }
 
+/// HW limits of feed rate
+#define HWLIMIT_NORMAL_MAX_FEEDRATE \
+    { 300, 300, 12, 120 }
+#define HWLIMIT_STEALTH_MAX_FEEDRATE \
+    { 160, 160, 40, 100 }
+
 /**
  * Default Max Acceleration (change/s) change = mm/s
  * (Maximum start speed for accelerated moves)
@@ -760,6 +766,12 @@
 #define DEFAULT_MAX_ACCELERATION \
     { 1250, 1250, 400, 4000 }
 
+/// HW limits of max acceleration
+#define HWLIMIT_NORMAL_MAX_ACCELERATION \
+    { 4000, 4000, 200, 2500 }
+#define HWLIMIT_STEALTH_MAX_ACCELERATION \
+    { 2500, 2500, 200, 2500 }
+
 /**
  * Default Acceleration (change/s) change = mm/s
  * Override with M204
@@ -772,6 +784,14 @@
 #define DEFAULT_RETRACT_ACCELERATION 1250 // E acceleration for retracts
 #define DEFAULT_TRAVEL_ACCELERATION 1250 // X, Y, Z acceleration for travel (non printing) moves
 
+/// HW limits of Acceleration
+#define HWLIMIT_NORMAL_ACCELERATION 4000
+#define HWLIMIT_STEALTH_ACCELERATION 2500
+#define HWLIMIT_NORMAL_RETRACT_ACCELERATION 1250
+#define HWLIMIT_STEALTH_RETRACT_ACCELERATION 1200
+#define HWLIMIT_NORMAL_TRAVEL_ACCELERATION 4000
+#define HWLIMIT_STEALTH_TRAVEL_ACCELERATION 2500
+
 //
 // Use Junction Deviation instead of traditional Jerk Limiting
 //
@@ -796,6 +816,10 @@
 
 #define DEFAULT_EJERK 5 // May be used by Linear Advance
 
+/// HW limits of Jerk
+#define HWLIMIT_NORMAL_JERK { 8, 8, 2, 5 }
+#define HWLIMIT_STEALTH_JERK { 8, 8, 2, 5 }
+
 /**
  * S-Curve Acceleration
  *