summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Fiore <mfiore@multitech.com>2015-12-01 11:13:37 -0600
committerMike Fiore <mfiore@multitech.com>2015-12-01 11:13:37 -0600
commit182ee4e6157e7e0fb94fc83f5f5b45b2c565b88d (patch)
tree3821b6aa5fe90dba4c33290650650db017d6cd56
parent7f0ba1ea735a0d1619539ba69724fa8679af64b1 (diff)
downloadmtdot-box-evb-factory-firmware-182ee4e6157e7e0fb94fc83f5f5b45b2c565b88d.tar.gz
mtdot-box-evb-factory-firmware-182ee4e6157e7e0fb94fc83f5f5b45b2c565b88d.tar.bz2
mtdot-box-evb-factory-firmware-182ee4e6157e7e0fb94fc83f5f5b45b2c565b88d.zip
fix bug when sending data file, update default configuration
-rw-r--r--CommandTerminal/CmdFactoryDefault.cpp4
-rw-r--r--Mode/ModeSingle.cpp1
-rw-r--r--Mode/ModeSweep.cpp1
3 files changed, 6 insertions, 0 deletions
diff --git a/CommandTerminal/CmdFactoryDefault.cpp b/CommandTerminal/CmdFactoryDefault.cpp
index e2645cd..86a3c0f 100644
--- a/CommandTerminal/CmdFactoryDefault.cpp
+++ b/CommandTerminal/CmdFactoryDefault.cpp
@@ -20,6 +20,10 @@ uint32_t CmdFactoryDefault::action(std::vector<std::string> args)
_dot->setStartUpMode(0); //DotBox +Data is stored here. Default is 0.
_dot->setVerbose(1);
_dot->setEcho(1);
+ _dot->setAck(1);
+ _dot->setJoinMode(mDot::OTA);
+ _dot->setNetworkName("MultiTech");
+ _dot->setNetworkPassphrase("MultiTech");
_dot->resetNetworkSession();
return 0;
diff --git a/Mode/ModeSingle.cpp b/Mode/ModeSingle.cpp
index 26d0aad..6150128 100644
--- a/Mode/ModeSingle.cpp
+++ b/Mode/ModeSingle.cpp
@@ -284,6 +284,7 @@ bool ModeSingle::start() {
if (send_data) {
std::vector<uint8_t> s_data;
logInfo("sending data %s %d", _dot->DataRateStr(_data_rate).c_str(), _power);
+ send_data = false;
_success.updateInfo("Data Sending...");
_lora->setDataRate(_data_rate);
_lora->setPower(_power);
diff --git a/Mode/ModeSweep.cpp b/Mode/ModeSweep.cpp
index 023e461..724e35c 100644
--- a/Mode/ModeSweep.cpp
+++ b/Mode/ModeSweep.cpp
@@ -358,6 +358,7 @@ bool ModeSweep::start() {
if (send_data) {
std::vector<uint8_t> s_data;
logInfo("sending data %s %d", _dot->DataRateStr(_data_rate).c_str(), _power);
+ send_data = false;
_success.updateInfo("Data Sending...");
_lora->setDataRate(_data_rate);
_lora->setPower(_power);