MultiTech
Example programs for MultiTech Dot devices demonstrating how to use the Dot devices and the Dot libraries for LoRa communication.
Dependencies: ISL29011
Dependents: Dot-Examples-delujoc
This project has moved to github
Please see GitHub Dot-Examples
Dot Library Not Included!
Because these example programs can be used for both mDot and xDot devices, the LoRa stack is not included. The libmDot library should be imported if building for mDot devices. The libxDot library should be imported if building for xDot devices.
Dot Library Limitations
Commit messages in Dot Library repositories specify the version of the library and the version of mbed-os it was compiled against. We recommend building your application with the version of mbed-os specified in the commit message of the version of the Dot library you're using. This will ensure that you don't run into any runtime issues caused by differences in the mbed-os versions.
Example Programs Description
This application contains multiple example programs. Each example demonstrates a different way to configure and use a Dot. A short summary of each example is provided below. Common code used by multiple examples is in the dot_utils.cpp file.
All examples print logging, including RX data, on the USB debug port at 115200 baud. Each example defaults the Dot's configuration and saves the new configuration to NVM.
OTA Example
This example demonstrates configuring the Dot for OTA join mode and entering sleep or deepsleep mode between transactions with the gateway. If deepsleep mode is used, the session is saved and restored so that a rejoin is not necessary after waking up even though RAM contents have been lost. ACKs are disabled, but network link checks are configured - if enough link checks are missed, the Dot will no longer be considered joined to the network and will attempt to rejoin before transmitting more data.
AUTO_OTA Example
This example demonstrates configuring the Dot for AUTO_OTA join mode and entering sleep or deepsleep mode between transactions with the gateway. AUTO_OTA join mode automatically saves and restores the session when deepsleep mode is used, so the manual saving and restoring of the session is not necessary. ACKs are disabled, but network link checks are configured - if enough link checks are missed, the Dot will no longer be considered joined to the network and will attempt to rejoin before transmitting more data.
Manual Example
This example demonstrates configuring the Dot for MANUAL join mode and entering sleep or deepsleep mode between transactions with the gateway. The Dot must be provisioned on the gateway before its packets will be accepted! Follow these steps to provision the Dot on a Conduit gateway:
- ssh into the conduit
- use the lorq-query application to provision the Dot on the gateway
- lora-query -a 01020304 A 0102030401020304 <your Dot's device ID> 01020304010203040102030401020304 01020304010203040102030401020304
- if any of the credentials change on the Dot side, they must be updated on the gateway side as well
To provision a Dot on a third-party gateway, see the gateway or network provider documentation.
Class B Example
This example demonstrates how to configure the dot for an OTA join, how to acquire a lock on a GPS synchronized beacon, and then to subsequently enter class B mode of operation. After a successful join, the device will request to the dot-library to switch to class B. When this happens, the library will send an uplink to the network server (hence we must be joined first before entering this mode) requesting the GPS time to calculate when the next beacon is expected. Once this time elapses, the dot will open an rx window to demodulate the broadcasted beacon and fire an mDotEvent::BeaconRx event upon successful reception. After the beacon is received, the example sends an uplink which will have the class B bit in the packet's frame control set to indicate to the network server that downlinks may now be scheduled on ping slots. The lora-query application can be used to configure a Conduit gateway to communicate with a Dot in class B mode. For information on how to inform a third-party gateway that a Dot is operating in class B mode, see the gateway or network provider documentation.
Class C Example
This example demonstrates configuring the Dot for OTA join mode and communicating with the gateway using class C mode. In class C mode the gateway can send a packet to the Dot at any time, so it must be listening whenever it is not transmitting. This means that the Dot cannot enter sleep or deepsleep mode. The gateway will not immediately send packets to the Dot (outside the receive windows following a transmission from the Dot) until it is informed that the Dot is operating in class C mode. The lora-query application can be used to configure a Conduit gateway to communicate with a Dot in class C mode. For information on how to inform a third-party gateway that a Dot is operating in class C mode, see the gateway or network provider documentation.
FOTA Example
Full FOTA support is available on mDot and on xDot with external flash. See this article for details on adding external flash for xDot FOTA.
Without external flash xDot can use the FOTA example to dynamically join a multicast session only. After joining the multicast session the received Fragmentation packets could be handed to a host MCU for processing and at completion the firmware can be loaded into the xDot using the bootloader and y-modem. See xDot Developer Guide.
This example demonstrates how to incorporate over-the-air updates to an application. The example uses a Class C application. Class A or B functionality could also be used. The device will automatically enter into Class C operation for the FOTA operation, Class B would be disabled during the FOTA transfer.
- Add the following code to allow Fota to use the Dot instance
examples/src/fota_example.cpp
// Initialize FOTA singleton
Fota::getInstance(dot);
- Add fragmentation and multicast handling the the PacketRx event
examples/inc/RadioEvent.h
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, uint32_t address, uint32_t fcnt, bool dupRx) {
mDotEvent::PacketRx(port, payload, size, rssi, snr, ctrl, slot, retries, address, fcnt, dupRx);
#if ACTIVE_EXAMPLE == FOTA_EXAMPLE
if(port == 200 || port == 201 || port == 202) {
Fota::getInstance()->processCmd(payload, port, size);
}
#endif
}
A definition is needed to enable FOTA.
mbed_app.json
{
"macros": [
"FOTA=1"
]
}
Peer to Peer Example
This example demonstrates configuring Dots for peer to peer communication without a gateway. It should be compiled and run on two Dots. Peer to peer communication uses LoRa modulation but uses a single higher throughput (usually 500kHz or 250kHz) datarate. It is similar to class C operation - when a Dot isn't transmitting, it's listening for packets from the other Dot. Both Dots must be configured exactly the same for peer to peer communication to be successful.
Choosing An Example Program and Channel Plan
Only the active example is compiled. The active example can be updated by changing the ACTIVE_EXAMPLE definition in the examples/example_config.h file.
By default the OTA_EXAMPLE will be compiled and the US915 channel plan will be used.
example_config.h
#ifndef __EXAMPLE__CONFIG_H__ #define __EXAMPLE__CONFIG_H__ #define OTA_EXAMPLE 1 // see ota_example.cpp #define AUTO_OTA_EXAMPLE 2 // see auto_ota_example.cpp #define MANUAL_EXAMPLE 3 // see manual_example.cpp #define PEER_TO_PEER_EXAMPLE 4 // see peer_to_peer_example.cpp #define CLASS_C_EXAMPLE 5 // see class_c_example.cpp // the active example is the one that will be compiled #if !defined(ACTIVE_EXAMPLE) #define ACTIVE_EXAMPLE OTA_EXAMPLE #endif // the active channel plan is the one that will be compiled // options are : // CP_US915 // CP_AU915 // CP_EU868 // CP_KR920 // CP_AS923 // CP_AS923_JAPAN #if !defined(CHANNEL_PLAN) #define CHANNEL_PLAN CP_US915 #endif #endif
Compile the AUTO_OTA_EXAMPLE and use the EU868 channel plan instead.
example_config.h
#ifndef __EXAMPLE__CONFIG_H__ #define __EXAMPLE__CONFIG_H__ #define OTA_EXAMPLE 1 // see ota_example.cpp #define AUTO_OTA_EXAMPLE 2 // see auto_ota_example.cpp #define MANUAL_EXAMPLE 3 // see manual_example.cpp #define PEER_TO_PEER_EXAMPLE 4 // see peer_to_peer_example.cpp #define CLASS_C_EXAMPLE 5 // see class_c_example.cpp // the active example is the one that will be compiled #if !defined(ACTIVE_EXAMPLE) #define ACTIVE_EXAMPLE AUTO_OTA_EXAMPLE #endif // the active channel plan is the one that will be compiled // options are : // CP_US915 // CP_AU915 // CP_EU868 // CP_KR920 // CP_AS923 // CP_AS923_JAPAN #if !defined(CHANNEL_PLAN) #define CHANNEL_PLAN CP_EU868 #endif #endif
Dot Libraries
Stable and development libraries are available for both mDot and xDot platforms. The library chosen must match the target platform. Compiling for the mDot platform with the xDot library or vice versa will not succeed.
mDot Library
Development library for mDot.
Stable library for mDot.
For mbed-os 5 use:
Import librarylibmDot-mbed5
Stable version of the mDot library for mbed 5. This version of the library is suitable for deployment scenarios. See lastest commit message for version of mbed-os library that has been tested against.
Last commit 25 Mar 2020 by 
MultiTech
xDot Library
Development library for xDot.
Stable library for xDot.
For mbed-os 5 use:
Import librarylibxDot-mbed5
Stable version of the xDot library for mbed 5. This version of the library is suitable for deployment scenarios.
Last commit 02 Apr 2020 by MultiTech
Revision 42:20f6b29a9903, committed 2021-05-25
- Comitter:
- Taylor Heck
- Date:
- Tue May 25 09:54:33 2021 -0500
- Parent:
- 41:67feacfab49c
- Commit message:
- Target mbed-os 6 and Dot Library version 4.
Changed in this revision
diff -r 67feacfab49c -r 20f6b29a9903 README --- a/README Mon May 18 13:12:47 2020 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,22 +0,0 @@ -Instructions for building Dot-Examples - -1. Import dot-examples -$ mbed import http://os.mbed.com/teams/MultiTech/code/Dot-Examples/ - -2. cd to the Dot-Examples/examples and import the dot library stack -Choose either the stable or dev library for your dot device -e.g. to get the latest development library for the xDot -$ mbed add http://os.mbed.com/teams/MultiTech/code/libxDot-dev-mbed5/ - -3. Update mbed-os revision to match that of the dot library you just imported. -This information can be found in the library's commit history. -e.g. -$ cd Dot-Examples/mbed-os -$ mbed update mbed-os-5.7.6 - -4. Modify the Dot-Examples/examples/example_config.h to select the channel plan and which example to build -By default, the OTA example is selected to build with the US channel plan - -5. Once the example is selected, modify the example source file to match the configuration of your gateway. -Make sure the network_name, network_passphrase, frequency_sub_band (US), public_network, and join_delay settings match that of your gateway -
diff -r 67feacfab49c -r 20f6b29a9903 README.md
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/README.md Tue May 25 09:54:33 2021 -0500
@@ -0,0 +1,205 @@
+# dot-examples
+Example programs for MultiTech Dot devices demonstrating how to use the Dot devices and the Dot libraries for LoRa communication.
+
+## Instructions for building Dot-Examples
+
+1. Import dot-examples
+$ mbed import http://os.mbed.com/teams/MultiTech/code/Dot-Examples/
+
+2. Change directory to the Dot-Examples/examples and import the dot library stack
+Choose either the stable or dev library for your dot device
+e.g. to get the latest development library for the xDot
+$ mbed add http://os.mbed.com/teams/MultiTech/code/libxDot-dev/
+
+3. Update mbed-os revision to match that of the dot library you just imported.
+This information can be found in the library's commit history.
+e.g.
+$ cd Dot-Examples/mbed-os
+$ mbed update mbed-os-6.1.0
+
+4. Modify the Dot-Examples/examples/example_config.h to select the channel plan and which example to build
+By default, the OTA example is selected to build with the US channel plan
+
+5. Once the example is selected, modify the example source file to match the configuration of your gateway.
+Make sure the network_name, network_passphrase, frequency_sub_band (US), public_network, and join_delay settings match that of your gateway
+
+### Compiler Versions
+
+* [Arm Compiler](https://developer.arm.com/tools-and-software/embedded/arm-compiler/downloads/version-6) version 6.11 or newer
+* [GNU Arm Embedded Toolchain](https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm/downloads) version 9 2019-q4-major or newer
+
+_When compiling for XDot GCC can cause out-of-memory errors._
+
+### Programming Over Serial
+
+The lastest bootloader requires firmware images to be application only and have a CRC appended. [Multitool](https://pypi.org/project/mtsmultitool) can be used to transfer firmware files over serial.
+
+Example multitool commands for stripping the bootloader, appending a CRC, and sending a file to an mDot or xDot over serial.
+```
+multitool device upgrade -b COM3 MTDOT mbed_output.bin
+multitool device upgrade -b COM3 XDOT mbed_output.bin
+```
+
+## Example Programs Description
+This application contains multiple example programs. Each example demonstrates a different way to configure and use a Dot. A short summary of each example is provided below. Common code used by multiple examples is in the dot_utils.cpp file.
+
+All examples print logging, including RX data, on the USB debug port at 115200 baud. Each example defaults the Dot's configuration and saves the new configuration to NVM.
+
+### OTA Example
+This example demonstrates configuring the Dot for OTA join mode and entering sleep or deepsleep mode between transactions with the gateway. If deepsleep mode is used, the session is saved and restored so that a rejoin is not necessary after waking up even though RAM contents have been lost. ACKs are disabled, but network link checks are configured - if enough link checks are missed, the Dot will no longer be considered joined to the network and will attempt to rejoin before transmitting more data.
+
+### AUTO_OTA Example
+This example demonstrates configuring the Dot for AUTO_OTA join mode and entering sleep or deepsleep mode between transactions with the gateway. AUTO_OTA join mode automatically saves and restores the session when deepsleep mode is used, so the manual saving and restoring of the session is not necessary. ACKs are disabled, but network link checks are configured - if enough link checks are missed, the Dot will no longer be considered joined to the network and will attempt to rejoin before transmitting more data.
+
+### Manual Example
+This example demonstrates configuring the Dot for MANUAL join mode and entering sleep or deepsleep mode between transactions with the gateway. The Dot must be provisioned on the gateway before its packets will be accepted! Follow these steps to provision the Dot on a Conduit gateway:
+
+* ssh into the conduit
+* use the lora-query application to provision the Dot on the gateway
+lora-query -a 01020304 A 0102030401020304 <your Dot's device ID> 01020304010203040102030401020304 01020304010203040102030401020304
+* if any of the credentials change on the Dot side, they must be updated on the gateway side as well
+To provision a Dot on a third-party gateway, see the gateway or network provider documentation.
+
+### Class C Example
+This example demonstrates configuring the Dot for OTA join mode and communicating with the gateway using class C mode. In class C mode the gateway can send a packet to the Dot at any time, so it must be listening whenever it is not transmitting. This means that the Dot cannot enter sleep or deepsleep mode. The gateway will not immediately send packets to the Dot (outside the receive windows following a transmission from the Dot) until it is informed that the Dot is operating in class C mode. The lora-query application can be used to configure a Conduit gateway to communicate with a Dot in class C mode. For information on how to inform a third-party gateway that a Dot is operating in class C mode, see the gateway or network provider documentation.
+
+### Class B Example
+This example demonstrates how to configure the dot for an OTA join, how to acquire a lock on a GPS synchronized beacon, and then to subsequently enter class B mode of operation. After a successful join, the device will request to the dot-library to switch to class B. When this happens, the library will send an uplink to the network server (hence we must be joined first before entering this mode) requesting the GPS time to calculate when the next beacon is expected. Once this time elapses, the dot will open an rx window to demodulate the broadcasted beacon and fire an mDotEvent::BeaconRx event upon successful reception. After the beacon is received, the example sends an uplink which will have the class B bit in the packet's frame control set to indicate to the network server that downlinks may now be scheduled on ping slots. The lora-query application can be used to configure a Conduit gateway to communicate with a Dot in class B mode. For information on how to inform a third-party gateway that a Dot is operating in class B mode, see the gateway or network provider documentation.
+
+### FOTA Example
+Full FOTA support is available on mDot and on xDot with external flash. See [this article](https://multitechsystems.github.io/dot-development-xdot) for details on adding external flash for xDot FOTA.
+
+Without external flash xDot can use the FOTA example to dynamically join a multicast session only. After joining the multicast session the received Fragmentation packets could be handed to a host MCU for processing and at completion the firmware can be loaded into the xDot using the bootloader and y-modem. See [xDot Developer Guide](https://www.multitech.com/brands/multiconnect-xdot).
+
+This example demonstrates how to incorporate over-the-air updates to an application. The example uses a Class C application. Class A or B functionality could also be used. The device will automatically enter into Class C operation for the FOTA operation, Class B would be disabled during the FOTA transfer.
+
+Add the following code to allow Fota to use the Dot instance
+>examples/src/fota_example.cpp
+```c
+ // Initialize FOTA singleton
+ Fota::getInstance(dot);
+```
+
+Add fragmentation handling the the PacketRx event
+
+Note: The type for snr changed from int8_t in 3.2.x to int16_t in 3.3.x library
+
+>examples/inc/RadioEvent.h
+```c
+ virtual void PacketRx(uint8_t port, uint8_t *payload, uint16_t size, int16_t rssi, int16_t snr, lora::DownlinkControl ctrl, uint8_t slot, uint8_t retries, uint32_t address, uint32_t fcnt, bool dupRx) {
+ mDotEvent::PacketRx(port, payload, size, rssi, snr, ctrl, slot, retries, address, fcnt, dupRx);
+
+#if ACTIVE_EXAMPLE == FOTA_EXAMPLE
+ if(port == 200 || port == 201 || port == 202) {
+ Fota::getInstance()->processCmd(payload, port, size);
+ }
+#endif
+ }
+```
+
+The FOTA implementation has a few differences from the [LoRaWAN FOTA Protocol](https://lora-alliance.org/resource-hub/lorawan-fragmented-data-block-transport-specification-v100)
+* Fragmentation Indexing starts at 0
+* McKEKey is 00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00
+* Start Time is a count-down in seconds to start of session
+
+
+### Peer to Peer Example
+This example demonstrates configuring Dots for peer to peer communication without a gateway. It should be compiled and run on two Dots. Peer to peer communication uses LoRa modulation but uses a single higher throughput (usually 500kHz or 250kHz) datarate. It is similar to class C operation - when a Dot isn't transmitting, it's listening for packets from the other Dot. Both Dots must be configured exactly the same for peer to peer communication to be successful.
+
+
+## Choosing An Example Program and Channel Plan
+Only the active example is compiled. The active example can be updated by changing the **ACTIVE_EXAMPLE** definition in the examples/example_config.h file.
+
+By default the OTA_EXAMPLE will be compiled and the US915 channel plan will be used.
+>example_config.h
+
+```c
+#ifndef __EXAMPLE__CONFIG_H__
+#define __EXAMPLE__CONFIG_H__
+
+#define OTA_EXAMPLE 1 // see ota_example.cpp
+#define AUTO_OTA_EXAMPLE 2 // see auto_ota_example.cpp
+#define MANUAL_EXAMPLE 3 // see manual_example.cpp
+#define PEER_TO_PEER_EXAMPLE 4 // see peer_to_peer_example.cpp
+#define CLASS_C_EXAMPLE 5 // see class_c_example.cpp
+#define CLASS_B_EXAMPLE 6 // see class_b_example.cpp
+#define FOTA_EXAMPLE 7 // see fota_example.cpp
+
+// the active example is the one that will be compiled
+#if !defined(ACTIVE_EXAMPLE)
+#define ACTIVE_EXAMPLE OTA_EXAMPLE
+#endif
+
+// the active channel plan is the one that will be compiled
+// options are :
+// CP_US915
+// CP_AU915
+// CP_EU868
+// CP_KR920
+// CP_AS923
+// CP_AS923_JAPAN
+#if !defined(CHANNEL_PLAN)
+#define CHANNEL_PLAN CP_US915
+#endif
+
+#endif
+```
+
+Compile the AUTO_OTA_EXAMPLE and use the EU868 channel plan instead.
+```c
+#ifndef __EXAMPLE__CONFIG_H__
+#define __EXAMPLE__CONFIG_H__
+
+#define OTA_EXAMPLE 1 // see ota_example.cpp
+#define AUTO_OTA_EXAMPLE 2 // see auto_ota_example.cpp
+#define MANUAL_EXAMPLE 3 // see manual_example.cpp
+#define PEER_TO_PEER_EXAMPLE 4 // see peer_to_peer_example.cpp
+#define CLASS_C_EXAMPLE 5 // see class_c_example.cpp
+
+// the active example is the one that will be compiled
+#if !defined(ACTIVE_EXAMPLE)
+#define ACTIVE_EXAMPLE AUTO_OTA_EXAMPLE
+#endif
+
+// the active channel plan is the one that will be compiled
+// options are :
+// CP_US915
+// CP_AU915
+// CP_EU868
+// CP_KR920
+// CP_AS923
+// CP_AS923_JAPAN
+#if !defined(CHANNEL_PLAN)
+#define CHANNEL_PLAN CP_EU868
+#endif
+
+#endif
+```
+
+## Dot Libraries
+Stable and development libraries are available for both mDot and xDot platforms. The library chosen must match the target platform. Compiling for the mDot platform with the xDot library or vice versa will not succeed.
+
+### mDot Library
+#### Development library for mDot
+
+Bleeding edge development version of the mDot library for mbed 6. This version of the library is not guaranteed to be stable or well tested and should not be used in production or deployment scenarios.
+
+mbed add [https://github.com/MultiTechSystems/libmDot-dev](https://github.com/MultiTechSystems/libmDot-dev)
+
+#### Stable library for mDot
+
+Stable version of the mDot library for mbed 6. This version of the library is suitable for deployment scenarios. See lastest commit message for version of mbed-os library that has been tested against.
+
+mbed add [https://github.com/MultiTechSystems/libmDot](https://github.com/MultiTechSystems/libmDot)
+
+### xDot Library
+#### Development library for xDot
+Bleeding edge development version of the xDot library for mbed 6. This version of the library is not guaranteed to be stable or well tested and should not be used in production or deployment scenarios.
+
+mbed add [https://github.com/MultiTechSystems/libxDot-dev](https://github.com/MultiTechSystems/libxDot-dev)
+
+#### Stable library for xDot
+
+Stable version of the xDot library for mbed 6. This version of the library is suitable for deployment scenarios.
+
+mbed add [https://github.com/MultiTechSystems/libxDot](https://github.com/MultiTechSystems/libxDot)
diff -r 67feacfab49c -r 20f6b29a9903 bootloaders/mdot-boot.bin Binary file bootloaders/mdot-boot.bin has changed
diff -r 67feacfab49c -r 20f6b29a9903 bootloaders/xdot-boot.bin Binary file bootloaders/xdot-boot.bin has changed
diff -r 67feacfab49c -r 20f6b29a9903 examples/example_config.h --- a/examples/example_config.h Mon May 18 13:12:47 2020 -0500 +++ b/examples/example_config.h Tue May 25 09:54:33 2021 -0500 @@ -21,8 +21,14 @@ // CP_EU868 // CP_KR920 // CP_AS923 +// CP_AS923_2 +// CP_AS923_3 // CP_AS923_JAPAN +// CP_AS923_JAPAN1 +// CP_AS923_JAPAN2 // CP_IN865 +// CP_RU864 + #if !defined(CHANNEL_PLAN) #define CHANNEL_PLAN CP_US915 #endif
diff -r 67feacfab49c -r 20f6b29a9903 examples/inc/RadioEvent.h
--- a/examples/inc/RadioEvent.h Mon May 18 13:12:47 2020 -0500
+++ b/examples/inc/RadioEvent.h Tue May 25 09:54:33 2021 -0500
@@ -4,6 +4,7 @@
#include "dot_util.h"
#include "mDotEvent.h"
#include "Fota.h"
+#include "example_config.h"
class RadioEvent : public mDotEvent
{
@@ -13,8 +14,8 @@
virtual ~RadioEvent() {}
- virtual void PacketRx(uint8_t port, uint8_t *payload, uint16_t size, int16_t rssi, int16_t snr, lora::DownlinkControl ctrl, uint8_t slot, uint8_t retries, uint32_t address, bool dupRx) {
- mDotEvent::PacketRx(port, payload, size, rssi, snr, ctrl, slot, retries, address, dupRx);
+ virtual void PacketRx(uint8_t port, uint8_t *payload, uint16_t size, int16_t rssi, int16_t snr, lora::DownlinkControl ctrl, uint8_t slot, uint8_t retries, uint32_t address, uint32_t fcnt, bool dupRx) {
+ mDotEvent::PacketRx(port, payload, size, rssi, snr, ctrl, slot, retries, address, fcnt, dupRx);
#if ACTIVE_EXAMPLE == FOTA_EXAMPLE
if(port == 200 || port == 201 || port == 202) {
@@ -72,7 +73,8 @@
if (flags->Bits.Rx) {
- logDebug("Rx %d bytes", info->RxBufferSize);
+ logInfo("Rx %d bytes", info->RxBufferSize);
+
if (info->RxBufferSize > 0) {
#if ACTIVE_EXAMPLE != FOTA_EXAMPLE
// print RX data as string and hexadecimal
@@ -83,6 +85,7 @@
}
}
+
#if ACTIVE_EXAMPLE == FOTA_EXAMPLE
virtual void ServerTime(uint32_t seconds, uint8_t sub_seconds) {
mDotEvent::ServerTime(seconds, sub_seconds);
diff -r 67feacfab49c -r 20f6b29a9903 examples/inc/dot_util.h --- a/examples/inc/dot_util.h Mon May 18 13:12:47 2020 -0500 +++ b/examples/inc/dot_util.h Tue May 25 09:54:33 2021 -0500 @@ -11,6 +11,8 @@ extern mDot* dot; +lora::ChannelPlan* create_channel_plan(); + void display_config(); void update_ota_config_name_phrase(std::string network_name, std::string network_passphrase, uint8_t frequency_sub_band, lora::NetworkType network_type, uint8_t ack);
diff -r 67feacfab49c -r 20f6b29a9903 examples/src/auto_ota_example.cpp
--- a/examples/src/auto_ota_example.cpp Mon May 18 13:12:47 2020 -0500
+++ b/examples/src/auto_ota_example.cpp Tue May 25 09:54:33 2021 -0500
@@ -41,7 +41,7 @@
mDot* dot = NULL;
lora::ChannelPlan* plan = NULL;
-Serial pc(USBTX, USBRX);
+mbed::UnbufferedSerial pc(USBTX, USBRX);
#if defined(TARGET_XDOT_L151CC)
I2C i2c(I2C_SDA, I2C_SCL);
@@ -62,21 +62,8 @@
mts::MTSLog::setLogLevel(mts::MTSLog::TRACE_LEVEL);
-#if CHANNEL_PLAN == CP_US915
- plan = new lora::ChannelPlan_US915();
-#elif CHANNEL_PLAN == CP_AU915
- plan = new lora::ChannelPlan_AU915();
-#elif CHANNEL_PLAN == CP_EU868
- plan = new lora::ChannelPlan_EU868();
-#elif CHANNEL_PLAN == CP_KR920
- plan = new lora::ChannelPlan_KR920();
-#elif CHANNEL_PLAN == CP_AS923
- plan = new lora::ChannelPlan_AS923();
-#elif CHANNEL_PLAN == CP_AS923_JAPAN
- plan = new lora::ChannelPlan_AS923_Japan();
-#elif CHANNEL_PLAN == CP_IN865
- plan = new lora::ChannelPlan_IN865();
-#endif
+ // Create channel plan
+ plan = create_channel_plan();
assert(plan);
dot = mDot::getInstance(plan);
diff -r 67feacfab49c -r 20f6b29a9903 examples/src/class_b_example.cpp
--- a/examples/src/class_b_example.cpp Mon May 18 13:12:47 2020 -0500
+++ b/examples/src/class_b_example.cpp Tue May 25 09:54:33 2021 -0500
@@ -38,7 +38,7 @@
mDot* dot = NULL;
lora::ChannelPlan* plan = NULL;
-Serial pc(USBTX, USBRX);
+mbed::UnbufferedSerial pc(USBTX, USBRX);
#if defined(TARGET_XDOT_L151CC)
I2C i2c(I2C_SDA, I2C_SCL);
@@ -58,22 +58,9 @@
#endif
mts::MTSLog::setLogLevel(mts::MTSLog::TRACE_LEVEL);
-
-#if CHANNEL_PLAN == CP_US915
- plan = new lora::ChannelPlan_US915();
-#elif CHANNEL_PLAN == CP_AU915
- plan = new lora::ChannelPlan_AU915();
-#elif CHANNEL_PLAN == CP_EU868
- plan = new lora::ChannelPlan_EU868();
-#elif CHANNEL_PLAN == CP_KR920
- plan = new lora::ChannelPlan_KR920();
-#elif CHANNEL_PLAN == CP_AS923
- plan = new lora::ChannelPlan_AS923();
-#elif CHANNEL_PLAN == CP_AS923_JAPAN
- plan = new lora::ChannelPlan_AS923_Japan();
-#elif CHANNEL_PLAN == CP_IN865
- plan = new lora::ChannelPlan_IN865();
-#endif
+
+ // Create channel plan
+ plan = create_channel_plan();
assert(plan);
dot = mDot::getInstance(plan);
@@ -158,11 +145,11 @@
srand(dot->getRadioRandom());
uint32_t rand_delay = rand() % 5000;
logInfo("Applying a random delay of %d ms before class notification uplink", rand_delay);
- osDelay(rand_delay);
+ ThisThread::sleep_for(std::chrono::milliseconds(rand_delay));
// Ensure the link is idle before trying to transmit
while (!dot->getIsIdle()) {
- osDelay(10);
+ ThisThread::sleep_for(10ms);
}
if (send_data(tx_data) != mDot::MDOT_OK) {
@@ -187,8 +174,7 @@
bcn_timer.reset();
}
}
-
- Thread::wait(10000);
+ ThisThread::sleep_for(10s);
}
return 0;
diff -r 67feacfab49c -r 20f6b29a9903 examples/src/class_c_example.cpp
--- a/examples/src/class_c_example.cpp Mon May 18 13:12:47 2020 -0500
+++ b/examples/src/class_c_example.cpp Tue May 25 09:54:33 2021 -0500
@@ -35,7 +35,7 @@
mDot* dot = NULL;
lora::ChannelPlan* plan = NULL;
-Serial pc(USBTX, USBRX);
+mbed::UnbufferedSerial pc(USBTX, USBRX);
#if defined(TARGET_XDOT_L151CC)
I2C i2c(I2C_SDA, I2C_SCL);
@@ -55,22 +55,9 @@
#endif
mts::MTSLog::setLogLevel(mts::MTSLog::TRACE_LEVEL);
-
-#if CHANNEL_PLAN == CP_US915
- plan = new lora::ChannelPlan_US915();
-#elif CHANNEL_PLAN == CP_AU915
- plan = new lora::ChannelPlan_AU915();
-#elif CHANNEL_PLAN == CP_EU868
- plan = new lora::ChannelPlan_EU868();
-#elif CHANNEL_PLAN == CP_KR920
- plan = new lora::ChannelPlan_KR920();
-#elif CHANNEL_PLAN == CP_AS923
- plan = new lora::ChannelPlan_AS923();
-#elif CHANNEL_PLAN == CP_AS923_JAPAN
- plan = new lora::ChannelPlan_AS923_Japan();
-#elif CHANNEL_PLAN == CP_IN865
- plan = new lora::ChannelPlan_IN865();
-#endif
+
+ // Create channel plan
+ plan = create_channel_plan();
assert(plan);
dot = mDot::getInstance(plan);
@@ -164,7 +151,7 @@
// it must be waiting for data from the gateway
// send data every 30s
logInfo("waiting for 30s");
- wait(30);
+ ThisThread::sleep_for(30s);
}
return 0;
diff -r 67feacfab49c -r 20f6b29a9903 examples/src/dot_util.cpp
--- a/examples/src/dot_util.cpp Mon May 18 13:12:47 2020 -0500
+++ b/examples/src/dot_util.cpp Tue May 25 09:54:33 2021 -0500
@@ -12,6 +12,39 @@
#endif
+lora::ChannelPlan* create_channel_plan() {
+ lora::ChannelPlan* plan;
+
+#if CHANNEL_PLAN == CP_US915
+ plan = new lora::ChannelPlan_US915();
+#elif CHANNEL_PLAN == CP_AU915
+ plan = new lora::ChannelPlan_AU915();
+#elif CHANNEL_PLAN == CP_EU868
+ plan = new lora::ChannelPlan_EU868();
+#elif CHANNEL_PLAN == CP_KR920
+ plan = new lora::ChannelPlan_KR920();
+#elif CHANNEL_PLAN == CP_IN865
+ plan = new lora::ChannelPlan_IN865();
+#elif CHANNEL_PLAN == CP_AS923
+ plan = new lora::ChannelPlan_AS923();
+#elif CHANNEL_PLAN == CP_AS923_2
+ plan = new lora::ChannelPlan_AS923();
+#elif CHANNEL_PLAN == CP_AS923_3
+ plan = new lora::ChannelPlan_AS923();
+#elif CHANNEL_PLAN == CP_AS923_JAPAN
+ plan = new lora::ChannelPlan_AS923_Japan();
+#elif CHANNEL_PLAN == CP_AS923_JAPAN1
+ plan = new lora::ChannelPlan_AS923_Japan1();
+#elif CHANNEL_PLAN == CP_AS923_JAPAN2
+ plan = new lora::ChannelPlan_AS923_Japan2();
+#elif CHANNEL_PLAN == CP_RU864
+ plan = new lora::ChannelPlan_RU864();
+#endif
+
+ return plan;
+}
+
+
void display_config() {
// display configuration and library version information
logInfo("=====================");
@@ -301,7 +334,7 @@
uint32_t delay_s = (dot->getNextTxMs() / 1000) + 1;
if (delay_s < 5) {
logInfo("waiting %lu s until next free channel", delay_s);
- wait(delay_s);
+ ThisThread::sleep_for(std::chrono::seconds(delay_s));
} else {
logInfo("sleeping %lu s until next free channel", delay_s);
dot->sleep(delay_s, mDot::RTC_ALARM, false);
diff -r 67feacfab49c -r 20f6b29a9903 examples/src/fota_example.cpp
--- a/examples/src/fota_example.cpp Mon May 18 13:12:47 2020 -0500
+++ b/examples/src/fota_example.cpp Tue May 25 09:54:33 2021 -0500
@@ -3,6 +3,12 @@
#if ACTIVE_EXAMPLE == FOTA_EXAMPLE
+
+#if defined(TARGET_XDOT_L151CC)
+//#include "SPIFBlockDevice.h"
+//#include "DataFlashBlockDevice.h"
+#endif
+
/////////////////////////////////////////////////////////////////////////////
// -------------------- DOT LIBRARY REQUIRED ------------------------------//
// * Because these example programs can be used for both mDot and xDot //
@@ -18,19 +24,33 @@
////////////////////////////////////////////////////////////////////////////
// -------------------- DEFINITIONS REQUIRED ---------------------------- //
-// mDot - add define for FOTA in mbed_app.json or on command line //
+// Add define for FOTA in mbed_app.json or on command line //
// Command line //
// mbed compile -t GCC_ARM -m MTS_MDOT_F411RE -DFOTA=1 //
// mbed_app.json //
// { //
// "macros": [ //
-// "FOTA=1" //
+// "FOTA" //
// ] //
// } //
// //
-// xDot - DO NOT define FOTA, there is no file system support available //
-// Only multicast is supported for xDot, external MCU and Flash //
-// are required to support Fragmentation //
+////////////////////////////////////////////////////////////////////////////
+
+
+////////////////////////////////////////////////////////////////////////////
+// -------------------------- XDOT EXTERNAL STORAGE --------------------- //
+// An external storage device is required for FOTA on an XDot. The //
+// storage device must meet the following criteria: //
+// * Work with MBed OS DataFlashBlockDevice or SPIFBlockDevice classes //
+// * Maximum 4KB sector erase size //
+// * Maximum 512 byte page size //
+// * SPIF type components must support Serial Flash Discoverable //
+// Parameters (SFDP) //
+// //
+// Refer to mbed_app.json included in this project for configuration //
+// parameters requried for external storage. //
+// //
+// Modify code below to create a BlockDevice object. //
////////////////////////////////////////////////////////////////////////////
@@ -55,7 +75,7 @@
mDot* dot = NULL;
lora::ChannelPlan* plan = NULL;
-Serial pc(USBTX, USBRX);
+mbed::UnbufferedSerial pc(USBTX, USBRX);
#if defined(TARGET_XDOT_L151CC)
I2C i2c(I2C_SDA, I2C_SCL);
@@ -76,24 +96,26 @@
mts::MTSLog::setLogLevel(mts::MTSLog::TRACE_LEVEL);
-#if CHANNEL_PLAN == CP_US915
- plan = new lora::ChannelPlan_US915();
-#elif CHANNEL_PLAN == CP_AU915
- plan = new lora::ChannelPlan_AU915();
-#elif CHANNEL_PLAN == CP_EU868
- plan = new lora::ChannelPlan_EU868();
-#elif CHANNEL_PLAN == CP_KR920
- plan = new lora::ChannelPlan_KR920();
-#elif CHANNEL_PLAN == CP_AS923
- plan = new lora::ChannelPlan_AS923();
-#elif CHANNEL_PLAN == CP_AS923_JAPAN
- plan = new lora::ChannelPlan_AS923_Japan();
-#elif CHANNEL_PLAN == CP_IN865
- plan = new lora::ChannelPlan_IN865();
-#endif
+ // Create channel plan
+ plan = create_channel_plan();
assert(plan);
+#if defined(TARGET_XDOT_L151CC)
+
+ mbed::BlockDevice* ext_bd = NULL;
+
+ // XDot requires an external storage device for FOTA (see above).
+ // If one is connected provide the block device object to the mDot instance.
+ //
+ // ** Uncomment the appropriate block device here and include statement above
+ //
+ //ext_bd = new SPIFBlockDevice();
+ //ext_bd = new DataFlashBlockDevice();
+ ext_bd->init();
+ dot = mDot::getInstance(plan, ext_bd);
+#else
dot = mDot::getInstance(plan);
+#endif
assert(dot);
logInfo("mbed-os library version: %d.%d.%d", MBED_MAJOR_VERSION, MBED_MINOR_VERSION, MBED_PATCH_VERSION);
@@ -189,13 +211,13 @@
// send data every 30s
if (Fota::getInstance()->timeToStart() != 0) {
logInfo("waiting for 30s");
- wait(30);
+ ThisThread::sleep_for(30s);
} else {
// Reduce uplinks during FOTA, dot cannot receive while transmitting
// Too many lost packets will cause FOTA to fail
logInfo("FOTA starting in %d seconds", Fota::getInstance()->timeToStart());
logInfo("waiting for 300s");
- wait(300);
+ ThisThread::sleep_for(300s);
}
}
diff -r 67feacfab49c -r 20f6b29a9903 examples/src/manual_example.cpp
--- a/examples/src/manual_example.cpp Mon May 18 13:12:47 2020 -0500
+++ b/examples/src/manual_example.cpp Tue May 25 09:54:33 2021 -0500
@@ -38,7 +38,7 @@
mDot* dot = NULL;
lora::ChannelPlan* plan = NULL;
-Serial pc(USBTX, USBRX);
+mbed::UnbufferedSerial pc(USBTX, USBRX);
#if defined(TARGET_XDOT_L151CC)
I2C i2c(I2C_SDA, I2C_SCL);
@@ -58,22 +58,9 @@
#endif
mts::MTSLog::setLogLevel(mts::MTSLog::TRACE_LEVEL);
-
-#if CHANNEL_PLAN == CP_US915
- plan = new lora::ChannelPlan_US915();
-#elif CHANNEL_PLAN == CP_AU915
- plan = new lora::ChannelPlan_AU915();
-#elif CHANNEL_PLAN == CP_EU868
- plan = new lora::ChannelPlan_EU868();
-#elif CHANNEL_PLAN == CP_KR920
- plan = new lora::ChannelPlan_KR920();
-#elif CHANNEL_PLAN == CP_AS923
- plan = new lora::ChannelPlan_AS923();
-#elif CHANNEL_PLAN == CP_AS923_JAPAN
- plan = new lora::ChannelPlan_AS923_Japan();
-#elif CHANNEL_PLAN == CP_IN865
- plan = new lora::ChannelPlan_IN865();
-#endif
+
+ // Create channel plan
+ plan = create_channel_plan();
assert(plan);
dot = mDot::getInstance(plan);
diff -r 67feacfab49c -r 20f6b29a9903 examples/src/ota_example.cpp
--- a/examples/src/ota_example.cpp Mon May 18 13:12:47 2020 -0500
+++ b/examples/src/ota_example.cpp Tue May 25 09:54:33 2021 -0500
@@ -41,7 +41,7 @@
mDot* dot = NULL;
lora::ChannelPlan* plan = NULL;
-Serial pc(USBTX, USBRX);
+mbed::UnbufferedSerial pc(USBTX, USBRX);
#if defined(TARGET_XDOT_L151CC)
I2C i2c(I2C_SDA, I2C_SCL);
@@ -62,21 +62,8 @@
mts::MTSLog::setLogLevel(mts::MTSLog::TRACE_LEVEL);
-#if CHANNEL_PLAN == CP_US915
- plan = new lora::ChannelPlan_US915();
-#elif CHANNEL_PLAN == CP_AU915
- plan = new lora::ChannelPlan_AU915();
-#elif CHANNEL_PLAN == CP_EU868
- plan = new lora::ChannelPlan_EU868();
-#elif CHANNEL_PLAN == CP_KR920
- plan = new lora::ChannelPlan_KR920();
-#elif CHANNEL_PLAN == CP_AS923
- plan = new lora::ChannelPlan_AS923();
-#elif CHANNEL_PLAN == CP_AS923_JAPAN
- plan = new lora::ChannelPlan_AS923_Japan();
-#elif CHANNEL_PLAN == CP_IN865
- plan = new lora::ChannelPlan_IN865();
-#endif
+ // Create channel plan
+ plan = create_channel_plan();
assert(plan);
dot = mDot::getInstance(plan);
diff -r 67feacfab49c -r 20f6b29a9903 examples/src/peer_to_peer_example.cpp
--- a/examples/src/peer_to_peer_example.cpp Mon May 18 13:12:47 2020 -0500
+++ b/examples/src/peer_to_peer_example.cpp Tue May 25 09:54:33 2021 -0500
@@ -26,7 +26,7 @@
mDot* dot = NULL;
lora::ChannelPlan* plan = NULL;
-Serial pc(USBTX, USBRX);
+mbed::UnbufferedSerial pc(USBTX, USBRX);
#if defined(TARGET_XDOT_L151CC)
I2C i2c(I2C_SDA, I2C_SCL);
@@ -50,22 +50,9 @@
#endif
mts::MTSLog::setLogLevel(mts::MTSLog::TRACE_LEVEL);
-
-#if CHANNEL_PLAN == CP_US915
- plan = new lora::ChannelPlan_US915();
-#elif CHANNEL_PLAN == CP_AU915
- plan = new lora::ChannelPlan_AU915();
-#elif CHANNEL_PLAN == CP_EU868
- plan = new lora::ChannelPlan_EU868();
-#elif CHANNEL_PLAN == CP_KR920
- plan = new lora::ChannelPlan_KR920();
-#elif CHANNEL_PLAN == CP_AS923
- plan = new lora::ChannelPlan_AS923();
-#elif CHANNEL_PLAN == CP_AS923_JAPAN
- plan = new lora::ChannelPlan_AS923_Japan();
-#elif CHANNEL_PLAN == CP_IN865
- plan = new lora::ChannelPlan_IN865();
-#endif
+
+ // Create channel plan
+ plan = create_channel_plan();
assert(plan);
dot = mDot::getInstance(plan);
@@ -141,7 +128,7 @@
default:
while (true) {
logFatal("no known channel plan in use - extra configuration is needed!");
- wait(5);
+ ThisThread::sleep_for(5s);
}
break;
}
@@ -195,7 +182,7 @@
// it must be waiting for data from the other Dot
// send data every 5 seconds
logInfo("waiting for 5s");
- wait(5);
+ ThisThread::sleep_for(5s);
}
return 0;
diff -r 67feacfab49c -r 20f6b29a9903 mbed-os.lib --- a/mbed-os.lib Mon May 18 13:12:47 2020 -0500 +++ b/mbed-os.lib Tue May 25 09:54:33 2021 -0500 @@ -1,1 +1,1 @@ -https://github.com/ARMmbed/mbed-os/#c966348d3f9ca80843be7cdc9b748f06ea73ced0 +https://github.com/ARMmbed/mbed-os/#a6207cadad0acd1876f436dc6baeddf46c42af06
diff -r 67feacfab49c -r 20f6b29a9903 mbed_app.json
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mbed_app.json Tue May 25 09:54:33 2021 -0500
@@ -0,0 +1,30 @@
+{
+ "macros": [
+ "FOTA"
+ ],
+ "target_overrides": {
+ "*": {
+ "target.printf_lib": "std"
+ },
+ "MTS_MDOT_F411RE": {
+ "target.app_offset": "0x10000",
+ "target.bootloader_img": "bootloaders/mdot-boot.bin"
+ },
+ "XDOT_L151CC": {
+ "target.app_offset": "0x0D000",
+ "target.bootloader_img": "bootloaders/xdot-boot.bin",
+
+ "target.components_add": ["SPIF", "DATAFLASH"],
+ "spif-driver.SPI_MOSI": "SPI_MOSI",
+ "spif-driver.SPI_MISO": "SPI_MISO",
+ "spif-driver.SPI_CLK": "SPI_SCK",
+ "spif-driver.SPI_CS": "SPI_NSS",
+
+ "dataflash.SPI_MOSI": "SPI_MOSI",
+ "dataflash.SPI_MISO": "SPI_MISO",
+ "dataflash.SPI_CLK": "SPI_SCK",
+ "dataflash.SPI_CS": "SPI_NSS",
+ "dataflash.binary-size": 1
+ }
+ }
+}
\ No newline at end of file