From b69d31cd29222178a47a2d1511c5c6d879d155ef Mon Sep 17 00:00:00 2001
From: commaci-public <60409688+commaci-public@users.noreply.github.com>
Date: Tue, 1 Oct 2024 10:14:12 -0700
Subject: [PATCH 1/3] pre-commit: autoupdate hooks (#2051)

Update pre-commit hook versions

Co-authored-by: adeebshihadeh <adeebshihadeh@users.noreply.github.com>
---
 .pre-commit-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index c2759df9c..623a67e24 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -15,6 +15,6 @@ repos:
       additional_dependencies: ['numpy', 'types-requests', 'types-atomicwrites',
                                 'types-pycurl']
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.6.3
+  rev: v0.6.8
   hooks:
     - id: ruff

From f5e1900537b39b98ca269fd3d934bac792c4ae12 Mon Sep 17 00:00:00 2001
From: Maxime Desroches <desroches.maxime@gmail.com>
Date: Tue, 1 Oct 2024 19:05:39 -0700
Subject: [PATCH 2/3] mutation tests: remove `cxx_assign_const` op (#2053)

* no 42

* last one
---
 tests/safety/mutation.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/safety/mutation.sh b/tests/safety/mutation.sh
index e8c242cab..9b40bdedd 100755
--- a/tests/safety/mutation.sh
+++ b/tests/safety/mutation.sh
@@ -8,7 +8,8 @@ $DIR/install_mull.sh
 
 GIT_REF="${GIT_REF:-origin/master}"
 GIT_ROOT=$(git rev-parse --show-toplevel)
-echo -e "mutators:\n  - cxx_all" > $GIT_ROOT/mull.yml
+MULL_OPS="mutators: [cxx_increment, cxx_decrement, cxx_comparison, cxx_boundary, cxx_bitwise_assignment, cxx_bitwise, cxx_arithmetic_assignment, cxx_arithmetic]"
+echo -e "$MULL_OPS" > $GIT_ROOT/mull.yml
 scons --mutation -j$(nproc) -D
 echo -e "timeout: 10000\ngitDiffRef: $GIT_REF\ngitProjectRoot: $GIT_ROOT" >> $GIT_ROOT/mull.yml
 

From fab8d0bb4a7704d771bbac79e1cf94c6469f8888 Mon Sep 17 00:00:00 2001
From: Radek <radek@comma.ai>
Date: Wed, 2 Oct 2024 20:53:32 +0100
Subject: [PATCH 3/3] CAN print improvement (#2052)

* Jungle spam can.

* Print all busses by default.  Prettier print.

* can_health printer

* colors on can error
---
 board/jungle/scripts/can_health.py  | 20 ++++++++++++++++++--
 board/jungle/scripts/can_printer.py | 17 +++++++++++------
 board/jungle/scripts/spam_can.py    | 20 ++++++++++++++++++++
 tests/can_health.py                 | 29 +++++++++++++++++++++++++++++
 tests/can_printer.py                | 20 ++++++++++----------
 5 files changed, 88 insertions(+), 18 deletions(-)
 create mode 100755 board/jungle/scripts/spam_can.py
 create mode 100755 tests/can_health.py

diff --git a/board/jungle/scripts/can_health.py b/board/jungle/scripts/can_health.py
index ff068b5ba..47efbb2e6 100755
--- a/board/jungle/scripts/can_health.py
+++ b/board/jungle/scripts/can_health.py
@@ -1,13 +1,29 @@
 #!/usr/bin/env python3
-
 import time
+import re
 from panda import PandaJungle
 
+RED = '\033[91m'
+GREEN = '\033[92m'
+
+def colorize_errors(value):
+  if isinstance(value, str):
+    if re.search(r'(?i)No error', value):
+      return f'{GREEN}{value}\033[0m'
+    elif re.search(r'(?i)(?<!No error\s)(err|error)', value):
+      return f'{RED}{value}\033[0m'
+  return str(value)
+
 if __name__ == "__main__":
   jungle = PandaJungle()
 
   while True:
+    print(chr(27) + "[2J") # clear screen
+    print("Connected to " + ("internal panda" if jungle.is_internal() else "External panda") + f" id: {jungle.get_serial()[0]}: {jungle.get_version()}")
     for bus in range(3):
-      print(bus, jungle.can_health(bus))
+      print(f"\nBus {bus}:")
+      health = jungle.can_health(bus)
+      for key, value in health.items():
+        print(f"{key}: {colorize_errors(value)}  ", end=" ")
     print()
     time.sleep(1)
diff --git a/board/jungle/scripts/can_printer.py b/board/jungle/scripts/can_printer.py
index f620d6f12..05cc802aa 100755
--- a/board/jungle/scripts/can_printer.py
+++ b/board/jungle/scripts/can_printer.py
@@ -12,22 +12,27 @@ def sec_since_boot():
 
 def can_printer():
   p = PandaJungle()
+  print(f"Connected to: {p._serial}: {p.get_version()}")
+  time.sleep(1)
+
+  p.can_clear(0xFFFF)
 
   start = sec_since_boot()
   lp = sec_since_boot()
   msgs = defaultdict(list)
-  canbus = int(os.getenv("CAN", "0"))
+  canbus = os.getenv("CAN")
   while True:
     can_recv = p.can_recv()
-    for address, dat, src  in can_recv:
-      if src == canbus:
-        msgs[address].append(dat)
+    for address,dat, src in can_recv:
+      if canbus is None or str(src) == canbus:
+        msgs[address].append((dat, src))
 
     if sec_since_boot() - lp > 0.1:
       dd = chr(27) + "[2J"
       dd += "%5.2f\n" % (sec_since_boot() - start)
-      for k,v in sorted(zip(list(msgs.keys()), [binascii.hexlify(x[-1]) for x in list(msgs.values())], strict=True)):
-        dd += "%s(%6d) %s\n" % ("%04X(%4d)" % (k,k),len(msgs[k]), v)
+      for k, v in sorted(msgs.items()):
+        last_msg, last_src = v[-1]
+        dd += "%d: %s(%6d): %s\n" % (last_src, "%04X(%4d)" % (k, k), len(v), binascii.hexlify(last_msg).decode())
       print(dd)
       lp = sec_since_boot()
 
diff --git a/board/jungle/scripts/spam_can.py b/board/jungle/scripts/spam_can.py
new file mode 100755
index 000000000..c3d798b47
--- /dev/null
+++ b/board/jungle/scripts/spam_can.py
@@ -0,0 +1,20 @@
+#!/usr/bin/env python3
+import os
+import random
+from panda import PandaJungle
+
+def get_test_string():
+  return b"test" + os.urandom(10)
+
+if __name__ == "__main__":
+  p = PandaJungle()
+
+  p.set_safety_mode(PandaJungle.SAFETY_ALLOUTPUT)
+
+  print("Spamming all buses...")
+  while True:
+    at = random.randint(1, 2000)
+    st = get_test_string()[0:8]
+    bus = random.randint(0, 2)
+    p.can_send(at, st, bus)
+    # print("Sent message on bus: ", bus)
diff --git a/tests/can_health.py b/tests/can_health.py
new file mode 100755
index 000000000..26de9cdab
--- /dev/null
+++ b/tests/can_health.py
@@ -0,0 +1,29 @@
+#!/usr/bin/env python3
+import time
+import re
+from panda import Panda
+
+RED = '\033[91m'
+GREEN = '\033[92m'
+
+def colorize_errors(value):
+  if isinstance(value, str):
+    if re.search(r'(?i)No error', value):
+      return f'{GREEN}{value}\033[0m'
+    elif re.search(r'(?i)(?<!No error\s)(err|error)', value):
+      return f'{RED}{value}\033[0m'
+  return str(value)
+
+if __name__ == "__main__":
+
+  panda = Panda()
+  while True:
+    print(chr(27) + "[2J") # clear screen
+    print("Connected to " + ("internal panda" if panda.is_internal() else "External panda") + f" id: {panda.get_serial()[0]}: {panda.get_version()}")
+    for bus in range(3):
+      print(f"\nBus {bus}:")
+      health = panda.can_health(bus)
+      for key, value in health.items():
+        print(f"{key}: {colorize_errors(value)}  ", end=" ")
+    print()
+    time.sleep(1)
diff --git a/tests/can_printer.py b/tests/can_printer.py
index 70a18a61b..791f8e75d 100755
--- a/tests/can_printer.py
+++ b/tests/can_printer.py
@@ -12,28 +12,28 @@ def sec_since_boot():
 
 def can_printer():
   p = Panda()
+  print(f"Connected to id: {p.get_serial()[0]}: {p.get_version()}")
+  time.sleep(1)
+
+  p.can_clear(0xFFFF)
   p.set_safety_mode(Panda.SAFETY_ALLOUTPUT)
 
   start = sec_since_boot()
   lp = sec_since_boot()
   msgs = defaultdict(list)
-
-  canbus = int(os.getenv("CAN", "0"))
-  if canbus == 3:
-    canbus = 1
-    p.set_obd(True)
-
+  canbus = os.getenv("CAN")
   while True:
     can_recv = p.can_recv()
     for address, dat, src in can_recv:
-      if src == canbus:
-        msgs[address].append(dat)
+      if canbus is None or str(src) == canbus:
+        msgs[address].append((dat, src))
 
     if sec_since_boot() - lp > 0.1:
       dd = chr(27) + "[2J"
       dd += "%5.2f\n" % (sec_since_boot() - start)
-      for k, v in sorted(zip(list(msgs.keys()), [binascii.hexlify(x[-1]) for x in list(msgs.values())], strict=True)):
-        dd += "%s(%6d) %s\n" % ("%04X(%4d)" % (k, k), len(msgs[k]), v)
+      for k, v in sorted(msgs.items()):
+        last_msg, last_src = v[-1]
+        dd += "%d: %s(%6d): %s\n" % (last_src, "%04X(%4d)" % (k, k), len(v), binascii.hexlify(last_msg).decode())
       print(dd)
       lp = sec_since_boot()