Skip to content

Commit 2142041

Browse files
committed
corrected errors, more readable, send to each other
1 parent 95d7410 commit 2142041

File tree

3 files changed

+289
-166
lines changed

3 files changed

+289
-166
lines changed

src/flight-software/main.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,9 @@
2727

2828
boot_time: float = time.time()
2929

30-
cube_ids = ["Listener1", "Listener2", "Listener3"]
31-
my_cubesat_id = "Listener1"
30+
# Satellite configuration constants
31+
CUBE_IDS = ["Listener1", "Listener2", "Listener3"]
32+
MY_CUBESAT_ID = "Listener1"
3233

3334
rtc = MicrocontrollerManager()
3435

@@ -137,8 +138,8 @@
137138
logger.info("Entering main loop")
138139
while True:
139140
# TODO(nateinaction): Modify behavior based on power state
140-
nominal_power_loop(logger, uhf_packet_manager, sleep_helper, my_cubesat_id="Listener1")
141-
#nominal_power_loop(logger, uhf_packet_manager, sleep_helper, cube_id=["Listener1", "Listener2", "Listener3"])
141+
listener_nominal_power_loop(logger, uhf_packet_manager, sleep_helper)
142+
#nominal_power_loop(logger, uhf_packet_manager, sleep_helper, cube_ids=["Listener1", "Listener2", "Listener3"])
142143

143144
except Exception as e:
144145
logger.critical("Critical in Main Loop", e)

src/flight-software/repl.py

Lines changed: 37 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,47 @@ def hard_reboot():
3737
from lib.pysquared.rtc.manager.microcontroller import MicrocontrollerManager
3838
from lib.pysquared.sleep_helper import SleepHelper
3939
from lib.pysquared.watchdog import Watchdog
40-
from version import __version__
41-
from utils import nominal_power_loop, listener_nominal_power_loop, test_sd, update_leaderboard, display_leaderboard, send_leaderboard, send_leaderboard_power_loop
4240

43-
from lib.adafruit_mcp230xx.mcp23017 import (
44-
MCP23017, # This is Hacky V5a Devel Stuff###
41+
# Local imports
42+
from version import __version__
43+
from utils import (
44+
nominal_power_loop,
45+
listener_nominal_power_loop,
46+
test_sd,
47+
update_leaderboard,
48+
display_leaderboard,
49+
send_leaderboard,
50+
send_leaderboard_power_loop,
4551
)
4652

53+
54+
def erase_system():
55+
"""Erase the filesystem to allow new code to be written to the board."""
56+
storage.erase_filesystem()
57+
58+
59+
def hard_reboot():
60+
"""Perform a hard reboot of the microcontroller."""
61+
microcontroller.reset()
62+
63+
64+
def get_temp(sensor):
65+
"""
66+
Get temperature readings from a sensor for testing purposes.
67+
68+
Args:
69+
sensor: Temperature sensor object
70+
"""
71+
for i in range(1000):
72+
print(sensor.get_temperature().value)
73+
time.sleep(0.1)
74+
75+
76+
# Initialize RTC
4777
rtc = MicrocontrollerManager()
4878

49-
logger: Logger = Logger(
79+
# Initialize logger
80+
logger = Logger(
5081
error_counter=Counter(0),
5182
colorized=False,
5283
)
@@ -57,13 +88,7 @@ def hard_reboot():
5788
software_version=__version__,
5889
)
5990

60-
61-
def get_temp(sensor):
62-
for i in range(1000):
63-
print(sensor.get_temperature().value)
64-
time.sleep(0.1)
65-
66-
91+
# Initialize watchdog
6792
watchdog = Watchdog(logger, board.WDT_WDI)
6893
watchdog.pet()
6994

0 commit comments

Comments
 (0)