Mirror
/
klipper-dgus
mirror of https://github.com/Desuuuu/klipper.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

klippy: No need to define __str__ and __init__ methods on exception classes 

The base Exception class already defines these methods.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2016-11-29 18:27:48 -05:00
parent 7835f50722
commit f547cab710
3 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
klippy/homing.py
View File

@ -78,7 +78,7 @@ class Homing:
try: try:
if es.check_busy(self.eventtime): if es.check_busy(self.eventtime):
return True return True
except mcu.MCUError, e: except mcu.error, e:
raise EndstopError("Failed to home stepper %s: %s" % ( raise EndstopError("Failed to home stepper %s: %s" % (
stepper.name, str(e))) stepper.name, str(e)))
post_home_pos = stepper.mcu_stepper.get_mcu_position() post_home_pos = stepper.mcu_stepper.get_mcu_position()
@ -110,7 +110,7 @@ class QueryEndstops:
try: try:
if self.busy[0][1].check_busy(eventtime): if self.busy[0][1].check_busy(eventtime):
return True return True
except mcu.MCUError, e: except mcu.error, e:
raise EndstopError("Failed to query endstop %s: %s" % ( raise EndstopError("Failed to query endstop %s: %s" % (
self.busy[0][0], str(e))) self.busy[0][0], str(e)))
self.busy.pop(0) self.busy.pop(0)
@ -125,10 +125,7 @@ class QueryEndstops:
return False return False
class EndstopError(Exception): class EndstopError(Exception):
def __init__(self, msg="Endstop error"): pass
self._msg = msg
def __str__(self):
return self._msg
def EndstopMoveError(pos, msg="Move out of range"): def EndstopMoveError(pos, msg="Move out of range"):
return EndstopError("%s: %.3f %.3f %.3f [%.3f]" % ( return EndstopError("%s: %.3f %.3f %.3f [%.3f]" % (

11
klippy/mcu.py
View File

@ -6,11 +6,8 @@
import sys, zlib, logging, time, math import sys, zlib, logging, time, math
import serialhdl, pins, chelper import serialhdl, pins, chelper
class MCUError(Exception): class error(Exception):
def __init__(self, msg="MCU Error"): pass
self._msg = msg
def __str__(self):
return self._msg
def parse_pin_extras(pin, can_pullup=False): def parse_pin_extras(pin, can_pullup=False):
pullup = invert = 0 pullup = invert = 0
@ -167,9 +164,9 @@ class MCU_endstop:
# Timeout - disable endstop checking # Timeout - disable endstop checking
msg = self._home_cmd.encode(self._oid, 0, 0, 0) msg = self._home_cmd.encode(self._oid, 0, 0, 0)
self._mcu.send(msg, reqclock=0, cq=self._cmd_queue) self._mcu.send(msg, reqclock=0, cq=self._cmd_queue)
raise MCUError("Timeout during endstop homing") raise error("Timeout during endstop homing")
if self._mcu.is_shutdown: if self._mcu.is_shutdown:
raise MCUError("MCU is shutdown") raise error("MCU is shutdown")
last_clock = self._mcu.get_last_clock() last_clock = self._mcu.get_last_clock()
if last_clock >= self._next_query_clock: if last_clock >= self._next_query_clock:
self._next_query_clock = last_clock + self._retry_query_ticks self._next_query_clock = last_clock + self._retry_query_ticks

5
klippy/msgproto.py
View File

@ -24,10 +24,7 @@ MESSAGE_DEST = 0x10
MESSAGE_SYNC = '\x7E' MESSAGE_SYNC = '\x7E'
class error(Exception): class error(Exception):
def __init__(self, msg): pass
self.msg = msg
def __str__(self):
return self.msg
def crc16_ccitt(buf): def crc16_ccitt(buf):
crc = 0xffff crc = 0xffff