Skip to content

Commit a4922b4

Browse files
committed
Moved two get/set functions from private to public, added getTxPower function.
1 parent 266873a commit a4922b4

File tree

4 files changed

+21
-4
lines changed

4 files changed

+21
-4
lines changed

keywords.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ receive KEYWORD2
4040
idle KEYWORD2
4141
sleep KEYWORD2
4242

43+
getTxPower KEYWORD2
44+
getSpreadingFactor KEYWORD2
45+
getSignalBandwidth KEYWORD2
4346
setTxPower KEYWORD2
4447
setFrequency KEYWORD2
4548
setSpreadingFactor KEYWORD2

library.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name=LoRa
2-
version=0.8.0
2+
version=0.8.1
33
author=Sandeep Mistry <[email protected]>
44
maintainer=Sandeep Mistry <[email protected]>
55
sentence=An Arduino library for sending and receiving data using LoRa radios.

src/LoRa.cpp

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -450,6 +450,11 @@ void LoRaClass::sleep()
450450
writeRegister(REG_OP_MODE, MODE_LONG_RANGE_MODE | MODE_SLEEP);
451451
}
452452

453+
int LoRaClass::getTxPower()
454+
{
455+
return _level;
456+
}
457+
453458
void LoRaClass::setTxPower(int level, int outputPin)
454459
{
455460
if (PA_OUTPUT_RFO_PIN == outputPin) {
@@ -460,6 +465,8 @@ void LoRaClass::setTxPower(int level, int outputPin)
460465
level = 14;
461466
}
462467

468+
_level = level;
469+
463470
writeRegister(REG_PA_CONFIG, 0x70 | level);
464471
} else {
465472
// PA BOOST
@@ -468,6 +475,8 @@ void LoRaClass::setTxPower(int level, int outputPin)
468475
level = 20;
469476
}
470477

478+
_level = level;
479+
471480
// subtract 3 from level, so 18 - 20 maps to 15 - 17
472481
level -= 3;
473482

@@ -478,6 +487,9 @@ void LoRaClass::setTxPower(int level, int outputPin)
478487
if (level < 2) {
479488
level = 2;
480489
}
490+
491+
_level = level;
492+
481493
//Default value PA_HF/LF or +17dBm
482494
writeRegister(REG_PA_DAC, 0x84);
483495
setOCP(100);

src/LoRa.h

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,10 @@ class LoRaClass : public Stream {
6868
void idle();
6969
void sleep();
7070

71+
int getTxPower();
72+
int getSpreadingFactor();
73+
long getSignalBandwidth();
74+
7175
void setTxPower(int level, int outputPin = PA_OUTPUT_PA_BOOST_PIN);
7276
void setFrequency(long frequency);
7377
void setSpreadingFactor(int sf);
@@ -105,9 +109,6 @@ class LoRaClass : public Stream {
105109
void handleDio0Rise();
106110
bool isTransmitting();
107111

108-
int getSpreadingFactor();
109-
long getSignalBandwidth();
110-
111112
void setLdoFlag();
112113
void setLdoFlagForced(const boolean);
113114

@@ -123,6 +124,7 @@ class LoRaClass : public Stream {
123124
int _ss;
124125
int _reset;
125126
int _dio0;
127+
int _level;
126128
long _frequency;
127129
int _packetIndex;
128130
int _implicitHeaderMode;

0 commit comments

Comments
 (0)