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

[Pager] Added missing exclude direct receive guards (#697)

Browse source
This commit is contained in:
jgromes 2023-03-13 22:02:07 +01:00
parent 482b962f79
commit f809f17dc8
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/protocols/Pager/Pager.cpp
View file

@ -1,6 +1,7 @@
#include "Pager.h" #include "Pager.h"
#if !defined(RADIOLIB_EXCLUDE_PAGER) #if !defined(RADIOLIB_EXCLUDE_PAGER)
#if !defined(RADIOLIB_EXCLUDE_DIRECT_RECEIVE)
// this is a massive hack, but we need a global-scope ISR to manage the bit reading // this is a massive hack, but we need a global-scope ISR to manage the bit reading
// let's hope nobody ever tries running two POCSAG receivers at the same time // let's hope nobody ever tries running two POCSAG receivers at the same time
static PhysicalLayer* _readBitInstance = NULL; static PhysicalLayer* _readBitInstance = NULL;
@ -14,10 +15,13 @@ static void PagerClientReadBit(void) {
_readBitInstance->readBit(_readBitPin); _readBitInstance->readBit(_readBitPin);
} }
} }
#endif
PagerClient::PagerClient(PhysicalLayer* phy) { PagerClient::PagerClient(PhysicalLayer* phy) {
_phy = phy; _phy = phy;
#if !defined(RADIOLIB_EXCLUDE_DIRECT_RECEIVE)
_readBitInstance = _phy; _readBitInstance = _phy;
#endif
} }
int16_t PagerClient::begin(float base, uint16_t speed, bool invert, uint16_t shift) { int16_t PagerClient::begin(float base, uint16_t speed, bool invert, uint16_t shift) {
@ -214,6 +218,7 @@ int16_t PagerClient::transmit(uint8_t* data, size_t len, uint32_t addr, uint8_t
return(RADIOLIB_ERR_NONE); return(RADIOLIB_ERR_NONE);
} }
#if !defined(RADIOLIB_EXCLUDE_DIRECT_RECEIVE)
int16_t PagerClient::startReceive(RADIOLIB_PIN_TYPE pin, uint32_t addr, uint32_t mask) { int16_t PagerClient::startReceive(RADIOLIB_PIN_TYPE pin, uint32_t addr, uint32_t mask) {
// save the variables // save the variables
_readBitPin = pin; _readBitPin = pin;
@ -430,6 +435,7 @@ int16_t PagerClient::readData(uint8_t* data, size_t* len, uint32_t* addr) {
*len = decodedBytes; *len = decodedBytes;
return(RADIOLIB_ERR_NONE); return(RADIOLIB_ERR_NONE);
} }
#endif
void PagerClient::write(uint32_t* data, size_t len) { void PagerClient::write(uint32_t* data, size_t len) {
// write code words from buffer // write code words from buffer
@ -471,6 +477,7 @@ void PagerClient::write(uint32_t codeWord) {
} }
} }
#if !defined(RADIOLIB_EXCLUDE_DIRECT_RECEIVE)
uint32_t PagerClient::read() { uint32_t PagerClient::read() {
uint32_t codeWord = 0; uint32_t codeWord = 0;
codeWord |= (uint32_t)_phy->read() << 24; codeWord |= (uint32_t)_phy->read() << 24;
@ -491,6 +498,7 @@ uint32_t PagerClient::read() {
// TODO BCH error correction here // TODO BCH error correction here
return(codeWord); return(codeWord);
} }
#endif
uint8_t PagerClient::encodeBCD(char c) { uint8_t PagerClient::encodeBCD(char c) {
switch(c) { switch(c) {

7
src/protocols/Pager/Pager.h
View file

@ -142,6 +142,8 @@ class PagerClient {
*/ */
int16_t transmit(uint8_t* data, size_t len, uint32_t addr, uint8_t encoding = RADIOLIB_PAGER_BCD); int16_t transmit(uint8_t* data, size_t len, uint32_t addr, uint8_t encoding = RADIOLIB_PAGER_BCD);
#if !defined(RADIOLIB_EXCLUDE_DIRECT_RECEIVE)
/*! /*!
\brief Start reception of POCSAG packets. \brief Start reception of POCSAG packets.
@ -190,6 +192,7 @@ class PagerClient {
\returns \ref status_codes \returns \ref status_codes
*/ */
int16_t readData(uint8_t* data, size_t* len, uint32_t* addr = NULL); int16_t readData(uint8_t* data, size_t* len, uint32_t* addr = NULL);
#endif
#if !defined(RADIOLIB_GODMODE) #if !defined(RADIOLIB_GODMODE)
private: private:
@ -202,7 +205,6 @@ class PagerClient {
uint16_t _shift; uint16_t _shift;
uint16_t _shiftHz; uint16_t _shiftHz;
uint16_t _bitDuration; uint16_t _bitDuration;
uint32_t _readBatchPos;
uint32_t _filterAddr; uint32_t _filterAddr;
uint32_t _filterMask; uint32_t _filterMask;
bool inv = false; bool inv = false;
@ -214,7 +216,10 @@ class PagerClient {
void write(uint32_t* data, size_t len); void write(uint32_t* data, size_t len);
void write(uint32_t codeWord); void write(uint32_t codeWord);
#if !defined(RADIOLIB_EXCLUDE_DIRECT_RECEIVE)
uint32_t read(); uint32_t read();
#endif
uint8_t encodeBCD(char c); uint8_t encodeBCD(char c);
char decodeBCD(uint8_t b); char decodeBCD(uint8_t b);