Skip to content

Commit 0d355c0

Browse files
brentrubrentru
authored
Merge pull request #45 from jerryneedell/jerryn_size
implemented memory saving changes
2 parents 6485df1 + 7d95326 commit 0d355c0

File tree

1 file changed

+30
-152
lines changed

1 file changed

+30
-152
lines changed

‎adafruit_rfm9x.py

Lines changed: 30 additions & 152 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,6 @@
3434
import digitalio
3535
from micropython import const
3636

37-
try:
38-
from warnings import warn
39-
except ImportError:
40-
41-
def warn(msg, **kwargs):
42-
"Issue a warning to stdout."
43-
print(
44-
"%s: %s"
45-
% ("Warning" if kwargs.get("cat") is None else kwargs["cat"].__name__, msg)
46-
)
47-
4837

4938
import adafruit_bus_device.spi_device as spidev
5039

@@ -58,10 +47,6 @@ def warn(msg, **kwargs):
5847
# Register names (FSK Mode even though we use LoRa instead, from table 85)
5948
_RH_RF95_REG_00_FIFO = const(0x00)
6049
_RH_RF95_REG_01_OP_MODE = const(0x01)
61-
_RH_RF95_REG_02_RESERVED = const(0x02)
62-
_RH_RF95_REG_03_RESERVED = const(0x03)
63-
_RH_RF95_REG_04_RESERVED = const(0x04)
64-
_RH_RF95_REG_05_RESERVED = const(0x05)
6550
_RH_RF95_REG_06_FRF_MSB = const(0x06)
6651
_RH_RF95_REG_07_FRF_MID = const(0x07)
6752
_RH_RF95_REG_08_FRF_LSB = const(0x08)
@@ -108,118 +93,9 @@ def warn(msg, **kwargs):
10893
_RH_RF95_REG_63_AGC_THRESH2 = const(0x63)
10994
_RH_RF95_REG_64_AGC_THRESH3 = const(0x64)
11095

