Skip to content

Commit 8f3486e

Browse files
committed
Fixed Some Imports
Seems to be stable now!
1 parent fb42714 commit 8f3486e

File tree

5 files changed

+65
-31
lines changed

5 files changed

+65
-31
lines changed

lib/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ adafruit-circuitpython-ticks==1.1.1
1212
adafruit-circuitpython-veml7700==2.0.2
1313
Adafruit_CircuitPython_MCP230xx
1414
proves-circuitpython-rv3028 @ git+https://github.com/proveskit/[email protected]
15-
proves-circuitpython-sx1280 @ git+https://github.com/proveskit/CircuitPython_SX1280@ngay-stuffs
15+
proves-circuitpython-sx1280 @ git+https://github.com/proveskit/CircuitPython_SX1280@mike-dev

main.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,16 @@
99
"""
1010

1111
import gc
12-
import time
1312
import os
13+
import time
1414

15+
import board
1516
import digitalio
1617
import microcontroller
17-
import board
1818

1919
import lib.pysquared.functions as functions
2020
import lib.pysquared.nvm.register as register
21+
from lib.proves_sx1280.sx1280 import SX1280
2122
from lib.pysquared.cdh import CommandDataHandler
2223
from lib.pysquared.config.config import Config
2324
from lib.pysquared.hardware.busio import _spi_init, initialize_i2c_bus
@@ -32,7 +33,6 @@
3233
from lib.pysquared.satellite import Satellite
3334
from lib.pysquared.sleep_helper import SleepHelper
3435
from lib.pysquared.watchdog import Watchdog
35-
from lib.sx1280.sx1280 import SX1280
3636
from version import __version__
3737

3838
rtc = MicrocontrollerManager()

repl.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import time
1212

1313
import digitalio
14-
import microcontroller
1514

1615
try:
1716
# from board_definitions import proveskit_rp2040_v4 as board
@@ -23,12 +22,12 @@
2322

2423
import lib.pysquared.functions as functions
2524
import lib.pysquared.nvm.register as register
26-
import sx1280 ### This is Hacky V5a Devel Stuff###
2725
from lib.adafruit_mcp230xx.mcp23017 import (
2826
MCP23017, ### This is Hacky V5a Devel Stuff###
2927
)
3028
from lib.adafruit_mcp9808 import MCP9808 ### This is Hacky V5a Devel Stuff###
3129
from lib.adafruit_tca9548a import TCA9548A ### This is Hacky V5a Devel Stuff###
30+
from lib.proves_sx1280.sx1280 import SX1280
3231
from lib.pysquared.Big_Data import AllFaces ### This is Hacky V5a Devel Stuff###
3332
from lib.pysquared.cdh import CommandDataHandler
3433
from lib.pysquared.config.config import Config
@@ -49,7 +48,7 @@
4948
rtc = MicrocontrollerManager()
5049

5150
logger: Logger = Logger(
52-
error_counter=Counter(index=register.ERRORCNT, datastore=microcontroller.nvm),
51+
error_counter=Counter(index=register.ERRORCNT),
5352
colorized=False,
5453
)
5554

@@ -101,7 +100,7 @@
101100
radio = RFM9xManager(
102101
logger,
103102
config.radio,
104-
Flag(index=register.FLAG, bit_index=7, datastore=microcontroller.nvm),
103+
Flag(index=register.FLAG, bit_index=7),
105104
spi0,
106105
initialize_pin(logger, board.SPI0_CS0, digitalio.Direction.OUTPUT, True),
107106
initialize_pin(logger, board.RF1_RST, digitalio.Direction.OUTPUT, True),
@@ -137,7 +136,7 @@
137136
tx_en.direction = digitalio.Direction.OUTPUT
138137
rx_en.direction = digitalio.Direction.OUTPUT
139138

140-
radio2 = sx1280.SX1280(
139+
radio2 = SX1280(
141140
spi1, spi1_cs0, rf2_rst, rf2_busy, 2.4, debug=False, txen=tx_en, rxen=rx_en
142141
)
143142

typings/board.pyi

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ FIRE_DEPLOY1_B: microcontroller.Pin # GPIO29
5555
# SPI), MP_ROM_PTR(&board_spi_obj) },
5656
# UART), MP_ROM_PTR(&board_uart_obj) },
5757

58-
5958
# Members:
6059
def I2C() -> busio.I2C:
6160
"""Returns the `busio.I2C` object for the board's designated I2C bus(es).

uv.lock

Lines changed: 57 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)