diff --git a/GUI.py b/GUI.py index 90d180d..30245e8 100644 --- a/GUI.py +++ b/GUI.py @@ -1,11 +1,20 @@ from Rewrite import * +import time link = "" -fetch_gonogo() -fetch_major_concerns() +fetchGonogo() +fetchMajorConcerns() -print(update_gonogo()) -print(update_major_concerns()) +print(updateGonogo()) +print(updateMajorConcerns()) #T and L toggle -#Scrub \ No newline at end of file +#Scrub + +structTime = time.strptime("29 January 2026 20 21 0", "%d %B %Y %H %M %S") +getLaunchTime(structTime) +while True: + t1 = time.monotonic() + print(updateCountdown()) + t2 = time.monotonic() + sleep(1.0 - (t2 - t1)) \ No newline at end of file diff --git a/Rewrite.py b/Rewrite.py index 09c37aa..1b203aa 100644 --- a/Rewrite.py +++ b/Rewrite.py @@ -1,17 +1,18 @@ import csv import io import requests +from time import * +from calendar import timegm session = requests.Session() -def fetch_gonogo(Manual, GUIVariables, link): - # Make GoNoGo Global +def fetchGonogo(Manual = False, GUIVariables = ["N/A", "N/A", "N/A"], link = None): global weather, Range, vehicle # if GUI controlled if Manual: try: # Get Range, Weather and vehicle from GUI - Range = GUIVariables[0] + Range = GUIVariables[0] weather = GUIVariables[1] vehicle = GUIVariables[2] return[Range, weather, vehicle] @@ -25,8 +26,7 @@ def fetch_gonogo(Manual, GUIVariables, link): vehicle = pullSpreedsheet(16, 2, link) return[Range, weather, vehicle] -def fetch_major_concerns(Manual = False, GUIVariables = None, link = None): - # Make concerns global +def fetchMajorConcerns(Manual = True, GUIVariables = "N/A", link = None): global concerns # if GUI controlled if Manual: @@ -42,10 +42,10 @@ def fetch_major_concerns(Manual = False, GUIVariables = None, link = None): concerns = pullSpreedsheet(11, 4, link) return concerns -def update_gonogo(): +def updateGonogo(): return[Range, weather, vehicle] -def update_major_concerns(): +def updateMajorConcerns(): return concerns def pullSpreedsheet(inputCol, inputRow, link): @@ -67,4 +67,20 @@ def pullSpreedsheet(inputCol, inputRow, link): return pulledcell[0] except Exception as e: print(f"[ERROR] Failed to fetch Go/No-Go from sheet: {e}") - return None \ No newline at end of file + return "N/A" + +def getLaunchTime(structTime): + global launchTime + launchTime = timegm(structTime) + +def updateCountdown(): + # are we counting up yet? + if time() > launchTime: + countUp = False + else: countUp = True + # return the secconds till or after launchTime + # possible overflow, may need to swap time() with monotonic() + if countUp: + return int(launchTime - time() + 1) + else: + return int(time() - launchTime) \ No newline at end of file diff --git a/config.py b/config.py index bd1fc12..3ee1189 100644 --- a/config.py +++ b/config.py @@ -14,6 +14,7 @@ Border_Color = "#FFFFFF" Go_Color = "#00FF00" No-Go_Color = "#FF0000" Caution_Color = "#FFA500" +Concerns_Update_Rate = 2 Font_Size = 20 [Other]