2222except ImportError :
2323 import board
2424
25- from lib .proveskit_rp2040_v4 .register import BitIndex , Register
25+ from lib .proveskit_rp2040_v4 .register import Register
2626from lib .pysquared .beacon import Beacon
2727from lib .pysquared .cdh import CommandDataHandler
2828from lib .pysquared .config .config import Config
3434from lib .pysquared .hardware .radio .packetizer .packet_manager import PacketManager
3535from lib .pysquared .logger import Logger
3636from lib .pysquared .nvm .counter import Counter
37- from lib .pysquared .nvm .flag import Flag
3837from lib .pysquared .rtc .manager .microcontroller import MicrocontrollerManager
3938from lib .pysquared .sleep_helper import SleepHelper
4039from lib .pysquared .watchdog import Watchdog
4645
4746(boot_count := Counter (index = Register .boot_count )).increment ()
4847error_count : Counter = Counter (index = Register .error_count )
49- use_fsk = Flag (index = Register .flag , bit_index = BitIndex .use_fsk )
5048
5149logger : Logger = Logger (
5250 error_counter = error_count ,
8280 radio = RFM9xManager (
8381 logger ,
8482 config .radio ,
85- use_fsk ,
8683 spi0 ,
8784 initialize_pin (logger , board .SPI0_CS0 , digitalio .Direction .OUTPUT , True ),
8885 initialize_pin (logger , board .RF1_RST , digitalio .Direction .OUTPUT , True ),
118115 imu ,
119116 magnetometer ,
120117 radio ,
121- use_fsk ,
122118 error_count ,
123119 boot_count ,
124120 )
@@ -127,9 +123,7 @@ def initial_boot():
127123 watchdog .pet ()
128124 beacon .send ()
129125 watchdog .pet ()
130- message : bytes | None = packet_manager .listen ()
131- if message :
132- cdh .message_handler (message )
126+ cdh .listen_for_commands ()
133127 watchdog .pet ()
134128
135129 try :
@@ -153,40 +147,30 @@ def main():
153147
154148 watchdog .pet ()
155149
156- message : bytes | None = packet_manager .listen ()
157- if message :
158- cdh .message_handler (message )
150+ cdh .listen_for_commands ()
159151
160152 sleep_helper .safe_sleep (config .sleep_duration )
161153
162154 # TODO(nateinaction): replace me
163155 # f.state_of_health()
164156
165- message : bytes | None = packet_manager .listen ()
166- if message :
167- cdh .message_handler (message )
157+ cdh .listen_for_commands ()
168158
169159 sleep_helper .safe_sleep (config .sleep_duration )
170160
171- message : bytes | None = packet_manager .listen ()
172- if message :
173- cdh .message_handler (message )
161+ cdh .listen_for_commands ()
174162
175163 sleep_helper .safe_sleep (config .sleep_duration )
176164
177- message : bytes | None = packet_manager .listen ()
178- if message :
179- cdh .message_handler (message )
165+ cdh .listen_for_commands ()
180166
181167 sleep_helper .safe_sleep (config .sleep_duration )
182168
183169 packet_manager .send (random .choice (config .jokes ).encode ("utf-8" ))
184170
185171 watchdog .pet ()
186172
187- message : bytes | None = packet_manager .listen ()
188- if message :
189- cdh .message_handler (message )
173+ cdh .listen_for_commands ()
190174
191175 sleep_helper .safe_sleep (config .sleep_duration )
192176
0 commit comments