refactored some testings, updated makefile, removed compile.sh, added…

… old firmware
wyattduber · May 3, 2023 · ad77c16 · ad77c16
1 parent bcafe32
commit ad77c16
Show file tree

Hide file tree

Showing 13 changed files with 2 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@ default:
 	python -m pip install -r requirements.txt
 
 build: gui/app.py cli/
-	python -m PyInstaller --windowed --noconfirm -i ".\gui\qtdesigner\assets\CyDAQ_Logo_vector.ico" -n "CyDAQ" --onefile --add-data="cli;cli" gui/app.py cli/*.py
+    python -m PyInstaller --windowed --noconfirm -i ".\gui\qtdesigner\assets\CyDAQ_Logo_vector.ico" -n "CyDAQ" --splash ".\images\CyDAQ.jpg" --onefile --add-data="cli;cli" gui/app.py cli/*.py
 
 clean:
 	rm -rvf build/ dist/ CyDAQ.spec
diff --git a/cli/testing/cli_test.py → testing/cli/cli_test.py b/cli/testing/cli_test.py → testing/cli/cli_test.py
diff --git a/cli/testing/cli_testing2.py → testing/cli/cli_testing2.py b/cli/testing/cli_testing2.py → testing/cli/cli_testing2.py
diff --git a/cli/testing/speed_test.py → testing/cli/speed_test.py b/cli/testing/speed_test.py → testing/cli/speed_test.py
diff --git a/testing/old-firmware-boot/BOOT.bin b/testing/old-firmware-boot/BOOT.bin
diff --git a/testing/serial2.py → testing/serial/serial2.py b/testing/serial2.py → testing/serial/serial2.py
diff --git a/testing/serial_physical_testing.py → testing/serial/serial_physical_testing.py b/testing/serial_physical_testing.py → testing/serial/serial_physical_testing.py
diff --git a/testing/serial_testing.py → testing/serial/serial_testing.py b/testing/serial_testing.py → testing/serial/serial_testing.py
diff --git a/testing/test.py → testing/serial/test.py b/testing/test.py → testing/serial/test.py
diff --git a/testing/test2.py → testing/serial/test2.py b/testing/test2.py → testing/serial/test2.py
diff --git a/testing/test3.py → testing/wrapper/test3.py b/testing/test3.py → testing/wrapper/test3.py
@@ -1,5 +1,5 @@
 import sys
-sys.path.insert(0, "../cli")
+sys.path.insert(0, "../../cli")
 import CLIWrapper
 
 

diff --git a/cli/testing/wrapper_bb_testing.py → testing/wrapper/wrapper_bb_testing.py b/cli/testing/wrapper_bb_testing.py → testing/wrapper/wrapper_bb_testing.py
diff --git a/cli/testing/wrapper_bb_testing2.py → testing/wrapper/wrapper_bb_testing2.py b/cli/testing/wrapper_bb_testing2.py → testing/wrapper/wrapper_bb_testing2.py