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

[FSK4] Formatting fixes

Browse source
This commit is contained in:
jgromes 2021-09-24 08:58:48 +02:00
parent f099a075e0
commit b46d9f8e59
2 changed files with 17 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/protocols/FSK4/FSK4.cpp
View file

@ -1,8 +1,6 @@
#include "FSK4.h" #include "FSK4.h"
#if !defined(RADIOLIB_EXCLUDE_FSK4) #if !defined(RADIOLIB_EXCLUDE_FSK4)
FSK4Client::FSK4Client(PhysicalLayer* phy) { FSK4Client::FSK4Client(PhysicalLayer* phy) {
_phy = phy; _phy = phy;
#if !defined(RADIOLIB_EXCLUDE_AFSK) #if !defined(RADIOLIB_EXCLUDE_AFSK)
@ -10,19 +8,18 @@ FSK4Client::FSK4Client(PhysicalLayer* phy) {
#endif #endif
} }
//#if !defined(RADIOLIB_EXCLUDE_AFSK) #if !defined(RADIOLIB_EXCLUDE_AFSK)
// FSK4Client::FSK4Client(AFSKClient* audio) { FSK4Client::FSK4Client(AFSKClient* audio) {
// _phy = audio->_phy; _phy = audio->_phy;
// _audio = audio; _audio = audio;
// } }
//#endif #endif
int16_t FSK4Client::begin(float base, uint32_t shift, uint16_t rate) { int16_t FSK4Client::begin(float base, uint32_t shift, uint16_t rate) {
// save configuration // save configuration
_baseHz = base; _baseHz = base;
_shiftHz = shift; _shiftHz = shift;
// calculate duration of 1 bit // calculate duration of 1 bit
_bitDuration = (uint32_t)1000000/rate; _bitDuration = (uint32_t)1000000/rate;
@ -74,18 +71,17 @@ size_t FSK4Client::write(uint8_t* buff, size_t len) {
} }
size_t FSK4Client::write(uint8_t b) { size_t FSK4Client::write(uint8_t b) {
// send symbols MSB first
for(uint8_t i = 0; i < 4; i++) {
// Extract 4FSK symbol (2 bits)
uint8_t symbol = (b & 0xC0) >> 6;
int k; // Modulate
// Send symbols MSB first. FSK4Client::tone(symbol);
for (k=0;k<4;k++)
{ // Shift to next symbol
// Extract 4FSK symbol (2 bits) b = b << 2;
uint8_t symbol = (b & 0xC0) >> 6; }
// Modulate
FSK4Client::tone(symbol);
// Shift to next symbol.
b = b << 2;
}
return(1); return(1);
} }

3
src/protocols/FSK4/FSK4.h
View file

@ -8,7 +8,6 @@
#include "../PhysicalLayer/PhysicalLayer.h" #include "../PhysicalLayer/PhysicalLayer.h"
#include "../AFSK/AFSK.h" #include "../AFSK/AFSK.h"
/*! /*!
\class FSK4Client \class FSK4Client
@ -29,7 +28,7 @@ class FSK4Client {
\param audio Pointer to the AFSK instance providing audio. \param audio Pointer to the AFSK instance providing audio.
*/ */
//explicit FSK4Client(AFSKClient* audio); explicit FSK4Client(AFSKClient* audio);
#endif #endif
// basic methods // basic methods