Apply ruff pre-commit hook

common/igvcutils/src/igvcutils/__init__.py

@@ -1,2 +1,6 @@
-from . import can
-from . import ctrl
+# ruff: noqa: F401
+
+from . import (
+    can,
+    ctrl,
+)

dbw/ember_bl/ember_identity.py

@@ -1,3 +1,4 @@
+# ruff: noqa: F821
 # Simple script to add a #define for EMBER_NODE_IDENTITY.
 
 Import('env')

dbw/ember_bl/update.py

@@ -138,7 +138,7 @@ def main():
 
         sleep(SLEEP_WAIT)
 
-    log.info(f"Waiting for node to be in RECV_CHUNK....")
+    log.info("Waiting for node to be in RECV_CHUNK....")
     while node.state() != 'RECV_CHUNK':
         sleep(SLEEP_WAIT)
 

dbw/node_fw/ember_identity.py

@@ -1,3 +1,4 @@
+# ruff: noqa: F821
 # Simple script to add a #define for EMBER_NODE_IDENTITY.
 
 Import('env')

dbw/node_fw/ember_update_pio.py

@@ -1,3 +1,5 @@
+# ruff: noqa: F821
+
 Import("env")
 
 identity = env.GetProjectOption('board_node_identity', default=None)

dbw/node_fw/opencan-pio.py

@@ -1,3 +1,5 @@
+# ruff: noqa: F821
+
 Import("env")
 
 node = env.GetProjectOption("board_can_node")
@@ -11,7 +13,7 @@
 # These Execute calls call opencan-cli every time.
 # They could be replaced with a proper Command, but it was tricky getting
 # PlatformIO to reliably execute them. You could ask them on GitHub or similar.
-if 0 != env.Execute(f'scons -QD deps-opencan'):
+if 0 != env.Execute('scons -QD deps-opencan'):
     print("Error making sure opencan-cli is installed; stopping build.")
     exit(-1)
 

dbw/node_fw/updater.py

@@ -3,9 +3,7 @@
 import argparse
 import can
 import cantools
-import re
 
-from pprint import pprint
 from time import sleep
 from tqdm import trange
 

dbw/node_sim/node.py

@@ -1,4 +1,3 @@
-import logging
 import time
 
 from cand.client import Bus

dbw/node_sim/node_sim.py

@@ -1,11 +1,8 @@
 #!/usr/bin/env python3
 # node simulator
 
-import logging
 import multiprocessing as mp
 
-from cand.client import Bus
-
 from node import Node
 
 

dbw/safed/tests.py

@@ -41,9 +41,9 @@ def test(self):
         data_time, data_data = data_rec
         cmd_time, cmd_data = cmd_rec
 
-        if cur_time - data_time >= THROTTLE_ACCELDATA_TIMEOUT_NS:
+        if cur_time - data_time >= DBWNODE_ACCEL_DATA_TIMEOUT_NS:
             return self.abort('TIMEOUT')
-        if cur_time - cmd_time >= DBW_VELCMD_TIMEOUT_NS:
+        if cur_time - cmd_time >= DBWNODE_VEL_CMD_TIMEOUT_NS:
             return self.abort('TIMEOUT')
 
         perc_diff = abs(data_data['percent'] - cmd_data['throttlePercent'])
@@ -76,7 +76,7 @@ def test(self):
 
         encoder_time, encoder_data = encoder_rec
 
-        if cur_time - encoder_time >= ENCF_ENCODERDATA_TIMEOUT_NS:
+        if cur_time - encoder_time >= DBWNODE_ENCODER_DATA_TIMEOUT_NS:
             return self.abort('TIMEOUT')
 
         encoder_max = max(

ros/docker/detection/src/detection.py

@@ -1,13 +1,13 @@
 #!/usr/bin/env python3
 
 import cv2 as cv
-from cv_bridge import CvBridge, CvBridgeError
+import numpy as np
 import rospy
-import os
+
+
+from cv_bridge import CvBridge
 from sensor_msgs.msg import Image
 from std_msgs.msg import Bool
-import numpy as np
-from matplotlib import pyplot as plt
 
 
 # DEFINES
@@ -142,7 +142,7 @@ def detection(self):
         )
 
         hsv = cv.cvtColor(barrel_jpg, cv.COLOR_BGR2HSV)
-        # frame_thresh = cv2.inRange(hsv,orange_min,orange_max)
+        # frame_thresh = cv.inRange(hsv,orange_min,orange_max)
 
         orange_min = (0, 97, 4)
         orange_max = (18, 255, 255)
@@ -156,7 +156,7 @@ def detection(self):
             keypoints,
             np.zeros((1, 1)),
             (0, 0, 255),
-            cv2.DRAW_MATCHES_FLAGS_DRAW_RICH_KEYPOINTS,
+            cv.DRAW_MATCHES_FLAGS_DRAW_RICH_KEYPOINTS,
         )
         cv.imshow("Keypoints", im_with_keypoints)
         cv.waitKey(0)

ros/docker/encoder_odom/src/encoder_arduino.py

@@ -1,16 +1,22 @@
 #!/usr/bin/env python3
 
+import pyfirmata
 import rospy
 import tf2_ros
-import math
-from math import sin, cos, pi
 
-# Used for Arudino
-import pyfirmata
-import time
 
-from geometry_msgs.msg import Point, Pose, Quaternion, Vector3, Twist
-from std_msgs.msg import Float32
+from math import (
+    cos,
+    sin,
+)
+
+from geometry_msgs.msg import (
+    Point,
+    Pose,
+    Quaternion,
+    Twist,
+    Vector3,
+)
 from nav_msgs.msg import Odometry
 
 
@@ -35,7 +41,7 @@ def publish(self, data):
 # vy might always be zero
 class Encoder_Odom:
     def __init__(self):
-        self.sub = Subscribe()
+        self.sub = Subscribe()  # noqa: F821
         self.broadcaster = tf2_ros.TransformBroadcaster()
 
         self.x = 0.0