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

[FSK4] Update to 5.0.0

Browse source
This commit is contained in:
jgromes 2021-11-14 11:39:17 +01:00
parent e82049587b
commit 727e4b4703
4 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
examples/FSK4/FSK4_Transmit/FSK4_Transmit.ino
View file

@ -68,7 +68,7 @@ void setup() {
// (RF69, CC1101, Si4432 etc.), use the basic begin() method // (RF69, CC1101, Si4432 etc.), use the basic begin() method
// int state = radio.begin(); // int state = radio.begin();
if(state == ERR_NONE) { if(state == RADIOLIB_ERR_NONE) {
Serial.println(F("success!")); Serial.println(F("success!"));
} else { } else {
Serial.print(F("failed, code ")); Serial.print(F("failed, code "));
@ -92,7 +92,7 @@ void setup() {
// frequency shift: 270 Hz // frequency shift: 270 Hz
// baud rate: 100 baud // baud rate: 100 baud
state = fsk4.begin(434.0, 270, 100); state = fsk4.begin(434.0, 270, 100);
if(state == ERR_NONE) { if(state == RADIOLIB_ERR_NONE) {
Serial.println(F("success!")); Serial.println(F("success!"));
} else { } else {
Serial.print(F("failed, code ")); Serial.print(F("failed, code "));

4
examples/FSK4/FSK4_Transmit_AFSK/FSK4_Transmit_AFSK.ino
View file

@ -69,7 +69,7 @@ void setup() {
// (RF69, CC1101, Si4432 etc.), use the basic begin() method // (RF69, CC1101, Si4432 etc.), use the basic begin() method
// int state = radio.begin(); // int state = radio.begin();
if(state == ERR_NONE) { if(state == RADIOLIB_ERR_NONE) {
Serial.println(F("success!")); Serial.println(F("success!"));
} else { } else {
Serial.print(F("failed, code ")); Serial.print(F("failed, code "));
@ -85,7 +85,7 @@ void setup() {
// frequency shift: 270 Hz // frequency shift: 270 Hz
// baud rate: 100 baud // baud rate: 100 baud
state = fsk4.begin(400, 270, 100); state = fsk4.begin(400, 270, 100);
if(state == ERR_NONE) { if(state == RADIOLIB_ERR_NONE) {
Serial.println(F("success!")); Serial.println(F("success!"));
} else { } else {
Serial.print(F("failed, code ")); Serial.print(F("failed, code "));

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

@ -28,7 +28,7 @@ int16_t FSK4Client::begin(float base, uint32_t shift, uint16_t rate) {
// check minimum shift value // check minimum shift value
if(shift < step / 2) { if(shift < step / 2) {
return(ERR_INVALID_RTTY_SHIFT); return(RADIOLIB_ERR_INVALID_RTTY_SHIFT);
} }
// round shift to multiples of frequency step size // round shift to multiples of frequency step size
@ -87,10 +87,11 @@ size_t FSK4Client::write(uint8_t b) {
} }
void FSK4Client::tone(uint8_t i) { void FSK4Client::tone(uint8_t i) {
uint32_t start = Module::micros(); Module* mod = _phy->getMod();
uint32_t start = mod->micros();
transmitDirect(_base + _tones[i], _baseHz + _tonesHz[i]); transmitDirect(_base + _tones[i], _baseHz + _tonesHz[i]);
while(Module::micros() - start < _bitDuration) { while(mod->micros() - start < _bitDuration) {
Module::yield(); mod->yield();
} }
} }

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

@ -56,7 +56,7 @@ class FSK4Client {
size_t write(uint8_t b); size_t write(uint8_t b);
#ifndef RADIOLIB_GODMODE #if !defined(RADIOLIB_GODMODE)
private: private:
#endif #endif
PhysicalLayer* _phy; PhysicalLayer* _phy;