Set up FSW to be plugged into the Sim

HITL-tests/driver_testing/HITL_table_test.py

@@ -4,7 +4,7 @@
 import logging
 import time
 
-from utils.constants import GomOutputs
+from fsw_utils.constants import GomOutputs
 
 HITL_test = pc.Power()
 

HITL-tests/file_transmitter.py

@@ -1,4 +1,4 @@
-from utils.constants import MIN_COMMAND_SIZE, FMEnum, CommandCommandEnum, FLIGHT_SOFTWARE_PATH
+from fsw_utils.constants import MIN_COMMAND_SIZE, FMEnum, CommandCommandEnum, FLIGHT_SOFTWARE_PATH
 from communications.satellite_radio import Radio
 from communications.commands import CommandHandler
 from communications.downlink import DownlinkHandler

HITL-tests/flight_unit_downlink.py

@@ -1,6 +1,6 @@
 from communications.satellite_radio import Radio
 from drivers.gom import Gomspace
-import utils.parameters as params
+import fsw_utils.parameters as params
 from time import sleep
 
 radio = Radio()

communications/codec.py

@@ -1,4 +1,4 @@
-from utils.struct import packer_dict
+from fsw_utils.struct import packer_dict
 from typing import Dict, Any
 
 

communications/codecs.py

@@ -1,5 +1,5 @@
 from communications.codec import Codec
-from utils.constants import DownlinkKwargs as dk
+from fsw_utils.constants import DownlinkKwargs as dk
 
 
 TIME_codec = Codec(dk.RTC_TIME, "double")

communications/command_definitions.py

@@ -5,33 +5,33 @@
 from communications.codec import Codec
 from communications.commands import Command
 from communications import codecs
-from utils import parameter_utils
+from fsw_utils import parameter_utils
 
-from utils import gom_util
+from fsw_utils import gom_util
 
 if TYPE_CHECKING:
-    from main import MainSatelliteThread
+    from main.main import MainSatelliteThread
 # for an explanation of the above 4 lines of code, see
 # https://stackoverflow.com/questions/39740632/python-type-hinting-without-cyclic-imports
 # It lets your IDE know what type(main) is, without causing any circular imports at runtime.
 
 import drivers.power.power_structs as ps
 import time
 import hashlib
