Rollback to Frontend adjustment commit (ad20d54) and rename sc1-data-format submodule to sc-data-format (#118)

* Initial plan

* Rollback to Frontend adjustment PR (ad20d54) and update sc1-data-format to sc-data-format submodule

Co-authored-by: sbasu107 <40325803+sbasu107@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: sbasu107 <40325803+sbasu107@users.noreply.github.com>

Author: Copilot

.github/workflows/deploy-frontend.yml

@@ -39,8 +39,6 @@ jobs:
         working-directory: Frontend
         run: npm run build
         env:
-          REACT_APP_API_URL: ${{ vars.REACT_APP_API_URL }}
-          REACT_APP_WS_URL: ${{ vars.REACT_APP_WS_URL }}
           NODE_OPTIONS: --openssl-legacy-provider
           CI: false
 

.gitmodules

@@ -1,6 +1,6 @@
-[submodule "Backend/Data/sc1-data-format"]
-	path = Backend/Data/sc1-data-format
-	url = git@github.com:badgerloop-software/sc1-data-format.git
+[submodule "Backend/Data/sc-data-format"]
+	path = Backend/Data/sc-data-format
+	url = git@github.com:badgerloop-software/sc-data-format.git
 	branch = main
 [submodule "Backend/file_sync"]
 	path = Backend/file_sync

Backend/Data/sc1-data-format Backend/Data/sc-data-formatBackend/Data/sc1-data-format renamed to Backend/Data/sc-data-format

@@ -1,74 +1,21 @@
 import os
 
-# ==================== DEPLOYMENT MODE ====================
-# Determines how the application runs:
-# - "local": Full features (Redis Stack, Serial, DataGenerator/Replayer)
-# - "cloud": Cloud-compatible mode (Convex, Upstash Redis, no serial)
-DEPLOYMENT_MODE = os.getenv("DEPLOYMENT_MODE", "local")
+DATAFORMAT_PATH = f'{os.getcwd()}/Data/sc-data-format/format.json'
+HOST_PORT = 4001
 
-# ==================== PATHS ====================
-DATAFORMAT_PATH = os.getenv(
-    "DATAFORMAT_PATH", 
-    f'{os.getcwd()}/Data/sc1-data-format/format.json'
-)
+REDIS_URL = '127.0.0.1'
+REDIS_PORT = 6379
+REDIS_DB = 0
 
-# ==================== SERVER SETTINGS ====================
-HOST_PORT = int(os.getenv("PORT", 4001))  # Render uses PORT env var
-HOST = os.getenv("HOST", "0.0.0.0")
+# TCP SETTINGS
+CAR_IP = '192.168.1.15'
+LOCAL_IP = '127.0.0.1'
+DATA_PORT = 4003
 
-# ==================== REDIS SETTINGS ====================
-# Local mode: Redis Stack with TimeSeries module
-# Cloud mode: Upstash Redis (standard Redis, no TimeSeries)
-if DEPLOYMENT_MODE == "cloud":
-    # Upstash Redis URL format: redis://default:password@host:port
-    REDIS_URL = os.getenv("UPSTASH_REDIS_URL", "")
-    REDIS_PORT = None  # URL contains port
-    REDIS_DB = 0
-    USE_TIMESERIES = False
-else:
-    REDIS_URL = os.getenv("REDIS_URL", "127.0.0.1")
-    REDIS_PORT = int(os.getenv("REDIS_PORT", 6379))
-    REDIS_DB = int(os.getenv("REDIS_DB", 0))
-    USE_TIMESERIES = True
+#UDP SETTINGS
+UDP_PORT = 4003
 
-# ==================== CONVEX SETTINGS ====================
-# Convex is used as the primary cloud database for real-time data
-CONVEX_URL = os.getenv("CONVEX_URL", "")
-CONVEX_DEPLOY_KEY = os.getenv("CONVEX_DEPLOY_KEY", "")
+VPS_URL = 'http://live.bsr-dev.org'
 
-# ==================== DATA SOURCE SETTINGS ====================
-# Which data sources are enabled
-ENABLE_SERIAL = DEPLOYMENT_MODE == "local"  # Serial only works locally
-ENABLE_UDP = DEPLOYMENT_MODE == "local"      # UDP only works locally
-ENABLE_CONVEX = bool(CONVEX_URL)             # Convex works in both modes
-
-# ==================== NETWORK SETTINGS (Local Mode) ====================
-CAR_IP = os.getenv("CAR_IP", "192.168.1.15")
-LOCAL_IP = os.getenv("LOCAL_IP", "127.0.0.1")
-DATA_PORT = int(os.getenv("DATA_PORT", 4003))
-UDP_PORT = int(os.getenv("UDP_PORT", 4003))
-
-# ==================== LEGACY VPS SETTINGS ====================
-VPS_URL = os.getenv("VPS_URL", "http://live.bsr-dev.org")
-
-# ==================== RUNTIME DATA ====================
-# Filled by the program at startup
+#Filled by the program
 FORMAT = dict()
-
-# ==================== HELPER FUNCTIONS ====================
-def is_cloud_mode():
-    return DEPLOYMENT_MODE == "cloud"
-
-def is_local_mode():
-    return DEPLOYMENT_MODE == "local"
-
-def print_config():
-    """Print current configuration for debugging"""
-    print(f"=== Chase Car Dashboard Configuration ===")
-    print(f"Deployment Mode: {DEPLOYMENT_MODE}")
-    print(f"Host: {HOST}:{HOST_PORT}")
-    print(f"Redis TimeSeries: {'Enabled' if USE_TIMESERIES else 'Disabled'}")
-    print(f"Serial Enabled: {ENABLE_SERIAL}")
-    print(f"UDP Enabled: {ENABLE_UDP}")
-    print(f"Convex Enabled: {ENABLE_CONVEX}")
-    print(f"=========================================")

Backend/config.py

@@ -313,7 +313,7 @@ def start_comms():
     # Start two live comm channels
     #vps_thread = threading.Thread(target=lambda : asyncio.run(telemetry.remote_db_fetch(config.VPS_URL)))
     #vps_thread.start()
-    socket_thread = threading.Thread(target=lambda: telemetry.listen_udp(config.UDP_PORT))
-    socket_thread.start()
-    #socket_thread = threading.Thread(target=lambda: telemetry.serial_read())
+    #socket_thread = threading.Thread(target=lambda: telemetry.listen_udp(config.UDP_PORT))
     #socket_thread.start()
+    socket_thread = threading.Thread(target=lambda: telemetry.serial_read())
+    socket_thread.start()

Backend/core/comms.py

@@ -2,39 +2,9 @@
 import serial.tools.list_ports
 from . import comms
 from pydantic import BaseModel
-import asyncio
 
 router = APIRouter()
 
-@router.websocket("/single-values")
-async def single_values_websocket(websocket: WebSocket):
-    await websocket.accept()
-    
-    while True:
-        try:
-            # Wait for client request
-            await websocket.receive_text()
-            
-            # Prepare data
-            if comms.solar_car_connection['udp'] or comms.solar_car_connection['lte'] or comms.solar_car_connection['serial']:
-                latest_data = comms.frontend_data.copy()
-                latest_data['solar_car_connection'] = True
-                latest_data['udp_status'] = comms.solar_car_connection['udp']
-                latest_data['lte_status'] = comms.solar_car_connection['lte']
-                latest_data['serial_status'] = comms.solar_car_connection['serial']
-                latest_data['timestamps'] = f'{latest_data.get("tstamp_hr", 0):02d}:{latest_data.get("tstamp_mn", 0):02d}:' \
-                                        f'{latest_data.get("tstamp_sc", 0):02d}.{latest_data.get("tstamp_ms", 0)}'
-                format_data = {}
-                for key in latest_data.keys():
-                    format_data[key] = [latest_data[key]]
-                json_data = {'response': format_data}
-                await websocket.send_json(json_data)
-            else:
-                await websocket.send_json({'response': None})
-        except Exception as e:
-            print(f"WebSocket error: {e}")
-            break
-
 @router.get("/single-values")
 async def single_values():
     if comms.solar_car_connection['udp'] or comms.solar_car_connection['lte'] or comms.solar_car_connection['serial']: