Add the remainder of diff changes with exception of persistence files'

g2core/controller.cpp

@@ -48,6 +48,7 @@
 #ifdef ENABLE_INTERLOCK_AND_ESTOP
 #include "spindle.h"
 #endif
+#include "persistence.h"
 
 #include "MotatePower.h"
 
@@ -232,6 +233,7 @@ static void _controller_HSM()
 #if MARLIN_COMPAT_ENABLED == true
     DISPATCH(marlin_callback());                // handle Marlin stuff - may return EAGAIN, must be after planner_callback!
 #endif
+    DISPATCH(write_persistent_values_callback());
 
 //----- command readers and parsers --------------------------------------------------//
 

g2core/cycle_feedhold.cpp

@@ -36,7 +36,7 @@
 #include "spindle.h"
 #include "coolant.h"
 #include "util.h"
-//#include "xio.h"        // DIAGNOSTIC
+#include "xio.h"
 
 //static void _start_feedhold(void);
 static void _start_cycle_restart(void);
@@ -406,6 +406,7 @@ static void _start_queue_flush()
 {
     // Don't initiate the queue until in HOLD state (this also means that runtime is idle)
     if ((cm1.queue_flush_state == QUEUE_FLUSH_REQUESTED) && (cm1.hold_state == FEEDHOLD_HOLD)) {
+        xio_flush_device(DEV_IS_DATA);
         if (cm1.hold_type == FEEDHOLD_TYPE_ACTIONS) {
             op.add_action(_feedhold_restart_with_actions);
         } else {