summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Layout/LayoutStartup.cpp6
-rw-r--r--Mode/ModeDemo.cpp12
-rw-r--r--main.cpp4
-rwxr-xr-xsetup.sh8
4 files changed, 18 insertions, 12 deletions
diff --git a/Layout/LayoutStartup.cpp b/Layout/LayoutStartup.cpp
index 4603308..bf591d5 100644
--- a/Layout/LayoutStartup.cpp
+++ b/Layout/LayoutStartup.cpp
@@ -24,10 +24,10 @@
LayoutStartup::LayoutStartup(DOGS102* lcd, mDot* dot)
: Layout(lcd),
_dot(dot),
- _lName(0, 3, "MTDOT-BOX/EVB"),
+ _lName(0, 3, "DOT-BOX/EVB"),
_lInfo(0, 4, "Factory Firmware"),
_lVersion(0, 5, "Version"),
- _fName(14, 3, 3),
+ _fName(12, 3, 5),
_fVersion(8, 5, 9),
_fId(0, 7, 17),
_fGps(0, 6, 17),
@@ -47,7 +47,7 @@ void LayoutStartup::display() {
writeLabel(_lName);
writeLabel(_lInfo);
writeLabel(_lVersion);
- writeField(_fName, mDot::FrequencyBandStr(_dot->getFrequencyBand()).substr(3));
+ writeField(_fName, mDot::FrequencyBandStr(_dot->getFrequencyBand()));
writeField(_fVersion, version);
writeField(_fId, id);
diff --git a/Mode/ModeDemo.cpp b/Mode/ModeDemo.cpp
index f32e03c..cdabe32 100644
--- a/Mode/ModeDemo.cpp
+++ b/Mode/ModeDemo.cpp
@@ -41,9 +41,15 @@ bool ModeDemo::start() {
_initial_data_rate = _dot->getTxDataRate();
// use configured data rate and power if possible
- if ((_band == mDot::FB_US915 || _band == mDot::FB_AU915) && _initial_data_rate == mDot::DR0) {
- logInfo("using DR1 instead of DR0 - DR0 max packet size is too small for data");
- _dot->setTxDataRate(mDot::DR1);
+ if ((_band == mDot::FB_US915 || _band == mDot::FB_AU915) && (_initial_data_rate == mDot::DR0 || _initial_data_rate == mDot::SF_10)) {
+ if(_initial_data_rate == mDot::DR0){
+ logInfo("using DR1 instead of DR0 - DR0 max packet size is too small for data");
+ _dot->setTxDataRate(mDot::DR1);
+ }
+ else{
+ logInfo("using SF_9 instead of SF_10 - SF_10 max packet size is too small for data");
+ _dot->setTxDataRate(mDot::SF_9);
+ }
}
_state = show_help;
diff --git a/main.cpp b/main.cpp
index 71ac376..fdbd3e2 100644
--- a/main.cpp
+++ b/main.cpp
@@ -178,8 +178,8 @@ void mainMenu() {
items.push_back(menu_strings[data]);
while (true) {
- product = "MTDOT-BOX/EVB ";
- product += mDot::FrequencyBandStr(dot->getFrequencyBand()).substr(3);
+ product = "DOT-BOX/EVB ";
+ product += mDot::FrequencyBandStr(dot->getFrequencyBand());
// reset session between modes
dot->resetNetworkSession();
diff --git a/setup.sh b/setup.sh
index d21538b..9bd8c46 100755
--- a/setup.sh
+++ b/setup.sh
@@ -31,12 +31,12 @@ mdot-library/version.sh
echo "creating libs directory..."
mkdir -p $LIB
-update_hg_lib "ISL29011" 3
-update_hg_lib "MMA845x" 3
-update_hg_lib "MPL3115A2" 2
+update_hg_lib "ISL29011" 4
+update_hg_lib "MMA845x" 4
+update_hg_lib "MPL3115A2" 3
update_hg_lib "NCP5623B" 3
update_hg_lib "GpsParser" 10
-update_hg_lib "DOGS102" 4
+update_hg_lib "DOGS102" 5
echo "generating version header..."
cd $DIR