nguyen hoang / Mbed OS Dot-AT-Firmware-Khang1810218

firm newest

Dependencies:   MTS-Serial libmDot-dev-mbed5-deprecated

Files at this revision

API Documentation at this revision

Revision 1:c1c6549b9333, committed 2018-10-22

Comitter:
nguyenhoang9x5555
Date:
Mon Oct 22 01:56:09 2018 +0000
Parent:
0:3c869a8cb8f8
Commit message:
hey

Changed in this revision

CommandTerminal/CmdDisplayConfig.cpp Show annotated file Show diff for this revision Revisions of this file
CommandTerminal/CmdErrorCorrection.cpp Show annotated file Show diff for this revision Revisions of this file
CommandTerminal/CmdRxInverted.cpp Show annotated file Show diff for this revision Revisions of this file
CommandTerminal/CmdTxInverted.cpp Show annotated file Show diff for this revision Revisions of this file
libmDot-dev-mbed5.lib Show annotated file Show diff for this revision Revisions of this file
libmDot-mbed5.lib Show diff for this revision Revisions of this file
main.cpp Show annotated file Show diff for this revision Revisions of this file
mbed-os.lib Show annotated file Show diff for this revision Revisions of this file 
--- a/CommandTerminal/CmdDisplayConfig.cpp	Thu Oct 18 04:18:48 2018 +0000
+++ b/CommandTerminal/CmdDisplayConfig.cpp	Mon Oct 22 01:56:09 2018 +0000
@@ -77,11 +77,11 @@
     }
 
     CommandTerminal::Serial()->writef("Error Correction:\t");
