Skip to content

Commit c51d239

Browse files
committed
Radio appears to be working
1 parent 0c45816 commit c51d239

File tree

2 files changed

+11
-14
lines changed

2 files changed

+11
-14
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ PYSQUARED ?= git+https://github.com/proveskit/pysquared@$(PYSQUARED_VERSION)
2020
download-libraries: uv .venv ## Download the required libraries
2121
@echo "Downloading libraries..."
2222
@$(UV) pip install --requirement lib/requirements.txt --target lib --no-deps --upgrade --quiet
23-
$(UV) pip --no-cache install $(PYSQUARED) --target lib --no-deps --upgrade --quiet
23+
@$(UV) pip --no-cache install $(PYSQUARED) --target lib --no-deps --upgrade --quiet
2424

2525
@rm -rf lib/*.dist-info
2626
@rm -rf lib/.lock

main.py

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@
3333
from lib.pysquared.watchdog import Watchdog
3434
from lib.pysquared.hardware.magnetometer.manager.lis2mdl import LIS2MDLManager
3535
from lib.pysquared.hardware.imu.manager.lsm6dsox import LSM6DSOXManager
36-
from lib.pysquared.hardware.busio import initialize_i2c_bus, initialize_spi_bus
36+
from lib.pysquared.hardware.busio import initialize_i2c_bus, _spi_init
37+
from lib.pysquared.cdh import CommandDataHandler
3738
from version import __version__
3839

3940
rtc = MicrocontrollerManager()
@@ -58,18 +59,18 @@
5859
logger.debug("Initializing Config")
5960
config: Config = Config("config.json")
6061

61-
spi0 = initialize_spi_bus(
62+
# TODO(nateinaction): fix spi init
63+
spi0 = _spi_init(
6264
logger,
6365
board.SPI0_SCK,
6466
board.SPI0_MOSI,
6567
board.SPI0_MISO,
6668
)
6769

68-
radio_manager = RFM9xManager(
70+
radio = RFM9xManager(
6971
logger,
7072
config.radio,
7173
Flag(index=register.FLAG, bit_index=7, datastore=microcontroller.nvm),
72-
config.is_licensed,
7374
spi0,
7475
initialize_pin(logger, board.SPI0_CS0, digitalio.Direction.OUTPUT, True),
7576
initialize_pin(logger, board.RF1_RST, digitalio.Direction.OUTPUT, True),
@@ -88,17 +89,20 @@
8889

8990
c = Satellite(logger, config)
9091

91-
sleep_helper = SleepHelper(c, logger)
92+
sleep_helper = SleepHelper(c, logger, watchdog)
93+
94+
cdh = CommandDataHandler(config, logger, radio)
9295

9396
f = functions.functions(
9497
c,
9598
logger,
9699
config,
97100
sleep_helper,
98-
radio_manager,
101+
radio,
99102
magnetometer,
100103
imu,
101104
watchdog,
105+
cdh,
102106
)
103107

104108
def initial_boot():
@@ -176,19 +180,15 @@ def minimum_power_operations():
176180
c.check_reboot()
177181

178182
if c.power_mode == "critical":
179-
c.rgb = (0, 0, 0)
180183
critical_power_operations()
181184

182185
elif c.power_mode == "minimum":
183-
c.rgb = (255, 0, 0)
184186
minimum_power_operations()
185187

186188
elif c.power_mode == "normal":
187-
c.rgb = (255, 255, 0)
188189
main()
189190

190191
elif c.power_mode == "maximum":
191-
c.rgb = (0, 255, 0)
192192
main()
193193

194194
else:
@@ -202,8 +202,5 @@ def minimum_power_operations():
202202
finally:
203203
logger.info("Going Neutral!")
204204

205-
c.rgb = (0, 0, 0)
206-
c.hardware["WDT"] = False
207-
208205
except Exception as e:
209206
logger.critical("An exception occured within main.py", e)

0 commit comments

Comments
 (0)