diff options
author | Jason Reiss <jreiss@multitech.com> | 2016-09-21 13:52:59 -0500 |
---|---|---|
committer | Jason Reiss <jreiss@multitech.com> | 2016-09-21 13:52:59 -0500 |
commit | 04b6e95c2931eadee93a6c1fe982f1658a60e1b7 (patch) | |
tree | 84406fd9a31a44d78422003249572f2b104be850 /Mode/ModeJoin.cpp | |
parent | be0d56b806ce76cef1d5bd5b6795391c2049b8b4 (diff) | |
parent | 692b74778f6b95cf0c668dfdb85f39035e113baa (diff) | |
download | mtdot-box-evb-factory-firmware-04b6e95c2931eadee93a6c1fe982f1658a60e1b7.tar.gz mtdot-box-evb-factory-firmware-04b6e95c2931eadee93a6c1fe982f1658a60e1b7.tar.bz2 mtdot-box-evb-factory-firmware-04b6e95c2931eadee93a6c1fe982f1658a60e1b7.zip |
Merge branch 'Semtech'
Conflicts:
.gitmodules
Mode/ModeJoin.cpp
main.cpp
Add AU915
Diffstat (limited to 'Mode/ModeJoin.cpp')
-rw-r--r-- | Mode/ModeJoin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Mode/ModeJoin.cpp b/Mode/ModeJoin.cpp index 239eadb..3a86dd9 100644 --- a/Mode/ModeJoin.cpp +++ b/Mode/ModeJoin.cpp @@ -126,4 +126,4 @@ void ModeJoin::display() { _join.updateRate(_dot->getTxDataRate()); _join.updatePower(_power); _join.updateAttempt(_lora->getJoinAttempts()); -}
\ No newline at end of file +} |