MultiLogIterator: remove wraparound mode (commaai#23360)

budney · Jan 2, 2022 · 92f194d · 92f194d
1 parent 9d3a821
commit 92f194d
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 12 deletions.
diff --git a/panda b/panda
diff --git a/selfdrive/debug/fingerprint_from_route.py b/selfdrive/debug/fingerprint_from_route.py
@@ -41,5 +41,5 @@ def get_fingerprint(lr):
     sys.exit(1)
 
   route = Route(sys.argv[1])
-  lr = MultiLogIterator(route.log_paths()[:5], wraparound=False)
+  lr = MultiLogIterator(route.log_paths()[:5])
   get_fingerprint(lr)
diff --git a/selfdrive/debug/run_process_on_route.py b/selfdrive/debug/run_process_on_route.py
@@ -17,7 +17,7 @@
   cfg = [c for c in CONFIGS if c.proc_name == args.process][0]
 
   route = Route(args.route)
-  lr = MultiLogIterator(route.log_paths(), wraparound=False)
+  lr = MultiLogIterator(route.log_paths())
   inputs = list(lr)
 
   outputs = replay_process(cfg, inputs)

diff --git a/selfdrive/debug/toyota_eps_factor.py b/selfdrive/debug/toyota_eps_factor.py
@@ -59,6 +59,6 @@ def get_eps_factor(lr, plot=False):
 
 if __name__ == "__main__":
   r = Route(sys.argv[1])
-  lr = MultiLogIterator(r.log_paths(), wraparound=False)
+  lr = MultiLogIterator(r.log_paths())
   n = get_eps_factor(lr, plot="--plot" in sys.argv)
   print("EPS torque factor: ", n)
diff --git a/tools/lib/logreader.py b/tools/lib/logreader.py
@@ -13,9 +13,8 @@
 
 # this is an iterator itself, and uses private variables from LogReader
 class MultiLogIterator:
-  def __init__(self, log_paths, wraparound=False, sort_by_time=False):
+  def __init__(self, log_paths, sort_by_time=False):
     self._log_paths = log_paths
-    self._wraparound = wraparound
 
     self._first_log_idx = next(i for i in range(len(log_paths)) if log_paths[i] is not None)
     self._current_log = self._first_log_idx
@@ -42,12 +41,8 @@ def _inc(self):
       self._idx = 0
       self._current_log = next(i for i in range(self._current_log + 1, len(self._log_readers) + 1)
                                if i == len(self._log_readers) or self._log_paths[i] is not None)
-      # wraparound
       if self._current_log == len(self._log_readers):
-        if self._wraparound:
-          self._current_log = self._first_log_idx
-        else:
-          raise StopIteration
+        raise StopIteration
 
   def __next__(self):
     while 1:

diff --git a/tools/scripts/save_ubloxraw_stream.py b/tools/scripts/save_ubloxraw_stream.py
@@ -35,7 +35,7 @@ def main(argv):
     args.data_dir = os.path.dirname(args.data_dir)
 
   route = Route(args.route_name, args.data_dir)
-  lr = MultiLogIterator(route.log_paths(), wraparound=False)
+  lr = MultiLogIterator(route.log_paths())
 
   with open(args.out_path, 'wb') as f:
     try:
+0 −4		board/can_definitions.h
+1 −10		board/config.h
+3 −9		board/drivers/can_common.h
+2 −5		board/drivers/usb.h
+1 −1		board/flasher.h
+7 −7		board/main.c
+26 −0		board/panda.h
+1 −1		board/pedal/main.c
+1 −3		board/stm32fx/stm32fx_config.h
+1 −3		board/stm32h7/stm32h7_config.h
+ −		docs/CANPacket_structure.png
+ −		docs/USB_packet_structure.png
+1 −1		tests/safety/test.c
+1 −1		tests/safety_replay/replay_drive.py