111-
# RH_RF95_REG_01_OP_MODE 0x01
112-
_RH_RF95_LONG_RANGE_MODE = const(0x80)
113-
_RH_RF95_ACCESS_SHARED_REG = const(0x40)
114-
_RH_RF95_MODE = const(0x07)
115-
_RH_RF95_MODE_SLEEP = const(0x00)
116-
_RH_RF95_MODE_STDBY = const(0x01)
117-
_RH_RF95_MODE_FSTX = const(0x02)
118-
_RH_RF95_MODE_TX = const(0x03)
119-
_RH_RF95_MODE_FSRX = const(0x04)
120-
_RH_RF95_MODE_RXCONTINUOUS = const(0x05)
121-
_RH_RF95_MODE_RXSINGLE = const(0x06)
122-
_RH_RF95_MODE_CAD = const(0x07)
123-
124-
# RH_RF95_REG_09_PA_CONFIG 0x09
125-
_RH_RF95_PA_SELECT = const(0x80)
126-
_RH_RF95_MAX_POWER = const(0x70)
127-
_RH_RF95_OUTPUT_POWER = const(0x0F)
128-
129-
# RH_RF95_REG_0A_PA_RAMP 0x0a
130-
_RH_RF95_LOW_PN_TX_PLL_OFF = const(0x10)
131-
_RH_RF95_PA_RAMP = const(0x0F)
132-
_RH_RF95_PA_RAMP_3_4MS = const(0x00)
133-
_RH_RF95_PA_RAMP_2MS = const(0x01)
134-
_RH_RF95_PA_RAMP_1MS = const(0x02)
135-
_RH_RF95_PA_RAMP_500US = const(0x03)
136-
_RH_RF95_PA_RAMP_250US = const(0x04)
137-
_RH_RF95_PA_RAMP_125US = const(0x05)
138-
_RH_RF95_PA_RAMP_100US = const(0x06)
139-
_RH_RF95_PA_RAMP_62US = const(0x07)
140-
_RH_RF95_PA_RAMP_50US = const(0x08)
141-
_RH_RF95_PA_RAMP_40US = const(0x09)
142-
_RH_RF95_PA_RAMP_31US = const(0x0A)
143-
_RH_RF95_PA_RAMP_25US = const(0x0B)
144-
_RH_RF95_PA_RAMP_20US = const(0x0C)
145-
_RH_RF95_PA_RAMP_15US = const(0x0D)
146-
_RH_RF95_PA_RAMP_12US = const(0x0E)
147-
_RH_RF95_PA_RAMP_10US = const(0x0F)
148-
149-
# RH_RF95_REG_0B_OCP 0x0b
150-
_RH_RF95_OCP_ON = const(0x20)
151-
_RH_RF95_OCP_TRIM = const(0x1F)
152-
153-
# RH_RF95_REG_0C_LNA 0x0c
154-
_RH_RF95_LNA_GAIN = const(0xE0)
155-
_RH_RF95_LNA_BOOST = const(0x03)
156-
_RH_RF95_LNA_BOOST_DEFAULT = const(0x00)
157-
_RH_RF95_LNA_BOOST_150PC = const(0x11)
158-
159-
# RH_RF95_REG_11_IRQ_FLAGS_MASK 0x11
160-
_RH_RF95_RX_TIMEOUT_MASK = const(0x80)
161-
_RH_RF95_RX_DONE_MASK = const(0x40)
162-
_RH_RF95_PAYLOAD_CRC_ERROR_MASK = const(0x20)
163-
_RH_RF95_VALID_HEADER_MASK = const(0x10)
164-
_RH_RF95_TX_DONE_MASK = const(0x08)
165-
_RH_RF95_CAD_DONE_MASK = const(0x04)
166-
_RH_RF95_FHSS_CHANGE_CHANNEL_MASK = const(0x02)
167-
_RH_RF95_CAD_DETECTED_MASK = const(0x01)
168-
169-
# RH_RF95_REG_12_IRQ_FLAGS 0x12
170-
_RH_RF95_RX_TIMEOUT = const(0x80)
171-
_RH_RF95_RX_DONE = const(0x40)
172-
_RH_RF95_PAYLOAD_CRC_ERROR = const(0x20)
173-
_RH_RF95_VALID_HEADER = const(0x10)
174-
_RH_RF95_TX_DONE = const(0x08)
175-
_RH_RF95_CAD_DONE = const(0x04)
176-
_RH_RF95_FHSS_CHANGE_CHANNEL = const(0x02)
177-
_RH_RF95_CAD_DETECTED = const(0x01)
178-
179-
# RH_RF95_REG_18_MODEM_STAT 0x18
180-
_RH_RF95_RX_CODING_RATE = const(0xE0)
181-
_RH_RF95_MODEM_STATUS_CLEAR = const(0x10)
182-
_RH_RF95_MODEM_STATUS_HEADER_INFO_VALID = const(0x08)
183-
_RH_RF95_MODEM_STATUS_RX_ONGOING = const(0x04)
184-
_RH_RF95_MODEM_STATUS_SIGNAL_SYNCHRONIZED = const(0x02)
185-
_RH_RF95_MODEM_STATUS_SIGNAL_DETECTED = const(0x01)
186-
187-
# RH_RF95_REG_1C_HOP_CHANNEL 0x1c
188-
_RH_RF95_PLL_TIMEOUT = const(0x80)
189-
_RH_RF95_RX_PAYLOAD_CRC_IS_ON = const(0x40)
190-
_RH_RF95_FHSS_PRESENT_CHANNEL = const(0x3F)
191-
192-
# RH_RF95_REG_1D_MODEM_CONFIG1 0x1d
193-
_RH_RF95_BW = const(0xC0)
194-
_RH_RF95_BW_125KHZ = const(0x00)
195-
_RH_RF95_BW_250KHZ = const(0x40)
196-
_RH_RF95_BW_500KHZ = const(0x80)
197-
_RH_RF95_BW_RESERVED = const(0xC0)
198-
_RH_RF95_CODING_RATE = const(0x38)
199-
_RH_RF95_CODING_RATE_4_5 = const(0x00)
200-
_RH_RF95_CODING_RATE_4_6 = const(0x08)
201-
_RH_RF95_CODING_RATE_4_7 = const(0x10)
202-
_RH_RF95_CODING_RATE_4_8 = const(0x18)
203-
_RH_RF95_IMPLICIT_HEADER_MODE_ON = const(0x04)
204-
_RH_RF95_RX_PAYLOAD_CRC_ON = const(0x02)
205-
_RH_RF95_LOW_DATA_RATE_OPTIMIZE = const(0x01)
206-
207-
# RH_RF95_REG_1E_MODEM_CONFIG2 0x1e
20896
_RH_RF95_DETECTION_OPTIMIZE = const(0x31)
20997
_RH_RF95_DETECTION_THRESHOLD = const(0x37)
210-
_RH_RF95_SPREADING_FACTOR = const(0xF0)
211-
_RH_RF95_SPREADING_FACTOR_64CPS = const(0x60)
212-
_RH_RF95_SPREADING_FACTOR_128CPS = const(0x70)
213-
_RH_RF95_SPREADING_FACTOR_256CPS = const(0x80)
214-
_RH_RF95_SPREADING_FACTOR_512CPS = const(0x90)
215-
_RH_RF95_SPREADING_FACTOR_1024CPS = const(0xA0)
216-
_RH_RF95_SPREADING_FACTOR_2048CPS = const(0xB0)
217-
_RH_RF95_SPREADING_FACTOR_4096CPS = const(0xC0)
218-
_RH_RF95_TX_CONTINUOUS_MOE = const(0x08)
219-
_RH_RF95_AGC_AUTO_ON = const(0x04)
220-
_RH_RF95_SYM_TIMEOUT_MSB = const(0x03)
221-
222-
# RH_RF95_REG_4D_PA_DAC 0x4d
98+
22399
_RH_RF95_PA_DAC_DISABLE = const(0x04)
224100
_RH_RF95_PA_DAC_ENABLE = const(0x07)
225101

@@ -352,12 +228,6 @@ def __set__(self, obj, val):
352228

