From 977d702770ec8eb0701cd2c7e20a93804fe16bcd Mon Sep 17 00:00:00 2001
From: Adeeb Shihadeh <adeebshihadeh@gmail.com>
Date: Fri, 4 Aug 2023 10:40:53 -0700
Subject: [PATCH] cleanup old pedal stuff (#1552)

---
 board/pedal/{README => README.md} | 0
 board/pedal/flash_can.sh          | 4 ++--
 board/pedal/recover.sh            | 2 +-
 tests/pedal/test_pedal.py         | 3 ---
 4 files changed, 3 insertions(+), 6 deletions(-)
 rename board/pedal/{README => README.md} (100%)

diff --git a/board/pedal/README b/board/pedal/README.md
similarity index 100%
rename from board/pedal/README
rename to board/pedal/README.md
diff --git a/board/pedal/flash_can.sh b/board/pedal/flash_can.sh
index 0225bf8d..b9edf25f 100755
--- a/board/pedal/flash_can.sh
+++ b/board/pedal/flash_can.sh
@@ -2,7 +2,7 @@
 set -e
 
 cd ..
-PEDAL=1 scons -u -j$(nproc)
+scons -u -j$(nproc)
 cd pedal
 
-../../tests/pedal/enter_canloader.py ../obj/pedal.bin.signed
+../../tests/pedal/enter_canloader.py obj/pedal.bin.signed
diff --git a/board/pedal/recover.sh b/board/pedal/recover.sh
index f81f6727..d7fe0aff 100755
--- a/board/pedal/recover.sh
+++ b/board/pedal/recover.sh
@@ -4,7 +4,7 @@ set -e
 DFU_UTIL="dfu-util"
 
 cd ..
-PEDAL=1 scons -u -j$(nproc)
+scons -u -j$(nproc)
 cd pedal
 
 $DFU_UTIL -d 0483:df11 -a 0 -s 0x08004000 -D obj/pedal.bin.signed
diff --git a/tests/pedal/test_pedal.py b/tests/pedal/test_pedal.py
index a4bc5724..04c293e0 100755
--- a/tests/pedal/test_pedal.py
+++ b/tests/pedal/test_pedal.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 import os
 import time
-import subprocess
 import unittest
 
 from panda import Panda, PandaJungle, CanHandle, McuType, BASEDIR
@@ -44,7 +43,6 @@ class TestPedal(unittest.TestCase):
     return msgs
 
   def test_usb_fw(self):
-    subprocess.check_output(f"cd {BASEDIR} && PEDAL=1 PEDAL_USB=1 scons", shell=True)
     self._flash_over_can(PEDAL_BUS, f"{BASEDIR}/board/pedal/obj/pedal_usb.bin.signed")
     time.sleep(2)
     with Panda(PEDAL_SERIAL) as p:
@@ -52,7 +50,6 @@ class TestPedal(unittest.TestCase):
     self.assertTrue(self._listen_can_frames() > 40)
 
   def test_nonusb_fw(self):
-    subprocess.check_output(f"cd {BASEDIR} && PEDAL=1 scons", shell=True)
     self._flash_over_can(PEDAL_BUS, f"{BASEDIR}board/pedal/obj/pedal.bin.signed")
     time.sleep(2)
     self.assertTrue(self._listen_can_frames() > 40)