forks/RadioLibSmol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[PHY] Update to 5.0.0

Browse source
This commit is contained in:
jgromes 2021-11-14 11:40:06 +01:00
parent d0670fd997
commit e775bfc22e
2 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/protocols/PhysicalLayer/PhysicalLayer.cpp
View file

@ -12,7 +12,7 @@ int16_t PhysicalLayer::transmit(__FlashStringHelper* fstr, uint8_t addr) {
size_t len = 0; size_t len = 0;
PGM_P p = reinterpret_cast<PGM_P>(fstr); PGM_P p = reinterpret_cast<PGM_P>(fstr);
while(true) { while(true) {
char c = RADIOLIB_PROGMEM_READ_BYTE(p++); char c = RADIOLIB_NONVOLATILE_READ_BYTE(p++);
len++; len++;
if(c == '\0') { if(c == '\0') {
break; break;
@ -20,7 +20,7 @@ int16_t PhysicalLayer::transmit(__FlashStringHelper* fstr, uint8_t addr) {
} }
// dynamically allocate memory // dynamically allocate memory
#ifdef RADIOLIB_STATIC_ONLY #if defined(RADIOLIB_STATIC_ONLY)
char str[RADIOLIB_STATIC_ARRAY_SIZE]; char str[RADIOLIB_STATIC_ARRAY_SIZE];
#else #else
char* str = new char[len]; char* str = new char[len];
@ -29,12 +29,12 @@ int16_t PhysicalLayer::transmit(__FlashStringHelper* fstr, uint8_t addr) {
// copy string from flash // copy string from flash
p = reinterpret_cast<PGM_P>(fstr); p = reinterpret_cast<PGM_P>(fstr);
for(size_t i = 0; i < len; i++) { for(size_t i = 0; i < len; i++) {
str[i] = RADIOLIB_PROGMEM_READ_BYTE(p + i); str[i] = RADIOLIB_NONVOLATILE_READ_BYTE(p + i);
} }
// transmit string // transmit string
int16_t state = transmit(str, addr); int16_t state = transmit(str, addr);
#ifndef RADIOLIB_STATIC_ONLY #if !defined(RADIOLIB_STATIC_ONLY)
delete[] str; delete[] str;
#endif #endif
return(state); return(state);
@ -57,7 +57,7 @@ int16_t PhysicalLayer::startTransmit(const char* str, uint8_t addr) {
} }
int16_t PhysicalLayer::readData(String& str, size_t len) { int16_t PhysicalLayer::readData(String& str, size_t len) {
int16_t state = ERR_NONE; int16_t state = RADIOLIB_ERR_NONE;
// read the number of actually received bytes // read the number of actually received bytes
size_t length = getPacketLength(); size_t length = getPacketLength();
@ -69,19 +69,19 @@ int16_t PhysicalLayer::readData(String& str, size_t len) {
} }
// build a temporary buffer // build a temporary buffer
#ifdef RADIOLIB_STATIC_ONLY #if defined(RADIOLIB_STATIC_ONLY)
uint8_t data[RADIOLIB_STATIC_ARRAY_SIZE + 1]; uint8_t data[RADIOLIB_STATIC_ARRAY_SIZE + 1];
#else #else
uint8_t* data = new uint8_t[length + 1]; uint8_t* data = new uint8_t[length + 1];
if(!data) { if(!data) {
return(ERR_MEMORY_ALLOCATION_FAILED); return(RADIOLIB_ERR_MEMORY_ALLOCATION_FAILED);
} }
#endif #endif
// read the received data // read the received data
state = readData(data, length); state = readData(data, length);
if(state == ERR_NONE) { if(state == RADIOLIB_ERR_NONE) {
// add null terminator // add null terminator
data[length] = 0; data[length] = 0;
@ -90,7 +90,7 @@ int16_t PhysicalLayer::readData(String& str, size_t len) {
} }
// deallocate temporary buffer // deallocate temporary buffer
#ifndef RADIOLIB_STATIC_ONLY #if !defined(RADIOLIB_STATIC_ONLY)
delete[] data; delete[] data;
#endif #endif
@ -98,7 +98,7 @@ int16_t PhysicalLayer::readData(String& str, size_t len) {
} }
int16_t PhysicalLayer::receive(String& str, size_t len) { int16_t PhysicalLayer::receive(String& str, size_t len) {
int16_t state = ERR_NONE; int16_t state = RADIOLIB_ERR_NONE;
// user can override the length of data to read // user can override the length of data to read
size_t length = len; size_t length = len;
@ -109,19 +109,19 @@ int16_t PhysicalLayer::receive(String& str, size_t len) {
} }
// build a temporary buffer // build a temporary buffer
#ifdef RADIOLIB_STATIC_ONLY #if defined(RADIOLIB_STATIC_ONLY)
uint8_t data[RADIOLIB_STATIC_ARRAY_SIZE + 1]; uint8_t data[RADIOLIB_STATIC_ARRAY_SIZE + 1];
#else #else
uint8_t* data = new uint8_t[length + 1]; uint8_t* data = new uint8_t[length + 1];
if(!data) { if(!data) {
return(ERR_MEMORY_ALLOCATION_FAILED); return(RADIOLIB_ERR_MEMORY_ALLOCATION_FAILED);
} }
#endif #endif
// attempt packet reception // attempt packet reception
state = receive(data, length); state = receive(data, length);
if(state == ERR_NONE) { if(state == RADIOLIB_ERR_NONE) {
// read the number of actually received bytes (for unknown packets) // read the number of actually received bytes (for unknown packets)
if(len == 0) { if(len == 0) {
length = getPacketLength(false); length = getPacketLength(false);
@ -135,7 +135,7 @@ int16_t PhysicalLayer::receive(String& str, size_t len) {
} }
// deallocate temporary buffer // deallocate temporary buffer
#ifndef RADIOLIB_STATIC_ONLY #if !defined(RADIOLIB_STATIC_ONLY)
delete[] data; delete[] data;
#endif #endif
@ -203,7 +203,7 @@ uint8_t PhysicalLayer::read() {
int16_t PhysicalLayer::setDirectSyncWord(uint32_t syncWord, uint8_t len) { int16_t PhysicalLayer::setDirectSyncWord(uint32_t syncWord, uint8_t len) {
if(len > 32) { if(len > 32) {
return(ERR_INVALID_SYNC_WORD); return(RADIOLIB_ERR_INVALID_SYNC_WORD);
} }
_directSyncWordMask = 0xFFFFFFFF >> (32 - len); _directSyncWordMask = 0xFFFFFFFF >> (32 - len);
_directSyncWordLen = len; _directSyncWordLen = len;
@ -214,7 +214,7 @@ int16_t PhysicalLayer::setDirectSyncWord(uint32_t syncWord, uint8_t len) {
_gotSync = true; _gotSync = true;
} }
return(ERR_NONE); return(RADIOLIB_ERR_NONE);
} }
void PhysicalLayer::updateDirectBuffer(uint8_t bit) { void PhysicalLayer::updateDirectBuffer(uint8_t bit) {

6
src/protocols/PhysicalLayer/PhysicalLayer.h
View file

@ -1,4 +1,4 @@
#ifndef _RADIOLIB_PHYSICAL_LAYER_H #if !defined(_RADIOLIB_PHYSICAL_LAYER_H)
#define _RADIOLIB_PHYSICAL_LAYER_H #define _RADIOLIB_PHYSICAL_LAYER_H
#include "../../TypeDef.h" #include "../../TypeDef.h"
@ -298,10 +298,12 @@ class PhysicalLayer {
*/ */
uint8_t read(); uint8_t read();
virtual Module* getMod() = 0;
protected: protected:
void updateDirectBuffer(uint8_t bit); void updateDirectBuffer(uint8_t bit);
#ifndef RADIOLIB_GODMODE #if !defined(RADIOLIB_GODMODE)
private: private:
#endif #endif
float _freqStep; float _freqStep;