diff --git a/satsim/modules/gamma.py b/satsim/modules/gamma.py index d13a401..9c6003a 100644 --- a/satsim/modules/gamma.py +++ b/satsim/modules/gamma.py @@ -1,4 +1,4 @@ -from module import module +from .module import module from random import randint class gamma_sensor(module): def __init__(self): diff --git a/satsim/modules/heartbeat.py b/satsim/modules/heartbeat.py index 7c17c80..1299edd 100644 --- a/satsim/modules/heartbeat.py +++ b/satsim/modules/heartbeat.py @@ -1,4 +1,4 @@ -from module import module +from .module import module class heartbeat_module(module): def __init__(self): diff --git a/satsim/modules/location.py b/satsim/modules/location.py index d6ae70d..54dadc2 100644 --- a/satsim/modules/location.py +++ b/satsim/modules/location.py @@ -1,4 +1,4 @@ -from module import module +from .module import module class location_module(module): id_c = 0 def __init__(self): diff --git a/satsim/modules/module.py b/satsim/modules/module.py index 15ccace..6a26ff7 100644 --- a/satsim/modules/module.py +++ b/satsim/modules/module.py @@ -1,4 +1,3 @@ - class module: id_c = 0 def __init__(self, name): diff --git a/satsim/satsim.py b/satsim/satsim.py index 3c8b064..73367b5 100644 --- a/satsim/satsim.py +++ b/satsim/satsim.py @@ -1,7 +1,7 @@ import numpy as np -from gamma import gamma_sensor -from heartbeat import heartbeat_module -from location import location_module +from modules.gamma import gamma_sensor +from modules.heartbeat import heartbeat_module +from modules.location import location_module from time import sleep from astropy.coordinates import SkyCoord as sc from os import system @@ -57,6 +57,7 @@ class sat: for m in self.modules: self.modules[m].mod_update() + if self.modules["heartbeat"].mod_get("kill")[0] == 1: print("heading to bed") return