Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rewrite 89 #92

Merged
merged 7 commits into from
Feb 19, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions MainControlLoop/lib/StateFieldRegistry/registry.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ def __init__(self):
StateField.IRIDIUM_LAST_MESSAGE_TIME: 0.0,
StateField.APRS_LAST_BEACON_TIME: 0.0,
StateField.LAST_ARCHIVE_TIME: 0.0,

# SYSTEM INFO
StateField.NOT_FIRST_BOOT: False,
StateField.ANTENNA_DEPLOYED: False
}

self.hardware_faults = {
Expand Down
8 changes: 8 additions & 0 deletions MainControlLoop/lib/StateFieldRegistry/state_fields.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@ class StateField(Enum):
APRS_LAST_BEACON_TIME = 'APRS_LAST_BEACON_TIME'
LAST_ARCHIVE_TIME = 'LAST_ARCHIVE_TIME'

# SYSTEM INFO
NOT_FIRST_BOOT = "FIRST_BOOT"
ANTENNA_DEPLOYED = "ANTENNA_DEPLOY"


class ErrorFlag(Enum):
ANTENNA_DEPLOYER_FAILURE = "ANTENNA_DEPLOYER_FAILURE"
Expand Down Expand Up @@ -87,6 +91,10 @@ class ErrorFlag(Enum):
StateField.IRIDIUM_LAST_MESSAGE_TIME: float,
StateField.APRS_LAST_BEACON_TIME: float,
StateField.LAST_ARCHIVE_TIME: float,

# SYSTEM INFO
StateField.NOT_FIRST_BOOT: bool,
StateField.ANTENNA_DEPLOYED: bool
}

for state_field in StateField:
Expand Down
3 changes: 3 additions & 0 deletions MainControlLoop/main_control_loop.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from MainControlLoop.lib.StateFieldRegistry import StateFieldRegistry, StateFieldRegistryLocker
from MainControlLoop.tasks.PiMonitor import PiMonitorTask
from MainControlLoop.tasks.StateFieldRegistryArchiver import StateFieldRegistryArchiver
from MainControlLoop.tasks.APRS import APRSTask
from MainControlLoop.tasks.Iridium import IridiumTask
from MainControlLoop.tasks.core import Core
Expand All @@ -11,6 +12,7 @@ def __init__(self):
self.state_field_registry: StateFieldRegistry = StateFieldRegistry()
self.locker: StateFieldRegistryLocker = StateFieldRegistryLocker()
self.pi_monitor: PiMonitorTask = PiMonitorTask(self.state_field_registry)
self.archiver: StateFieldRegistryArchiver = StateFieldRegistryArchiver(self.state_field_registry, self.locker)
self.aprs_task: APRSTask = APRSTask(self.state_field_registry, self.locker)
self.iridium_task: IridiumTask = IridiumTask(self.state_field_registry)
self.core: Core = Core(self.state_field_registry, self.aprs_task)
Expand All @@ -24,6 +26,7 @@ def execute(self):

# CONTROL BLOCK
self.core.control(commands)
self.archiver.control()
self.aprs_task.control(commands)

# ACTUATE BLOCK
Expand Down
2 changes: 1 addition & 1 deletion MainControlLoop/tasks/PiMonitor/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
from MainControlLoop.tasks.PiMonitor.pi_monitor_task import PiMonitorTask
from MainControlLoop.tasks.PiMonitor.task import PiMonitorTask
17 changes: 17 additions & 0 deletions MainControlLoop/tasks/PiMonitor/antenna_deploy_read_task.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
from time import time as sys_time
from os import path

from MainControlLoop.lib.StateFieldRegistry import StateFieldRegistry, StateField


class AntennaDeployReadTask:

def __init__(self, state_field_registry: StateFieldRegistry):
self.state_field_registry: StateFieldRegistry = state_field_registry

def execute(self):
"""
Checks if antenna has been deployed
:return: (None)
"""
self.state_field_registry.update(StateField.ANTENNA_DEPLOYED, path.exists("/root/antenna_deployed"))
19 changes: 19 additions & 0 deletions MainControlLoop/tasks/PiMonitor/first_boot_read_task.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
from time import time as sys_time
from os import path

from MainControlLoop.lib.StateFieldRegistry import StateFieldRegistry, StateField


class FirstBootReadTask:

def __init__(self, state_field_registry: StateFieldRegistry):
self.state_field_registry: StateFieldRegistry = state_field_registry

def execute(self):
"""
Checks if current boot is first boot
:return: (None)
"""
self.state_field_registry.update(StateField.NOT_FIRST_BOOT, path.exists("/root/first_boot"))


Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
from MainControlLoop.lib.StateFieldRegistry import StateFieldRegistry
from MainControlLoop.tasks.PiMonitor.system_time_read_task import SystemTimeReadTask
from MainControlLoop.tasks.PiMonitor.first_boot_read_task import FirstBootReadTask
from MainControlLoop.tasks.PiMonitor.antenna_deploy_read_task import AntennaDeployReadTask


class PiMonitorTask:

def __init__(self, state_field_registry: StateFieldRegistry):
self.state_field_registry: StateFieldRegistry = state_field_registry
self.sys_time_read_task = SystemTimeReadTask(self.state_field_registry)
self.first_boot_read_task = FirstBootReadTask(self.state_field_registry)
self.antenna_deploy_read_task = AntennaDeployReadTask(self.state_field_registry)

def read(self):
self.sys_time_read_task.execute()
self.first_boot_read_task.execute()
self.antenna_deploy_read_task.execute()
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
from .archiver import StateFieldRegistryArchiver
16 changes: 16 additions & 0 deletions MainControlLoop/tasks/StateFieldRegistryArchiver/archiver.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
from MainControlLoop.lib.StateFieldRegistry import StateFieldRegistry, StateField, StateFieldRegistryLocker


class StateFieldRegistryArchiver:
ARCHIVE_INTERVAL = 30

def __init__(self, state_field_registry: StateFieldRegistry, locker: StateFieldRegistryLocker):
self.state_field_registry: StateFieldRegistry = state_field_registry
self.locker: StateFieldRegistryLocker = locker

def control(self):
last_archive_time: float = self.state_field_registry.get(StateField.LAST_ARCHIVE_TIME)
current_sys_time: float = self.state_field_registry.get(StateField.SYS_TIME)

if current_sys_time - last_archive_time > self.ARCHIVE_INTERVAL:
self.locker.store(self.state_field_registry)