Merge pull request #44 from TomiXRM/fix/gs_usb-error-frame

format

Author: TomiXRM

src/component/can_message_editor.py

@@ -54,22 +54,19 @@ def __init__(self, parent=None, initial_radix_type="dec"):
         self._grid_layout.setVerticalSpacing(2)
         self._left_container.setLayout(self._grid_layout)
         self._layout.addWidget(self._left_container)
-        self._layout.setAlignment(
-            self._left_container, Qt.AlignmentFlag.AlignTop)
+        self._layout.setAlignment(self._left_container, Qt.AlignmentFlag.AlignTop)
 
         # ID (StdID/ExtID)
         self.id_button = QPushButton("StdID")
         self.id_button.setMinimumWidth(50)
         self.id_button.clicked.connect(self.toggle_stdid_extid)
-        self._grid_layout.addWidget(
-            self.id_button, 0, 0, Qt.AlignmentFlag.AlignBottom)
+        self._grid_layout.addWidget(self.id_button, 0, 0, Qt.AlignmentFlag.AlignBottom)
 
         # ID (Edit)
         self.id_edit = QLineEdit("0")
         self.id_edit.setValidator(QIntValidator())
         self.id_edit.setMinimumWidth(50)
-        self._grid_layout.addWidget(
-            self.id_edit, 0, 1, Qt.AlignmentFlag.AlignBottom)
+        self._grid_layout.addWidget(self.id_edit, 0, 1, Qt.AlignmentFlag.AlignBottom)
 
         # Label for DataFrame
         self.dataframe_label = ClickableLabel("DataFrame")
@@ -85,8 +82,7 @@ def __init__(self, parent=None, initial_radix_type="dec"):
         self._dataframe_button_layout.setSpacing(2)
 
         self.dataframe_add_button = QPushButton("Add 8")
-        self.dataframe_add_button.clicked.connect(
-            self._on_add_dataframe_row_clicked)
+        self.dataframe_add_button.clicked.connect(self._on_add_dataframe_row_clicked)
         self._dataframe_button_layout.addWidget(self.dataframe_add_button)
 
         self.dataframe_remove_button = QPushButton("Remove 8")
@@ -124,24 +120,21 @@ def update_radix(self, new_radix: str) -> None:
             for edit in self.dataframe_edits:
                 edit.setStyleSheet(self.style_edit_default)
                 edit.setValidator(Validator.dec_validator)
-                edit.setText(
-                    Validator.text_decimalize_from_hex_text(edit.text()))
+                edit.setText(Validator.text_decimalize_from_hex_text(edit.text()))
 
         elif new_radix == "hex":
             # ID Edit
             self.id_edit.setStyleSheet(self.style_edit_hex)
             self.id_edit.setValidator(Validator.hex_validator)
             self.id_edit.setText(
-                Validator.text_hexadecimalize_from_decimal_text(
-                    self.id_edit.text())
+                Validator.text_hexadecimalize_from_decimal_text(self.id_edit.text())
             )
             # DataFrame Edits
             for edit in self.dataframe_edits:
                 edit.setStyleSheet(self.style_edit_hex)
                 edit.setValidator(Validator.hex_validator)
                 edit.setText(
-                    Validator.text_hexadecimalize_from_decimal_text(
-                        edit.text())
+                    Validator.text_hexadecimalize_from_decimal_text(edit.text())
                 )
         self._update_dataframe_button_state()
 
@@ -180,8 +173,7 @@ def get_message(self) -> Tuple[Union[can.Message, None], bool]:
             for data_edit in self.dataframe_edits:
                 can_data_text: str = data_edit.text()
                 if can_data_text:
-                    value = Validator.decimalize(
-                        can_data_text, self.radix_type)
+                    value = Validator.decimalize(can_data_text, self.radix_type)
                     value = max(0, min(value, 255))
                     dataframe.append(value)
                 else:
@@ -223,11 +215,9 @@ def set_can_fd_mode(self, enabled: bool) -> None:
 
     def _update_dataframe_button_state(self) -> None:
         can_add = (
-            self.can_fd_enabled and len(
-                self.dataframe_edits) < self._max_data_bytes
+            self.can_fd_enabled and len(self.dataframe_edits) < self._max_data_bytes
         )
-        can_remove = self.can_fd_enabled and len(
-            self.dataframe_edits) > self._row_size
+        can_remove = self.can_fd_enabled and len(self.dataframe_edits) > self._row_size
         self.dataframe_add_button.setVisible(self.can_fd_enabled)
         self.dataframe_add_button.setEnabled(can_add)
         self.dataframe_remove_button.setVisible(can_remove)
@@ -288,6 +278,5 @@ def _on_add_dataframe_row_clicked(self) -> None:
 
     @Slot()
     def _on_remove_dataframe_row_clicked(self) -> None:
-        target_total = max(self._row_size, len(
-            self.dataframe_edits) - self._row_size)
+        target_total = max(self._row_size, len(self.dataframe_edits) - self._row_size)
         self._trim_dataframe_rows(target_total)

src/utils/can_handler.py

@@ -124,8 +124,7 @@ def _format_can_error_frame(msg: can.Message) -> str:
         for error_bit, label in CAN_ERROR_CLASSES
         if msg.arbitration_id & error_bit
     ]
-    error_text = ", ".join(
-        error_classes) if error_classes else "unknown CAN error"
+    error_text = ", ".join(error_classes) if error_classes else "unknown CAN error"
     details = [f"CAN error frame: {error_text}"]
 
     data = list(msg.data) if msg.data is not None else []
@@ -137,8 +136,7 @@ def _format_can_error_frame(msg: can.Message) -> str:
     if msg.arbitration_id & CAN_ERR_BUSOFF:
         details.append("controller entered bus-off state")
     if len(data) >= 8 and (msg.arbitration_id & CAN_ERR_CRTL):
-        details.append(
-            f"tx error counter={data[6]}, rx error counter={data[7]}")
+        details.append(f"tx error counter={data[6]}, rx error counter={data[7]}")
 
     return ". ".join(details)
 
@@ -166,8 +164,7 @@ def connect_device(
             if channel == "":
                 raise ValueError("No CAN channel is selected")
             if can_fd and interface == "gs_usb":
-                raise ValueError(
-                    "CAN-FD is not supported for gs_usb channels yet")
+                raise ValueError("CAN-FD is not supported for gs_usb channels yet")
 
             bus_channel: str | int = channel
             if interface == "gs_usb":
@@ -178,8 +175,7 @@ def connect_device(
                 bus_channel, bitrate, interface, can_fd, data_bitrate
             )
             self._reported_error_frames.clear()
-            self.can_notifier = can.Notifier(
-                self.can_bus, [self._on_can_recieve])
+            self.can_notifier = can.Notifier(self.can_bus, [self._on_can_recieve])
             return Success(True)
         except Exception as e:
             e = _format_connection_error(e, interface)