diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 5ab5654c3b..036dc99337 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -2465,7 +2465,7 @@ // When enabled Marlin will send a busy status message to the host // every couple of seconds when it can't accept commands. // -#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages +//#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages #define DEFAULT_KEEPALIVE_INTERVAL 5 // Number of seconds between "busy" messages. Set with M113. #define BUSY_WHILE_HEATING // Some hosts require "busy" messages even during heating diff --git a/Marlin/Version.h b/Marlin/Version.h index 5923ed3166..2a2c1afcf5 100644 --- a/Marlin/Version.h +++ b/Marlin/Version.h @@ -41,7 +41,7 @@ * here we define this default string as the date where the latest release * version was tagged. */ -//#define STRING_DISTRIBUTION_DATE "2024-11-05" +//#define STRING_DISTRIBUTION_DATE "2024-11-19" #define STRING_DISTRIBUTION_DATE __DATE__ #define STRING_DISTRIBUTION_TIME __TIME__ diff --git a/Marlin/src/gcode/probe/M851.cpp b/Marlin/src/gcode/probe/M851.cpp index a8c1786bb5..2bc139ee56 100644 --- a/Marlin/src/gcode/probe/M851.cpp +++ b/Marlin/src/gcode/probe/M851.cpp @@ -85,7 +85,7 @@ void GcodeSuite::M851() { // Save the new offsets if (ok) { probe.offset = offs; - TERN_(PROUI_EX, ApplyPhySet();) + TERN_(PROUI_EX, ProEx.ApplyPhySet();) } } diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h index 75942225d8..244173175f 100644 --- a/Marlin/src/inc/Version.h +++ b/Marlin/src/inc/Version.h @@ -42,7 +42,7 @@ * version was tagged. */ #ifndef STRING_DISTRIBUTION_DATE - #define STRING_DISTRIBUTION_DATE "2024-11-05" + #define STRING_DISTRIBUTION_DATE "2024-11-19" #endif /** diff --git a/Marlin/src/lcd/e3v2/proui/dwin.cpp b/Marlin/src/lcd/e3v2/proui/dwin.cpp index d01da86fb9..443b932d8a 100644 --- a/Marlin/src/lcd/e3v2/proui/dwin.cpp +++ b/Marlin/src/lcd/e3v2/proui/dwin.cpp @@ -2161,7 +2161,7 @@ void DWIN_SetDataDefaults() { const uint8_t _def[] = DEF_TBOPT; for (uint8_t i = 0; i < TBMaxOpt; ++i) PRO_data.TBopt[i] = _def[i]; #endif - SetData(); + ProEx.SetData(); #else #if HAS_BED_PROBE HMI_data.zprobefeedslow = DEF_Z_PROBE_FEEDRATE_SLOW; @@ -2189,7 +2189,9 @@ void DWIN_CopySettingsFrom(PGM_P const buff) { DEBUG_ECHOLNPGM("DWIN_CopySettingsFrom"); memcpy(&HMI_data, buff, sizeof(HMI_data_t)); TERN_(PROUI_EX, memcpy(&PRO_data, buff + sizeof(HMI_data_t), sizeof(PRO_data_t));) - #if ANY(PROUI_EX, MESH_BED_LEVELING) + #if PROUI_EX + ProEx.SetData(); + #elif ENABLED(MESH_BED_LEVELING) SetData(); #endif DWINUI::SetColors(HMI_data.Text_Color, HMI_data.Background_Color, HMI_data.TitleBg_Color); @@ -2568,8 +2570,8 @@ void ApplyMove() { #if HAS_BED_PROBE - void SetProbeOffsetX() { SetPFloatOnClick(-60, 60, UNITFDIGITS, TERN(PROUI_EX, ApplyPhySet, nullptr)); } - void SetProbeOffsetY() { SetPFloatOnClick(-60, 60, UNITFDIGITS, TERN(PROUI_EX, ApplyPhySet, nullptr)); } + void SetProbeOffsetX() { SetPFloatOnClick(-60, 60, UNITFDIGITS, TERN(PROUI_EX, ProEx.ApplyPhySet, nullptr)); } + void SetProbeOffsetY() { SetPFloatOnClick(-60, 60, UNITFDIGITS, TERN(PROUI_EX, ProEx.ApplyPhySet, nullptr)); } void SetProbeOffsetZ() { SetPFloatOnClick(-10, 10, 2); } void SetProbeZSpeed() { SetPIntOnClick(60, 1000); } #if DISABLED(BD_SENSOR) @@ -3117,10 +3119,9 @@ void ApplyMaxAccel() { planner.set_max_acceleration(HMI_value.axis, MenuData.Val #endif #endif -#if ANY(PROUI_EX, MESH_BED_LEVELING) +#if !PROUI_EX && ENABLED(MESH_BED_LEVELING) void ApplyPhySet() { - TERN_(PROUI_EX, ProEx.CheckParkingPos();) - TERN_(MESH_BED_LEVELING, bedlevel.initialize();) + bedlevel.initialize(); update_software_endstops(X_AXIS); update_software_endstops(Y_AXIS); update_software_endstops(Z_AXIS); @@ -3131,13 +3132,13 @@ void ApplyMaxAccel() { planner.set_max_acceleration(HMI_value.axis, MenuData.Val #endif #if PROUI_EX - void SetBedSizeX() { HMI_value.axis = NO_AXIS_ENUM; SetPIntOnClick(X_BED_MIN, X_MAX_POS, ApplyPhySet); } - void SetBedSizeY() { HMI_value.axis = NO_AXIS_ENUM; SetPIntOnClick(Y_BED_MIN, Y_MAX_POS, ApplyPhySet); } - void SetMinPosX() { HMI_value.axis = X_AXIS; SetPIntOnClick( -100, 100, ApplyPhySet); } - void SetMinPosY() { HMI_value.axis = Y_AXIS; SetPIntOnClick( -100, 100, ApplyPhySet); } - void SetMaxPosX() { HMI_value.axis = X_AXIS; SetPIntOnClick(X_BED_MIN, 999, ApplyPhySet); } - void SetMaxPosY() { HMI_value.axis = Y_AXIS; SetPIntOnClick(Y_BED_MIN, 999, ApplyPhySet); } - void SetMaxPosZ() { HMI_value.axis = Z_AXIS; SetPIntOnClick( 100, 999, ApplyPhySet); } + void SetBedSizeX() { HMI_value.axis = NO_AXIS_ENUM; SetPIntOnClick(X_BED_MIN, X_MAX_POS, ProEx.ApplyPhySet); } + void SetBedSizeY() { HMI_value.axis = NO_AXIS_ENUM; SetPIntOnClick(Y_BED_MIN, Y_MAX_POS, ProEx.ApplyPhySet); } + void SetMinPosX() { HMI_value.axis = X_AXIS; SetPIntOnClick( -100, 100, ProEx.ApplyPhySet); } + void SetMinPosY() { HMI_value.axis = Y_AXIS; SetPIntOnClick( -100, 100, ProEx.ApplyPhySet); } + void SetMaxPosX() { HMI_value.axis = X_AXIS; SetPIntOnClick(X_BED_MIN, 999, ProEx.ApplyPhySet); } + void SetMaxPosY() { HMI_value.axis = Y_AXIS; SetPIntOnClick(Y_BED_MIN, 999, ProEx.ApplyPhySet); } + void SetMaxPosZ() { HMI_value.axis = Z_AXIS; SetPIntOnClick( 100, 999, ProEx.ApplyPhySet); } #endif #if HAS_EXTRUDERS diff --git a/Marlin/src/lcd/e3v2/proui/dwin.h b/Marlin/src/lcd/e3v2/proui/dwin.h index d887f3747b..ad19881981 100644 --- a/Marlin/src/lcd/e3v2/proui/dwin.h +++ b/Marlin/src/lcd/e3v2/proui/dwin.h @@ -162,7 +162,7 @@ void ResetEeprom(); #if ALL(HAS_BLTOUCH_HS_MODE, HS_MENU_ITEM) void SetHSMode(); #endif -#if ANY(PROUI_EX, MESH_BED_LEVELING) +#if !PROUI_EX && ENABLED(MESH_BED_LEVELING) void ApplyPhySet(); void SetData(); #endif diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp index 4608f769c1..4bac125360 100644 --- a/Marlin/src/module/motion.cpp +++ b/Marlin/src/module/motion.cpp @@ -1430,11 +1430,11 @@ void restore_feedrate_and_scaling() { OPTARG(HAS_HOTEND_OFFSET, const uint8_t old_tool_index/*=0*/, const uint8_t new_tool_index/*=0*/) ) { - // #if PROUI_EX + #if PROUI_EX - // ProEx.UpdateAxis(axis); + ProEx.UpdateAxis(axis); - #if ENABLED(DUAL_X_CARRIAGE) + #elif ENABLED(DUAL_X_CARRIAGE) if (axis == X_AXIS) { diff --git a/configurations/Andrew427/Configuration-MP.h b/configurations/Andrew427/Configuration-MP.h index b424282eed..9dc8b50c64 100644 --- a/configurations/Andrew427/Configuration-MP.h +++ b/configurations/Andrew427/Configuration-MP.h @@ -2463,7 +2463,7 @@ // When enabled Marlin will send a busy status message to the host // every couple of seconds when it can't accept commands. // -#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages +//#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages #define DEFAULT_KEEPALIVE_INTERVAL 5 // Number of seconds between "busy" messages. Set with M113. #define BUSY_WHILE_HEATING // Some hosts require "busy" messages even during heating diff --git a/configurations/Andrew427/Configuration.h b/configurations/Andrew427/Configuration.h index 300c58bded..4b9d615cb5 100644 --- a/configurations/Andrew427/Configuration.h +++ b/configurations/Andrew427/Configuration.h @@ -2462,7 +2462,7 @@ // When enabled Marlin will send a busy status message to the host // every couple of seconds when it can't accept commands. // -#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages +//#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages #define DEFAULT_KEEPALIVE_INTERVAL 5 // Number of seconds between "busy" messages. Set with M113. #define BUSY_WHILE_HEATING // Some hosts require "busy" messages even during heating diff --git a/configurations/BTT_SKR-Mini-E3-V2/MM/Configuration.h b/configurations/BTT_SKR-Mini-E3-V2/MM/Configuration.h index 84dad887b8..90a2cd823c 100644 --- a/configurations/BTT_SKR-Mini-E3-V2/MM/Configuration.h +++ b/configurations/BTT_SKR-Mini-E3-V2/MM/Configuration.h @@ -2462,7 +2462,7 @@ // When enabled Marlin will send a busy status message to the host // every couple of seconds when it can't accept commands. // -#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages +//#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages #define DEFAULT_KEEPALIVE_INTERVAL 5 // Number of seconds between "busy" messages. Set with M113. #define BUSY_WHILE_HEATING // Some hosts require "busy" messages even during heating diff --git a/configurations/BTT_SKR-Mini-E3-V2/MM/Version.h b/configurations/BTT_SKR-Mini-E3-V2/MM/Version.h index 2c044d4376..dcdb9b0674 100644 --- a/configurations/BTT_SKR-Mini-E3-V2/MM/Version.h +++ b/configurations/BTT_SKR-Mini-E3-V2/MM/Version.h @@ -41,7 +41,7 @@ * here we define this default string as the date where the latest release * version was tagged. */ -//#define STRING_DISTRIBUTION_DATE "2024-11-05" +//#define STRING_DISTRIBUTION_DATE "2024-11-19" #define STRING_DISTRIBUTION_DATE __DATE__ #define STRING_DISTRIBUTION_TIME __TIME__ diff --git a/configurations/BTT_SKR-Mini-E3-V2/UBL/Configuration.h b/configurations/BTT_SKR-Mini-E3-V2/UBL/Configuration.h index 357c2543a9..002c903de3 100644 --- a/configurations/BTT_SKR-Mini-E3-V2/UBL/Configuration.h +++ b/configurations/BTT_SKR-Mini-E3-V2/UBL/Configuration.h @@ -2462,7 +2462,7 @@ // When enabled Marlin will send a busy status message to the host // every couple of seconds when it can't accept commands. // -#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages +//#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages #define DEFAULT_KEEPALIVE_INTERVAL 5 // Number of seconds between "busy" messages. Set with M113. #define BUSY_WHILE_HEATING // Some hosts require "busy" messages even during heating diff --git a/configurations/BTT_SKR-Mini-E3-V2/UBL/Version.h b/configurations/BTT_SKR-Mini-E3-V2/UBL/Version.h index 6c48a31409..3bbb76c9d3 100644 --- a/configurations/BTT_SKR-Mini-E3-V2/UBL/Version.h +++ b/configurations/BTT_SKR-Mini-E3-V2/UBL/Version.h @@ -41,7 +41,7 @@ * here we define this default string as the date where the latest release * version was tagged. */ -//#define STRING_DISTRIBUTION_DATE "2024-11-05" +//#define STRING_DISTRIBUTION_DATE "2024-11-19" #define STRING_DISTRIBUTION_DATE __DATE__ #define STRING_DISTRIBUTION_TIME __TIME__ diff --git a/configurations/BTT_SKR-Mini-E3-V3/MM/Configuration.h b/configurations/BTT_SKR-Mini-E3-V3/MM/Configuration.h index ab1c509975..44025b55fb 100644 --- a/configurations/BTT_SKR-Mini-E3-V3/MM/Configuration.h +++ b/configurations/BTT_SKR-Mini-E3-V3/MM/Configuration.h @@ -2462,7 +2462,7 @@ // When enabled Marlin will send a busy status message to the host // every couple of seconds when it can't accept commands. // -#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages +//#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages #define DEFAULT_KEEPALIVE_INTERVAL 5 // Number of seconds between "busy" messages. Set with M113. #define BUSY_WHILE_HEATING // Some hosts require "busy" messages even during heating diff --git a/configurations/BTT_SKR-Mini-E3-V3/MM/Version.h b/configurations/BTT_SKR-Mini-E3-V3/MM/Version.h index 2c044d4376..dcdb9b0674 100644 --- a/configurations/BTT_SKR-Mini-E3-V3/MM/Version.h +++ b/configurations/BTT_SKR-Mini-E3-V3/MM/Version.h @@ -41,7 +41,7 @@ * here we define this default string as the date where the latest release * version was tagged. */ -//#define STRING_DISTRIBUTION_DATE "2024-11-05" +//#define STRING_DISTRIBUTION_DATE "2024-11-19" #define STRING_DISTRIBUTION_DATE __DATE__ #define STRING_DISTRIBUTION_TIME __TIME__ diff --git a/configurations/BTT_SKR-Mini-E3-V3/UBL/Configuration.h b/configurations/BTT_SKR-Mini-E3-V3/UBL/Configuration.h index 8b6f30aa11..e36d02aa85 100644 --- a/configurations/BTT_SKR-Mini-E3-V3/UBL/Configuration.h +++ b/configurations/BTT_SKR-Mini-E3-V3/UBL/Configuration.h @@ -2462,7 +2462,7 @@ // When enabled Marlin will send a busy status message to the host // every couple of seconds when it can't accept commands. // -#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages +//#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages #define DEFAULT_KEEPALIVE_INTERVAL 5 // Number of seconds between "busy" messages. Set with M113. #define BUSY_WHILE_HEATING // Some hosts require "busy" messages even during heating diff --git a/configurations/BTT_SKR-Mini-E3-V3/UBL/Version.h b/configurations/BTT_SKR-Mini-E3-V3/UBL/Version.h index 6c48a31409..3bbb76c9d3 100644 --- a/configurations/BTT_SKR-Mini-E3-V3/UBL/Version.h +++ b/configurations/BTT_SKR-Mini-E3-V3/UBL/Version.h @@ -41,7 +41,7 @@ * here we define this default string as the date where the latest release * version was tagged. */ -//#define STRING_DISTRIBUTION_DATE "2024-11-05" +//#define STRING_DISTRIBUTION_DATE "2024-11-19" #define STRING_DISTRIBUTION_DATE __DATE__ #define STRING_DISTRIBUTION_TIME __TIME__ diff --git a/configurations/Creality Ender/BLT/Configuration.h b/configurations/Creality Ender/BLT/Configuration.h index cf95c8b649..aece7a65f1 100644 --- a/configurations/Creality Ender/BLT/Configuration.h +++ b/configurations/Creality Ender/BLT/Configuration.h @@ -2462,7 +2462,7 @@ // When enabled Marlin will send a busy status message to the host // every couple of seconds when it can't accept commands. // -#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages +//#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages #define DEFAULT_KEEPALIVE_INTERVAL 5 // Number of seconds between "busy" messages. Set with M113. #define BUSY_WHILE_HEATING // Some hosts require "busy" messages even during heating diff --git a/configurations/Creality Ender/BLT/Version.h b/configurations/Creality Ender/BLT/Version.h index 05815e79e7..2b8ad34d96 100644 --- a/configurations/Creality Ender/BLT/Version.h +++ b/configurations/Creality Ender/BLT/Version.h @@ -41,7 +41,7 @@ * here we define this default string as the date where the latest release * version was tagged. */ -//#define STRING_DISTRIBUTION_DATE "2024-11-05" +//#define STRING_DISTRIBUTION_DATE "2024-11-19" #define STRING_DISTRIBUTION_DATE __DATE__ #define STRING_DISTRIBUTION_TIME __TIME__ diff --git a/configurations/Creality Ender/Default/Configuration.h b/configurations/Creality Ender/Default/Configuration.h index 65edf2ba2c..f3b7db9a58 100644 --- a/configurations/Creality Ender/Default/Configuration.h +++ b/configurations/Creality Ender/Default/Configuration.h @@ -2462,7 +2462,7 @@ // When enabled Marlin will send a busy status message to the host // every couple of seconds when it can't accept commands. // -#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages +//#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages #define DEFAULT_KEEPALIVE_INTERVAL 5 // Number of seconds between "busy" messages. Set with M113. #define BUSY_WHILE_HEATING // Some hosts require "busy" messages even during heating diff --git a/configurations/Creality Ender/Default/Version.h b/configurations/Creality Ender/Default/Version.h index 27674b1298..c84fe1cf2d 100644 --- a/configurations/Creality Ender/Default/Version.h +++ b/configurations/Creality Ender/Default/Version.h @@ -41,7 +41,7 @@ * here we define this default string as the date where the latest release * version was tagged. */ -//#define STRING_DISTRIBUTION_DATE "2024-11-05" +//#define STRING_DISTRIBUTION_DATE "2024-11-19" #define STRING_DISTRIBUTION_DATE __DATE__ #define STRING_DISTRIBUTION_TIME __TIME__ diff --git a/configurations/Creality Ender/E3-Free-runs/MM/Configuration.h b/configurations/Creality Ender/E3-Free-runs/MM/Configuration.h index 74c4594ed5..2f1a2a88d5 100644 --- a/configurations/Creality Ender/E3-Free-runs/MM/Configuration.h +++ b/configurations/Creality Ender/E3-Free-runs/MM/Configuration.h @@ -2460,7 +2460,7 @@ // When enabled Marlin will send a busy status message to the host // every couple of seconds when it can't accept commands. // -#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages +//#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages #define DEFAULT_KEEPALIVE_INTERVAL 5 // Number of seconds between "busy" messages. Set with M113. #define BUSY_WHILE_HEATING // Some hosts require "busy" messages even during heating diff --git a/configurations/Creality Ender/E3-Free-runs/MM/Version.h b/configurations/Creality Ender/E3-Free-runs/MM/Version.h index 7d3930b3ce..169228fd7e 100644 --- a/configurations/Creality Ender/E3-Free-runs/MM/Version.h +++ b/configurations/Creality Ender/E3-Free-runs/MM/Version.h @@ -41,7 +41,7 @@ * here we define this default string as the date where the latest release * version was tagged. */ -//#define STRING_DISTRIBUTION_DATE "2024-11-05" +//#define STRING_DISTRIBUTION_DATE "2024-11-19" #define STRING_DISTRIBUTION_DATE __DATE__ #define STRING_DISTRIBUTION_TIME __TIME__ diff --git a/configurations/Creality Ender/E3-Free-runs/UBL/Configuration.h b/configurations/Creality Ender/E3-Free-runs/UBL/Configuration.h index 87cfe36ef2..4d7f6c7a63 100644 --- a/configurations/Creality Ender/E3-Free-runs/UBL/Configuration.h +++ b/configurations/Creality Ender/E3-Free-runs/UBL/Configuration.h @@ -2460,7 +2460,7 @@ // When enabled Marlin will send a busy status message to the host // every couple of seconds when it can't accept commands. // -#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages +//#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages #define DEFAULT_KEEPALIVE_INTERVAL 5 // Number of seconds between "busy" messages. Set with M113. #define BUSY_WHILE_HEATING // Some hosts require "busy" messages even during heating diff --git a/configurations/Creality Ender/E3-Free-runs/UBL/Version.h b/configurations/Creality Ender/E3-Free-runs/UBL/Version.h index 392c646b06..814b44fb79 100644 --- a/configurations/Creality Ender/E3-Free-runs/UBL/Version.h +++ b/configurations/Creality Ender/E3-Free-runs/UBL/Version.h @@ -41,7 +41,7 @@ * here we define this default string as the date where the latest release * version was tagged. */ -//#define STRING_DISTRIBUTION_DATE "2024-11-05" +//#define STRING_DISTRIBUTION_DATE "2024-11-19" #define STRING_DISTRIBUTION_DATE __DATE__ #define STRING_DISTRIBUTION_TIME __TIME__ diff --git a/configurations/Creality Ender/MM/Configuration.h b/configurations/Creality Ender/MM/Configuration.h index a9f63ffe2b..d379e6952e 100644 --- a/configurations/Creality Ender/MM/Configuration.h +++ b/configurations/Creality Ender/MM/Configuration.h @@ -2462,7 +2462,7 @@ // When enabled Marlin will send a busy status message to the host // every couple of seconds when it can't accept commands. // -#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages +//#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages #define DEFAULT_KEEPALIVE_INTERVAL 5 // Number of seconds between "busy" messages. Set with M113. #define BUSY_WHILE_HEATING // Some hosts require "busy" messages even during heating diff --git a/configurations/Creality Ender/MM/Version.h b/configurations/Creality Ender/MM/Version.h index 107061d4ca..e5132a74bd 100644 --- a/configurations/Creality Ender/MM/Version.h +++ b/configurations/Creality Ender/MM/Version.h @@ -41,7 +41,7 @@ * here we define this default string as the date where the latest release * version was tagged. */ -//#define STRING_DISTRIBUTION_DATE "2024-11-05" +//#define STRING_DISTRIBUTION_DATE "2024-11-19" #define STRING_DISTRIBUTION_DATE __DATE__ #define STRING_DISTRIBUTION_TIME __TIME__ diff --git a/configurations/Creality Ender/S1/UBL/Configuration.h b/configurations/Creality Ender/S1/UBL/Configuration.h index 9782194d12..82da374d7a 100644 --- a/configurations/Creality Ender/S1/UBL/Configuration.h +++ b/configurations/Creality Ender/S1/UBL/Configuration.h @@ -2460,7 +2460,7 @@ // When enabled Marlin will send a busy status message to the host // every couple of seconds when it can't accept commands. // -#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages +//#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages #define DEFAULT_KEEPALIVE_INTERVAL 5 // Number of seconds between "busy" messages. Set with M113. #define BUSY_WHILE_HEATING // Some hosts require "busy" messages even during heating diff --git a/configurations/Creality Ender/S1/UBL/Version.h b/configurations/Creality Ender/S1/UBL/Version.h index 2b68c785b6..179fbce3fd 100644 --- a/configurations/Creality Ender/S1/UBL/Version.h +++ b/configurations/Creality Ender/S1/UBL/Version.h @@ -41,7 +41,7 @@ * here we define this default string as the date where the latest release * version was tagged. */ -//#define STRING_DISTRIBUTION_DATE "2024-11-05" +//#define STRING_DISTRIBUTION_DATE "2024-11-19" #define STRING_DISTRIBUTION_DATE __DATE__ #define STRING_DISTRIBUTION_TIME __TIME__ diff --git a/configurations/Creality Ender/UBL/Configuration.h b/configurations/Creality Ender/UBL/Configuration.h index d4bf68f5d3..a214edc049 100644 --- a/configurations/Creality Ender/UBL/Configuration.h +++ b/configurations/Creality Ender/UBL/Configuration.h @@ -2462,7 +2462,7 @@ // When enabled Marlin will send a busy status message to the host // every couple of seconds when it can't accept commands. // -#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages +//#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages #define DEFAULT_KEEPALIVE_INTERVAL 5 // Number of seconds between "busy" messages. Set with M113. #define BUSY_WHILE_HEATING // Some hosts require "busy" messages even during heating diff --git a/configurations/Creality Ender/UBL/Version.h b/configurations/Creality Ender/UBL/Version.h index 7804ea6c74..ad3d00e3d5 100644 --- a/configurations/Creality Ender/UBL/Version.h +++ b/configurations/Creality Ender/UBL/Version.h @@ -41,7 +41,7 @@ * here we define this default string as the date where the latest release * version was tagged. */ -//#define STRING_DISTRIBUTION_DATE "2024-11-05" +//#define STRING_DISTRIBUTION_DATE "2024-11-19" #define STRING_DISTRIBUTION_DATE __DATE__ #define STRING_DISTRIBUTION_TIME __TIME__ diff --git a/configurations/Voxelab Aquila 427/BLT/Configuration.h b/configurations/Voxelab Aquila 427/BLT/Configuration.h index 90f7583dfa..1d4d5ac332 100644 --- a/configurations/Voxelab Aquila 427/BLT/Configuration.h +++ b/configurations/Voxelab Aquila 427/BLT/Configuration.h @@ -2462,7 +2462,7 @@ // When enabled Marlin will send a busy status message to the host // every couple of seconds when it can't accept commands. // -#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages +//#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages #define DEFAULT_KEEPALIVE_INTERVAL 5 // Number of seconds between "busy" messages. Set with M113. #define BUSY_WHILE_HEATING // Some hosts require "busy" messages even during heating diff --git a/configurations/Voxelab Aquila 427/BLT/Version.h b/configurations/Voxelab Aquila 427/BLT/Version.h index 079284a84c..4cb23cabbc 100644 --- a/configurations/Voxelab Aquila 427/BLT/Version.h +++ b/configurations/Voxelab Aquila 427/BLT/Version.h @@ -41,7 +41,7 @@ * here we define this default string as the date where the latest release * version was tagged. */ -//#define STRING_DISTRIBUTION_DATE "2024-11-05" +//#define STRING_DISTRIBUTION_DATE "2024-11-19" #define STRING_DISTRIBUTION_DATE __DATE__ #define STRING_DISTRIBUTION_TIME __TIME__ diff --git a/configurations/Voxelab Aquila 427/Default/Configuration.h b/configurations/Voxelab Aquila 427/Default/Configuration.h index bc47fd303b..beb6998fe5 100644 --- a/configurations/Voxelab Aquila 427/Default/Configuration.h +++ b/configurations/Voxelab Aquila 427/Default/Configuration.h @@ -2462,7 +2462,7 @@ // When enabled Marlin will send a busy status message to the host // every couple of seconds when it can't accept commands. // -#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages +//#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages #define DEFAULT_KEEPALIVE_INTERVAL 5 // Number of seconds between "busy" messages. Set with M113. #define BUSY_WHILE_HEATING // Some hosts require "busy" messages even during heating diff --git a/configurations/Voxelab Aquila 427/Default/Version.h b/configurations/Voxelab Aquila 427/Default/Version.h index 223b13adb5..ac533109d2 100644 --- a/configurations/Voxelab Aquila 427/Default/Version.h +++ b/configurations/Voxelab Aquila 427/Default/Version.h @@ -41,7 +41,7 @@ * here we define this default string as the date where the latest release * version was tagged. */ -//#define STRING_DISTRIBUTION_DATE "2024-11-05" +//#define STRING_DISTRIBUTION_DATE "2024-11-19" #define STRING_DISTRIBUTION_DATE __DATE__ #define STRING_DISTRIBUTION_TIME __TIME__ diff --git a/configurations/Voxelab Aquila 427/MM/Configuration.h b/configurations/Voxelab Aquila 427/MM/Configuration.h index 1f9497690a..0dda517b25 100644 --- a/configurations/Voxelab Aquila 427/MM/Configuration.h +++ b/configurations/Voxelab Aquila 427/MM/Configuration.h @@ -2462,7 +2462,7 @@ // When enabled Marlin will send a busy status message to the host // every couple of seconds when it can't accept commands. // -#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages +//#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages #define DEFAULT_KEEPALIVE_INTERVAL 5 // Number of seconds between "busy" messages. Set with M113. #define BUSY_WHILE_HEATING // Some hosts require "busy" messages even during heating diff --git a/configurations/Voxelab Aquila 427/MM/Version.h b/configurations/Voxelab Aquila 427/MM/Version.h index 2c044d4376..dcdb9b0674 100644 --- a/configurations/Voxelab Aquila 427/MM/Version.h +++ b/configurations/Voxelab Aquila 427/MM/Version.h @@ -41,7 +41,7 @@ * here we define this default string as the date where the latest release * version was tagged. */ -//#define STRING_DISTRIBUTION_DATE "2024-11-05" +//#define STRING_DISTRIBUTION_DATE "2024-11-19" #define STRING_DISTRIBUTION_DATE __DATE__ #define STRING_DISTRIBUTION_TIME __TIME__ diff --git a/configurations/Voxelab Aquila 427/UBL/Configuration.h b/configurations/Voxelab Aquila 427/UBL/Configuration.h index 7f42821847..b6bceba0db 100644 --- a/configurations/Voxelab Aquila 427/UBL/Configuration.h +++ b/configurations/Voxelab Aquila 427/UBL/Configuration.h @@ -2462,7 +2462,7 @@ // When enabled Marlin will send a busy status message to the host // every couple of seconds when it can't accept commands. // -#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages +//#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages #define DEFAULT_KEEPALIVE_INTERVAL 5 // Number of seconds between "busy" messages. Set with M113. #define BUSY_WHILE_HEATING // Some hosts require "busy" messages even during heating diff --git a/configurations/Voxelab Aquila 427/UBL/Version.h b/configurations/Voxelab Aquila 427/UBL/Version.h index 6c48a31409..3bbb76c9d3 100644 --- a/configurations/Voxelab Aquila 427/UBL/Version.h +++ b/configurations/Voxelab Aquila 427/UBL/Version.h @@ -41,7 +41,7 @@ * here we define this default string as the date where the latest release * version was tagged. */ -//#define STRING_DISTRIBUTION_DATE "2024-11-05" +//#define STRING_DISTRIBUTION_DATE "2024-11-19" #define STRING_DISTRIBUTION_DATE __DATE__ #define STRING_DISTRIBUTION_TIME __TIME__ diff --git a/configurations/Voxelab Aquila HC32/C2/Default/Configuration.h b/configurations/Voxelab Aquila HC32/C2/Default/Configuration.h index 6af43ef139..052acf1ef5 100644 --- a/configurations/Voxelab Aquila HC32/C2/Default/Configuration.h +++ b/configurations/Voxelab Aquila HC32/C2/Default/Configuration.h @@ -2464,7 +2464,7 @@ // When enabled Marlin will send a busy status message to the host // every couple of seconds when it can't accept commands. // -#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages +//#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages #define DEFAULT_KEEPALIVE_INTERVAL 5 // Number of seconds between "busy" messages. Set with M113. #define BUSY_WHILE_HEATING // Some hosts require "busy" messages even during heating diff --git a/configurations/Voxelab Aquila HC32/C2/Default/Version.h b/configurations/Voxelab Aquila HC32/C2/Default/Version.h index 3739caa37c..25ad483c16 100644 --- a/configurations/Voxelab Aquila HC32/C2/Default/Version.h +++ b/configurations/Voxelab Aquila HC32/C2/Default/Version.h @@ -41,7 +41,7 @@ * here we define this default string as the date where the latest release * version was tagged. */ -//#define STRING_DISTRIBUTION_DATE "2024-11-01" +//#define STRING_DISTRIBUTION_DATE "2024-11-19" #define STRING_DISTRIBUTION_DATE __DATE__ #define STRING_DISTRIBUTION_TIME __TIME__ diff --git a/configurations/Voxelab Aquila HC32/C2/MM/Configuration.h b/configurations/Voxelab Aquila HC32/C2/MM/Configuration.h index 908a8443fc..8a2918c3c1 100644 --- a/configurations/Voxelab Aquila HC32/C2/MM/Configuration.h +++ b/configurations/Voxelab Aquila HC32/C2/MM/Configuration.h @@ -2464,7 +2464,7 @@ // When enabled Marlin will send a busy status message to the host // every couple of seconds when it can't accept commands. // -#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages +//#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages #define DEFAULT_KEEPALIVE_INTERVAL 5 // Number of seconds between "busy" messages. Set with M113. #define BUSY_WHILE_HEATING // Some hosts require "busy" messages even during heating diff --git a/configurations/Voxelab Aquila HC32/C2/MM/Version.h b/configurations/Voxelab Aquila HC32/C2/MM/Version.h index 69d385a05b..7601e7f5d1 100644 --- a/configurations/Voxelab Aquila HC32/C2/MM/Version.h +++ b/configurations/Voxelab Aquila HC32/C2/MM/Version.h @@ -41,7 +41,7 @@ * here we define this default string as the date where the latest release * version was tagged. */ -//#define STRING_DISTRIBUTION_DATE "2024-11-01" +//#define STRING_DISTRIBUTION_DATE "2024-11-19" #define STRING_DISTRIBUTION_DATE __DATE__ #define STRING_DISTRIBUTION_TIME __TIME__ diff --git a/configurations/Voxelab Aquila HC32/ConfigurationBLT.h b/configurations/Voxelab Aquila HC32/ConfigurationBLT.h index 463f593a60..a596216925 100644 --- a/configurations/Voxelab Aquila HC32/ConfigurationBLT.h +++ b/configurations/Voxelab Aquila HC32/ConfigurationBLT.h @@ -2464,7 +2464,7 @@ // When enabled Marlin will send a busy status message to the host // every couple of seconds when it can't accept commands. // -#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages +//#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages #define DEFAULT_KEEPALIVE_INTERVAL 5 // Number of seconds between "busy" messages. Set with M113. #define BUSY_WHILE_HEATING // Some hosts require "busy" messages even during heating diff --git a/configurations/Voxelab Aquila HC32/ConfigurationDNP.h b/configurations/Voxelab Aquila HC32/ConfigurationDNP.h index 00cbe19fd2..aa18f4a464 100644 --- a/configurations/Voxelab Aquila HC32/ConfigurationDNP.h +++ b/configurations/Voxelab Aquila HC32/ConfigurationDNP.h @@ -2464,7 +2464,7 @@ // When enabled Marlin will send a busy status message to the host // every couple of seconds when it can't accept commands. // -#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages +//#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages #define DEFAULT_KEEPALIVE_INTERVAL 5 // Number of seconds between "busy" messages. Set with M113. #define BUSY_WHILE_HEATING // Some hosts require "busy" messages even during heating diff --git a/configurations/Voxelab Aquila HC32/ConfigurationMM.h b/configurations/Voxelab Aquila HC32/ConfigurationMM.h index 7367604d5d..8ab1c83893 100644 --- a/configurations/Voxelab Aquila HC32/ConfigurationMM.h +++ b/configurations/Voxelab Aquila HC32/ConfigurationMM.h @@ -2464,7 +2464,7 @@ // When enabled Marlin will send a busy status message to the host // every couple of seconds when it can't accept commands. // -#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages +//#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages #define DEFAULT_KEEPALIVE_INTERVAL 5 // Number of seconds between "busy" messages. Set with M113. #define BUSY_WHILE_HEATING // Some hosts require "busy" messages even during heating diff --git a/configurations/Voxelab Aquila HC32/ConfigurationUBL.h b/configurations/Voxelab Aquila HC32/ConfigurationUBL.h index c85427ada5..15bc7b1a30 100644 --- a/configurations/Voxelab Aquila HC32/ConfigurationUBL.h +++ b/configurations/Voxelab Aquila HC32/ConfigurationUBL.h @@ -2464,7 +2464,7 @@ // When enabled Marlin will send a busy status message to the host // every couple of seconds when it can't accept commands. // -#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages +//#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages #define DEFAULT_KEEPALIVE_INTERVAL 5 // Number of seconds between "busy" messages. Set with M113. #define BUSY_WHILE_HEATING // Some hosts require "busy" messages even during heating diff --git a/configurations/Voxelab Aquila HC32/Version.h b/configurations/Voxelab Aquila HC32/Version.h index ec671b9646..5b2bf124b3 100644 --- a/configurations/Voxelab Aquila HC32/Version.h +++ b/configurations/Voxelab Aquila HC32/Version.h @@ -41,7 +41,7 @@ * here we define this default string as the date where the latest release * version was tagged. */ -//#define STRING_DISTRIBUTION_DATE "2024-11-01" +//#define STRING_DISTRIBUTION_DATE "2024-11-19" #define STRING_DISTRIBUTION_DATE __DATE__ #define STRING_DISTRIBUTION_TIME __TIME__ diff --git a/configurations/Voxelab Aquila/BLT/Configuration.h b/configurations/Voxelab Aquila/BLT/Configuration.h index 79a8e556d8..ffba07780f 100644 --- a/configurations/Voxelab Aquila/BLT/Configuration.h +++ b/configurations/Voxelab Aquila/BLT/Configuration.h @@ -2462,7 +2462,7 @@ // When enabled Marlin will send a busy status message to the host // every couple of seconds when it can't accept commands. // -#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages +//#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages #define DEFAULT_KEEPALIVE_INTERVAL 5 // Number of seconds between "busy" messages. Set with M113. #define BUSY_WHILE_HEATING // Some hosts require "busy" messages even during heating diff --git a/configurations/Voxelab Aquila/BLT/Version.h b/configurations/Voxelab Aquila/BLT/Version.h index 079284a84c..4cb23cabbc 100644 --- a/configurations/Voxelab Aquila/BLT/Version.h +++ b/configurations/Voxelab Aquila/BLT/Version.h @@ -41,7 +41,7 @@ * here we define this default string as the date where the latest release * version was tagged. */ -//#define STRING_DISTRIBUTION_DATE "2024-11-05" +//#define STRING_DISTRIBUTION_DATE "2024-11-19" #define STRING_DISTRIBUTION_DATE __DATE__ #define STRING_DISTRIBUTION_TIME __TIME__ diff --git a/configurations/Voxelab Aquila/Default/Configuration.h b/configurations/Voxelab Aquila/Default/Configuration.h index 9f783c79d6..7c9a8fb83c 100644 --- a/configurations/Voxelab Aquila/Default/Configuration.h +++ b/configurations/Voxelab Aquila/Default/Configuration.h @@ -2462,7 +2462,7 @@ // When enabled Marlin will send a busy status message to the host // every couple of seconds when it can't accept commands. // -#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages +//#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages #define DEFAULT_KEEPALIVE_INTERVAL 5 // Number of seconds between "busy" messages. Set with M113. #define BUSY_WHILE_HEATING // Some hosts require "busy" messages even during heating diff --git a/configurations/Voxelab Aquila/Default/Version.h b/configurations/Voxelab Aquila/Default/Version.h index 223b13adb5..ac533109d2 100644 --- a/configurations/Voxelab Aquila/Default/Version.h +++ b/configurations/Voxelab Aquila/Default/Version.h @@ -41,7 +41,7 @@ * here we define this default string as the date where the latest release * version was tagged. */ -//#define STRING_DISTRIBUTION_DATE "2024-11-05" +//#define STRING_DISTRIBUTION_DATE "2024-11-19" #define STRING_DISTRIBUTION_DATE __DATE__ #define STRING_DISTRIBUTION_TIME __TIME__ diff --git a/configurations/Voxelab Aquila/MM/Configuration.h b/configurations/Voxelab Aquila/MM/Configuration.h index fa6c0772ee..d630a27fbf 100644 --- a/configurations/Voxelab Aquila/MM/Configuration.h +++ b/configurations/Voxelab Aquila/MM/Configuration.h @@ -2462,7 +2462,7 @@ // When enabled Marlin will send a busy status message to the host // every couple of seconds when it can't accept commands. // -#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages +//#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages #define DEFAULT_KEEPALIVE_INTERVAL 5 // Number of seconds between "busy" messages. Set with M113. #define BUSY_WHILE_HEATING // Some hosts require "busy" messages even during heating diff --git a/configurations/Voxelab Aquila/MM/Version.h b/configurations/Voxelab Aquila/MM/Version.h index 2c044d4376..dcdb9b0674 100644 --- a/configurations/Voxelab Aquila/MM/Version.h +++ b/configurations/Voxelab Aquila/MM/Version.h @@ -41,7 +41,7 @@ * here we define this default string as the date where the latest release * version was tagged. */ -//#define STRING_DISTRIBUTION_DATE "2024-11-05" +//#define STRING_DISTRIBUTION_DATE "2024-11-19" #define STRING_DISTRIBUTION_DATE __DATE__ #define STRING_DISTRIBUTION_TIME __TIME__ diff --git a/configurations/Voxelab Aquila/UBL/Configuration.h b/configurations/Voxelab Aquila/UBL/Configuration.h index 66f987f780..20d4f3a0ab 100644 --- a/configurations/Voxelab Aquila/UBL/Configuration.h +++ b/configurations/Voxelab Aquila/UBL/Configuration.h @@ -2462,7 +2462,7 @@ // When enabled Marlin will send a busy status message to the host // every couple of seconds when it can't accept commands. // -#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages +//#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages #define DEFAULT_KEEPALIVE_INTERVAL 5 // Number of seconds between "busy" messages. Set with M113. #define BUSY_WHILE_HEATING // Some hosts require "busy" messages even during heating diff --git a/configurations/Voxelab Aquila/UBL/Version.h b/configurations/Voxelab Aquila/UBL/Version.h index 6c48a31409..3bbb76c9d3 100644 --- a/configurations/Voxelab Aquila/UBL/Version.h +++ b/configurations/Voxelab Aquila/UBL/Version.h @@ -41,7 +41,7 @@ * here we define this default string as the date where the latest release * version was tagged. */ -//#define STRING_DISTRIBUTION_DATE "2024-11-05" +//#define STRING_DISTRIBUTION_DATE "2024-11-19" #define STRING_DISTRIBUTION_DATE __DATE__ #define STRING_DISTRIBUTION_TIME __TIME__ diff --git a/configurations/Voxelab Aquila/X3/Configuration.h b/configurations/Voxelab Aquila/X3/Configuration.h index 202d7d80f2..b3ce70ea6d 100644 --- a/configurations/Voxelab Aquila/X3/Configuration.h +++ b/configurations/Voxelab Aquila/X3/Configuration.h @@ -2464,7 +2464,7 @@ // When enabled Marlin will send a busy status message to the host // every couple of seconds when it can't accept commands. // -#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages +//#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages #define DEFAULT_KEEPALIVE_INTERVAL 5 // Number of seconds between "busy" messages. Set with M113. #define BUSY_WHILE_HEATING // Some hosts require "busy" messages even during heating diff --git a/configurations/Voxelab Aquila/X3/Version.h b/configurations/Voxelab Aquila/X3/Version.h index 2b18748978..e004d64535 100644 --- a/configurations/Voxelab Aquila/X3/Version.h +++ b/configurations/Voxelab Aquila/X3/Version.h @@ -41,7 +41,7 @@ * here we define this default string as the date where the latest release * version was tagged. */ -//#define STRING_DISTRIBUTION_DATE "2024-11-05" +//#define STRING_DISTRIBUTION_DATE "2024-11-19" #define STRING_DISTRIBUTION_DATE __DATE__ #define STRING_DISTRIBUTION_TIME __TIME__ diff --git a/ini/stm32f1-maple.ini b/ini/stm32f1-maple.ini index d5fd753bb4..f4e13b4bac 100644 --- a/ini/stm32f1-maple.ini +++ b/ini/stm32f1-maple.ini @@ -23,7 +23,7 @@ # HAL/STM32F1 Common Environment values # [STM32F1_maple] -platform = ststm32@~15.4.1 +platform = ststm32@~17.1.0 board_build.core = maple build_flags = !python buildroot/share/PlatformIO/scripts/STM32F1_build_flags.py ${common.build_flags} -DARDUINO_ARCH_STM32 -DMAPLE_STM32F1 -DPLATFORM_M997_SUPPORT