Skip to content

Commit 8f97a06

Browse files
committed
Remove legacy config options, improve install speed, update main and repl
1 parent dcf7bbb commit 8f97a06

File tree

5 files changed

+19
-29
lines changed

5 files changed

+19
-29
lines changed

Makefile

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,14 @@ help: ## Display this help.
1313
@$(UV) venv
1414
@$(UV) pip install --requirement pyproject.toml
1515

16-
LOCAL_PYSQUARED ?= ""
16+
PYSQUARED_VERSION ?= main
17+
PYSQUARED ?= git+https://github.com/proveskit/pysquared@$(PYSQUARED_VERSION)
1718

1819
.PHONY: download-libraries
1920
download-libraries: uv .venv ## Download the required libraries
2021
@echo "Downloading libraries..."
21-
@$(UV) pip install --requirement lib/requirements.txt --target lib --no-deps --upgrade --quiet; \
22-
23-
@if [ -n "$(LOCAL_PYSQUARED)" ]; then \
24-
$(UV) pip install $(LOCAL_PYSQUARED) --target lib --no-deps --upgrade --quiet; \
25-
else \
26-
$(UV) pip install git+https://github.com/proveskit/pysquared --target lib --no-deps --upgrade --quiet; \
27-
fi
22+
@$(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
2824

2925
@rm -rf lib/*.dist-info
3026
@rm -rf lib/.lock
@@ -83,7 +79,7 @@ define rsync_to_dest
8379
exit 1; \
8480
fi
8581

86-
@rsync -avh $(1)/config.json artifacts/proves/version.py $(1)/*.py $(1)/lib --exclude='requirements.txt' --exclude='__pycache__' $(2) --delete --times --checksum
82+
@rsync -avh $(1)/config.json artifacts/proves/version.py $(1)/*.py $(1)/lib --exclude=".*" --exclude='requirements.txt' --exclude='__pycache__' $(2) --delete --times --checksum
8783
endef
8884

8985
##@ Build Tools

config.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"cubesat_name": "Orpheus",
3-
"callsign": "KO6AZM",
43
"last_battery_temp": 20.0,
54
"sleep_duration": 30,
65
"detumble_enable_z": true,
@@ -44,10 +43,7 @@
4443
"Everything in life is a spring if you think hard enough!"
4544
],
4645
"debug": true,
47-
"legacy": false,
4846
"heating": false,
49-
"orpheus":true,
50-
"is_licensed":false,
5147
"normal_temp": 20,
5248
"normal_battery_temp": 1,
5349
"normal_micro_temp": 20,
@@ -59,6 +55,7 @@
5955
"reboot_time": 3600,
6056
"turbo_clock": false,
6157
"radio": {
58+
"license": "",
6259
"receiver_id": 250,
6360
"sender_id": 251,
6461
"start_time": 80000,

lib/requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
adafruit-circuitpython-asyncio @ git+https://github.com/adafruit/[email protected]
2-
proves-circuitpython-rv3028 @ git+https://github.com/proveskit/[email protected]
32
adafruit-circuitpython-drv2605==1.3.4
43
adafruit-circuitpython-lis2mdl==2.1.23
54
adafruit-circuitpython-lsm6ds==4.5.13
65
adafruit-circuitpython-mcp9808==3.3.24
76
adafruit-circuitpython-neopixel==6.3.12
87
adafruit-circuitpython-register==1.10.1
98
adafruit-circuitpython-rfm==1.0.3
10-
adafruit-circuitpython-tca9548a @ git+https://github.com/proveskit/Adafruit_CircuitPython_TCA9548A
9+
adafruit-circuitpython-tca9548a @ git+https://github.com/proveskit/Adafruit_CircuitPython_TCA9548A@1.0.0
1110
adafruit-circuitpython-ticks==1.1.1
1211
adafruit-circuitpython-veml7700==2.0.2
12+
proves-circuitpython-rv3028 @ git+https://github.com/proveskit/[email protected]

main.py

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,26 +21,25 @@
2121

2222
import lib.pysquared.functions as functions
2323
import lib.pysquared.nvm.register as register
24-
import lib.pysquared.pysquared as pysquared
24+
from lib.pysquared.satellite import Satellite
2525
from lib.pysquared.config.config import Config
2626
from lib.pysquared.hardware.digitalio import initialize_pin
27-
from lib.pysquared.hardware.rfm9x.factory import RFM9xFactory
28-
from lib.pysquared.hardware.rfm9x.manager import RFM9xManager
27+
from lib.pysquared.hardware.radio.manager.rfm9x import RFM9xManager
2928
from lib.pysquared.logger import Logger
3029
from lib.pysquared.nvm.counter import Counter
3130
from lib.pysquared.nvm.flag import Flag
32-
from lib.pysquared.rtc.rtc_common import RTC
31+
from lib.pysquared.rtc.manager.microcontroller import MicrocontrollerManager
3332
from lib.pysquared.sleep_helper import SleepHelper
3433
from version import __version__
3534

36-
RTC.init()
35+
rtc = MicrocontrollerManager()
3736

3837
logger: Logger = Logger(
3938
error_counter=Counter(index=register.ERRORCNT, datastore=microcontroller.nvm),
4039
colorized=False,
4140
)
4241

43-
logger.info("Booting", software_version=__version__, published_date="November 19, 2024")
42+
logger.info("Booting", software_version=__version__)
4443

4544
loiter_time: int = 5
4645

@@ -52,20 +51,18 @@
5251
logger.debug("Initializing Config")
5352
config: Config = Config("config.json")
5453

55-
c = pysquared.Satellite(config, logger, __version__)
54+
c = Satellite(logger, config)
5655
c.watchdog_pet()
5756
sleep_helper = SleepHelper(c, logger)
5857

5958
radio_manager = RFM9xManager(
6059
logger,
60+
config.radio,
6161
Flag(index=register.FLAG, bit_index=7, datastore=microcontroller.nvm),
62-
RFM9xFactory(
63-
c.spi0,
64-
initialize_pin(logger, board.SPI0_CS0, digitalio.Direction.OUTPUT, True),
65-
initialize_pin(logger, board.RF1_RST, digitalio.Direction.OUTPUT, True),
66-
config.radio,
67-
),
6862
config.is_licensed,
63+
c.spi0,
64+
initialize_pin(logger, board.SPI0_CS0, digitalio.Direction.OUTPUT, True),
65+
initialize_pin(logger, board.RF1_RST, digitalio.Direction.OUTPUT, True),
6966
)
7067

7168
f = functions.functions(c, logger, config, sleep_helper, radio_manager)

repl.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from lib.pysquared.config.config import Config
55
from lib.pysquared.logger import Logger
66
from lib.pysquared.nvm.counter import Counter
7-
from lib.pysquared.pysquared import Satellite
7+
from lib.pysquared.satellite import Satellite
88
from version import __version__
99

1010
logger: Logger = Logger(

0 commit comments

Comments
 (0)