-    if (CommandTerminal::Dot()->getFec() == 0) {
-        CommandTerminal::Serial()->writef("off\r\n");
-    } else {
-        CommandTerminal::Serial()->writef("%u bytes\r\n", CommandTerminal::Dot()->getFec());
-    }
+//    if (CommandTerminal::Dot()->getFec() == 0) {
+//        CommandTerminal::Serial()->writef("off\r\n");
+//    } else {
+//        CommandTerminal::Serial()->writef("%u bytes\r\n", CommandTerminal::Dot()->getFec());
+//    }
 
     CommandTerminal::Serial()->writef("ACK Retries:\t\t");
     if (CommandTerminal::Dot()->getAck() == 0) {
@@ -107,7 +107,7 @@
     CommandTerminal::Serial()->writef("Tx Antenna Gain:\t%d\r\n", CommandTerminal::Dot()->getAntennaGain());
     CommandTerminal::Serial()->writef("Tx Wait:\t\t%s\r\n", CommandTerminal::Dot()->getTxWait() ? "on" : "off");
 
-    CommandTerminal::Serial()->writef("Tx Inverted Signal:\t%s\r\n", CommandTerminal::Dot()->getTxInverted() ? "on" : "off");
+   // CommandTerminal::Serial()->writef("Tx Inverted Signal:\t%s\r\n", CommandTerminal::Dot()->getTxInverted() ? "on" : "off");
 
     bool hasChannels = false;
     for (size_t i = 0; i < 16; i++) {
@@ -130,7 +130,7 @@
     CommandTerminal::Serial()->writef("Rx Delay:\t\t%d s\r\n", CommandTerminal::Dot()->getRxDelay());
 //    CommandTerminal::Serial()->writef("Rx Frequency:\t\t%lu\r\n", CommandTerminal::Dot()->getRxFrequency());
 //    CommandTerminal::Serial()->writef("Rx Data Rate:\t\t%s\r\n", mDot::DataRateStr(CommandTerminal::Dot()->getRxDataRate()).c_str());
-    CommandTerminal::Serial()->writef("Rx Inverted Signal:\t%s\r\n", CommandTerminal::Dot()->getRxInverted() ? "on" : "off");
+    //CommandTerminal::Serial()->writef("Rx Inverted Signal:\t%s\r\n", CommandTerminal::Dot()->getRxInverted() ? "on" : "off");
 
     CommandTerminal::Serial()->writef("Rx Output Style:\t%s\r\n", mDot::RxOutputStr(CommandTerminal::Dot()->getRxOutput()).c_str());
 

--- a/CommandTerminal/CmdErrorCorrection.cpp	Thu Oct 18 04:18:48 2018 +0000
+++ b/CommandTerminal/CmdErrorCorrection.cpp	Mon Oct 22 01:56:09 2018 +0000
@@ -10,18 +10,18 @@
 {
     if (args.size() == 1)
     {
-        CommandTerminal::Serial()->writef("%u\r\n", CommandTerminal::Dot()->getFec());
+        ;//CommandTerminal::Serial()->writef("%u\r\n", CommandTerminal::Dot()->getFec());
     }
     else if (args.size() == 2)
     {
         uint32_t bytes;
         sscanf(args[1].c_str(), "%lu", &bytes);
-
-        if (CommandTerminal::Dot()->setFec(bytes) != mDot::MDOT_OK)
-        {
-            CommandTerminal::setErrorMessage(CommandTerminal::Dot()->getLastError());;
-            return 1;
-        }
+//
+//        if (CommandTerminal::Dot()->setFec(bytes) != mDot::MDOT_OK)
+//        {
+//            CommandTerminal::setErrorMessage(CommandTerminal::Dot()->getLastError());;
+//            return 1;
+//        }
     }
 
     return 0;

--- a/CommandTerminal/CmdRxInverted.cpp	Thu Oct 18 04:18:48 2018 +0000
+++ b/CommandTerminal/CmdRxInverted.cpp	Mon Oct 22 01:56:09 2018 +0000
@@ -10,17 +10,17 @@
 {
     if (args.size() == 1)
     {
-        CommandTerminal::Serial()->writef("%d\r\n", CommandTerminal::Dot()->getRxInverted());
+        ;//CommandTerminal::Serial()->writef("%d\r\n", CommandTerminal::Dot()->getRxInverted());
     }
     else if (args.size() == 2)
     {
         
         bool invert = args[1] == "1";
-        if (CommandTerminal::Dot()->setRxInverted(invert) != mDot::MDOT_OK)
-        {
-            CommandTerminal::setErrorMessage(CommandTerminal::Dot()->getLastError());;
-            return 1;
-        }
+//        if (CommandTerminal::Dot()->setRxInverted(invert) != mDot::MDOT_OK)
+//        {
+//            CommandTerminal::setErrorMessage(CommandTerminal::Dot()->getLastError());;
+//            return 1;
+//        }
     }
 
     return 0;

--- a/CommandTerminal/CmdTxInverted.cpp	Thu Oct 18 04:18:48 2018 +0000
+++ b/CommandTerminal/CmdTxInverted.cpp	Mon Oct 22 01:56:09 2018 +0000
@@ -10,16 +10,16 @@
 {
     if (args.size() == 1)
     {
-        CommandTerminal::Serial()->writef("%d\r\n", CommandTerminal::Dot()->getTxInverted());
+        ;//CommandTerminal::Serial()->writef("%d\r\n", CommandTerminal::Dot()->getTxInverted());
     }
     else if (args.size() == 2)
     {
         bool invert = args[1] == "1";
-        if (CommandTerminal::Dot()->setTxInverted(invert) != mDot::MDOT_OK)
-        {
-            CommandTerminal::setErrorMessage(CommandTerminal::Dot()->getLastError());;
-            return 1;
-        }
+//        if (CommandTerminal::Dot()->setTxInverted(invert) != mDot::MDOT_OK)
+//        {
+//            CommandTerminal::setErrorMessage(CommandTerminal::Dot()->getLastError());;
+//            return 1;
+//        }
     }
 
     return 0;

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libmDot-dev-mbed5.lib	Mon Oct 22 01:56:09 2018 +0000
@@ -0,0 +1,1 @@
+http://os.mbed.com/teams/MultiTech/code/libmDot-dev-mbed5/#b642f4d0c95b

--- a/libmDot-mbed5.lib	Thu Oct 18 04:18:48 2018 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-http://os.mbed.com/teams/MultiTech/code/libmDot-mbed5/#64982192a2af

--- a/main.cpp	Thu Oct 18 04:18:48 2018 +0000
+++ b/main.cpp	Mon Oct 22 01:56:09 2018 +0000
@@ -19,22 +19,22 @@
 int main()
 {
     in_serial.baud(115200);
-//
-//#if CHANNEL_PLAN == CP_AS923
-//    lora::ChannelPlan* plan = new lora::ChannelPlan_AS923();
-//#elif CHANNEL_PLAN == CP_US915
-//    lora::ChannelPlan* plan = new lora::ChannelPlan_US915();
-//#elif CHANNEL_PLAN == CP_AU915
+
+#if CHANNEL_PLAN == CP_AS923
+    lora::ChannelPlan* plan = new lora::ChannelPlan_AS923();
+#elif CHANNEL_PLAN == CP_US915
+    lora::ChannelPlan* plan = new lora::ChannelPlan_US915();
+#elif CHANNEL_PLAN == CP_AU915
     lora::ChannelPlan* plan = new lora::ChannelPlan_AU915();
-//#elif CHANNEL_PLAN == CP_EU868
-//    lora::ChannelPlan* plan = new lora::ChannelPlan_EU868();
-//#elif CHANNEL_PLAN == CP_KR920
-//    lora::ChannelPlan* plan = new lora::ChannelPlan_KR920();
-//#elif CHANNEL_PLAN == CP_IN865
-//    lora::ChannelPlan* plan = new lora::ChannelPlan_IN865();
-//#elif CHANNEL_PLAN == CP_AS923_JAPAN
-//    lora::ChannelPlan* plan = new lora::ChannelPlan_AS923_Japan();
-//#endif
+#elif CHANNEL_PLAN == CP_EU868
+    lora::ChannelPlan* plan = new lora::ChannelPlan_EU868();
+#elif CHANNEL_PLAN == CP_KR920
+    lora::ChannelPlan* plan = new lora::ChannelPlan_KR920();
+#elif CHANNEL_PLAN == CP_IN865
+    lora::ChannelPlan* plan = new lora::ChannelPlan_IN865();
+#elif CHANNEL_PLAN == CP_AS923_JAPAN
+    lora::ChannelPlan* plan = new lora::ChannelPlan_AS923_Japan();
+#endif
     assert(plan);
 
     mDot* dot = mDot::getInstance(plan);

--- a/mbed-os.lib	Thu Oct 18 04:18:48 2018 +0000
+++ b/mbed-os.lib	Mon Oct 22 01:56:09 2018 +0000
@@ -1,1 +1,1 @@
-https://github.com/ARMmbed/mbed-os/#16bac101a6b7b4724023dcf86ece1548e3a23cbf
+https://github.com/ARMmbed/mbed-os/#0fdfcf7350896a9c0b57c4a18237677abfe25f1a