diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2020-09-16 23:41:27 -0400 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2020-09-16 23:53:45 -0400 |
| commit | 9814daa999387085f95f55aa36dd1842d46e33e5 (patch) | |
| tree | c916f0860127e2ff75add04379d1480d9868ad73 /klippy/mcu.py | |
| parent | 2447025fa62d89c1e3a31d09bb97e04522444b0c (diff) | |
| download | kutter-9814daa999387085f95f55aa36dd1842d46e33e5.tar.gz kutter-9814daa999387085f95f55aa36dd1842d46e33e5.tar.xz kutter-9814daa999387085f95f55aa36dd1842d46e33e5.zip | |
mcu: Setup for steppersync_free to be automatically called
Use ffi_main.gc() to automatically free the C steppersync object.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy/mcu.py')
| -rw-r--r-- | klippy/mcu.py | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/klippy/mcu.py b/klippy/mcu.py index b7837638..c919d88e 100644 --- a/klippy/mcu.py +++ b/klippy/mcu.py @@ -430,8 +430,8 @@ class MCU: self._mcu_freq = 0. # Move command queuing ffi_main, self._ffi_lib = chelper.get_ffi() - self._max_stepper_error = config.getfloat( - 'max_stepper_error', 0.000025, minval=0.) + self._max_stepper_error = config.getfloat('max_stepper_error', 0.000025, + minval=0.) self._stepqueues = [] self._steppersync = None # Stats @@ -566,17 +566,19 @@ class MCU: else: start_reason = self._printer.get_start_args().get("start_reason") if start_reason == 'firmware_restart': - raise error("Failed automated reset of MCU '%s'" % ( - self._name,)) + raise error("Failed automated reset of MCU '%s'" + % (self._name,)) # Already configured - send init commands self._send_config(config_params['crc']) # Setup steppersync with the move_count returned by get_config move_count = config_params['move_count'] - self._steppersync = self._ffi_lib.steppersync_alloc( - self._serial.serialqueue, self._stepqueues, len(self._stepqueues), - move_count) - self._ffi_lib.steppersync_set_time( - self._steppersync, 0., self._mcu_freq) + ffi_main, ffi_lib = chelper.get_ffi() + self._steppersync = ffi_main.gc( + ffi_lib.steppersync_alloc(self._serial.serialqueue, + self._stepqueues, len(self._stepqueues), + move_count), + ffi_lib.steppersync_free) + ffi_lib.steppersync_set_time(self._steppersync, 0., self._mcu_freq) # Log config information move_msg = "Configured MCU '%s' (%d moves)" % (self._name, move_count) logging.info(move_msg) @@ -682,9 +684,7 @@ class MCU: # Restarts def _disconnect(self): self._serial.disconnect() - if self._steppersync is not None: - self._ffi_lib.steppersync_free(self._steppersync) - self._steppersync = None + self._steppersync = None def _shutdown(self, force=False): if (self._emergency_stop_cmd is None or (self._is_shutdown and not force)): @@ -745,8 +745,8 @@ class MCU: return ret = self._ffi_lib.steppersync_flush(self._steppersync, clock) if ret: - raise error("Internal error in MCU '%s' stepcompress" % ( - self._name,)) + raise error("Internal error in MCU '%s' stepcompress" + % (self._name,)) def check_active(self, print_time, eventtime): if self._steppersync is None: return |