Fix get_parent for revert

Author: masonova1

.gitignore

@@ -6,12 +6,6 @@ filesystem/splash
 filesystem/Saves
 filesystem/lib
 
-production_files
-
 doc/build
 .vscode
 **/desktop.ini
-filesystem/system/settings.txt
-firmware_date.h
-filesystem/lib
-filesystem/Games/TempGames

build_and_upload.py

@@ -38,44 +38,20 @@ def get_drives():
 
 # ### Step 1: Get arguments
 arguments = sys.argv[1:]
-upload = True
 
 if len(arguments) > 0 and arguments[0] == "clean":
     execute(['make', '-C', '../ports/rp2', 'clean', 'BOARD=THUMBY_COLOR'])
     print("\n\nSUCCESS: Done cleaning rp2 port!\n")
     exit(1)
-elif len(arguments) > 0 and arguments[0] == "no_upload":
-    upload = False
-
-
-# ### Step 2: Get the date of the last commit and bake into firmware
-firmware_date_file = open("src/firmware_date.h", "w")
-commit_id   = os.popen('git rev-parse --short HEAD').read()
-commit_date = os.popen('git log -1 --format="%cd" --date=iso').read()
-commit_date = commit_date.splitlines()
-commit_date = commit_date[0]
-commit_date = commit_date.split(' ')
-commit_date = commit_date[0] + "_" + commit_date[1]
-firmware_date_file.write(f"""
-#ifndef FIRMWARE_DATE_H
-#define FIRMWARE_DATE_H
-
-#define FIRMWARE_DATE "{commit_date}"
-                             
-#endif
-""")
-firmware_date_file.close()
-
-# ### Step 3: Build the firmware (which will freeze everything in `modules`)
+
+
+# ### Step 2: Build the firmware (which will freeze everything in `modules`)
 print("\n\nBuilding rp2 port...\n")
 execute(['make', '-C', '../ports/rp2', '-j8', 'BOARD=THUMBY_COLOR', 'USER_C_MODULES=../../TinyCircuits-Tiny-Game-Engine/src/micropython.cmake'])
 print("\n\nDone building rp2 port!\n")
 
-# Rename UF2 if want to
-firmware_path = f"../ports/rp2/build-THUMBY_COLOR/firmware_{commit_id}.uf2"
-shutil.move("../ports/rp2/build-THUMBY_COLOR/firmware.uf2", firmware_path)
 
-# ### Step 4: Make sure output binary isn't larger than 1 MiB
+# ### Step 3: Make sure output binary isn't larger than 1 MiB
 #             as the flash is partitioned as FIRMWARE | SCRATCH | FILESYSTEM
 #             and only 1MiB is assumed for the max size of the binary
 #             (see resources/engine_resource_manager.c)
@@ -84,11 +60,7 @@ def get_drives():
 if output_bin_size >= 1 * 1024 * 1024:
     raise Exception("ERROR: Output binary size is too large! It can only be upto 1Mib in size. See: https://github.com/TinyCircuits/TinyCircuits-Tiny-Game-Engine/issues/66")
 
-# Exit if told not to upload
-if(upload is False):
-    exit(0)
-
-# ### Step 5: Assume that the port is plugged in and may be running a program, connect to it
+# ### Step 4: Assume that the port is plugged in and may be running a program, connect to it
 #             end program with ctrl-c, and put into BOOTLOADER mode for upload
 print("Looking for serial port to reset...")
 for port, desc, hwid in sorted(serial.tools.list_ports.comports()):
@@ -118,7 +90,7 @@ def get_drives():
         print("\nConnected and reset!\n")
 
 
-# ### Step 6: Find the BOOTSEL device and copy over the firmware
+# ### Step 5: Find the BOOTSEL device and copy over the firmware
 print("Finding drive letter... (may need to manually put into BOOTSEL mode)")
 mount = None
 done = False
@@ -134,7 +106,7 @@ def get_drives():
 print("Found drive! " + mount)
 
 print("Copying firmware to device...")
-execute(['sudo', 'cp', firmware_path, mount + "/firmware.uf2"])
+execute(['sudo', 'cp', '../ports/rp2/build-THUMBY_COLOR/firmware.uf2', mount + "/firmware.uf2"])
 print("SUCCESS: Copied firmware to device!\n")
 
 # Wait for logo to end if calling in succession with run.py