Skip to content

Commit 35dd96d

Browse files
committed
cleanup
1 parent dbbfa93 commit 35dd96d

File tree

1 file changed

+25
-86
lines changed

1 file changed

+25
-86
lines changed

can/bit_timing.py

Lines changed: 25 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -299,39 +299,16 @@ def btr1(self) -> int:
299299
return sam << 7 | (self.tseg2 - 1) << 4 | self.tseg1 - 1
300300

301301
def __str__(self) -> str:
302-
segments = []
303-
try:
304-
segments.append(f"BR {self.bitrate} bit/s")
305-
except ValueError:
306-
pass
307-
try:
308-
segments.append(f"SP: {self.sample_point:.2f}%")
309-
except ValueError:
310-
pass
311-
try:
312-
segments.append(f"BRP: {self.brp}")
313-
except ValueError:
314-
pass
315-
try:
316-
segments.append(f"TSEG1: {self.tseg1}")
317-
except ValueError:
318-
pass
319-
try:
320-
segments.append(f"TSEG2: {self.tseg2}")
321-
except ValueError:
322-
pass
323-
try:
324-
segments.append(f"SJW: {self.sjw}")
325-
except ValueError:
326-
pass
327-
try:
328-
segments.append(f"BTR: {self.btr0:02X}{self.btr1:02X}h")
329-
except ValueError:
330-
pass
331-
try:
332-
segments.append(f"f_clock: {self.f_clock / 1e6:.0f}MHz")
333-
except ValueError:
334-
pass
302+
segments = [
303+
f"BR {self.bitrate} bit/s",
304+
f"SP: {self.sample_point:.2f}%",
305+
f"BRP: {self.brp}",
306+
f"TSEG1: {self.tseg1}",
307+
f"TSEG2: {self.tseg2}",
308+
f"SJW: {self.sjw}",
309+
f"BTR: {self.btr0:02X}{self.btr1:02X}h",
310+
f"f_clock: {self.f_clock / 1e6:.0f}MHz",
311+
]
335312
return ", ".join(segments)
336313

337314
def __repr__(self) -> str:
@@ -804,59 +781,21 @@ def oscillator_tolerance(
804781
return max(0.0, min(df_clock_list) * 100)
805782

806783
def __str__(self) -> str:
807-
segments = []
808-
try:
809-
segments.append(f"NBR: {self.nom_bitrate} bit/s")
810-
except ValueError:
811-
pass
812-
try:
813-
segments.append(f"NSP: {self.nom_sample_point:.2f}%")
814-
except ValueError:
815-
pass
816-
try:
817-
segments.append(f"NBRP: {self.nom_brp}")
818-
except ValueError:
819-
pass
820-
try:
821-
segments.append(f"NTSEG1: {self.nom_tseg1}")
822-
except ValueError:
823-
pass
824-
try:
825-
segments.append(f"NTSEG2: {self.nom_tseg2}")
826-
except ValueError:
827-
pass
828-
try:
829-
segments.append(f"NSJW: {self.nom_sjw}")
830-
except ValueError:
831-
pass
832-
try:
833-
segments.append(f"DBR: {self.data_bitrate} bit/s")
834-
except ValueError:
835-
pass
836-
try:
837-
segments.append(f"DSP: {self.data_sample_point:.2f}%")
838-
except ValueError:
839-
pass
840-
try:
841-
segments.append(f"DBRP: {self.data_brp}")
842-
except ValueError:
843-
pass
844-
try:
845-
segments.append(f"DTSEG1: {self.data_tseg1}")
846-
except ValueError:
847-
pass
848-
try:
849-
segments.append(f"DTSEG2: {self.data_tseg2}")
850-
except ValueError:
851-
pass
852-
try:
853-
segments.append(f"DSJW: {self.data_sjw}")
854-
except ValueError:
855-
pass
856-
try:
857-
segments.append(f"f_clock: {self.f_clock / 1e6:.0f}MHz")
858-
except ValueError:
859-
pass
784+
segments = [
785+
f"NBR: {self.nom_bitrate} bit/s",
786+
f"NSP: {self.nom_sample_point:.2f}%",
787+
f"NBRP: {self.nom_brp}",
788+
f"NTSEG1: {self.nom_tseg1}",
789+
f"NTSEG2: {self.nom_tseg2}",
790+
f"NSJW: {self.nom_sjw}",
791+
f"DBR: {self.data_bitrate} bit/s",
792+
f"DSP: {self.data_sample_point:.2f}%",
793+
f"DBRP: {self.data_brp}",
794+
f"DTSEG1: {self.data_tseg1}",
795+
f"DTSEG2: {self.data_tseg2}",
796+
f"DSJW: {self.data_sjw}",
797+
f"f_clock: {self.f_clock / 1e6:.0f}MHz",
798+
]
860799
return ", ".join(segments)
861800

862801
def __repr__(self) -> str:

0 commit comments

Comments
 (0)