Diff: radio_sx126x.cpp

Revision:

1:e79b0a55135f

Parent:

0:9c052ff8dd6a

Child:

2:c321b5919516

--- a/radio_sx126x.cpp	Thu Jul 05 17:31:54 2018 -0700
+++ b/radio_sx126x.cpp	Mon Jul 16 11:15:59 2018 -0700
@@ -2,8 +2,6 @@
 #ifdef SX126x_H 
 #include "SPIu.h"
 
-extern RawSerial pc;
-
 LowPowerTimer Radio::lpt;
 volatile us_timestamp_t Radio::irqAt;
 
@@ -78,8 +76,6 @@
         radio.start_rx(RX_TIMEOUT_CONTINUOUS);
     else
         radio.start_rx(timeout * RC_TICKS_PER_US);
-
-    //pc.printf("start_rx %u  busy%u\r\n", timeout, busy.read());
 }
 
 void Radio::Standby()
@@ -370,18 +366,16 @@
     return 0;
 } // ..Send()
 
-void Radio::SetRxMaxPayloadLength(RadioModems_t modem, uint8_t max)
+void Radio::SetRxMaxPayloadLength(uint8_t max)
 {
-    uint8_t buf[8];
+    uint8_t pktType = radio.getPacketType();
 
-    if (modem == MODEM_FSK) {
+    if (pktType == PACKET_TYPE_GFSK) {
         pp.gfsk.PayloadLength = max;
-        memcpy(buf, pp.buf, 8);
-        radio.xfer(OPCODE_SET_PACKET_PARAMS, 8, 0, buf);
-    } else if (modem == MODEM_LORA) {
+        radio.xfer(OPCODE_SET_PACKET_PARAMS, 8, 0, pp.buf);
+    } else if (pktType == PACKET_TYPE_LORA) {
         pp.lora.PayloadLength = max;
-        memcpy(buf, pp.buf, 6);
-        radio.xfer(OPCODE_SET_PACKET_PARAMS, 6, 0, buf);
+        radio.xfer(OPCODE_SET_PACKET_PARAMS, 6, 0, pp.buf);
     }
 }