diff --git a/klippy/mcu.py b/klippy/mcu.py
index 6a7e84b66..3903e8b48 100644
--- a/klippy/mcu.py
+++ b/klippy/mcu.py
@@ -659,7 +659,7 @@ class MCU:
         self._printer.request_exit('firmware_restart')
         self._reactor.pause(self._reactor.monotonic() + 2.000)
         raise error("Attempt MCU '%s' restart failed" % (self._name,))
-    def _connect_file(self, pace=False):
+    def _attach_file(self, pace=False):
         # In a debugging mode.  Open debug output file and read data dictionary
         start_args = self._printer.get_start_args()
         if self._name == 'mcu':
@@ -775,40 +775,32 @@ class MCU:
         logging.info(move_msg)
         log_info = self._log_info() + "\n" + move_msg
         self._printer.set_rollover_info(self._name, log_info, log=False)
-    def _mcu_identify(self):
-        if self.is_fileoutput():
-            self._connect_file()
-        else:
-            resmeth = self._restart_method
-            if resmeth == 'rpi_usb' and not os.path.exists(self._serialport):
-                # Try toggling usb power
-                self._check_restart("enable power")
-            try:
-                if self._canbus_iface is not None:
-                    cbid = self._printer.lookup_object('canbus_ids')
-                    nodeid = cbid.get_nodeid(self._serialport)
-                    self._serial.connect_canbus(self._serialport, nodeid,
-                                                self._canbus_iface)
-                elif self._baud:
-                    # Cheetah boards require RTS to be deasserted
-                    # else a reset will trigger the built-in bootloader.
-                    rts = (resmeth != "cheetah")
-                    self._serial.connect_uart(self._serialport, self._baud, rts)
-                else:
-                    self._serial.connect_pipe(self._serialport)
-                self._clocksync.connect(self._serial)
-            except serialhdl.error as e:
-                raise error(str(e))
-        logging.info(self._log_info())
-        ppins = self._printer.lookup_object('pins')
-        pin_resolver = ppins.get_pin_resolver(self._name)
-        for cname, value in self.get_constants().items():
-            if cname.startswith("RESERVE_PINS_"):
-                for pin in value.split(','):
-                    pin_resolver.reserve_pin(pin, cname[13:])
-        self._mcu_freq = self.get_constant_float('CLOCK_FREQ')
-        self._stats_sumsq_base = self.get_constant_float('STATS_SUMSQ_BASE')
+    def _attach(self):
+        resmeth = self._restart_method
+        if resmeth == 'rpi_usb' and not os.path.exists(self._serialport):
+            # Try toggling usb power
+            self._check_restart("enable power")
+        try:
+            if self._canbus_iface is not None:
+                cbid = self._printer.lookup_object('canbus_ids')
+                nodeid = cbid.get_nodeid(self._serialport)
+                self._serial.connect_canbus(self._serialport, nodeid,
+                                            self._canbus_iface)
+            elif self._baud:
+                # Cheetah boards require RTS to be deasserted
+                # else a reset will trigger the built-in bootloader.
+                rts = (resmeth != "cheetah")
+                self._serial.connect_uart(self._serialport, self._baud, rts)
+            else:
+                self._serial.connect_pipe(self._serialport)
+            self._clocksync.connect(self._serial)
+        except serialhdl.error as e:
+            raise error(str(e))
+    def _post_attach_setup_shutdown(self):
         self._emergency_stop_cmd = self.lookup_command("emergency_stop")
+        self.register_response(self._handle_shutdown, 'shutdown')
+        self.register_response(self._handle_shutdown, 'is_shutdown')
+    def _post_attach_setup_restart(self):
         self._reset_cmd = self.try_lookup_command("reset")
         self._config_reset_cmd = self.try_lookup_command("config_reset")
         ext_only = self._reset_cmd is None and self._config_reset_cmd is None
@@ -820,13 +812,32 @@ class MCU:
             self._is_mcu_bridge = True
             self._printer.register_event_handler("klippy:firmware_restart",
                                                  self._firmware_restart_bridge)
+    def _post_attach_setup_stats(self):
+        self._stats_sumsq_base = self.get_constant_float('STATS_SUMSQ_BASE')
+        msgparser = self._serial.get_msgparser()
         version, build_versions = msgparser.get_version_info()
         self._get_status_info['mcu_version'] = version
         self._get_status_info['mcu_build_versions'] = build_versions
         self._get_status_info['mcu_constants'] = msgparser.get_constants()
-        self.register_response(self._handle_shutdown, 'shutdown')
-        self.register_response(self._handle_shutdown, 'is_shutdown')
         self.register_response(self._handle_mcu_stats, 'stats')
+    def _post_attach_setup_for_config(self):
+        self._mcu_freq = self.get_constant_float('CLOCK_FREQ')
+        ppins = self._printer.lookup_object('pins')
+        pin_resolver = ppins.get_pin_resolver(self._name)
+        for cname, value in self.get_constants().items():
+            if cname.startswith("RESERVE_PINS_"):
+                for pin in value.split(','):
+                    pin_resolver.reserve_pin(pin, cname[13:])
+    def _mcu_identify(self):
+        if self.is_fileoutput():
+            self._attach_file()
+        else:
+            self._attach()
+        logging.info(self._log_info())
+        self._post_attach_setup_shutdown()
+        self._post_attach_setup_restart()
+        self._post_attach_setup_for_config()
+        self._post_attach_setup_stats()
     def _ready(self):
         if self.is_fileoutput():
             return