specify _headerType with every call to setPacketParams

This commit is contained in:
Callan Bryant 2020-01-09 15:16:52 +00:00
parent 562ed02eab
commit b85e7474b3
No known key found for this signature in database
GPG key ID: C31FA9DF3ACBFFAA

View file

@ -450,7 +450,7 @@ int16_t SX126x::startTransmit(uint8_t* data, size_t len, uint8_t addr) {
int16_t state = ERR_NONE; int16_t state = ERR_NONE;
uint8_t modem = getPacketType(); uint8_t modem = getPacketType();
if(modem == SX126X_PACKET_TYPE_LORA) { if(modem == SX126X_PACKET_TYPE_LORA) {
state = setPacketParams(_preambleLength, _crcType, len); state = setPacketParams(_preambleLength, _crcType, len, _headerType);
} else if(modem == SX126X_PACKET_TYPE_GFSK) { } else if(modem == SX126X_PACKET_TYPE_GFSK) {
state = setPacketParamsFSK(_preambleLengthFSK, _crcTypeFSK, _syncWordLength, _addrComp, _whitening, _packetType, len); state = setPacketParamsFSK(_preambleLengthFSK, _crcTypeFSK, _syncWordLength, _addrComp, _whitening, _packetType, len);
} else { } else {
@ -742,7 +742,7 @@ int16_t SX126x::setPreambleLength(uint16_t preambleLength) {
uint8_t modem = getPacketType(); uint8_t modem = getPacketType();
if(modem == SX126X_PACKET_TYPE_LORA) { if(modem == SX126X_PACKET_TYPE_LORA) {
_preambleLength = preambleLength; _preambleLength = preambleLength;
return(setPacketParams(_preambleLength, _crcType)); return(setPacketParams(_preambleLength, _crcType, 0xFF, _headerType));
} else if(modem == SX126X_PACKET_TYPE_GFSK) { } else if(modem == SX126X_PACKET_TYPE_GFSK) {
_preambleLengthFSK = preambleLength; _preambleLengthFSK = preambleLength;
return(setPacketParamsFSK(_preambleLengthFSK, _crcTypeFSK, _syncWordLength, _addrComp, _whitening, _packetType)); return(setPacketParamsFSK(_preambleLengthFSK, _crcTypeFSK, _syncWordLength, _addrComp, _whitening, _packetType));
@ -1047,7 +1047,7 @@ int16_t SX126x::setCRC(uint8_t len, uint16_t initial, uint16_t polynomial, bool
_crcType = SX126X_LORA_CRC_OFF; _crcType = SX126X_LORA_CRC_OFF;
} }
return(setPacketParams(_preambleLength, _crcType)); return(setPacketParams(_preambleLength, _crcType, 0xFF, _headerType));
} }
return(ERR_UNKNOWN); return(ERR_UNKNOWN);