diff --git a/HITL-tests/driver_testing/HITL_table_test.py b/HITL-tests/driver_testing/HITL_table_test.py index e1fc389c..52e6a8db 100644 --- a/HITL-tests/driver_testing/HITL_table_test.py +++ b/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() diff --git a/utils/__init__.py b/HITL-tests/driver_testing/__init__.py similarity index 100% rename from utils/__init__.py rename to HITL-tests/driver_testing/__init__.py diff --git a/HITL-tests/file_transmitter.py b/HITL-tests/file_transmitter.py index 487c6573..25a84a77 100644 --- a/HITL-tests/file_transmitter.py +++ b/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 diff --git a/HITL-tests/flight_unit_downlink.py b/HITL-tests/flight_unit_downlink.py index 2e8e8d35..f7300434 100644 --- a/HITL-tests/flight_unit_downlink.py +++ b/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() diff --git a/communications/ax5043_manager/__init__.py b/communications/ax5043_manager/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/communications/codec.py b/communications/codec.py index 9ece664a..a831f95b 100644 --- a/communications/codec.py +++ b/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 diff --git a/communications/codecs.py b/communications/codecs.py index 79d2385a..4d545b86 100644 --- a/communications/codecs.py +++ b/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") diff --git a/communications/command_definitions.py b/communications/command_definitions.py index 03edf089..e9901683 100644 --- a/communications/command_definitions.py +++ b/communications/command_definitions.py @@ -5,12 +5,12 @@ 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. @@ -18,20 +18,20 @@ 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): diff --git a/communications/command_handler.py b/communications/command_handler.py index af56feb1..226a75d8 100644 --- a/communications/command_handler.py +++ b/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: diff --git a/communications/commands.py b/communications/commands.py index d20b3302..8a475eb7 100644 --- a/communications/commands.py +++ b/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): diff --git a/communications/groundstation.py b/communications/groundstation.py index f90a32f0..cd9386f1 100644 --- a/communications/groundstation.py +++ b/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: diff --git a/communications/satellite_radio.py b/communications/satellite_radio.py index ea8903fb..e141aed9 100644 --- a/communications/satellite_radio.py +++ b/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 diff --git a/drivers/device.py b/drivers/device.py index fe149412..a7ec906b 100644 --- a/drivers/device.py +++ b/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): diff --git a/drivers/imu.py b/drivers/imu.py index 21e20ed7..babc4e3e 100644 --- a/drivers/imu.py +++ b/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) diff --git a/drivers/nemo/__init__.py b/drivers/nemo/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/drivers/power/loadswitch.py b/drivers/power/loadswitch.py index 19e7d9f5..9f660620 100644 --- a/drivers/power/loadswitch.py +++ b/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 diff --git a/drivers/power/power_controller.py b/drivers/power/power_controller.py index 73a88eb7..c727e8fc 100644 --- a/drivers/power/power_controller.py +++ b/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 diff --git a/flight_modes/attitude_adjustment.py b/flight_modes/attitude_adjustment.py index d74ac107..02896fca 100644 --- a/flight_modes/attitude_adjustment.py +++ b/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 diff --git a/flight_modes/flight_mode.py b/flight_modes/flight_mode.py index 2c8bce22..5865e0ba 100644 --- a/flight_modes/flight_mode.py +++ b/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, diff --git a/flight_modes/flight_mode_factory.py b/flight_modes/flight_mode_factory.py index 5dc13a83..f6b405f6 100644 --- a/flight_modes/flight_mode_factory.py +++ b/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, diff --git a/flight_modes/low_battery.py b/flight_modes/low_battery.py index fe58a1ae..2ebbf9ec 100644 --- a/flight_modes/low_battery.py +++ b/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): diff --git a/flight_modes/maneuver_flightmode.py b/flight_modes/maneuver_flightmode.py index 28a8fe7b..269b98ea 100644 --- a/flight_modes/maneuver_flightmode.py +++ b/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) diff --git a/flight_modes/opnav_flightmode.py b/flight_modes/opnav_flightmode.py index d6d90df7..ab52d13d 100644 --- a/flight_modes/opnav_flightmode.py +++ b/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 diff --git a/flight_modes/restart_reboot.py b/flight_modes/restart_reboot.py index b1351eae..bf2a8ed7 100644 --- a/flight_modes/restart_reboot.py +++ b/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): diff --git a/fsw_main/__init__.py b/fsw_main/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/main.py b/fsw_main/main.py similarity index 98% rename from main.py rename to fsw_main/main.py index 820394d3..c9693934 100644 --- a/main.py +++ b/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 diff --git a/utils/.gitignore b/fsw_utils/.gitignore similarity index 100% rename from utils/.gitignore rename to fsw_utils/.gitignore diff --git a/utils/HITL_parameters b/fsw_utils/HITL_parameters similarity index 100% rename from utils/HITL_parameters rename to fsw_utils/HITL_parameters diff --git a/fsw_utils/__init__.py b/fsw_utils/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/utils/boot_cause.py b/fsw_utils/boot_cause.py similarity index 100% rename from utils/boot_cause.py rename to fsw_utils/boot_cause.py diff --git a/utils/constants.py b/fsw_utils/constants.py similarity index 100% rename from utils/constants.py rename to fsw_utils/constants.py diff --git a/utils/cqc.py b/fsw_utils/cqc.py similarity index 100% rename from utils/cqc.py rename to fsw_utils/cqc.py diff --git a/utils/db.py b/fsw_utils/db.py similarity index 100% rename from utils/db.py rename to fsw_utils/db.py diff --git a/utils/db_functions.py b/fsw_utils/db_functions.py similarity index 97% rename from utils/db_functions.py rename to fsw_utils/db_functions.py index 811a645e..bb3a82a2 100644 --- a/utils/db_functions.py +++ b/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 diff --git a/utils/exceptions.py b/fsw_utils/exceptions.py similarity index 100% rename from utils/exceptions.py rename to fsw_utils/exceptions.py diff --git a/utils/gom_util.py b/fsw_utils/gom_util.py similarity index 99% rename from utils/gom_util.py rename to fsw_utils/gom_util.py index 71de2a13..3fb854ea 100644 --- a/utils/gom_util.py +++ b/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 diff --git a/utils/hydrogen_parameters b/fsw_utils/hydrogen_parameters similarity index 100% rename from utils/hydrogen_parameters rename to fsw_utils/hydrogen_parameters diff --git a/utils/log.py b/fsw_utils/log.py similarity index 100% rename from utils/log.py rename to fsw_utils/log.py diff --git a/utils/orbital_utils.py b/fsw_utils/orbital_utils.py similarity index 100% rename from utils/orbital_utils.py rename to fsw_utils/orbital_utils.py diff --git a/utils/oxygen_parameters b/fsw_utils/oxygen_parameters similarity index 100% rename from utils/oxygen_parameters rename to fsw_utils/oxygen_parameters diff --git a/utils/parameter_utils.py b/fsw_utils/parameter_utils.py similarity index 93% rename from utils/parameter_utils.py rename to fsw_utils/parameter_utils.py index 95912fb9..56b7c990 100644 --- a/utils/parameter_utils.py +++ b/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 diff --git a/utils/parameters.py b/fsw_utils/parameters.py similarity index 100% rename from utils/parameters.py rename to fsw_utils/parameters.py diff --git a/utils/struct.py b/fsw_utils/struct.py similarity index 100% rename from utils/struct.py rename to fsw_utils/struct.py diff --git a/opnav/core/camera.py b/opnav/core/camera.py index 374d3b98..659f6c69 100644 --- a/opnav/core/camera.py +++ b/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: diff --git a/opnav/core/find_algos/find_with_contours.py b/opnav/core/find_algos/find_with_contours.py index 885f6d1f..2a9eb2d0 100644 --- a/opnav/core/find_algos/find_with_contours.py +++ b/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 diff --git a/opnav/core/find_algos/find_with_hough_transform_and_contours.py b/opnav/core/find_algos/find_with_hough_transform_and_contours.py index 1174e389..fa5faace 100644 --- a/opnav/core/find_algos/find_with_hough_transform_and_contours.py +++ b/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 diff --git a/opnav/core/observe_functions.py b/opnav/core/observe_functions.py index 97bec6d1..b5693908 100644 --- a/opnav/core/observe_functions.py +++ b/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 diff --git a/opnav/core/opnav.py b/opnav/core/opnav.py index 68321b72..378764fe 100644 --- a/opnav/core/opnav.py +++ b/opnav/core/opnav.py @@ -24,20 +24,20 @@ from opnav.core.const import OPNAV_EXIT_STATUS, CisLunarCameraParameters # , BodyEnum from opnav.core.observe_functions import * -from utils.db import ( +from fsw_utils.db import ( create_sensor_tables_from_path, OpNavTrajectoryStateModel, OpNavAttitudeStateModel, ) -from utils.db import ( +from fsw_utils.db import ( OpNavEphemerisModel, OpNavCameraMeasurementModel, OpNavPropulsionModel, OpNavGyroMeasurementModel, ) -from utils.constants import SURRENDER_LOCAL_DIR, DB_FILE, OPNAV_MEDIA_DIR -from utils.log import * -import utils.parameters as params +from fsw_utils.constants import SURRENDER_LOCAL_DIR, DB_FILE, OPNAV_MEDIA_DIR +from fsw_utils.log import * +import fsw_utils.parameters as params import numpy as np from datetime import datetime, timezone diff --git a/opnav/experiments/extract_frames_test.py b/opnav/experiments/extract_frames_test.py index 38d46878..594bb9bc 100644 --- a/opnav/experiments/extract_frames_test.py +++ b/opnav/experiments/extract_frames_test.py @@ -1,9 +1,9 @@ from opnav.core.preprocess import extract_frames from opnav.core.sense import select_camera, record_video -from utils.constants import OPNAV_MEDIA_DIR +from fsw_utils.constants import OPNAV_MEDIA_DIR from opnav.core.const import CameraRecordingParameters from opnav.core.opnav import __get_elapsed_time -import utils.parameters as params +import fsw_utils.parameters as params from picamera import PiCamera import time import numpy as np diff --git a/opnav/experiments/extract_frames_test_v2.py b/opnav/experiments/extract_frames_test_v2.py index ae1e27b2..c6486543 100644 --- a/opnav/experiments/extract_frames_test_v2.py +++ b/opnav/experiments/extract_frames_test_v2.py @@ -1,8 +1,8 @@ from opnav.core.preprocess import extract_frames from opnav.core.sense import select_camera, record_video -from utils.constants import OPNAV_MEDIA_DIR +from fsw_utils.constants import OPNAV_MEDIA_DIR from opnav.core.const import CameraRecordingParameters -import utils.parameters as params +import fsw_utils.parameters as params # from picamera import PiCamera import argparse diff --git a/opnav/simulations/sim/src/opnav_sim.py b/opnav/simulations/sim/src/opnav_sim.py index 5b3b86d2..930a64ac 100644 --- a/opnav/simulations/sim/src/opnav_sim.py +++ b/opnav/simulations/sim/src/opnav_sim.py @@ -15,7 +15,7 @@ st_circle, is_illuminated, ) -from utils.constants import FLIGHT_SOFTWARE_PATH +from fsw_utils.constants import FLIGHT_SOFTWARE_PATH # Limitations: # * No BRDF, PSF diff --git a/opnav/tests/ang_size_testing.py b/opnav/tests/ang_size_testing.py index 4e75441c..c7038c92 100644 --- a/opnav/tests/ang_size_testing.py +++ b/opnav/tests/ang_size_testing.py @@ -5,7 +5,7 @@ import os # from opnav.core.find_algos.tiled_remap import -from utils.constants import FLIGHT_SOFTWARE_PATH +from fsw_utils.constants import FLIGHT_SOFTWARE_PATH def stereographic_inv(x, y): diff --git a/opnav/tests/test_body_meas.py b/opnav/tests/test_body_meas.py index 8981b1d3..10840dd1 100644 --- a/opnav/tests/test_body_meas.py +++ b/opnav/tests/test_body_meas.py @@ -4,14 +4,14 @@ import json import re import logging -from utils.log import log +from fsw_utils.log import log import numpy as np from opnav.core.find_algos.tiled_remap import st_to_sph from opnav.core.const import BodyEnum, FileData, DetectionData, Vector3 from opnav.core.observe_functions import cam_to_body, body_to_T0 from opnav.core.opnav import calculate_cam_measurements -from utils.constants import FLIGHT_SOFTWARE_PATH +from fsw_utils.constants import FLIGHT_SOFTWARE_PATH class BodyMeas(unittest.TestCase): diff --git a/opnav/tests/test_center_finding.py b/opnav/tests/test_center_finding.py index 70ae5bd6..bc7dfd14 100644 --- a/opnav/tests/test_center_finding.py +++ b/opnav/tests/test_center_finding.py @@ -8,9 +8,9 @@ import math import unittest import time -from utils.constants import FLIGHT_SOFTWARE_PATH +from fsw_utils.constants import FLIGHT_SOFTWARE_PATH -from utils.log import log +from fsw_utils.log import log from opnav.core.find_algos.find_with_hough_transform_and_contours import find from opnav.core.const import BodyEnum diff --git a/opnav/tests/test_detections.py b/opnav/tests/test_detections.py index 0b137882..3f400187 100644 --- a/opnav/tests/test_detections.py +++ b/opnav/tests/test_detections.py @@ -1,5 +1,5 @@ from opnav.core.find_algos.find_with_contours import find -from utils.constants import FLIGHT_SOFTWARE_PATH, SURRENDER_LOCAL_DIR +from fsw_utils.constants import FLIGHT_SOFTWARE_PATH, SURRENDER_LOCAL_DIR import numpy as np import unittest import glob diff --git a/opnav/tests/test_end_to_end.py b/opnav/tests/test_end_to_end.py index 08d8347d..d113dc9a 100644 --- a/opnav/tests/test_end_to_end.py +++ b/opnav/tests/test_end_to_end.py @@ -3,10 +3,10 @@ import glob # import logging -from utils.log import log +from fsw_utils.log import log from opnav.tests import test_center_finding, test_reprojections, test_body_meas from opnav.core.const import BodyEnum -from utils.constants import FLIGHT_SOFTWARE_PATH +from fsw_utils.constants import FLIGHT_SOFTWARE_PATH import re import numpy as np diff --git a/opnav/tests/test_pipeline.py b/opnav/tests/test_pipeline.py index 10074415..9d5f128a 100644 --- a/opnav/tests/test_pipeline.py +++ b/opnav/tests/test_pipeline.py @@ -8,19 +8,19 @@ import opnav.core.const as opnav_constants from tests.const import CesiumTestCameraParameters -from utils.db import ( +from fsw_utils.db import ( create_sensor_tables_from_path, OpNavTrajectoryStateModel, OpNavAttitudeStateModel, ) -from utils.db import ( +from fsw_utils.db import ( OpNavEphemerisModel, OpNavCameraMeasurementModel, OpNavPropulsionModel, OpNavGyroMeasurementModel, RebootsModel, ) -from utils.constants import DB_FILE +from fsw_utils.constants import DB_FILE # import utils.parameters as params diff --git a/opnav/tests/test_reprojections.py b/opnav/tests/test_reprojections.py index 5c281877..ef85f047 100644 --- a/opnav/tests/test_reprojections.py +++ b/opnav/tests/test_reprojections.py @@ -5,7 +5,7 @@ import os from opnav.core.find_algos import tiled_remap import unittest -from utils.constants import FLIGHT_SOFTWARE_PATH +from fsw_utils.constants import FLIGHT_SOFTWARE_PATH DATA_DIR = str(FLIGHT_SOFTWARE_PATH) + "/opnav/simulations/sim/data/" diff --git a/sim/__init__.py b/sim/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/telemetry/dummy_sensors.py b/telemetry/dummy_sensors.py index 93919a1f..710f1d72 100644 --- a/telemetry/dummy_sensors.py +++ b/telemetry/dummy_sensors.py @@ -1,4 +1,4 @@ -from utils.parameters import HIGH_CRACKING_PRESSURE +from fsw_utils.parameters import HIGH_CRACKING_PRESSURE from telemetry.sensor import SynchronousSensor diff --git a/telemetry/sensor.py b/telemetry/sensor.py index 7780ec02..532aa396 100644 --- a/telemetry/sensor.py +++ b/telemetry/sensor.py @@ -2,7 +2,7 @@ from typing import TYPE_CHECKING if TYPE_CHECKING: - from main import MainSatelliteThread + from fsw_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(self._main) is, without causing any circular imports at runtime. diff --git a/telemetry/telemetry.py b/telemetry/telemetry.py index 105fa3ea..63b1030b 100644 --- a/telemetry/telemetry.py +++ b/telemetry/telemetry.py @@ -10,11 +10,11 @@ from drivers.power.power_structs import eps_hk_t from telemetry.sensor import SynchronousSensor -from utils.constants import DB_FILE, MAX_GYRO_RATE, DownlinkKwargs as dk +from fsw_utils.constants import DB_FILE, MAX_GYRO_RATE, DownlinkKwargs as dk # from utils.db import GyroModel -from utils.db import TelemetryModel, create_sensor_tables_from_path -from utils.exceptions import ( +from fsw_utils.db import TelemetryModel, create_sensor_tables_from_path +from fsw_utils.exceptions import ( PiSensorError, PressureError, GomSensorError, diff --git a/tests/bitflip_test.py b/tests/bitflip_test.py index b5137e93..9268877e 100644 --- a/tests/bitflip_test.py +++ b/tests/bitflip_test.py @@ -1,7 +1,7 @@ -from main import MainSatelliteThread -from utils.exceptions import DeserializationException +from main.main import MainSatelliteThread +from fsw_utils.exceptions import DeserializationException import unittest -from utils import constants +from fsw_utils import constants from typing import List import logging diff --git a/tests/command_test.py b/tests/command_test.py index 668db126..d3b3538d 100644 --- a/tests/command_test.py +++ b/tests/command_test.py @@ -28,10 +28,10 @@ import logging import unittest -from utils.constants import CommandEnum, FMEnum, CommandKwargs as ck -from main import MainSatelliteThread +from fsw_utils.constants import CommandEnum, FMEnum, CommandKwargs as ck +from main.main import MainSatelliteThread from communications.command_handler import CommandHandler -import utils.parameters as params +import fsw_utils.parameters as params class CommandTest(unittest.TestCase): @@ -119,7 +119,7 @@ def test_manual_fm_commands(self): def test_get_param_command(self): """Tests whether we can 'get' the value of every parameter thru the command structure.""" - from utils.parameter_utils import get_parameter_list, get_parameter_from_name + from fsw_utils.parameter_utils import get_parameter_list, get_parameter_from_name param_list = get_parameter_list() # loop thru all parameters and get their value diff --git a/tests/commands_def_test.py b/tests/commands_def_test.py index 811a074f..755e80a4 100644 --- a/tests/commands_def_test.py +++ b/tests/commands_def_test.py @@ -1,4 +1,4 @@ -from utils.constants import CommandEnum +from fsw_utils.constants import CommandEnum from communications.command_definitions import COMMAND_LIST import unittest diff --git a/tests/db_test.py b/tests/db_test.py index 111c70b3..534cf8fd 100644 --- a/tests/db_test.py +++ b/tests/db_test.py @@ -1,7 +1,7 @@ from time import time -from utils.db import create_sensor_tables_from_path, TelemetryModel -from utils import db_functions +from fsw_utils.db import create_sensor_tables_from_path, TelemetryModel +from fsw_utils import db_functions MEMORY_DB_PATH = "sqlite://" diff --git a/tests/env_test.py b/tests/env_test.py index a8aadc25..005fff5c 100644 --- a/tests/env_test.py +++ b/tests/env_test.py @@ -1,4 +1,4 @@ -import utils.constants as consts +import fsw_utils.constants as consts def test_env(): diff --git a/tests/gom_config_test.py b/tests/gom_config_test.py index 76dced18..b0ec00c2 100644 --- a/tests/gom_config_test.py +++ b/tests/gom_config_test.py @@ -1,9 +1,9 @@ from random import randint import drivers.power.power_structs as ps -from main import MainSatelliteThread -from utils.constants import CommandEnum +from main.main import MainSatelliteThread +from fsw_utils.constants import CommandEnum from communications.command_handler import CommandHandler -from utils.gom_util import ( +from fsw_utils.gom_util import ( dict_from_eps_config, eps_config_from_dict, dict_from_eps_config2, diff --git a/tests/main_test.py b/tests/main_test.py index ce78fac6..ac3dce13 100644 --- a/tests/main_test.py +++ b/tests/main_test.py @@ -5,7 +5,7 @@ """ import unittest from drivers.devices import DeviceContainer -from main import MainSatelliteThread +from main.main import MainSatelliteThread from queue import Queue from communications.command_handler import CommandHandler diff --git a/tests/maneuver_test.py b/tests/maneuver_test.py index e85a2822..f99dbae7 100644 --- a/tests/maneuver_test.py +++ b/tests/maneuver_test.py @@ -2,10 +2,10 @@ from queue import PriorityQueue import pytest -import utils.constants as consts -import utils.parameters as params +import fsw_utils.constants as consts +import fsw_utils.parameters as params from flight_modes.maneuver_flightmode import ManeuverMode -from main import MainSatelliteThread +from main.main import MainSatelliteThread from drivers.gom import Gomspace from drivers.power.loadswitch import mockGPIOLoadSwitch, mockP31uLoadSwitch import logging diff --git a/tests/parameters_test.py b/tests/parameters_test.py index 8bab31d0..7f0a0456 100644 --- a/tests/parameters_test.py +++ b/tests/parameters_test.py @@ -1,5 +1,5 @@ import os -from utils import parameter_utils, parameters +from fsw_utils import parameter_utils, parameters import json import unittest