353229
dio0_mapping = _RegisterBits(_RH_RF95_REG_40_DIO_MAPPING1, offset=6, bits=2)
354230

355-
tx_done = _RegisterBits(_RH_RF95_REG_12_IRQ_FLAGS, offset=3, bits=1)
356-
357-
rx_done = _RegisterBits(_RH_RF95_REG_12_IRQ_FLAGS, offset=6, bits=1)
358-
359-
crc_error = _RegisterBits(_RH_RF95_REG_12_IRQ_FLAGS, offset=5, bits=1)
360-
361231
bw_bins = (7800, 10400, 15600, 20800, 31250, 41700, 62500, 125000, 250000)
362232

363233
def __init__(
@@ -409,8 +279,16 @@ def __init__(
409279
self.frequency_mhz = frequency
410280
# Set preamble length (default 8 bytes to match radiohead).
411281
self.preamble_length = preamble_length
412-
# set radio configuration parameters
413-
self._configure_radio()
282+
# Defaults set modem config to RadioHead compatible Bw125Cr45Sf128 mode.
283+
self.signal_bandwidth = 125000
284+
self.coding_rate = 5
285+
self.spreading_factor = 7
286+
# Default to disable CRC checking on incoming packets.
287+
self.enable_crc = False
288+
# Note no sync word is set for LoRa mode either!
289+
self._write_u8(_RH_RF95_REG_26_MODEM_CONFIG3, 0x00) # Preamble lsb?
290+
# Set transmit power to 13 dBm, a safe value any module supports.
291+
self.tx_power = 13
414292
# initialize last RSSI reading
415293
self.last_rssi = 0.0
416294
"""The RSSI of the last received packet. Stored when the packet was received.
@@ -462,18 +340,7 @@ def __init__(
462340
Lower 4 bits may be used to pass information.
463341
Fourth byte of the RadioHead header.
464342
"""
465-
466-
def _configure_radio(self):
467-
# Defaults set modem config to RadioHead compatible Bw125Cr45Sf128 mode.
468-
self.signal_bandwidth = 125000
469-
self.coding_rate = 5
470-
self.spreading_factor = 7
471-
# Default to disable CRC checking on incoming packets.
472-
self.enable_crc = False
473-
# Note no sync word is set for LoRa mode either!
474-
self._write_u8(_RH_RF95_REG_26_MODEM_CONFIG3, 0x00) # Preamble lsb?
475-
# Set transmit power to 13 dBm, a safe value any module supports.
476-
self.tx_power = 13
343+
self.crc_error_count = 0
477344

478345
# pylint: disable=no-member
479346
# Reconsider pylint: disable when this can be tested
@@ -721,6 +588,18 @@ def enable_crc(self, val):
721588
self._read_u8(_RH_RF95_REG_1E_MODEM_CONFIG2) & 0xFB,
722589
)
723590

591+
def tx_done(self):
592+
"""Transmit status"""
593+
return (self._read_u8(_RH_RF95_REG_12_IRQ_FLAGS) & 0x8) >> 3
594+
595+
def rx_done(self):
596+
"""Receive status"""
597+
return (self._read_u8(_RH_RF95_REG_12_IRQ_FLAGS) & 0x40) >> 6
598+
599+
def crc_error(self):
600+
"""crc status"""
601+
return (self._read_u8(_RH_RF95_REG_12_IRQ_FLAGS) & 0x20) >> 5
602+
724603
def send(
725604
self,
726605
data,
@@ -783,7 +662,7 @@ def send(
783662
# best that can be done right now without interrupts).
784663
start = time.monotonic()
785664
timed_out = False
786-
while not timed_out and not self.tx_done:
665+
while not timed_out and not self.tx_done():
787666
if (time.monotonic() - start) >= self.xmit_timeout:
788667
timed_out = True
789668
# Listen again if necessary and return the result packet.
@@ -863,7 +742,7 @@ def receive(
863742
self.listen()
864743
start = time.monotonic()
865744
timed_out = False
866-
while not timed_out and not self.rx_done:
745+
while not timed_out and not self.rx_done():
867746
if (time.monotonic() - start) >= timeout:
868747
timed_out = True
869748
# Payload ready is set, a packet is in the FIFO.
@@ -873,8 +752,8 @@ def receive(
873752
# Enter idle mode to stop receiving other packets.
874753
self.idle()
875754
if not timed_out:
876-
if self.enable_crc and self.crc_error:
877-
warn("CRC error, packet ignored")
755+
if self.enable_crc and self.crc_error():
756+
self.crc_error_count += 1
878757
else:
879758
# Read the data from the FIFO.
880759
# Read the length of the FIFO.
@@ -907,10 +786,9 @@ def receive(
907786
# delay before sending Ack to give receiver a chance to get ready
908787
if self.ack_delay is not None:
909788
time.sleep(self.ack_delay)
910-
# send ACK packet to sender
911-
data = bytes("!", "UTF-8")
789+
# send ACK packet to sender (data is b'!')
912790
self.send(
913-
data,
791+
b"!",
914792
destination=packet[1],
915793
node=packet[0],
916794
identifier=packet[2],

0 commit comments

Comments
 (0)