-from utils.constants import (
+from fsw_utils.constants import (
     FMEnum,
     CommandEnum,
     CommandKwargs as ck,
     DownlinkKwargs as dk,
     GomConfKwargs,
 )
-import utils.constants as consts
-from utils.exceptions import CommandArgException
+import fsw_utils.constants as consts
+from fsw_utils.exceptions import CommandArgException
 import subprocess
 
 
 import os
-import utils.parameters as params
+import fsw_utils.parameters as params
 
 
 class FM_Switch(Command):

communications/command_handler.py

@@ -1,11 +1,11 @@
 from __future__ import annotations
 from typing import TYPE_CHECKING, Any, Union
-from utils import parameter_utils
+from fsw_utils import parameter_utils
 
 if TYPE_CHECKING:
-    from main import MainSatelliteThread
+    from fsw_main.main import MainSatelliteThread
 
-from utils.constants import (
+from fsw_utils.constants import (
     DATA_OFFSET,
     MAC_LENGTH,
     COUNTER_OFFSET,
@@ -22,11 +22,11 @@
 import hashlib
 from communications.commands import Command
 from communications.command_definitions import COMMAND_DICT
-from utils.exceptions import CommandUnpackingException
+from fsw_utils.exceptions import CommandUnpackingException
 from communications.downlink import bit_inflation
 from communications.groundstation import bit_deflation
 import logging
-import utils.parameters as params
+import fsw_utils.parameters as params
 
 
 def compute_mac(data: bytes) -> bytes:

communications/commands.py

@@ -1,15 +1,15 @@
 from __future__ import annotations
 
 from abc import ABC, abstractmethod
-from utils.constants import MAX_COMMAND_SIZE, MIN_COMMAND_SIZE, CommandEnum
-from utils.exceptions import CommandException
+from fsw_utils.constants import MAX_COMMAND_SIZE, MIN_COMMAND_SIZE, CommandEnum
+from fsw_utils.exceptions import CommandException
 from typing import TYPE_CHECKING, Union, Dict, List, Any, Optional
 from communications.codec import Codec
 import logging
 
 
 if TYPE_CHECKING:
-    from main import MainSatelliteThread
+    from main.main import MainSatelliteThread
 
 
 class Command(ABC):

communications/groundstation.py

@@ -9,7 +9,7 @@
 
 from communications.satellite_radio import Radio
 
-from utils.constants import ZERO_WORD, ONE_WORD
+from fsw_utils.constants import ZERO_WORD, ONE_WORD
 
 
 class Groundstation:

communications/satellite_radio.py

@@ -3,7 +3,7 @@
 
 from adafruit_blinka.agnostic import board_id
 
-from utils.constants import ZERO_WORD, ONE_WORD
+from fsw_utils.constants import ZERO_WORD, ONE_WORD
 
 from drivers.device import Device, DeviceEnum
 

drivers/device.py

@@ -1,7 +1,7 @@
 from abc import ABC, abstractmethod
 import logging
 from typing import Any
-from utils.constants import StringEnum
+from fsw_utils.constants import StringEnum
 
 
 class DeviceEnum(StringEnum):

drivers/imu.py

@@ -5,8 +5,8 @@
     import busio
 import adafruit_fxos8700
 import adafruit_fxas21002c
-from utils.constants import GYRO_RANGE
-import utils.parameters as params
+from fsw_utils.constants import GYRO_RANGE
+import fsw_utils.parameters as params
 from drivers.device import Device, DeviceEnum
 
 gyro_biases = (params.GYRO_BIAS_X, params.GYRO_BIAS_Y, params.GYRO_BIAS_Z)

drivers/power/loadswitch.py

@@ -5,7 +5,7 @@
 import time
 from dataclasses import dataclass
 
-from utils.constants import GomOutputs
+from fsw_utils.constants import GomOutputs
 import random
 
 

drivers/power/power_controller.py

@@ -14,9 +14,9 @@
 
 import pigpio
 import drivers.power.power_structs as ps
-from utils.constants import GomOutputs
-import utils.parameters as params
-from utils.exceptions import PowerInputError, PowerReadError  # , PowerException
+from fsw_utils.constants import GomOutputs
+import fsw_utils.parameters as params
+from fsw_utils.exceptions import PowerInputError, PowerReadError  # , PowerException
 from time import sleep
 import logging
 

flight_modes/attitude_adjustment.py

@@ -2,8 +2,8 @@
 # import numpy as np
 # from typing import Tuple
 from time import sleep, time
-from utils.constants import FMEnum, GOM_TIMING_FUDGE_FACTOR
-import utils.parameters as params
+from fsw_utils.constants import FMEnum, GOM_TIMING_FUDGE_FACTOR
+import fsw_utils.parameters as params
 from flight_modes.flight_mode import PauseBackgroundMode
 import logging
 

flight_modes/flight_mode.py

@@ -3,7 +3,7 @@
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
-    from main import MainSatelliteThread
+    from main.main import MainSatelliteThread
 
     # for an explanation of the above 4 lines of code, see
     # https://stackoverflow.com/questions/39740632/python-type-hinting-without-cyclic-imports
@@ -17,10 +17,10 @@
 from traceback import format_tb
 import logging
 
-import utils.constants as consts
-import utils.parameters as params
+import fsw_utils.constants as consts
+import fsw_utils.parameters as params
 
-from utils.exceptions import UnknownFlightModeException
+from fsw_utils.exceptions import UnknownFlightModeException
 
 no_transition_modes = [
     consts.FMEnum.SensorMode.value,

flight_modes/flight_mode_factory.py

@@ -13,8 +13,8 @@
 from flight_modes.restart_reboot import RestartMode, BootUpMode
 from flight_modes.maneuver_flightmode import ManeuverMode
 from flight_modes.attitude_adjustment import AAMode
-from utils.constants import FMEnum
-from utils.exceptions import UnknownFlightModeException
+from fsw_utils.constants import FMEnum
+from fsw_utils.exceptions import UnknownFlightModeException
 
 FLIGHT_MODE_DICT = {
     FMEnum.Boot.value: BootUpMode,

flight_modes/low_battery.py

@@ -2,8 +2,8 @@
 from time import sleep, time
 
 from flight_modes.flight_mode import FlightMode
-from utils import parameters as params
-from utils.constants import *
+from fsw_utils import parameters as params
+from fsw_utils.constants import *
 
 
 class LowBatterySafetyMode(FlightMode):

flight_modes/maneuver_flightmode.py

@@ -2,9 +2,9 @@
 
 from .flight_mode import PauseBackgroundMode
 import logging
-from utils.parameter_utils import set_parameter
-import utils.constants as consts
-import utils.parameters as params
+from fsw_utils.parameter_utils import set_parameter
+import fsw_utils.constants as consts
+import fsw_utils.parameters as params
 
 
 NO_ARGS = ([], 0)

flight_modes/opnav_flightmode.py

@@ -4,8 +4,8 @@
 from sqlalchemy.exc import SQLAlchemyError
 from multiprocessing import Process
 
-from utils.constants import FMEnum
-from utils.db import OpNavCoordinatesModel
+from fsw_utils.constants import FMEnum
+from fsw_utils.db import OpNavCoordinatesModel
 import logging
 from .flight_mode import PauseBackgroundMode
 

flight_modes/restart_reboot.py

@@ -1,12 +1,12 @@
 import time
 from datetime import datetime
-from utils.db import create_sensor_tables_from_path, RebootsModel
-from utils.constants import DB_FILE, BOOTUP_SEPARATION_DELAY, NO_FM_CHANGE, FMEnum
+from fsw_utils.db import create_sensor_tables_from_path, RebootsModel
+from fsw_utils.constants import DB_FILE, BOOTUP_SEPARATION_DELAY, NO_FM_CHANGE, FMEnum
 from flight_modes.flight_mode import FlightMode
 import os
 import logging
 import psutil
-import utils.parameters as params
+import fsw_utils.parameters as params
 
 
 class BootUpMode(FlightMode):

main.py → fsw_main/main.py

@@ -9,22 +9,22 @@
 import logging
 from time import sleep
 import sys
-import utils.constants as consts
+import fsw_utils.constants as consts
 
 # from drivers.dummy_sensors import PressureSensor
 from flight_modes.restart_reboot import RestartMode, BootUpMode
 from flight_modes.flight_mode_factory import build_flight_mode
 from communications.command_handler import CommandHandler
 from telemetry.telemetry import Telemetry
-from utils.boot_cause import hard_boot
+from fsw_utils.boot_cause import hard_boot
 from udp_client.client import Client
 
 from communications.comms_driver import CommunicationsSystem
 from drivers.devices import DeviceContainer
 from drivers.nemo.nemo_manager import NemoManager
 import opnav.core.camera as camera
-from utils.parameter_utils import init_parameters
-from utils.db import create_sensor_tables_from_path
+from fsw_utils.parameter_utils import init_parameters
+from fsw_utils.db import create_sensor_tables_from_path
 from sim.sim_data import SimData
 
 

utils/db_functions.py → fsw_utils/db_functions.py

@@ -1,20 +1,20 @@
 from typing import Dict
 
-from utils.db import TelemetryModel, CommandModel, RebootsModel
-from utils.db import (
+from fsw_utils.db import TelemetryModel, CommandModel, RebootsModel
+from fsw_utils.db import (
     OpNavTrajectoryStateModel,
     OpNavAttitudeStateModel,
     OpNavPropulsionModel,
 )
-from utils.db import (
+from fsw_utils.db import (
     OpNavEphemerisModel,
     OpNavCameraMeasurementModel,
     OpNavGyroMeasurementModel,
 )
-from utils.db import SQLAlchemyTableBase
+from fsw_utils.db import SQLAlchemyTableBase
 
 # from utils.db import create_sensor_tables_from_path
-from utils.constants import DB_ENTRY_LIMIT
+from fsw_utils.constants import DB_ENTRY_LIMIT
 import logging
 
 # TODO change MEMORY_DB_PATH back to DB_FILE

utils/gom_util.py → fsw_utils/gom_util.py

@@ -1,5 +1,5 @@
 import drivers.power.power_structs as ps
-from utils.constants import GomConfKwargs
+from fsw_utils.constants import GomConfKwargs
 from typing import Dict, List, cast
 
 

utils/parameter_utils.py → fsw_utils/parameter_utils.py

@@ -1,7 +1,7 @@
 from json import load, dump
-from utils.constants import PARAMETERS_JSON_PATH
-from utils import parameters
-from utils.exceptions import CislunarException
+from fsw_utils.constants import PARAMETERS_JSON_PATH
+from fsw_utils import parameters
+from fsw_utils.exceptions import CislunarException
 from typing import Dict, Any, List, Union
 import os
 

opnav/core/camera.py

@@ -16,7 +16,7 @@
 import time
 from fractions import Fraction
 
-from utils.log import *
+from fsw_utils.log import *
 
 
 class CameraMux:

opnav/core/find_algos/find_with_contours.py

@@ -3,7 +3,7 @@
     CameraParameters,
     CisLunarCameraParameters,
 )
-from utils.log import log
+from fsw_utils.log import log
 from dataclasses import dataclass
 import cv2
 import numpy as np

opnav/core/find_algos/find_with_hough_transform_and_contours.py

@@ -4,7 +4,7 @@
     CisLunarCameraParameters,
     BodyEnum,
 )
-from utils.parameters import (
+from fsw_utils.parameters import (
     EARTH_B_LOW,
     EARTH_G_LOW,
     EARTH_R_LOW,
@@ -28,7 +28,7 @@
     MOON_PERCENTAGE_THRESH,
 )
 from opnav.core.find_algos.tiled_remap import *
-from utils.log import log
+from fsw_utils.log import log
 
 import cv2
 import numpy as np

opnav/core/observe_functions.py

@@ -15,7 +15,7 @@
 if board_id and board_id != "GENERIC_LINUX_PC":
     from picamera import PiCamera
 
-from utils.constants import OPNAV_MEDIA_DIR
+from fsw_utils.constants import OPNAV_MEDIA_DIR
 
 import numpy as np
 import math