Revision 18:72b6b49d363d, committed 2019-01-16

Comitter:

jreiss

Date:

Wed Jan 16 14:20:49 2019 +0000

Parent:

17:95c9eb69329a

Commit message:

Update libxDot to latest and mbed-os to 5.7.7; Update PacketRx for new library

Changed in this revision

diff -r 95c9eb69329a -r 72b6b49d363d CommandTerminal/CommandTerminal.cpp
--- a/CommandTerminal/CommandTerminal.cpp	Mon Jun 19 15:54:03 2017 -0500
+++ b/CommandTerminal/CommandTerminal.cpp	Wed Jan 16 14:20:49 2019 +0000
@@ -1305,8 +1305,8 @@
 void CommandTerminal::wakeup(void) {
 }
 
-void CommandTerminal::RadioEvent::PacketRx(uint8_t port, uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr, lora::DownlinkControl ctrl, uint8_t slot, uint8_t retries) {
-    mDotEvent::PacketRx(port, payload, size, rssi, snr, ctrl, retries);
+void CommandTerminal::RadioEvent::PacketRx(uint8_t port, uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr, lora::DownlinkControl ctrl, uint8_t slot, uint8_t retries, uint32_t addr, bool dupRx) {
+    mDotEvent::PacketRx(port, payload, size, rssi, snr, ctrl, slot, retries, addr, dupRx);
 
     if (serial_data_mode) {
         logDebug("Rx %d bytes", size);

diff -r 95c9eb69329a -r 72b6b49d363d CommandTerminal/CommandTerminal.h
--- a/CommandTerminal/CommandTerminal.h	Mon Jun 19 15:54:03 2017 -0500
+++ b/CommandTerminal/CommandTerminal.h	Wed Jan 16 14:20:49 2019 +0000
@@ -82,7 +82,7 @@
             logDebug("RadioEvent - JoinFailed");
         }
 
-        virtual void PacketRx(uint8_t port, uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr, lora::DownlinkControl ctrl, uint8_t slot, uint8_t retries = 0);
+        virtual void PacketRx(uint8_t port, uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr, lora::DownlinkControl ctrl, uint8_t slot, uint8_t retries = 0, uint32_t addr = 0, bool dupRx=false);
 
         virtual void RxDone(uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr, lora::DownlinkControl ctrl, uint8_t slot) {
             mDotEvent::RxDone(payload, size, rssi, snr, ctrl, slot);

diff -r 95c9eb69329a -r 72b6b49d363d libxDot-mbed5.lib
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libxDot-mbed5.lib	Wed Jan 16 14:20:49 2019 +0000
@@ -0,0 +1,1 @@
+https://os.mbed.com/teams/MultiTech/code/libxDot-mbed5/#47c194c843d5

diff -r 95c9eb69329a -r 72b6b49d363d main.cpp
--- a/main.cpp	Mon Jun 19 15:54:03 2017 -0500
+++ b/main.cpp	Wed Jan 16 14:20:49 2019 +0000
@@ -7,7 +7,7 @@
 
 #define SERIAL_BUFFER_SIZE 512
 
-Serial debug(USBTX, USBRX);
+Serial pc(USBTX, USBRX);
 
 #ifndef CHANNEL_PLAN
 #define CHANNEL_PLAN CP_US915
@@ -17,7 +17,7 @@
 
 int main()
 {
-    debug.baud(115200);
+    pc.baud(115200);
 
 #if CHANNEL_PLAN == CP_AS923
     lora::ChannelPlan* plan = new lora::ChannelPlan_AS923();
@@ -57,7 +57,7 @@
         serial = new mts::ATSerial(UART1_TX, UART1_RX, SERIAL_BUFFER_SIZE, SERIAL_BUFFER_SIZE);
 #endif
 
-    debug.baud(dot->getDebugBaud());
+    pc.baud(dot->getDebugBaud());
     serial->baud(dot->getBaud());
 
     CommandTerminal term(*serial);

diff -r 95c9eb69329a -r 72b6b49d363d mbed-os.lib
--- a/mbed-os.lib	Mon Jun 19 15:54:03 2017 -0500
+++ b/mbed-os.lib	Wed Jan 16 14:20:49 2019 +0000
@@ -1,1 +1,1 @@
-https://github.com/ARMmbed/mbed-os/#a6f3fd1a60d5df59246d7caf3f108c4d34e1808e
+https://github.com/ARMmbed/mbed-os/#16bac101a6b7b4724023dcf86ece1548e3a23cbf

diff -r 95c9eb69329a -r 72b6b49d363d mbed_app.json
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mbed_app.json	Wed Jan 16 14:20:49 2019 +0000
@@ -0,0 +1,8 @@
+{
+    "config": {
+        "main-stack-size" : {
+            "macro_name": "MBED_CONF_APP_MAIN_STACK_SIZE",
+            "value": 8192
+        }
+    }
+}