diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100755 index e273ffee..00000000 --- a/CHANGELOG.md +++ /dev/null @@ -1,401 +0,0 @@ -## [Unreleased] - 2021-10-20 - -### Added - -### Changed - -### Fixed - -## [8.0.0] - 2021-10-20 - -### Added -- Provide RF test AT commands - - AT+TRSSI - - AT+TTONE - - AT+TTX - - AT+TRX - - AT+TCONF - - AT+TTH - - AT+TOFF - - AT+CERTIF - -### Changed -- Remove api.ble.setting.advertiseSlow.get()/api.ble.setting.advertiseSlow.set()/api.ble.setting.advertiseFast.get()/api.ble.setting.advertiseFast.set() -- Change the delimiter of AT+ARSSI=? from ',' to ':' - -### Fixed -- Bug #529: 868Mhz CLASS B OTAA "at+bfreq" format is not correct -- Bug #606: P2P at+ppl should get AT_PARAM_ERROR instead of AT_ERROR -- Bug #613: [AT COMMAND]Continuous input AT+JOIN will cause AT_ERROR -- Bug #509: Can't begin again after Serial.end() -- Fix AT+LPSEND bugs: 1. wrong return code 2. 512 bytes limitation - -## [7.1.0] - 2021-10-12 - -### Added -- Support AT+FSN -- Add api.lorawan.precv() for one-time P2P receiving. - -### Changed -- Rename all the examples -- Change the default setting of AT+DCS to be 1. -- Remove AT+PRECV=? because it is an one-time function, just like AT+SLEEP. -- Update LoRaWan_P2P example -- Update LoRaWan_Class_B example - -### Fixed -- Bug #598: Arduino Application Scenario with SmartFarm issue -- Bug #536: 868Mhz CLASS B OTAA / ABP mode dowlink with pgslot issue -- Fix ClassB multicast group default value -- Bug #453: lorawan nwm.set not working -- Bug #601: RUI API arssi cannot receive value -- Fix AT+BGW can't work issue. - -## [7.0.1] - 2021-10-03 - -### Added -- Enhance nRF52840 bootloader: 1. Add ATR command in bootloader to restore factory default. 2. Typing "rui" within 1s after POR can enter DFU mode to recover a dead system. -- Add a mechanism for factory to flash the default keys & IDs. - -### Changed -- Rearch API mode: 1. Remove Src & Dst fields. 2. Change the order of Flag & Frame Type fields. 3. Use the number of set bits as checksum instead of CRC32. -- Rearch example folders. -- Temporarily remove AT+AUTOSLEEP(AT+LPM) command. - -### Fixed -- Bug #584: [API Mode] ATCMD handler's execution command to ATZ, ATDFU, ATR, AT+BOOT, not response frame and no function also -- Bug #571: [API Mode] command ID 32:AT+CLASS set value {BCD:0|1|2} mismatch with get return value {ASCII:A|B|C} -- Bug #583: [API Mode] at+recv=? could not get the latest received data -- Bug #561: 868 OTAA Class C, set appkey during join will get AT_ERROR -- Bug #581: [API Mode] : ATCMD handler for PSF, PCR, PTP command response frame's byte-order of payload length is incorrect -- Bug #582: [API mode] ATCMD Handler AT+PPL=? command ID get value error -- Bug #572: [API Mode] command ID 35:AT+JN1DL and 36:AT+JN2DL input/output length improper, it should be 1 bytes, but not 4 bytes as now -- Add the default multicast group parameters for default B mode -- Bug #570: 868 ABP when gateway set rx2dr to 4, end device can not receive downlink -- Fix min()/max()/yield() -- Fix api.lorawan.addmulc()/api.lorawan.rmvmulc()/api.lorawan.lstmulc() - -## [7.0.0] - 2021-09-23 - -### Added -- BLE Beacon API change: - - Add api.ble.beacon.ibeacon.power.set(param) -- Add an example for analog API. -- Add an example for LoRaWAN OTAA. -- Add an example for LED breathing. - -### Changed -- BLE Beacon API change: - - Change api.ble.beacon.payload(byte array) to api.ble.beacon.ibeacon.uuid.set() - - Split api.ble.beacon.majorminor(param1, param2) into api.ble.beacon.ibeacon.majo.set(param) & api.ble.beacon.ibeacon.minor.set(param) -- Change the default setting of LoRaWAN confirm mode to be ON. -- Modify BLE UART example to support AT CMD. -- Remove api.system.flash.get() & api.system.flash.set(). - -### Fixed -- Tune the base current for one-time sleep (5uA) & auto sleep (20uA). -- Bug #538: 915Mhz CLASS B OTAA/ABP issue -- Bug #548: P2P Preamble Length setting 2 or 65535 will not receive message -- Bug #549: P2P show receive error when receive second p2p message -- Bug #565: LoRa Auto-Join Failed will cause system hang -- Bug #540: [BLE SCANNER] CONSOLE端顯示廣告有標頭無內容 -- Fix the usage of byte array in BLE examples. -- Fix the byte order of AT+DADDR -- Fix AT+AUTOSLEEP can't work when changing its setting from zero to non-zero. - -## [6.0.0] - 2021-09-02 - -### Added -- Add AT+LPSEND. -- Add api.lorawan.registerRecvCallback() -- Add api.lorawan.registerJoinCallback() -- Add api.lorawan.registerSendCallback() -- Add low power design for AT+AUTOSLEEP. -- Add api.lorawan.dcs.set() -- Add api.lorawan.addmulc()/api.lorawan.rmvmulc()/api.lorawan.lstmulc() - -### Changed -- Modify the class RAKBleService to support customized 128-bit BLE UUID. -- Add asynchronous event for AT+CFM. -- Redesign API mode: - - Always reply return code even if the request is write/execution and result is OK. - - Don't support AT? anymore because its output is for human, but not for machine. -- Remove '#include "Arduino.h"' in every example. -- Add api.ble.beacon.custom.payload.set() to support customized payload for BLE Beacon. -- Remove sensor examples from SDK -- Remove BLE HID from SDK -- Remove AT+DELBONDS -- Remove api.lorawan.recv() - -### Fixed -- Fix duplicated LoRaWAN RX data logs. -- Fix AT+CHE/AT+CHS bugs. -- Fix CFlist for AT+CHS when the band is AU915 US915. -- Bug #521: at+cfm=0 send a confirmed uplink -- Bug #508: Multicast can not receive message after change Freq. -- Bug #507: Multicast downlink message print multiple times -- Bug #509: Can't begin again after Serial.end() -- Bug #444: lorawan multicast C++ warpper not implement -- Bug #448: lorawan arssi C++ warpper not implement -- Bug #506: 868Mhz ClASS B description of S0/S1/S2/S3 state -- Bug #527: atr do not reset multicast list -- Create two instance of HardwareSerial that is Serial4 (USB) & Serial6 (BLE) -- Fix api.lorawan.ver(). -- Fix api.lorawan.arssi() - -## [5.3.0] - 2021-08-10 - -### Added -- Support API mode and operating mode switching. -- Support BLE pairing. -- Support NFC -- Support spiffs filesystem. -- Support FSK in LoRaWAN P2P mode. -- Support encryption in LoRaWAN P2P mode. - -### Changed - -### Fixed -- Fix ABP downlink bug. -- Fix AT+LINKCHECK & AT+SNR & AT+RSSI bugs. -- Fix the input range of periodicity. -- Fix the input range of AT+PWORD: Forbid zero length password. -- Fix the maximum number of argument of AT+CHE. -- Fix the input range of AT+SEND to be 2-500 digits. -- Fix write part of AT+DCS - -## [5.2.1] - 2021-07-28 - -### Added -- Add example code into RUIv3 SDK. - -### Changed -- Set the default value of AT+CFM to be off. -- Rewrite delay function to avoid wasting MCU time. - -### Fixed -- Fix Arduino Wire library implementation to be compatible with Adafruit libraries. -- Bug #450: lorawan jn1dl, rx1dl RUI-API can input number > 15 -- Bug #453: lorawan nwm.set not working -- Bug #452: RUI-API restore default not implement -- Bug #451: api.lorawan.band.get() return value not as same as at+band -- Bug #447: CLIVER, APIVER C++ warpper not implement - -## [5.1.0] - 2021-07-24 - -### Added -- Add AT+SLEEP command. -- Add AT+RETY command. - -### Changed -- Temporarily remove AT+TRSSI/AT+TTONE/AT+TTX/AT+TRX/AT+TCONF/AT+TTH/AT+TOFF commands. - -### Fixed -- Add parameter sanity check for AT+PGSLOT. -- Fix api.lorawan.ver.get(). -- Fix api.lorawan.join() always failure issue. -- Fix the wrong unit of api.lorawan.jn1dl.set()/api.lorawan.jn1dl.get()/api.lorawan.jn2dl.get()/api.lorawan.rx1dl.set()/api.lorawan.rx1dl.get()/api.lorawan.rx2dl.get(). -- Enhance Arduino compatibility. -- Fix api.lorawan.ver.get(). -- Fix api.lorawan.dr.set(). - -## [5.0.0] - 2021-07-23 - -### Added -- Support Arduino standard library - SPI. -- Add AT+TTH/AT+TTX/AT+TRX/AT+TCONF. -- Support upgrading bootloader by nrfutil. - -### Changed - -### Fixed -- Fix the wrong mask value when input AT+MASK=0. -- Fix the typo of api.lorawan.nwskey to be api.lorawan.nwkskey. -- Bug #417: P2P AT+PCR coding rate issue are asymmetric -- Bug #418: P2P part of all descriptions - -## [4.1.0] - 2021-07-19 - -### Added -- Add AT+RETY/AT+LPSEND/AT+ARSSI/AT+LINKCHECK/AT+NWM/AT+PFREQ/AT+PSF/AT+PBW/AT+PCR/AT+PPL/AT+PTP/AT+P2P/AT+PSEND/AT+PRECV/AT+ENCRY/AT+ENCKEY. -- Implement Serial.printf(). - -### Changed -- Reduce bootloader size and align the start address of bootloader with legacy RAK4631 bootloader. -- Separate AT+BUILDINFO into 2 AT commands AT+BUILDTIME & AT+REPOINFO. -- Change the design of serial lock AT+LOCK & AT+PWORD. -- Enhance the design of AT+MASK/AT+CHE/AT+CHS to fix coexistence issue. - -### Fixed -- Fix AT+BAT always display 0.0 issue. - -## [4.0.0] - 2021-07-09 - -### Added -- Add AT+CHS/AT+CHE/AT+ARSSI/AT+BGW - -### Changed -- Serial.begin() will only supports unsigned integer baudrate. - -### Fixed -- Bug #410: JN2DL/RX2DL against the spec -- Bug #411: at+baud is not working properly and return AT_PARAM_ERROR - -## [3.0.0] - 2021-07-08 - -### Added -- AT+BAUD/AT+HWMODEL/AT+HWID AT commands. -- AT+CHE AT command. -- Support transparent mode. - -### Changed -- Enhance customized AT command registration. -- Change AT+NWKID to AT+NETID because it describes network identifier (NetID) of 3 octets, rather than another network identifier (NwkID) of 7 bits. -- Change the unit of AT+JN1DL/AT+JN2DL/AT+RX1DL/AT+RX2DL from milli-seconds to seconds. - -### Fixed -- Fix DR10 - DR13 issues of LoRaWAN multicast feature. - -## [2.1.0] - 2021-07-01 - -### Added -- Add AT+CLIVER & AT+APIVER commands to show AT command version & RUI API version. - -### Changed - -### Fixed -- Fix Nordic softdevice assertion failed issue. -- Bug #406: at+jn1dl, at+rx2dl input range only 0-15 -- Bug #407: at+multicast issue -- Fix hardware watchdog timeout after software reset issue. -- Fix USB enumeration failure issue after calling api.system.sleep.all(). - -## [2.0.0] - 2021-06-26 - -### Added - -### Changed -- Add AT_BUSY_ERROR handling for AT+BAND, AT+MASK & ATR. -- Refine LoRaWAN initializaiton flow to reduce flash writing. -- Remove AT+JN2DL= & AT+RX2DL= commands because jn2dl=jn1dl+1 & rx2dl=rx1dl+1. - -### Fixed -- Bug #402: can not input too many command at same time -- Bug #404: rx1dl should be the same as gateway setting after connected to gateway in OTAA mode -- Bug #403: rx1dl, rx2dl, jn1dl, jn2dl should be ranged in 0-15 -- Bug #390: at+class can only setting once ( A ---> C ---x---> A) -- Fix the format of AT+ADDMULC. - -## [1.2.1] - 2021-06-25 - -### Added - -### Changed -- Change AT command output format. - -### Fixed -- Fix system stability issue caused by ATZ command. - -## [1.2.0] - 2021-06-24 - -### Added -- Support recovery mode. (Add CLI into RUI v3 bootloader.) -- Add AT+MASK AT command. - -### Changed - -### Fixed -- Fix LoRaWAN multicast downlink message. -- Bug #397: at+rx2fq show at error if input ramdomly -- Bug #393: at+rx2dr error code not as same as document -- Bug #400: at+adr default value not same as document - -## [1.1.0] - 2021-06-24 - -### Added - -### Changed -- Temporarily remove AT+MASK command. -- Temporarily remove AT+RX2FQ= command. - -### Fixed -- Fix AT+RX2DR command. -- Bug #394: at+band default value 4 switch to 5 will show at error -- Bug #395: at+band switch to 2 and then can not switch to other band -- Bug #388: get the random number after setting devaddr (at+daddr) -- Bug #389: at+send error code not as same as document -- Bug #390: at+class can only setting once ( A ---> C ---x---> A) -- Bug #392: AT+DR range should be 0-7 not 0-5 -- Bug #391: AT+DR=asdfklaskjdf can accept -- Bug #396: at+txp set 8-15 will show at error in eu868 -- Bug #399: device address not as same as gateway in ABP mode -- Bug #397: at+rx2fq show at error if input ramdomly -- Bug #398: command atdfu should rename to at+boot -- Bug #393: at+rx2dr error code not as same as document - -## [1.0.1] - 2021-06-23 - -### Added -- Add AT command AT+RECV. -- Add asynchronous event log for Class A/B/C Downlink. -- Add asynchronous event log for join process. - -### Changed -- Change the behavior of AT+NJM/AT+SEND/AT+ADR/AT+PNM. -- Rename the AT command AT+RESTORE to ATR. - -### Fixed -- Fix Class A/B/C downlink. - -## [1.0.0] - 2021-06-19 - -### Added -- Support customized AT command registration. -- Support read/write private user data from/to flash. - -### Changed -- Support Arduino library instead of built-in sensor API. - -### Fixed - -## [0.2.0] - 2021-06-19 - -### Added -- Support LoRaWAN Class B mode for WisBlock RAK4631 -- Support LoRaWAN multicast group for WisBlock RAK4631 - -### Changed - -### Fixed -- Bug #377: Arduino IDE verify code will encounter error until open log function - -## [0.1.0] - 2021-06-14 - -### Added -- Create a unified driver layer (UDRV) for all RAK hardware products -- Support WisBlock Sensor RAK1901/RAK1902/RAK1903/RAK1904/RAK1906/RAK1910 -- Compatible with Arduino API -- Add proprietary RUI API for BLE/LoRaWAN -- Enhance power consumption in sleep mode for WisBlock RAK4631 -- Upgrade to Nordic SDK 17.0.2 with BLE stack S140 7.2.0 -- Support BLE Configuration/Beacon service/UART service/Customized service for WisBlock RAK4631 -- Support Arduino IDE/Visual Studio IDE for WisBlock RAK4631 -- Support DFU over USB/BLE/UART for WisBlock RAK4631 -- Support LoRaWAN Class A/C mode for WisBlock RAK4631 -- Support AT commands over USB/BLE/UART - -### Changed - -### Fixed - -## [0.0.0] - 2021-01-21 - -This is the initial version of RUIv3. - -### Added -- Support WisDuo RAK4200 EVB/WisTrio RAK5010/WisBlock RAK4631 - -### Changed - -### Fixed - diff --git a/README.md b/README.md deleted file mode 100644 index 5d157e85..00000000 --- a/README.md +++ /dev/null @@ -1,53 +0,0 @@ -This is Arduino SDK of RUI v3, which is an unified platform designed by RAKwireless. -========== - -Before You Start --------- - -- Firstly, read chapter 3 "Installation of Board Support Package in Arduino IDE" of "Getting Started Guide for RAK Unified Interface (RUI) Version 3.0 Arduino Software (IDE)" to setup your development environment. -- Secondly, read CHANGELOG.md to know every added and changed features and fixed bugs of every release. -- Thirdly, you can refer to the examples provided by SDK from Arduino IDE menu to build your own application. - -Software Layering and Architecture --------- - -- Basically, use MVC model to separate software components: - - Separate software components that do hardware access. (M) - - Separate software components that are API wrappers. (V) - - Separate software components that are reusable common code. (C) -- Besides, separate software components from other components if: - - These software components are replaceable, that we can easily replace them in the future. - - These software components are platform independent, that we can reuse them for different platforms. - - These software components are from vendor or 3rd party, that we can easily upgrade them in the future. - - These software components is proprietary, that we can use different release policy for it. - -Software Component --------- - -- BSP (Board Support Package) Base: This component contains two major parts: boot code and UHAL (Unified Hardware Abstraction Layer). Boot code is the low level startup code provided by MCU vendor. UHAL is responsible to adapt different MCU. All MCU dependent code is in this layer, that only includes pure hardware access, but no any complicated logic. -- Board Dependent File: Contain all the board dependent source code or board dependent configuration files. -- UDRV (Unified Driver): Provide hardware independent API to upper layers, so different hardware information is hidden from upper layers. All common software logic that can be shared among different hardware platform is in this layer. -- Service: Multiple UDRV components could be used to construct larger software components that is called Service providing more powerful API for application to use. -- RUI API: This layer is used for customers to write customized firmware. It wraps all above mentioned software layers to any higher level programming language and provide unified API across different hardwares. -- AT Command: This software component provides an interactive command line interface that can be easily used to control hardware without programming any line of code. -- API Command: This software component provides an efficient M2M (Machine to Machine) communication for a 3rd party firmware on a 3rd party hardware to remote control RUI firmware. - -Operating Mode --------- - -- AT Command Mode - - It is designed for humans to configure devices interactively. - - It can also be used for M2M communication, but transmission of big-sized human-readable text data is very inefficient. -- Transparent Mode - - It is designed to share LoRaWAN connectivity to another device without LoRaWAN connectivity. - - It automatically passes-through any data from another connected device to LoRaWAN network, and vice versa. - - In this mode, users can’t configure devices. -- API Mode - - It is designed for efficient M2M communication. - - It uses proprietary protocol for devices to communicate with each other. - - It can be used for both configuring devices and transmitting data. -- Custom Mode - - The above 3 modes all have their corresponding parsers to analyze every bytes received from serial port. - - This mode disable all serial port parsers. - - In this mode, a customized parser MUST be written by users themselves. - diff --git a/cores/nRF5/component/core/board/rak4631/sdk_config.h b/cores/nRF5/component/core/board/rak4631/sdk_config.h index 7211bc39..171511ef 100644 --- a/cores/nRF5/component/core/board/rak4631/sdk_config.h +++ b/cores/nRF5/component/core/board/rak4631/sdk_config.h @@ -11722,7 +11722,7 @@ // NRF_SDH_BLE_GATT_MAX_MTU_SIZE - Static maximum MTU size. #ifndef NRF_SDH_BLE_GATT_MAX_MTU_SIZE -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 //23 //247 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 #endif #ifdef DFU_SUPPORT diff --git a/cores/nRF5/component/core/soc/nrf52840/libboot.a b/cores/nRF5/component/core/soc/nrf52840/libboot.a index ca8f5460..3f6e9949 100644 Binary files a/cores/nRF5/component/core/soc/nrf52840/libboot.a and b/cores/nRF5/component/core/soc/nrf52840/libboot.a differ diff --git a/cores/nRF5/component/core/soc/nrf52840/uhal/libuhal.a b/cores/nRF5/component/core/soc/nrf52840/uhal/libuhal.a index 7c2a6b17..6b293986 100644 Binary files a/cores/nRF5/component/core/soc/nrf52840/uhal/libuhal.a and b/cores/nRF5/component/core/soc/nrf52840/uhal/libuhal.a differ diff --git a/cores/nRF5/component/rui_v3_api/ACharacter.h b/cores/nRF5/component/rui_v3_api/ACharacter.h index 38a8e032..0b5adc25 100644 --- a/cores/nRF5/component/rui_v3_api/ACharacter.h +++ b/cores/nRF5/component/rui_v3_api/ACharacter.h @@ -20,7 +20,9 @@ * @par Syntax * isAlphaNumeric(thisChar); * @param thisChar variable(Type: char) - * @return true: if thisChar is alphanumeric(Type: bool) + * @return bool + * @retval TRUE : The character is alphanumeric + * @retval FALSE : The character is not alphanumeric * @par Example * @verbatim char mychar = 'A'; @@ -47,7 +49,9 @@ inline boolean isAlphaNumeric(int thisChar) __attribute__((always_inline)); * @par Syntax * isAlpha(thisChar); * @param thisChar variable(Type: char) - * @return true: if thisChar is alpha(Type: bool) + * @return bool + * @retval TRUE : The character is a letter + * @retval FALSE : The character is not a letter * @par Example * @verbatim char mychar = 'A'; @@ -74,7 +78,9 @@ inline boolean isAlpha(int thisChar) __attribute__((always_inline)); * @par Syntax * isAscii(thisChar); * @param thisChar variable(Type: char) - * @return true: if thisChar is Ascii(Type: bool) + * @return bool + * @retval TRUE : The character is Ascii + * @retval FALSE : The character is not Ascii * @par Example * @verbatim char mychar = 'A'; @@ -102,7 +108,9 @@ inline boolean isAscii(int thisChar) __attribute__((always_inline)); * @par Syntax * isWhitespace(thisChar); * @param thisChar variable(Type: char) - * @return true: if thisChar is a space character(Type: bool) + * @return bool + * @retval TRUE : The character is a space or tab + * @retval FALSE : The character is not a space or tab * @par Example * @verbatim char mychar = 'A'; @@ -129,7 +137,9 @@ inline boolean isWhitespace(int thisChar) __attribute__((always_inline)); * @par Syntax * isControl(thisChar); * @param thisChar variable(Type: char) - * @return true: if thisChar is a control character(Type: bool) + * @return bool + * @retval TRUE : The character is a control character + * @retval FALSE : The character is not a control character * @par Example * @verbatim char mychar = 'A'; @@ -156,7 +166,9 @@ inline boolean isControl(int thisChar) __attribute__((always_inline)); * @par Syntax * isDigit(thisChar); * @param thisChar variable(Type: char) - * @return true: if thisChar is a number(Type: bool) + * @return bool + * @retval TRUE : The character is a number + * @retval FALSE : The character is not a number * @par Example * @verbatim char mychar = 'A'; @@ -183,7 +195,9 @@ inline boolean isDigit(int thisChar) __attribute__((always_inline)); * @par Syntax * isGraph(thisChar); * @param thisChar variable(Type: char) - * @return true: if thisChar is printable(Type: bool) + * @return bool + * @retval TRUE : The character is printable + * @retval FALSE : The character is not printable * @par Example * @verbatim char mychar = 'A'; @@ -210,7 +224,9 @@ inline boolean isGraph(int thisChar) __attribute__((always_inline)); * @par Syntax * isLowerCase(thisChar); * @param thisChar variable(Type: char) - * @return true: if thisChar is lower case(Type: bool) + * @return bool + * @retval TRUE : The character is lower case + * @retval FALSE : The character is not lower case * @par Example * @verbatim char mychar = 'A'; @@ -237,7 +253,9 @@ inline boolean isLowerCase(int thisChar) __attribute__((always_inline)); * @par Syntax * isPrintAble(thisChar); * @param thisChar variable(Type: char) - * @return true: if thisChar is printable(Type: bool) + * @return bool + * @retval TRUE : The character is printable + * @retval FALSE : The character is not printable * @par Example * @verbatim char mychar = 'A'; @@ -264,7 +282,9 @@ inline boolean isPrintable(int thisChar) __attribute__((always_inline)); * @par Syntax * isPunct(thisChar); * @param thisChar variable(Type: char) - * @return true: if thisChar is punctuation(Type: bool) + * @return bool + * @retval TRUE : The character is a punctuation + * @retval FALSE : The character is not a punctuation * @par Example * @verbatim char mychar = 'A'; @@ -292,7 +312,9 @@ inline boolean isPunct(int thisChar) __attribute__((always_inline)); * @par Syntax * isSpace(thisChar); * @param thisChar variable(Type: char) - * @return true: if thisChar is a white-space character(Type: bool) + * @return bool + * @retval TRUE : The character is white-space + * @retval FALSE : The character is not white-space * @par Example * @verbatim char mychar = 'A'; @@ -319,7 +341,9 @@ inline boolean isSpace(int thisChar) __attribute__((always_inline)); * @par Syntax * isUpperCase(thisChar); * @param thisChar variable(Type: char) - * @return true: if thisChar is upper case(Type: bool) + * @return bool + * @retval TRUE : The character is upper case + * @retval FALSE : The character is not upper case * @par Example * @verbatim char mychar = 'A'; @@ -346,7 +370,9 @@ inline boolean isUpperCase(int thisChar) __attribute__((always_inline)); * @par Syntax * isHexadecimalDigit(thisChar); * @param thisChar variable(Type: char) - * @return true: if thisChar is an hexdecimal digit(Type: bool) + * @return bool + * @retval TRUE : The character is an hexadecimal digit + * @retval FALSE : The character is not an hexadecimal digit * @par Example * @verbatim char mychar = 'A'; diff --git a/cores/nRF5/component/rui_v3_api/HardwareSerial.h b/cores/nRF5/component/rui_v3_api/HardwareSerial.h index 0ca2d084..52a9c7d1 100644 --- a/cores/nRF5/component/rui_v3_api/HardwareSerial.h +++ b/cores/nRF5/component/rui_v3_api/HardwareSerial.h @@ -66,7 +66,7 @@ class HardwareSerial : public Stream } void begin(uint32_t baud, uint8_t config, UART_MODE mode = AT_MODE); - int32_t password(string new_passwd); + bool password(string new_passwd); size_t write(uint8_t n) {return write(&n, 1);} /**@addtogroup Serial @@ -157,7 +157,9 @@ class HardwareSerial : public Stream * @param new_passwd an char array to set for unlock the device * @param len the length your password set * - * @return SERIAL_WLOCK_STATE + * @return bool + * @retval TRUE for success + * @retval FALSE for failure * @par Example * @verbatim void setup() { @@ -173,7 +175,7 @@ class HardwareSerial : public Stream } @endverbatim */ - int32_t password(char *new_passwd, size_t len); + bool password(char *new_passwd, size_t len); /**@par Description diff --git a/cores/nRF5/component/rui_v3_api/RAKBleBeacon.h b/cores/nRF5/component/rui_v3_api/RAKBleBeacon.h index ec79dba1..6cf71de2 100755 --- a/cores/nRF5/component/rui_v3_api/RAKBleBeacon.h +++ b/cores/nRF5/component/rui_v3_api/RAKBleBeacon.h @@ -13,8 +13,9 @@ class cusPayload * api.ble.beacon.custom.payload.set(cus_adv_data[], cus_adv_len) * @param cus_adv_data[] set the advertising payload (MAX 31 bytes) * @param cus_adv_len the number of bytes to advertising data - * - * @return TRUE for success SET,FALSE for SET fail(Type: bool) + * @return bool + * @retval TRUE for success + * @retval FALSE for failure */ bool set(uint8_t cus_adv_data[], uint8_t cus_adv_len); @@ -47,7 +48,9 @@ app and deployment use case. * @par Syntax * api.ble.beacon.ibeacon.uuid.set(beaconUuid) * @param beaconUuid define 16 bytes - * @return TRUE for success SET,FALSE for SET fail(Type: bool) + * @return bool + * @retval TRUE for success + * @retval FALSE for failure */ bool set(uint8_t beaconUuid[]); }; @@ -63,7 +66,9 @@ the UUID. * @par Syntax * api.ble.beacon.ibeacon.major.set(major_value) * @param major_value set major (define 2 bytes) - * @return TRUE for success SET,FALSE for SET fail(Type: bool) + * @return bool + * @retval TRUE for success + * @retval FALSE for failure */ bool set(uint16_t major_value); }; @@ -78,7 +83,9 @@ application developer * @par Syntax * api.ble.beacon.ibeacon.minor.set(minor_value) * @param minor_value set minor (define 2 bytes) - * @return TRUE for success SET,FALSE for SET fail(Type: bool) + * @return bool + * @retval TRUE for success + * @retval FALSE for failure */ bool set(uint16_t minor_value); }; @@ -92,7 +99,9 @@ application developer * @par Syntax * api.ble.beacon.ibeacon.power.set(ibeacon_power) * @param ibeacon_power display measured power value (RSSI) - * @return TRUE for success SET,FALSE for SET fail(Type: bool) + * @return bool + * @retval TRUE for success + * @retval FALSE for failure */ bool set(int8_t ibeacon_power); }; diff --git a/cores/nRF5/component/rui_v3_api/RAKBleCus.h b/cores/nRF5/component/rui_v3_api/RAKBleCus.h index 04cfa04d..d96e45b4 100644 --- a/cores/nRF5/component/rui_v3_api/RAKBleCus.h +++ b/cores/nRF5/component/rui_v3_api/RAKBleCus.h @@ -165,7 +165,9 @@ class RAKBleCharacteristic * @par Syntax * bslc.notifyEnabled() - * @return void + * @return bool + * @retval TRUE : The mobile apps notification is enabled + * @retval FALSE : The mobile apps notification is not enabled */ bool notifyEnabled(void); diff --git a/cores/nRF5/component/rui_v3_api/RAKBleSettings.h b/cores/nRF5/component/rui_v3_api/RAKBleSettings.h index 7e0077ed..06f58786 100644 --- a/cores/nRF5/component/rui_v3_api/RAKBleSettings.h +++ b/cores/nRF5/component/rui_v3_api/RAKBleSettings.h @@ -5,7 +5,7 @@ #include "AString.h" /** - * @ingroup BLE_Data_Type + * @ingroup BLE_Setting */ typedef enum { @@ -31,7 +31,9 @@ class RAKBleSettings { * * @param txpwr The TX power level (dBm), which can be one of the following values (from lowest to higher transmit power):\n 0~8 , -4,-8,-12,-16,-20,-40 - * @return TRUE for success SET,FALSE for SET fail(Type: bool) + * @return bool + * @retval TRUE for success + * @retval FALSE for failure */ bool set(int8_t txpwr); @@ -55,7 +57,9 @@ class RAKBleSettings { * api.bel.setting.advertiseInterval.set(adv_interval) * * @param adv_interval 1000ms ~10240ms - * @return TRUE for success SET,FALSE for SET fail(Type: bool) + * @return bool + * @retval TRUE for success + * @retval FALSE for failure */ bool set(int32_t adv_interval); @@ -81,7 +85,9 @@ class RAKBleSettings { * * @param ble_name setting device name an array of data to send as bytes * @param device_name_length the number of bytes to transmit - * @return TRUE for success SET,FALSE for SET fail(Type: bool) + * @return bool + * @retval TRUE for success + * @retval FALSE for failure */ bool set(char *ble_name, uint8_t device_name_length); @@ -131,7 +137,9 @@ class RAKBleAdvertise { * @par Syntax * api.ble.advertise.start(adv_time) * @param adv_time advertising timeout in seconds. If x = 0, advertising never stops - * @return True for start advertising success, false for start advertising fail(Type: bool) + * @return bool + * @retval TRUE for start advertising success + * @retval FALSE for for start advertising failure */ bool start(uint8_t adv_time); @@ -139,8 +147,9 @@ class RAKBleAdvertise { * Used to stop advertising * @par Syntax * api.ble.advertise.stop() - * - * @return True for stop advertising success,false for stop advetising fail(Type: bool) + @return bool + @retval TRUE for stop advertising success + @retval FALSE for for stop advertising failure * @par Example * @verbatim void setup() @@ -162,8 +171,8 @@ class RAKBleAdvertise { * api.ble.advertise.status() * * @return bool - * @retval 0 the device is in advertising - * @retval 1 the device is adverting + * @retval TRUE : the device is in advertising + * @retval FALSE : the device is stop advertis */ bool status(); }; diff --git a/cores/nRF5/component/rui_v3_api/RAKBleUart.h b/cores/nRF5/component/rui_v3_api/RAKBleUart.h index 0978b27c..cc95211b 100644 --- a/cores/nRF5/component/rui_v3_api/RAKBleUart.h +++ b/cores/nRF5/component/rui_v3_api/RAKBleUart.h @@ -12,7 +12,7 @@ #include "udrv_ble.h" /** - * @ingroup BLE_Data_Type + * @ingroup BLE_Uart */ typedef enum { @@ -22,7 +22,7 @@ typedef enum } RAK_CHARS_SECURITY_REQ; /** - * @ingroup BLE_Data_Type + * @ingroup BLE_Uart */ typedef enum { @@ -71,8 +71,8 @@ class RAKBleUart { * @par Syntax * api.ble.uart.available() * @return bool - * @retval false nothing to get - * @retval true receive data from the ble device + * @retval TRUE : receive data from the ble device + * @retval FALSE : nothing to get */ bool available(void); @@ -100,7 +100,7 @@ class RAKBleUart { * @par Syntax * api.ble.uart.setPIN(key, size) * @param key the key to set the passkey(6 digits only) - * @param size the length of key(can only be 6) + * @param size the length of key(can only be 6) * * @return void */ diff --git a/cores/nRF5/component/rui_v3_api/RAKLorawan.h b/cores/nRF5/component/rui_v3_api/RAKLorawan.h index ce35aa8f..2a50b698 100644 --- a/cores/nRF5/component/rui_v3_api/RAKLorawan.h +++ b/cores/nRF5/component/rui_v3_api/RAKLorawan.h @@ -17,7 +17,6 @@ using namespace std; - /**@addtogroup LoRaWan_Data_Type * @{ */ @@ -27,15 +26,15 @@ using namespace std; */ typedef enum _RAK_LORA_BAND { - RAK_REGION_EU433 = 0, ///< EU433 - RAK_REGION_CN470 = 1, ///< CN470 ~ 510 - RAK_REGION_RU864 = 2, ///< RU864 ~ 870 - RAK_REGION_IN865 = 3, ///< IN865 ~ 867 - RAK_REGION_EU868 = 4, ///< EU863 ~ 870 - RAK_REGION_US915 = 5, ///< US902 ~ 928 - RAK_REGION_AU915 = 6, ///< AU915 ~ 928 - RAK_REGION_KR920 = 7, ///< KR920 ~ 923 - RAK_REGION_AS923 = 8, ///< AS923 + RAK_REGION_EU433 = 0, ///< EU433 + RAK_REGION_CN470 = 1, ///< CN470 ~ 510 + RAK_REGION_RU864 = 2, ///< RU864 ~ 870 + RAK_REGION_IN865 = 3, ///< IN865 ~ 867 + RAK_REGION_EU868 = 4, ///< EU863 ~ 870 + RAK_REGION_US915 = 5, ///< US902 ~ 928 + RAK_REGION_AU915 = 6, ///< AU915 ~ 928 + RAK_REGION_KR920 = 7, ///< KR920 ~ 923 + RAK_REGION_AS923 = 8, ///< AS923 } RAK_LORA_BAND; /**@par Description @@ -43,8 +42,8 @@ typedef enum _RAK_LORA_BAND */ typedef enum _RAK_LORA_JOIN_MODE { - RAK_LORA_ABP = 0, ///< activation by personalization - RAK_LORA_OTAA = 1 ///< over-the-air activation + RAK_LORA_ABP = 0, ///< activation by personalization + RAK_LORA_OTAA = 1 ///< over-the-air activation } RAK_LORA_JOIN_MODE; /**@par Description @@ -52,9 +51,9 @@ typedef enum _RAK_LORA_JOIN_MODE */ typedef enum _RAK_LORA_WORK_MODE { - RAK_LORA_P2P = 0, ///< Switch to P2P mode - RAK_LORAWAN = 1, ///< Switch to LoRaWan mode - RAK_LORA_FSK = 2, ///< Switch to FSK mode + RAK_LORA_P2P = 0, ///< Switch to P2P mode + RAK_LORAWAN = 1, ///< Switch to LoRaWan mode + RAK_LORA_FSK = 2, ///< Switch to FSK mode } RAK_LORA_WORK_MODE; /**@par Description @@ -62,8 +61,8 @@ typedef enum _RAK_LORA_WORK_MODE */ typedef enum _RAK_LORA_CONFIRM_MODE { - RAK_LORA_NO_ACK = 0, ///< The device will not get received data from network - RAL_LORA_ACK = 1, ///< The device will get received data from network + RAK_LORA_NO_ACK = 0, ///< The device will not get received data from network + RAL_LORA_ACK = 1, ///< The device will get received data from network } RAK_LORA_CONFIRM_MODE; /**@par Description @@ -71,9 +70,9 @@ typedef enum _RAK_LORA_CONFIRM_MODE */ typedef enum _RAK_LORA_CLASS { - RAK_LORA_CLASS_A = 0, ///< The LoRaWan will work in Class A - RAK_LORA_CLASS_B = 1, ///< The LoRaWan will work in Class B - RAK_LORA_CLASS_C = 2, ///< The LoRaWan will work in Class C + RAK_LORA_CLASS_A = 0, ///< The LoRaWan will work in Class A + RAK_LORA_CLASS_B = 1, ///< The LoRaWan will work in Class B + RAK_LORA_CLASS_C = 2, ///< The LoRaWan will work in Class C } RAK_LORA_CLASS; /**@par Description @@ -81,15 +80,15 @@ typedef enum _RAK_LORA_CLASS */ typedef struct _RAK_LORA_McSession { - uint8_t McDevclass; ///< The device class of a multicast group - uint32_t McAddress; ///< The address of a multicast group - uint8_t McAppSKey[16]; ///< The application session key of a multicast group - uint8_t McNwkSKey[16]; ///< The Network session key of a multicast group - uint32_t McFrequency; ///< The frequency of a multicast group - int8_t McDatarate; ///< The data rate of a multicast group - uint16_t McPeriodicity; ///< The periodicity of a multicast group - int8_t McGroupID; ///< The group ID of a multicast group - uint8_t entry; ///< The entry of a multicast group + uint8_t McDevclass; ///< The device class of a multicast group + uint32_t McAddress; ///< The address of a multicast group + uint8_t McAppSKey[16]; ///< The application session key of a multicast group + uint8_t McNwkSKey[16]; ///< The Network session key of a multicast group + uint32_t McFrequency; ///< The frequency of a multicast group + int8_t McDatarate; ///< The data rate of a multicast group + uint16_t McPeriodicity; ///< The periodicity of a multicast group + int8_t McGroupID; ///< The group ID of a multicast group + uint8_t entry; ///< The entry of a multicast group } RAK_LORA_McSession; /**@par Description @@ -97,24 +96,27 @@ typedef struct _RAK_LORA_McSession */ typedef struct RAK_LORA_chan_rssi_t { - uint32_t chan; ///< The channel of a rssi - uint16_t mask; ///< The mask of a rssi - int8_t rssi; ///< The rssi on reception + uint32_t chan; ///< The channel of a rssi + uint16_t mask; ///< The mask of a rssi + int8_t rssi; ///< The rssi on reception } RAK_LORA_chan_rssi; /**@}*/ -class RAKLorawan { +class RAKLorawan +{ - public: - RAKLorawan(); +public: + RAKLorawan(); - /**@par Description + /**@par Description * This api does a join request to the network * @ingroup Joining_and_Sending * @par Syntax * api.lorawan.join() - * @return TRUE for success join,FALSE for join fail(Type: bool) + * @return bool + * @retval TRUE for success + * @retval FALSE for join failure * @par Example * @verbatim // OTAA Device EUI MSB @@ -151,9 +153,9 @@ class RAKLorawan { @endverbatim */ - bool join(); + bool join(); - /**@par Description + /**@par Description * This api provides the way to send data on a dedicated port number * @ingroup Joining_and_Sending * @par Syntax @@ -163,10 +165,12 @@ class RAKLorawan { * * @param length the length of the payload * @param payload the date to uplink - * @param fport allow 1 ~ 223 - * @param confirm whether to get confirm message from gateway - * @param retry the retry time when send fail - * @return True for sending uplink success, False for sending uplink fail(Type: bool) + * @param fport allow 1 ~ 223 + * @param confirm whether to get confirm message from gateway + * @param retry the retry time when send fail + * @return bool + * @retval TRUE for sending uplink success + * @retval FALSE for sending uplink * @par Example * @verbatim // OTAA Device EUI MSB @@ -213,15 +217,16 @@ class RAKLorawan { @endverbatim */ - bool send(uint8_t length, uint8_t *payload, uint8_t fport, bool confirm = true, uint8_t retry = 0); + bool send(uint8_t length, uint8_t *payload, uint8_t fport, bool confirm = true, uint8_t retry = 0); - /**@par Description + /**@par Description * This api gets or sets the times of retransmission of Confirm packet data * @ingroup Generic_LoRaWAN_Instructions */ - class rety { - public: - /**@par Description + class rety + { + public: + /**@par Description * This api allows to get the times of retransmission of Confirm packet data * * @par Syntax @@ -245,9 +250,9 @@ class RAKLorawan { @endverbatim */ - uint8_t get(); + uint8_t get(); - /**@par Description + /**@par Description * This api allows to set the times of retransmission of Confirm packet data * * @par Syntax @@ -255,7 +260,9 @@ class RAKLorawan { * * @note Cant only input 0 ~ 7 times * @param value the retry times for retransmission - * @return True for setting retry time success, False for setting retry times fail(Type: bool) + * @return bool + * @retval TRUE for setting retry time success + * @retval FALSE for setting retry times failure * @par Example * @verbatim void setup() @@ -274,10 +281,10 @@ class RAKLorawan { @endverbatim */ - bool set(uint8_t value); - }; + bool set(uint8_t value); + }; - /**@par Description + /**@par Description * This api provides a way to send long packet(1024 bytes) text data * * @ingroup Generic_LoRaWAN_Instructions @@ -287,7 +294,9 @@ class RAKLorawan { * @param ack indicate this is a confirmed message or not * @param payload the date you want to send * @param length the length of the paylaod - * @return True for sending data success, False for sending data fail(Tpye: bool) + * @return bool + * @retval TRUE for sending data success + * @retval FALSE for sending data failure * @par Example * @verbatim // OTAA Device EUI MSB @@ -322,7 +331,7 @@ class RAKLorawan { { uint8_t payload[] = "12345678901234567890"; - if (api.lorawan.send(sizeof(payload), payload, 129, true, 1)) { + if (api.lorawan.lpsend(129, 1, payload, sizeof(payload))) { Serial.println("Send Success"); } else { Serial.println("Send fail"); @@ -334,9 +343,9 @@ class RAKLorawan { @endverbatim */ - bool lpsend(uint8_t port, bool ack, uint8_t *payload, int length); + bool lpsend(uint8_t port, bool ack, uint8_t *payload, int length); - /**@par Description + /**@par Description * * * @par Syntax @@ -346,11 +355,11 @@ class RAKLorawan { * @param retry * @param payload * @param length - * @return + * @return */ - bool usend(uint8_t port, bool confirm, uint8_t retry, uint8_t *payload, uint8_t length); + bool usend(uint8_t port, bool confirm, uint8_t retry, uint8_t *payload, uint8_t length); - /**@par Description + /**@par Description * This API is used to register a callback function, so that application can be notified on receiving LoRaWAN data. * @@ -358,7 +367,9 @@ class RAKLorawan { * @par Syntax * api.lorawan.registerRecvCallback(service_lora_recv_cb callback) * @param The callgback function - * @return True for setting callback function success, False for setting callback function fail + * @return bool + * @retval TRUE for setting callback function success + * @retval FALSE for setting callback function failure * @par Example * @verbatim void recv_cb(SERVICE_LORA_RECEIVE_T *data) { @@ -426,9 +437,9 @@ class RAKLorawan { @endverbatim */ - bool registerRecvCallback(service_lora_recv_cb callback); + bool registerRecvCallback(service_lora_recv_cb callback); - /**@par Description + /**@par Description * This API is used to register a callback function, so that application can be notified when joining process is done. * @@ -436,7 +447,9 @@ class RAKLorawan { * @par Syntax * api.lorawan.registerJoinCallback(service_lora_join_cb callback) * @param The callgback function - * @return True for setting callback function success, False for setting callback function fail + * @return bool + * @retval TRUE for setting callback function success + * @retval FALSE for setting callback function failure * @par Example * @verbatim void recv_cb(SERVICE_LORA_RECEIVE_T *data) { @@ -504,9 +517,9 @@ class RAKLorawan { @endverbatim */ - bool registerJoinCallback(service_lora_join_cb callback); + bool registerJoinCallback(service_lora_join_cb callback); - /**@par Description + /**@par Description * This API is used to register a callback function, so that application can be notified when uplink process is done. * @@ -514,7 +527,9 @@ class RAKLorawan { * @par Syntax * api.lorawan.registerSendCallback(service_lora_send_cb callback) * @param The callback function - * @return True for setting callback function success, False for setting callback function fail + * @return bool + * @retval TRUE for setting callback function success + * @retval FALSE for setting callback function failure * @par Example * @verbatim void recv_cb(SERVICE_LORA_RECEIVE_T *data) { @@ -582,9 +597,9 @@ class RAKLorawan { @endverbatim */ - bool registerSendCallback(service_lora_send_cb callback); + bool registerSendCallback(service_lora_send_cb callback); - /**@par Description + /**@par Description * This API is used to register a callback function, so that application can be notified on receiving P2P data. * @@ -592,7 +607,9 @@ class RAKLorawan { * @par Syntax * api.lorawan.registerPRecvCallback(service_lora_p2p_recv_cb_type callback) * @param The callback function - * @return True for setting callback function success, False for setting callback function fail + * @return bool + * @retval TRUE for setting callback function success + * @retval FALSE for setting callback function failure * @par Example * @verbatim void recv_cb(rui_lora_p2p_recv_t data) { @@ -649,9 +666,9 @@ class RAKLorawan { } @endverbatim */ - bool registerPRecvCallback(service_lora_p2p_recv_cb_type callback); + bool registerPRecvCallback(service_lora_p2p_recv_cb_type callback); - /**@par Description + /**@par Description * This API is used to register a callback function, so that application can be notified when P2P uplink process is done. * @@ -659,7 +676,9 @@ class RAKLorawan { * @par Syntax * api.lorawan.registerPSendCallback(service_lora_p2p_send_cb_type callback) * @param The callback function - * @return True for setting callback function success, False for setting callback function fail + * @return bool + * @retval TRUE for setting callback function success + * @retval FALSE for setting callback function failure * @par Example * @verbatim void recv_cb(rui_lora_p2p_recv_t data) { @@ -716,22 +735,25 @@ class RAKLorawan { } @endverbatim */ - bool registerPSendCallback(service_lora_p2p_send_cb_type callback); + bool registerPSendCallback(service_lora_p2p_send_cb_type callback); - /**@par Description + /**@par Description * view or change the LoRAWAN APPEUI and use it to setup the LoRAWAN connection * @ingroup Keys_IDs_and_EUI_Management */ - class appeui { - public: - /**@par Description + class appeui + { + public: + /**@par Description * This api allows the user to get the global application identifier * * @par Syntax * api.lorawan.appeui.get(buf, len) * @param buf the buffer to get AppEUI * @param len the length of AppEUI(must be 8 bytes) - * @return True for getting AppEUI successfully,False for getting AppEUI fail(Type: bool) + * @return bool + * @retval TRUE for getting AppEUI successfully + * @retval FALSE for getting AppEUI failure * @par Example * @verbatim // OTAA Application EUI MSB @@ -769,16 +791,18 @@ class RAKLorawan { @endverbatim */ - bool get(uint8_t *buf, uint32_t len); + bool get(uint8_t *buf, uint32_t len); - /**@par Description + /**@par Description * This api allows the user to set the global application identifier * * @par Syntax * api.lorawan.appeui.set(buf, len) * @param buf the buffer to set AppEUI * @param len the length of AppEUI(must be 8 bytes) - * @return True for setting AppEUI successfully,False for setting AppEUI fail(Type: bool) + * @return bool + * @retval TRUE for setting AppEUI successfully + * @retval FALSE for setting AppEUI failure * @par Example * @verbatim // OTAA Application EUI MSB @@ -815,24 +839,26 @@ class RAKLorawan { @endverbatim */ - bool set(uint8_t *buf, uint32_t len); - }; + bool set(uint8_t *buf, uint32_t len); + }; - /**@par Description + /**@par Description * view or change the LoRAWAN APPKEY and use it to setup the LoRAWAN connection * @ingroup Keys_IDs_and_EUI_Management */ - class appkey { - public: - - /**@par Description + class appkey + { + public: + /**@par Description * This api allows the user to get the application key * * @par Syntax * api.lorawan.appkey.get(buf, len) * @param buf the buffer to get AppKey * @param len the length of AppKey(must be 16 bytes) - * @return True for getting AppKey successfully,False for getting Appkey fail(type: bool) + * @return bool + * @retval TRUE for getting AppKey successfully + * @retval FALSE for getting Appkey failure * @par Example * @verbatim // OTAA Application Key MSB @@ -869,16 +895,18 @@ class RAKLorawan { @endverbatim */ - bool get(uint8_t *buf, uint32_t len); + bool get(uint8_t *buf, uint32_t len); - /**@par Description + /**@par Description * This api allows the user to set the application key * * @par Syntax * api.lorawan.appkey.set(buf, len); * @param buf the buffer to set AppKey * @param len the length of AppKey(must be 16 bytes) - * @return True for setting AppKey successfully,False for setting Appkey fail(Type: bool) + * @return bool + * @retval TRUE for setting AppKey successfully + * @retval FALSE for setting Appkey failure * @par Example * @verbatim // OTAA Application Key MSB @@ -915,23 +943,26 @@ class RAKLorawan { @endverbatim */ - bool set(uint8_t *buf, uint32_t len); - }; + bool set(uint8_t *buf, uint32_t len); + }; - /**@par Description + /**@par Description * This api allows the user to get or set the application session key * @ingroup Keys_IDs_and_EUI_Management */ - class appskey { - public: - /**@par Description + class appskey + { + public: + /**@par Description * This api allows the user to get the application session key * @par Syntax * api.lorawan.appskey.get(buf, len); * @note This function can only work in ABP mode * @param buf the buffer to get AppSKey * @param len the length of AppSKey(must be 16 bytes) - * @return True for getting AppSKey successfully,False for getting AppSKey fail + * @return bool + * @retval TRUE for getting AppSKey successfully + * @retval FALSE for getting AppSKey failure * @par Example * @verbatim // ABP Application Session Key @@ -968,16 +999,18 @@ class RAKLorawan { @endverbatim */ - bool get(uint8_t *buf, uint32_t len); - - /**@par Description + bool get(uint8_t *buf, uint32_t len); + + /**@par Description * This api allows the user to set the application session key * * @par Syntax * api.lorawan.appskey.set(buf, len) * @param buf The buffer to get AppSKey * @param len the length of AppSkey(must be 16 bytes) - * @return True for getting AppSKey successfully,False for getting AppSKey fail(Type: bool) + * @return bool + * @retval TRUE for getting AppSKey successfully + * @retval FALSE for getting AppSKey failure * @par Example * @verbatim // ABP Application Session Key @@ -1015,16 +1048,17 @@ class RAKLorawan { @endverbatim */ - bool set(uint8_t *buf, uint32_t len); - }; + bool set(uint8_t *buf, uint32_t len); + }; - /**@par Description + /**@par Description * This api allows the user to access the device address * @ingroup Keys_IDs_and_EUI_Management */ - class daddr { - public: - /**@par Description + class daddr + { + public: + /**@par Description * This api allows the user to get the device address * * @par Syntax @@ -1032,7 +1066,9 @@ class RAKLorawan { * @note This function can only work in ABP mode * @param buf the buffer to get device address * @param len the length of device address(must be 4 bytes) - * @return True for getting device address successfully,False for getting device address fail(Type: bool) + * @return bool + * @retval TRUE for getting device address successfully + * @retval FALSE for getting device address failure * @par Example * @verbatim // ABP Device Address @@ -1069,16 +1105,18 @@ class RAKLorawan { @endverbatim */ - bool get(uint8_t *buf, uint32_t len); + bool get(uint8_t *buf, uint32_t len); - /**@par Description + /**@par Description * This api allows the user to set the device address * * @par Syntax * api.lorawan.daddr.set(buf, len); * @param buf the buffer to set device address * @param len the length of device address(must be 4 bytes) - * @return True for getting device address successfully,False for getting device address fail(Type: bool) + * @return bool + * @retval TRUE for setting device address successfully + * @retval FALSE for setting device address failure * @par Example * @verbatim // ABP Device Address @@ -1115,23 +1153,26 @@ class RAKLorawan { @endverbatim */ - bool set(uint8_t *buf, uint32_t len); - }; + bool set(uint8_t *buf, uint32_t len); + }; - /**@par Description + /**@par Description * view or change the LoRAWAN DEUI and use it to setup the LoRAWAN connection * @ingroup Keys_IDs_and_EUI_Management */ - class deui { - public: - /**@par Description + class deui + { + public: + /**@par Description * This api allows the user to get the global end-device ID * * @par Syntax * api.lorawan.deui.get(buf, len) * @param buf the buffer to get device EUI * @param len the length of device EUI(must be 8 bytes) - * @return True for getting device EUI successfully,False for getting device EUI fail(Type: bool) + * @return bool + * @retval TRUE for getting device EUI successfully + * @retval FALSE for getting device EUI failure * @par Example * @verbatim // OTAA Device EUI MSB @@ -1168,16 +1209,18 @@ class RAKLorawan { @endverbatim */ - bool get(uint8_t *buf, uint32_t len); + bool get(uint8_t *buf, uint32_t len); - /**@par Description + /**@par Description * This api allows the user to set the global end-device ID * * @par Syntax * api.lorawan.deui.set(buf, len) * @param buf the buffer to set device EUI * @param len the length of device EUI(must be 8 bytes) - * @return True for setting device EUI successfully,False for setting device EUI fail(Type: bool) + * @return bool + * @retval TRUE for setting device EUI successfully + * @retval FALSE for setting device EUI failure * @par Example * @verbatim // OTAA Device EUI MSB @@ -1214,16 +1257,17 @@ class RAKLorawan { @endverbatim */ - bool set(uint8_t *buf, uint32_t len); - }; + bool set(uint8_t *buf, uint32_t len); + }; - /**@par Description + /**@par Description * This api allows the user to access the network identifier(NetID) * @ingroup Keys_IDs_and_EUI_Management */ - class netid { - public: - /**@par Description + class netid + { + public: + /**@par Description * This api allows the user to get the network identifier(NetID) * * @par Syntax @@ -1231,7 +1275,9 @@ class RAKLorawan { * @note Even though the length of network identifier(NetID) is 3 bytes, you should give 4-bytes buffer for natural alignment * @param buf the buffer to get network identifier(NetID) * @param len the length of network identifier(NetID)(must be 3 bytes) - * @return True for getting network identifier(NetID) successfully,False for getting network identifier(NetID) fail(Type: bool) + * @return bool + * @retval TRUE for getting network identifier(NetID) successfully + * @retval FALSE for getting network identifier(NetID) failure * @par Example * @verbatim // OTAA Device EUI MSB @@ -1281,16 +1327,17 @@ class RAKLorawan { @endverbatim */ - bool get(uint8_t *buf, uint32_t len); - }; + bool get(uint8_t *buf, uint32_t len); + }; - /**@par Description + /**@par Description * This api allows the user to get or set the network session key * @ingroup Keys_IDs_and_EUI_Management */ - class nwkskey { - public: - /**@par Description + class nwkskey + { + public: + /**@par Description * This api allows the user to get the network session key * * @par Syntax @@ -1298,7 +1345,9 @@ class RAKLorawan { * @note This function can only work in ABP mode0 * @param buf the buffer to get network session key * @param len the length of network session key(must be 16 bytes) - * @return True for getting network session key successfully,False for getting network session key fail + * @return bool + * @retval TRUE for getting network session key successfully + * @retval FALSE for getting network session key failure * @par Example * @verbatim // ABP Network Session Key @@ -1335,16 +1384,18 @@ class RAKLorawan { @endverbatim */ - bool get(uint8_t *buf, uint32_t len); + bool get(uint8_t *buf, uint32_t len); - /**@par Description + /**@par Description * This api allows the user to set the network session key * * @par Syntax * api.lorawan.nwkskey.set(buf, len) * @param buf the buffer to set network session key * @param len the length of network session key(must be 16 bytes) - * @return True for setting network session key successfully,False for setting network session key fail + * @return bool + * @retval TRUE for setting network session key successfully + * @retval FALSE for setting network session key failure * @par Example * @verbatim // ABP Network Session Key @@ -1381,23 +1432,24 @@ class RAKLorawan { @endverbatim */ - bool set(uint8_t *buf, uint32_t len); - }; + bool set(uint8_t *buf, uint32_t len); + }; - /**@par Description + /**@par Description * This api allows the user to access the notification on received data coming from the network * @ingroup Joining_and_Sending */ - class cfm { - public: - /**@par Description + class cfm + { + public: + /**@par Description * This api allows the user to get the notification on received data coming from the network * * @par Syntax * api.lorawan.cfm.get() - * @return bool - * @retval 0 LoRaWan uplink is on confirm mode - * @retval 1 LoRaWan uplink is not on confirm mode + * @return bool + * @retval TRUE : LoRaWan uplink is not on confirm mode + * @retval FALSE : LoRaWan uplink is on confirm mode * @par Example * @verbatim void setup() @@ -1416,15 +1468,17 @@ class RAKLorawan { @endverbatim */ - bool get(); + bool get(); - /**@par Description + /**@par Description * This api allows the user to set the notification on received data coming from the network * * @par Syntax * api.lorawan.cfm.set(value) * @param value the mode of confirm mode to set - * @return True for setting confirm mode success,False for setting confirm mode fail + * @return bool + * @retval TRUE for setting confirm mode success + * @retval FALSE for setting confirm mode failure * @par Example * @verbatim void setup() @@ -1443,24 +1497,25 @@ class RAKLorawan { @endverbatim */ - bool set(bool value); - }; + bool set(bool value); + }; - /**@par Description + /**@par Description * This api allows the user to access the status of the last “SEND” command * @ingroup Joining_and_Sending */ - class cfs { - public: - /**@par Description + class cfs + { + public: + /**@par Description * This api allows the user to get the status of the last “SEND” command * * @par Syntax * api.lorawan.cfs.get(); * @note This api can only work when Confirm mode is on - * @return The last confirm status for last "Send"(Type: bool) - * @retval 0 Confirm Fail - * @retval 1 Confirm Success + * @return bool + * @retval TRUE : Confirm Succes + * @retval FALSE : Confirm Failure * @par Example * @verbatim // OTAA Device EUI MSB @@ -1509,23 +1564,24 @@ class RAKLorawan { @endverbatim */ - bool get(); - }; + bool get(); + }; - /**@par Description + /**@par Description * This api allows the user to access the network join mode * @ingroup Joining_and_Sending */ - class njm { - public: - /**@par Description + class njm + { + public: + /**@par Description * This api allows the user to get the network join mode * * @par Syntax * api.lorawan.njm.get() - * @return Network join mode(Type: bool) - * @retval 0 ABP - * @retval 1 OTAA + * @return bool + * @retval TRUE : OTAA + * @retval FALSE : ABP * @par Example * @verbatim void setup() @@ -1544,9 +1600,9 @@ class RAKLorawan { @endverbatim */ - bool get(); + bool get(); - /**@par Description + /**@par Description * This api allows the user to set the network join mode * * @par Syntax @@ -1554,7 +1610,9 @@ class RAKLorawan { * @param value the mode of network join mode \n * ABP: 0\n * OTAA: 1 - * @return True for setting network join mode success,False for setting network join mode fail + * @return bool + * @retval TRUE for setting network join mode success + * @retval FALSE for setting network join mode failure * @par Example * @verbatim void setup() @@ -1573,23 +1631,24 @@ class RAKLorawan { @endverbatim */ - bool set(bool value); - }; + bool set(bool value); + }; - /**@par Description + /**@par Description * This api allows the user to access the current status of the LoRa® link * @ingroup Joining_and_Sending */ - class njs { - public: - /**@par Description + class njs + { + public: + /**@par Description * This api allows the user to get the current status of the LoRa® link * * @par Syntax * api.lorawan.njs.get() - * @return the status of LoRa link(Type: bool) - * @retval 0 Network not join - * @retval 1 Netwok join + * @return bool + * @retval TRUE : Netwok join + * @retval FALSE : Network not join * @par Example * @verbatim // OTAA Device EUI MSB @@ -1626,25 +1685,26 @@ class RAKLorawan { @endverbatim */ - bool get(); - }; + bool get(); + }; - /**@par Description + /**@par Description * This api allows the user to access the adaptive data rate * @ingroup Network * @note The default value of the ADR is 1 (enabled) */ - class adr { - public: - /**@par Description + class adr + { + public: + /**@par Description * This api allows the user to get the adaptive data rate * * @par Syntax * api.lorawan.adr.get() * - * @return the status of adaptive data rate - * @retval 0 disable adaptive data rate - * @retval 1 enable adaptive data rate + * @return bool + * @retval TRUE : enable adaptive data rate + * @retval FALSE : disable adaptive data rate * @par Example * @verbatim void setup() @@ -1662,16 +1722,18 @@ class RAKLorawan { @endverbatim */ - bool get(); + bool get(); - /**@par Description + /**@par Description * This api allows the user to set the adaptive data rate * * @par Syntax * api.lorawan.adr.set(value) * * @param value the status of adaptive data rate - * @return True for setting status of adr success, False for setting status of adr fail(Type: bool) + * @return bool + * @retval TRUE for setting status of adr success + * @retval FALSE for setting status of adr failure * @par Example * @verbatim void setup() @@ -1690,16 +1752,17 @@ class RAKLorawan { @endverbatim */ - bool set(bool value); - }; + bool set(bool value); + }; - /**@par Description + /**@par Description * This api allows the user to access the LoRaWAN® class * @ingroup Network */ - class deviceClass { - public: - /**@par Description + class deviceClass + { + public: + /**@par Description * This api allows the user to get the LoRaWAN® class * * @par Syntax @@ -1738,16 +1801,18 @@ class RAKLorawan { @endverbatim */ - uint8_t get(); + uint8_t get(); - /**@par Description + /**@par Description * This api allows the user to set the LoRaWAN® class * * @par Syntax * api.lorawan.deviceClass.set(value) * * @param value the LoRaWan class - * @return True for setting LoRaWan class success, False for setting LoRaWan class fail(Type: bool) + * @return bool + * @retval TRUE for setting LoRaWan class success + * @retval FALSE for setting LoRaWan class failure * @par Example * @verbatim void setup() @@ -1776,24 +1841,25 @@ class RAKLorawan { @endverbatim */ - bool set(uint8_t value); - }; + bool set(uint8_t value); + }; - /**@par Description + /**@par Description * This api allows the user to access the duty cycle parameter * @ingroup Network */ - class dcs { - public: - /**@par Description + class dcs + { + public: + /**@par Description * This api allows the user to get the duty cycle parameter * * @par Syntax * api.lorawan.dcs.get() * - * @return the duty cycle status(Type: bool) - * @retval 0 disable duty cycle - * @retval 1 enable duty cycle + * @return bool + * @retval TRUE : enable duty cycle + * @retval FALSE : disable duty cycle * @par Example * @verbatim void setup() @@ -1811,15 +1877,17 @@ class RAKLorawan { @endverbatim */ - bool get(); + bool get(); - /**@par Description + /**@par Description * This api allows the user to set the duty cycle paramter * @par Syntax * api.lorawan.dcs.set(dutyCycle) * * @param dutyCycle the LoRaWan duty cycle - * @return True for setting duty cycle success, False for setting duty cycle fail(Type: bool) + * @return bool + * @retval TRUE for setting duty cycle success + * @retval FALSE for setting duty cycle failure * @par Example * @verbatim void setup() @@ -1837,16 +1905,17 @@ class RAKLorawan { @endverbatim */ - bool set(uint8_t dutyCycle); - }; + bool set(uint8_t dutyCycle); + }; - /**@par Description + /**@par Description * This api allows the user to access the data rate * @ingroup Network */ - class dr { - public: - /**@par Description + class dr + { + public: + /**@par Description * This api allows the user to get the data rate * * @par Syntax @@ -1869,16 +1938,19 @@ class RAKLorawan { @endverbatim */ - uint8_t get(); + uint8_t get(); - /**@par Description + /**@par Description * This api allows the user to set the data rate * * @par Syntax * api.lorawan.dr.set(value) * * @param value the data rate - * @return True for setting data rate success, False for setting date rate fail(Type: bool) + * @return bool + * @retval TRUE for setting data rate success + * @retval FALSE for setting date rate failure + * * @par Example * @verbatim void setup() @@ -1896,16 +1968,17 @@ class RAKLorawan { @endverbatim */ - bool set(uint8_t value); - }; + bool set(uint8_t value); + }; - /**@par Description + /**@par Description * This api allows the user to access the join delay on RX window 1 * @ingroup Network */ - class jn1dl { - public: - /**@par Description + class jn1dl + { + public: + /**@par Description * This api allows the user to get the join delay on RX window 1 * * @par Syntax @@ -1929,16 +2002,18 @@ class RAKLorawan { @endverbatim */ - int get(); + int get(); - /**@par Description + /**@par Description * This api allows the user to set the join delay on RX window 1 * * @par Syntax * api.lorawan.jn1dl.set(value) * * @param value the join delay on RX window 1 - * @return True for setting join delay success, False for setting join delay false(Type: bool) + * @return bool + * @retval TRUE for setting join delay success + * @retval FALSE for setting join delay failure * @par Example * @verbatim void setup() @@ -1956,16 +2031,17 @@ class RAKLorawan { @endverbatim */ - bool set(int value); - }; + bool set(int value); + }; - /**@par Description + /**@par Description * This api allows the user to access the join delay on RX window 2 * @ingroup Network */ - class jn2dl { - public: - /**@par Description + class jn2dl + { + public: + /**@par Description * This api allows the user to access the join delay on RX window 2 * * @par Syntax @@ -1987,22 +2063,25 @@ class RAKLorawan { @endverbatim */ - int get(); - }; + int get(); + }; - /**@par Description + /**@par Description * This api allows the user to access the public network mode * @ingroup Network */ - class pnm { - public: - /**@par Description + class pnm + { + public: + /**@par Description * This api allows the user to get the public network mode * * @par Syntax * api.lorawan.pnm.get() * - * @return the public network mode(Type: bool) + * @return bool + * @retval TRUE : On + * @retval FALSE : Off * @par Example * @verbatim void setup() @@ -2020,16 +2099,18 @@ class RAKLorawan { @endverbatim */ - bool get(); + bool get(); - /**@par Description + /**@par Description * This api allows the user to set the public network mode * * @par Syntax * api.lorawan.pnm.set(value) * * @param value the public network mode - * @return True for setting public network mode success, False for setting public network mode fail(Type: bool) + * @return bool + * @retval TRUE for setting public network mode success + * @retval FALSE for setting public network mode failure * @par Example * @verbatim void setup() @@ -2047,16 +2128,17 @@ class RAKLorawan { @endverbatim */ - bool set(bool value); - }; + bool set(bool value); + }; - /**@par Description + /**@par Description * This api allows the user to access the delay of the received window 1 ( * @ingroup Network */ - class rx1dl { - public: - /**@par Description + class rx1dl + { + public: + /**@par Description * This api allows the user to get the delay of the received window 1 * * @par Syntax @@ -2080,15 +2162,17 @@ class RAKLorawan { @endverbatim */ - int get(); + int get(); - /**@par Description + /**@par Description * This api allows the user to set the delay of the received window 1 * * @par Syntax * api.lorawan.rx1dl.set(value) * @param value the delay of the received window 1 - * @return True for setting delay success, False for setting delay fail(Type: bool) + * @return bool + * @retval TRUE for setting delay success + * @retval FALSE for setting delay failure * @par Example * @verbatim void setup() @@ -2106,16 +2190,17 @@ class RAKLorawan { @endverbatim */ - bool set(int value); - }; + bool set(int value); + }; - /**@par Description + /**@par Description * This api allows the user to access the delay of the received window 2 * @ingroup Network */ - class rx2dl { - public: - /**@par Description + class rx2dl + { + public: + /**@par Description * This api allows the user to get the delay of the received window 2 * * @par Syntax @@ -2137,16 +2222,17 @@ class RAKLorawan { @endverbatim */ - int get(); - }; + int get(); + }; - /**@par Description + /**@par Description * This api allows the user to access the data rate of received window 2 * @ingroup Network */ - class rx2dr { - public: - /**@par Description + class rx2dr + { + public: + /**@par Description * This api allows the user to get the data rate of received window 2 * * @par Syntax @@ -2170,16 +2256,18 @@ class RAKLorawan { @endverbatim */ - uint8_t get(); + uint8_t get(); - /**@par Description + /**@par Description * This api allows the user to set the data rate of received window 2 * * @par Syntax * api.lorawan.rx2dr.set(value) * * @param value the date rate of received window 2 - * @return True for setting data rate success, Fasle for setting data rate fail(Type: bool) + * @return bool + * @retval TRUE for setting data rate success + * @retval FALSE for setting data rate failure * @par Example * @verbatim void setup() @@ -2197,16 +2285,17 @@ class RAKLorawan { @endverbatim */ - bool set(uint8_t value); - }; + bool set(uint8_t value); + }; - /**@par Description + /**@par Description * This api allows the user to access the frequency of the received window 2 * @ingroup Network */ - class rx2fq { - public: - /**@par Description + class rx2fq + { + public: + /**@par Description * This api allows the user to get the frequency of the received window 2 * * @par Syntax @@ -2228,16 +2317,17 @@ class RAKLorawan { @endverbatim */ - long get(); - }; + long get(); + }; - /**@par Description + /**@par Description * This api allows the user to access the transmit power * @ingroup Network */ - class txp { - public: - /**@par Description + class txp + { + public: + /**@par Description * This api allows the user to get the transmit power * * @par Syntax @@ -2261,16 +2351,18 @@ class RAKLorawan { @endverbatim */ - uint8_t get(); + uint8_t get(); - /**@par Description + /**@par Description * This api allows the user to set the transmit power * * @par Syntax * api.lorawan.txp.set(value) * * @param value the LoRaWan transmit power - * @return True for setting transmit power success, False for setting transmit power fail(Type: bool) + * @return bool + * @retval TRUE for setting transmit power successs + * @retval FALSE for setting transmit power failure * @par Example * @verbatim void setup() @@ -2288,17 +2380,17 @@ class RAKLorawan { @endverbatim */ - bool set(uint8_t value); - - }; + bool set(uint8_t value); + }; - /**@par Description + /**@par Description * This api allows the user to get or set the unicast ping slot periodicity * @ingroup Class_B */ - class pgslot { - public: - /**@par Description + class pgslot + { + public: + /**@par Description * This api allows the user to get the unicast ping slot periodicity * * @par Syntax @@ -2344,16 +2436,18 @@ class RAKLorawan { } @endverbatim */ - uint8_t get(); + uint8_t get(); - /**@par Description + /**@par Description * This api allows the user to set the unicast ping slot periodicity * * @par Syntax * api.lorawan.pgslot.set(value) * * @param value the unicast ping slot periodicity - * @return True for setting ping slot periodicity success, False for setting ping slot periodicity fail(Type: bool) + * @return bool + * @retval TRUE for setting ping slot periodicity success + * @retval FALSE for setting ping slot periodicity failure * @par Example * @verbatim // OTAA Device EUI MSB @@ -2393,16 +2487,17 @@ class RAKLorawan { } @endverbatim */ - bool set(uint8_t value); - }; + bool set(uint8_t value); + }; - /**@par Description + /**@par Description * This api allows the user to access the current beacon (default broadcast) frequency * @ingroup Class_B */ - class bfreq { - public: - /**@par Description + class bfreq + { + public: + /**@par Description * This api allows the user to get the current beacon (default broadcast) frequency * * @par Syntax @@ -2447,16 +2542,17 @@ class RAKLorawan { } @endverbatim */ - float get(); - }; + float get(); + }; - /**@par Description + /**@par Description * This api(a) allows the user to access the current beacon time(b) * @ingroup Class_B */ - class btime { - public: - /**@par Description + class btime + { + public: + /**@par Description * This api(a) allows the user to get the current beacon time(b) * * @par Syntax @@ -2501,16 +2597,17 @@ class RAKLorawan { } @endverbatim */ - long get(); - }; + long get(); + }; - /**@par Description + /**@par Description * This api(a) allows the user to access the gateway GPS coordinate, NetID and GwID(b) * @ingroup Class_B */ - class bgw { - public: - /**@par Description + class bgw + { + public: + /**@par Description * This api(a) allows the user to access the gateway GPS coordinate, NetID and GwID(b) * * @par Syntax @@ -2564,17 +2661,18 @@ class RAKLorawan { } @endverbatim */ - beacon_bgw_t get(); - }; + beacon_bgw_t get(); + }; - /**@par Description + /**@par Description * This api allows the user to access the RSSI on reception * @ingroup Information * @note When the connection is successful and get the RSSI of the last received packet */ - class rssi { - public: - /**@par Description + class rssi + { + public: + /**@par Description * This api allows the user to get the RSSI on reception * * @par Syntax @@ -2628,17 +2726,18 @@ class RAKLorawan { @endverbatim */ - int get(); - }; + int get(); + }; - /**@par Description + /**@par Description * This api allows the user to access the SNR of the last received packet * @ingroup Information * @note When the connection is successful and get the SNR of the last received packet */ - class snr { - public: - /**@par Description + class snr + { + public: + /**@par Description * This api allows the user to get the SNR of the last received packet * * @par Syntax @@ -2692,16 +2791,17 @@ class RAKLorawan { @endverbatim */ - int get(); - }; + int get(); + }; - /**@par Description + /**@par Description * This api(a) allows the user to access the local time in a UTC format * @ingroup Class_B */ - class ltime { - public: - /**@par Description + class ltime + { + public: + /**@par Description * This api(a) allows the user to get the local time in a UTC format * * @par Syntax @@ -2746,17 +2846,17 @@ class RAKLorawan { } @endverbatim */ - string get(); - }; - + string get(); + }; - /**@par Description + /**@par Description * This api allows the user to get the lorawan version * @ingroup Information */ - class ver { - public: - /**@par Description + class ver + { + public: + /**@par Description * This api allows the user to get the lorawan version * * @par Syntax @@ -2778,231 +2878,264 @@ class RAKLorawan { @endverbatim */ - string get(); - }; + string get(); + }; - /**@par Description + /**@par Description * * @ingruop RF_Test */ - class trssi { - public: - /**@par Description + class trssi + { + public: + /**@par Description * * * @par Syntax * api.lorawan.trssi.start(); - * @return + * @return bool + * @retval TRUE fot success + * @retval FALSE for failure */ - bool start(); - }; + bool start(); + }; - /**@par Description + /**@par Description * * @ingroup RF_Test */ - class ttone { - public: - /**@par Description + class ttone + { + public: + /**@par Description * * * @par Syntax * api.lorawan.ttone.start(); - * @return + * @return bool + * @retval TRUE fot success + * @retval FALSE for failure */ - bool start(); - }; + bool start(); + }; - /**@par Description + /**@par Description * * @ingroup RF_Test */ - class ttx { - public: - /**@par Description + class ttx + { + public: + /**@par Description * * * @par Syntax * api.lorawan.ttx.start(value); * @param value - * @return + * @return bool + * @retval TRUE fot success + * @retval FALSE for failu */ - bool start(uint8_t value); - }; + bool start(uint8_t value); + }; - /**@par Description + /**@par Description * * @ingroup RF_Test */ - class trx { - public: - /**@par Description + class trx + { + public: + /**@par Description * * * @par Syntax * api.lorawan.trx.start(value); * @param value - * @return + * @return bool + * @retval TRUE fot success + * @retval FALSE for failu */ - bool start(uint8_t value); - }; + bool start(uint8_t value); + }; - /**@par Description + /**@par Description * * @ingroup RF_Test */ - class tconf { - public: - - class freq { - public: - bool set(long value); - }; - - class power { - public: - bool set(uint8_t value); - }; - - class dr { - public: - bool set(uint8_t value); - }; - - class cr { - public: - bool set(uint8_t value); - }; - - class lna { - public: - bool set(bool value); - }; - - class boost { - public: - bool set(bool value); - }; - - class modulation { - public: - bool set(uint8_t value); - }; - - class payloadLength { - public: - bool set(uint8_t value); - }; - - class fskDeviation { - public: - bool set(int, int); - }; - - class lowDrOpt { - public: - bool set(uint8_t value); - }; - - class BTProduct { - public: - bool set(uint8_t value); - }; - //instance of tconf - freq freq; - power power; - dr dr; - cr cr; - lna lna; - boost boost; - modulation modulation; - payloadLength payloadLength; - fskDeviation fskDeviation; - lowDrOpt lowDrOpt; - BTProduct BTProduct; + class tconf + { + public: + class freq + { + public: + bool set(long value); }; - /**@par Description + class power + { + public: + bool set(uint8_t value); + }; + + class dr + { + public: + bool set(uint8_t value); + }; + + class cr + { + public: + bool set(uint8_t value); + }; + + class lna + { + public: + bool set(bool value); + }; + + class boost + { + public: + bool set(bool value); + }; + + class modulation + { + public: + bool set(uint8_t value); + }; + + class payloadLength + { + public: + bool set(uint8_t value); + }; + + class fskDeviation + { + public: + bool set(int, int); + }; + + class lowDrOpt + { + public: + bool set(uint8_t value); + }; + + class BTProduct + { + public: + bool set(uint8_t value); + }; + //instance of tconf + freq freq; + power power; + dr dr; + cr cr; + lna lna; + boost boost; + modulation modulation; + payloadLength payloadLength; + fskDeviation fskDeviation; + lowDrOpt lowDrOpt; + BTProduct BTProduct; + }; + + /**@par Description * * @ingroup RF_Test */ - class tth { - public: - bool start(); - - class freqStart { - public: - bool set(long value); - }; - - class freqStop { - public: - bool set(long value); - }; - - class freqDelta { - public: - bool set(long value); - }; - - class packetNb { - public: - bool set(uint8_t value); - }; - //instance of tth - freqStart freqStart; - freqStop freqStop; - freqDelta freqDelt; - packetNb packetNb; + class tth + { + public: + bool start(); + + class freqStart + { + public: + bool set(long value); }; - /**@par Description + class freqStop + { + public: + bool set(long value); + }; + + class freqDelta + { + public: + bool set(long value); + }; + + class packetNb + { + public: + bool set(uint8_t value); + }; + //instance of tth + freqStart freqStart; + freqStop freqStop; + freqDelta freqDelt; + packetNb packetNb; + }; + + /**@par Description * * @ingroup RF_Test */ - class toff { - public: - /**@par Description + class toff + { + public: + /**@par Description * * * @par Syntax * api.lorawan.toff.stop(); * @return */ - bool stop(); - }; + bool stop(); + }; - /**@par Description + /**@par Description * * @ingroup RF_Test */ - class certif { - public: - /**@par Description + class certif + { + public: + /**@par Description * * * @par Syntax * api.lorawan.certif.start(); * @return */ - bool start(); - }; + bool start(); + }; - /**@par Description + /**@par Description * This api configures the channel of the device by setting the hexadecimal channel mask * @ingroup Generic_LoRaWAN_Instructions */ - class mask { - public: - /**@par Description + class mask + { + public: + /**@par Description * This api allows the user to set the channel mask, close or open the channel * * @par Syntax * api.lorawan.mask.get(buff) * * @param buff the buffer to store channel mask - * @return True fot getting channel mask success, False for setting channel mask fail(Type: bool) + * @return bool + * @retval TRUE fot getting channel mask success + * @retval FALSE for setting channel mask failure * @par Example * @verbatim uint16_t maskBuff = 0x0003; @@ -3026,16 +3159,18 @@ channel mask @endverbatim */ - bool get(uint16_t *buff); + bool get(uint16_t *buff); - /**@par Description + /**@par Description * This api allows the user to get the channel mask, close or open the channel * * @par Syntax * api.lorawan.mask.set(value) * * @param value the buffer to set the channel mask - * @return True for setting channel mask success, False for setting channel mask fail(Type: bool) + * @return bool + * @retval TRUE for setting channel mask success + * @retval FALSE for setting channel mask failure * @par Example * @verbatim uint16_t maskBuff = 0x0003; @@ -3059,10 +3194,10 @@ channel mask @endverbatim */ - bool set(uint16_t *value); - }; + bool set(uint16_t *value); + }; - /**@par Description + /**@par Description * This api set number corresponding to active regions * @ingroup Generic_LoRaWAN_Instructions * @note 0: EU433\n @@ -3075,9 +3210,10 @@ channel mask * 7: KR920\n * 8: AS923 */ - class band { - public: - /**@par Description + class band + { + public: + /**@par Description * This api get number corresponding to active regions * * @par Syntax @@ -3111,16 +3247,18 @@ channel mask @endverbatim */ - int32_t get(); + int32_t get(); - /**@par Description + /**@par Description * This api set number corresponding to active regions * * @par Syntax * api.lorawan.band.set(value) * * @param value the active region to set - * @return True for setting active region, False for setting active region(Type: bool) + * @return bool + * @retval TRUE for setting active region success + * @retval FALSE for setting active region failure * @par Example * @verbatim void setup() @@ -3139,16 +3277,17 @@ channel mask @endverbatim */ - bool set(uint8_t value); - }; + bool set(uint8_t value); + }; - /**@par Description + /**@par Description * This api allows the user to Verify Network Link Status * @ingroup Generic_LoRaWAN_Instructions */ - class linkcheck { - public: - /**@par Description + class linkcheck + { + public: + /**@par Description * This api allows the user to Verify Network Link Status * * @par Syntax @@ -3176,16 +3315,18 @@ channel mask @endverbatim */ - uint32_t get(); + uint32_t get(); - /**@par Description + /**@par Description * This api allows the user to set Network Link Status * * @par Syntax * api.lorawan.linkcheck.set(value) * * @param value the mode of Verifying network link status - * @return True for setting mode of verifying network link status, False for setting mode of verifying network link status fail(Type: bool) + * @return bool + * @retval TRUE for setting mode of verifying network link status success + * @retval FALSE for setting mode of verifying network link status failure * @par Example * @verbatim void setup() @@ -3204,17 +3345,18 @@ channel mask @endverbatim */ - bool set(uint8_t value); - }; + bool set(uint8_t value); + }; - /**@par Description - * Switch to point-to-point mode, or LoRaWAN mode [0:Point to point, 1:LoRaWAN] + /**@par Description + * Switch to point-to-point mode, or LoRaWAN mode, or FSK mode [0:Point to point, 1:LoRaWAN, 2:FSK] * @ingroup P2P */ - class nwm { - public: - /**@par Description - * This api allows to get the network working mode (0 = P2P, 1 = LoRaWAN) + class nwm + { + public: + /**@par Description + * This api allows to get the network working mode (0 = P2P, 1 = LoRaWAN, 2 = FSK) * * @par Syntax * api.lorawan.nwm.get() @@ -3222,6 +3364,7 @@ channel mask * @return the netwok working mode * @retval 0 P2P mode * @retval 1 LoRaWan mode + * @retval 2 FSK mode * @par Example * @verbatim void setup() @@ -3240,16 +3383,18 @@ channel mask @endverbatim */ - int get(); + int get(); - /**@par Description - * This api allows to set the network working mode (0 = P2P, 1 = LoRaWAN) + /**@par Description + * This api allows to set the network working mode (0 = P2P, 1 = LoRaWAN, 2 = FSK) * * @par Syntax * api.lorawan.nwm.set(value) * * @param value the network working mode - * @return True for setting network working mode success, False for setting network working mode fail(Tpye: bool) + * @return bool + * @retval TRUE for setting network working mode success + * @retval FALSE for setting network working mode failure * @par Example * @verbatim void setup() @@ -3268,16 +3413,17 @@ channel mask @endverbatim */ - bool set(uint8_t value); - }; + bool set(uint8_t value); + }; - /**@par Description + /**@par Description * This api provides configuration frequency for the P2P mode * @ingroup P2P */ - class pfreq { - public: - /**@par Description + class pfreq + { + public: + /**@par Description * This api allows to get the P2P frequency * * @par Syntax @@ -3303,16 +3449,18 @@ channel mask @endverbatim */ - uint32_t get(); + uint32_t get(); - /**@par Description + /**@par Description * This api allows to set the P2P frequency * * @par Syntax * api.lorawan.pfreq.set(value) * * @param value the frequency for P2P mode - * @return True for setting frequency success, False for setting frequency fail(Type: bool) + * @return bool + * @retval TRUE for setting frequency success + * @retval FALSE for setting frequency failure * @par Example * @verbatim void setup() @@ -3332,16 +3480,17 @@ channel mask @endverbatim */ - bool set(uint32_t value); - }; + bool set(uint32_t value); + }; - /**@par Description + /**@par Description * This api provides a configuration Spreading Factor for the P2P mode * @ingroup P2P */ - class psf { - public: - /**@par Description + class psf + { + public: + /**@par Description * This api allows to get P2P Spreading Factor (6,7, 8,9, 10, 11, 12) * * @par Syntax @@ -3367,16 +3516,18 @@ channel mask @endverbatim */ - uint8_t get(); + uint8_t get(); - /**@par Description + /**@par Description * This api allows to set P2P Spreading Factor (6,7, 8,9, 10, 11, 12) * * @par Syntax * api.lorawan.psf.set(value) * * @param value the P2P spreading factor - * @return True for setting P2P spreading factor success, False for setting P2P spreading factor fail(Type: bool) + * @return bool + * @retval TRUE for setting P2P spreading factor success + * @retval FALSE for setting P2P spreading factor failure * @par Example * @verbatim void setup() @@ -3396,16 +3547,17 @@ channel mask @endverbatim */ - bool set(uint8_t value); - }; + bool set(uint8_t value); + }; - /**@par Description + /**@par Description * This api provides configuration Bandwidth for the P2P mode * @ingroup P2P */ - class pbw { - public: - /**@par Description + class pbw + { + public: + /**@par Description * This api allows to get P2P Bandwidth(125,250,500) * * @par Syntax @@ -3431,16 +3583,18 @@ channel mask @endverbatim */ - uint32_t get(); + uint32_t get(); - /**@par Description + /**@par Description * This api allow to set P2P Bandwidth(125,250,500) * * @par Syntax * api.lorawan.pbw.set(value) * * @param value the P2P bandwidth - * @return True for setting P2P bandwidth success, False for setting P2P bandwidth fail(Type: bool) + * @return bool + * @retval TRUE for setting P2P bandwidth success + * @retval FALSE for setting P2P bandwidth failure * @par Example * @verbatim void setup() @@ -3460,16 +3614,17 @@ channel mask @endverbatim */ - bool set(uint32_t value); - }; + bool set(uint32_t value); + }; - /**@par Description + /**@par Description * This api provides the configuration code rate for the P2P mode * @ingroup P2P */ - class pcr { - public: - /**@par Description + class pcr + { + public: + /**@par Description * This api allows to get code rate for the P2P mode * * @par Syntax @@ -3495,16 +3650,18 @@ channel mask @endverbatim */ - uint8_t get(); + uint8_t get(); - /**@par Description + /**@par Description * This api allows to set code rate for the P2P mode * * @par Syntax * api.lorawan.pcr.set(value) * * @param value the code rate for P2P mode - * @return True for setting code rate success, False for setting code rate fail(Type: bool) + * @return bool + * @retval TRUE for setting code rate success + * @retval FALSE for setting code rate failure * @par Example * @verbatim void setup() @@ -3524,16 +3681,17 @@ channel mask @endverbatim */ - bool set(uint8_t value); - }; + bool set(uint8_t value); + }; - /**@par Description + /**@par Description * This api provides configuration Preamble Length for the P2P mode * @ingroup P2P */ - class ppl { - public: - /**@par Description + class ppl + { + public: + /**@par Description * This api allows to get P2P Preamble Length (2-65535) * * @par Syntax @@ -3559,16 +3717,18 @@ channel mask @endverbatim */ - uint16_t get(); + uint16_t get(); - /**@par Description + /**@par Description * This api allows to set P2P Preamble Length (2-65535) * * @par Syntax * api.lorawan.ppl.set(value) * * @param value the P2P preamble length(2-65536) - * @return True for setting P2P preamble length success, False for setting preamble length fail(Type: bool) + * @return bool + * @retval TRUE for setting P2P preamble length success + * @retval FALSE for setting preamble length failure * @par Example * @verbatim void setup() @@ -3588,16 +3748,17 @@ channel mask @endverbatim */ - bool set(uint16_t value); - }; + bool set(uint16_t value); + }; - /**@par Description + /**@par Description * This api provides configuration Power for the P2P mode * @ingroup P2P */ - class ptp { - public: - /**@par Description + class ptp + { + public: + /**@par Description * This api allows to get P2P TX Power(5-22) * * @par Syntax @@ -3623,15 +3784,17 @@ channel mask @endverbatim */ - uint8_t get(); + uint8_t get(); - /**@par Description + /**@par Description * This api allows to set P2P TX Power(5-22) * * @par Syntax * api.lorawan.ptp.set(value) * @param value the P2P Tx power - * @return True for setting P2P Tx power success, False for setting P2P Tx power fail(Type: bool) + * @return bool + * @retval TRUE for setting P2P Tx power success + * @retval FALSE for setting P2P Tx power failure * @par Example * @verbatim void setup() @@ -3651,17 +3814,19 @@ channel mask @endverbatim */ - bool set(uint8_t value); - }; + bool set(uint8_t value); + }; - /**@par Description + /**@par Description * This API is used to enter P2P RX mode for a specified period. * * @par Syntax * api.lorawan.precv(uint32_t timeout) * - * @param timeout the duration of P2P Rx mode - * @return True for entering P2P Rx mode success, False for entering P2P Rx mode fail(Type: bool) + * @param timeout the duration of P2P Rx mode + * @return bool + * @retval TRUE for entering P2P Rx mode success + * @retval FALSE for entering P2P Rx mode failure * @par Example * @verbatim void setup() @@ -3688,61 +3853,61 @@ channel mask @endverbatim */ - bool precv(uint32_t timeout); - - //instance - rety rety; - appeui appeui; - appkey appkey; - appskey appskey; - daddr daddr; - deui deui; - netid netid; - nwkskey nwkskey; - cfm cfm; - cfs cfs; - njm njm; - njs njs; - adr adr; - deviceClass deviceClass; - dcs dcs; - dr dr; - jn1dl jn1dl; - jn2dl jn2dl; - pnm pnm; - rx1dl rx1dl; - rx2dl rx2dl; - rx2dr rx2dr; - rx2fq rx2fq; - txp txp; - pgslot pgslot; - bfreq bfreq; - btime btime; - bgw bgw; - rssi rssi; - snr snr; - ltime ltime; - ver ver; - trssi trssi; - ttone ttone; - ttx ttx; - trx trx; - tconf tconf; - tth tth; - toff toff; - certif certif; - mask mask; - band band; - linkcheck linkcheck; - nwm nwm; - pfreq pfreq; - psf psf; - pbw pbw; - pcr pcr; - ppl ppl; - ptp ptp; - - /**@par Description + bool precv(uint32_t timeout); + + //instance + rety rety; + appeui appeui; + appkey appkey; + appskey appskey; + daddr daddr; + deui deui; + netid netid; + nwkskey nwkskey; + cfm cfm; + cfs cfs; + njm njm; + njs njs; + adr adr; + deviceClass deviceClass; + dcs dcs; + dr dr; + jn1dl jn1dl; + jn2dl jn2dl; + pnm pnm; + rx1dl rx1dl; + rx2dl rx2dl; + rx2dr rx2dr; + rx2fq rx2fq; + txp txp; + pgslot pgslot; + bfreq bfreq; + btime btime; + bgw bgw; + rssi rssi; + snr snr; + ltime ltime; + ver ver; + trssi trssi; + ttone ttone; + ttx ttx; + trx trx; + tconf tconf; + tth tth; + toff toff; + certif certif; + mask mask; + band band; + linkcheck linkcheck; + nwm nwm; + pfreq pfreq; + psf psf; + pbw pbw; + pcr pcr; + ppl ppl; + ptp ptp; + + /**@par Description * This api provides the way to P2P send data * * @ingroup P2P @@ -3751,7 +3916,9 @@ channel mask * * @param length the length of the payload * @param payload the data send to the other device - * @return True for sending data success, False for sending data fail(Type: bool) + * @return bool + * @retval TRUE for sending data success + * @retval FALSE for sending data failure * @par Example * @verbatim void setup() @@ -3779,22 +3946,23 @@ channel mask @endverbatim */ - bool psend(uint8_t length, uint8_t *payload); + bool psend(uint8_t length, uint8_t *payload); - /**@par Description + /**@par Description * This api configures P2P mode encryption * @ingroup P2P */ - class encry { - public: - /**@par Description + class encry + { + public: + /**@par Description * This api allows to get the status of P2P mode encryption * * @par Syntax * api.lorawan.encry.get() - * @return The status of P2P mode encryption - * @retval 0 P2P mode encryption is disable - * @retval 1 P2P mode encryption is enable + * @return bool + * @retval TRUE : P2P mode encryption is enable + * @retval FALSE : P2P mode encryption is disable * @par Example * @verbatim long startTime; @@ -3852,16 +4020,18 @@ channel mask @endverbatim */ - bool get(); + bool get(); - /**@par Description + /**@par Description * This api allows to enable or disable P2P mode encryption * * @par Syntax * api.lorawan.encry.set(value) * * @param value the status of P2P mode encryption - * @return True for Setting status of encryption success, False for setting status of encryption fail + * @return bool + * @retval TRUE : for Setting status of encryption success + * @retval FALSE : for setting status of encryption failure * @par Example * @verbatim long startTime; @@ -3917,16 +4087,17 @@ channel mask } @endverbatim */ - bool set(bool value); - }; + bool set(bool value); + }; - /**@par Description + /**@par Description * This api will encrypt the date being sent and received * @ingroup P2P */ - class enckey { - public: - /**@par Description + class enckey + { + public: + /**@par Description * This api allows to get the key of P2P mode encryption * * @par Syntax @@ -3934,7 +4105,9 @@ channel mask * * @param buff the buffer to store encryption key * @param len the length of encryption key(must be 8 bytes) - * @return True for getting encryption key success, False for getting encryption key fail + * @return bool + * @retval TRUE for getting encryption key success + * @retval FALSE for getting encryption key failure * @par Example * @verbatim long startTime; @@ -3991,9 +4164,9 @@ channel mask } @endverbatim */ - bool get(uint8_t *buff, uint32_t len); + bool get(uint8_t *buff, uint32_t len); - /**@par Description + /**@par Description * This api allows to set the key of P2P mode encryption * * @par Syntax @@ -4001,7 +4174,9 @@ channel mask * * @param buff the buffer to set encryption key * @param len the length of encryption key(must be 8 bytes) - * @return True for setting encryption key success, False for setting encryption fail + * @return bool + * @retval TRUE for setting encryption key success + * @retval FALSE for setting encryption failure * @par Example * @verbatim long startTime; @@ -4058,29 +4233,30 @@ channel mask } @endverbatim */ - bool set(uint8_t *buff, uint32_t len); - }; + bool set(uint8_t *buff, uint32_t len); + }; - encry encry; - enckey enckey; + encry encry; + enckey enckey; - /**@par Description + /**@par Description * This api configures the P2P FSK modem bitrate (600b/s-307200b/s) * @ingroup P2P */ - class pbr { - public: - /**@par Description + class pbr + { + public: + /**@par Description * This api allows to get the P2P FSK modem bitrate (600b/s-307200b/s) * * @par Syntax * api.lorawan.pbr.get() * - * @return + * @return The P2P FSK modem bitrate */ - uint32_t get(); + uint32_t get(); - /**@par Description + /**@par Description * This api allows to set the P2P FSK modem bitrate (600b/s-307200b/s) * * @par Syntax @@ -4089,26 +4265,27 @@ channel mask * @param value * @return */ - bool set(uint32_t value); - }; + bool set(uint32_t value); + }; - /**@par Description + /**@par Description * This api configures the P2P FSK modem frequency deviation * @ingroup P2P */ - class pfdev { - public: - /**@par Description + class pfdev + { + public: + /**@par Description * This api allows to get the P2P FSK modem frequency deviation * * @par Syntax * api.lorawan.pfdev.get() * - * @return + * @return The P2P FSK modem frequency deviation */ - uint32_t get(); + uint32_t get(); - /**@par Description + /**@par Description * This api allows to set the P2P FSK modem frequency deviation * * @par Syntax @@ -4117,19 +4294,21 @@ channel mask * @param value * @return */ - bool set(uint32_t value); - }; + bool set(uint32_t value); + }; - pbr pbr; - pfdev pfdev; + pbr pbr; + pfdev pfdev; - /**@par Description + /**@par Description * This command adds a new multicast group configure multicast parameters * @ingroup Multicast * @par Syntax * api.lorawan.addmulc(session) - * @param session The structure of session - * @return True for adding multicast group success, False for adding multicast group fail(Type: bool) + * @param session The structure of session + * @return bool + * @retval TRUE for adding multicast group success + * @retval FALSE for adding multicast group failure * @par Example * @verbatim void setup() @@ -4199,16 +4378,18 @@ channel mask } @endverbatim */ - bool addmulc(RAK_LORA_McSession session); + bool addmulc(RAK_LORA_McSession session); - /**@par Description + /**@par Description * This command allows the removal of a configured multicast group * @ingroup Multicast * @par Syntax * api.lorawan.rmvmulc(devAddr) * * @param devAddr the address to remvoe a multicast group - * @return True for removing success, False for removing fail(Type: bool) + * @return bool + * @retval TRUE for removing success + * @retval FALSE for removing failure * @par Example * @verbatim // OTAA Device EUI MSB @@ -4278,16 +4459,18 @@ channel mask } @endverbatim */ - bool rmvmulc(uint32_t devAddr); + bool rmvmulc(uint32_t devAddr); - /**@par Description + /**@par Description * This command can view current configured multicast group information * @ingroup Multicast * @par Syntax * api.lorawan.lstmulc(&multicast_list) * * @param multicast_list a RAK_LORA_McSession variable - * @return True for getting multicast list success, False for getting multicast fail(Type: bool) + * @return bool + * @retval TRUE for getting multicast list success + * @retval FALSE for getting multicast failure * @par Example * @verbatim void setup() @@ -4387,16 +4570,18 @@ channel mask @endverbatim */ - bool lstmulc(RAK_LORA_McSession *iterator); + bool lstmulc(RAK_LORA_McSession *iterator); - /**@par Description + /**@par Description * This command can access all open channel rssi * @ingroup Information * @par Syntax * api.lorawan.arssi(chan_arssi) * * @param chan_arssi the struture array to store arssi - * @return True for getting arssi success, Fail for getting arssi fail + * @return bool + * @retval TRUE for getting arssi success + * @retval FALSE for getting arssi failure * @par Example * @verbatim // OTAA Device EUI MSB @@ -4443,7 +4628,7 @@ channel mask } @endverbatim */ - bool arssi(RAK_LORA_chan_rssi *iterator); + bool arssi(RAK_LORA_chan_rssi *iterator); }; #endif diff --git a/cores/nRF5/component/rui_v3_api/RAKSystem.h b/cores/nRF5/component/rui_v3_api/RAKSystem.h index cd1ea95c..f2f7c260 100644 --- a/cores/nRF5/component/rui_v3_api/RAKSystem.h +++ b/cores/nRF5/component/rui_v3_api/RAKSystem.h @@ -17,6 +17,58 @@ using namespace std; +/**@addtogroup File_System_Data_Type + * @{ + */ + +#define RAK_FS_OK SERVICE_FS_OK ///< (0) Succeeded +#define RAK_FS_ERR_NOT_MOUNTED SERVICE_FS_ERR_NOT_MOUNTED ///< FS_ERR NOT MOUNTED +#define RAK_FS_ERR_FULL SERVICE_FS_ERR_FULL ///< FS_ERR FULL +#define RAK_FS_ERR_NOT_FOUND SERVICE_FS_ERR_NOT_FOUND ///< FS_ERR NOT FOUND +#define RAK_FS_ERR_END_OF_OBJECT SERVICE_FS_ERR_END_OF_OBJECT ///< FS_ERR_END OF_OBJECT +#define RAK_FS_ERR_DELETED SERVICE_FS_ERR_DELETED ///< FS_ERR DELETED +#define RAK_FS_ERR_NOT_FINALIZED SERVICE_FS_ERR_NOT_FINALIZED ///< FS_ERR NOT FINALIZED +#define RAK_FS_ERR_NOT_INDEX SERVICE_FS_ERR_NOT_INDEX ///< FS_ERR NOT INDEX +#define RAK_FS_ERR_OUT_OF_FILE_DESCS SERVICE_FS_ERR_OUT_OF_FILE_DESCS ///< FS_ERR OUT OF FILE DESCS +#define RAK_FS_ERR_FILE_CLOSED SERVICE_FS_ERR_FILE_CLOSED ///< FS_ERR FILE CLOSED +#define RAK_FS_ERR_FILE_DELETED SERVICE_FS_ERR_FILE_DELETED ///< FS_ERR FILE DELETED +#define RAK_FS_ERR_BAD_DESCRIPTOR SERVICE_FS_ERR_BAD_DESCRIPTOR ///< FS_ERR BAD DESCRIPTOR +#define RAK_FS_ERR_IS_INDEX SERVICE_FS_ERR_IS_INDEX ///< FS_ERR IS INDEX +#define RAK_FS_ERR_IS_FREE SERVICE_FS_ERR_IS_FREE ///< FS_ERR IS FREE +#define RAK_FS_ERR_INDEX_SPAN_MISMATCH SERVICE_FS_ERR_INDEX_SPAN_MISMATCH ///< FS_ERR INDEX SPAN MISMATCH +#define RAK_FS_ERR_DATA_SPAN_MISMATCH SERVICE_FS_ERR_DATA_SPAN_MISMATCH ///< FS_ERR DATA SPAN MISMATCH +#define RAK_FS_ERR_INDEX_REF_FREE SERVICE_FS_ERR_INDEX_REF_FREE ///< FS_ERR INDEX REF FREE +#define RAK_FS_ERR_INDEX_REF_LU SERVICE_FS_ERR_INDEX_REF_LU ///< FS_ERR INDEX REF LU +#define RAK_FS_ERR_INDEX_REF_INVALID SERVICE_FS_ERR_INDEX_REF_INVALID ///< FS_ERR INDEX REF INVALID +#define RAK_FS_ERR_INDEX_FREE SERVICE_FS_ERR_INDEX_FREE ///< FS_ERR INDEX FREE +#define RAK_FS_ERR_INDEX_LU SERVICE_FS_ERR_INDEX_LU ///< FS_ERR INDEX LU +#define RAK_FS_ERR_INDEX_INVALID SERVICE_FS_ERR_INDEX_INVALID ///< FS_ERR INDEX INVALID +#define RAK_FS_ERR_NOT_WRITABLE SERVICE_FS_ERR_NOT_WRITABLE ///< FS_ERR NOT WRITABLE +#define RAK_FS_ERR_NOT_READABLE SERVICE_FS_ERR_NOT_READABLE ///< FS_ERR NOT READABLE +#define RAK_FS_ERR_CONFLICTING_NAME SERVICE_FS_ERR_CONFLICTING_NAME ///< FS_ERR CONFLICTING NAME +#define RAK_FS_ERR_NOT_CONFIGURED SERVICE_FS_ERR_NOT_CONFIGURED ///< FS_ERR NOT CONFIGURED +#define RAK_FS_ERR_NOT_A_FS SERVICE_FS_ERR_NOT_A_FS ///< FS_ERR_NOT A FS +#define RAK_FS_ERR_MOUNTED SERVICE_FS_ERR_MOUNTED ///< FS_ERR MOUNTED +#define RAK_FS_ERR_ERASE_FAIL SERVICE_FS_ERR_ERASE_FAIL ///< FS_ERR ERASE FAIL +#define RAK_FS_ERR_MAGIC_NOT_POSSIBLE SERVICE_FS_ERR_MAGIC_NOT_POSSIBLE ///< FS_ERR MAGIC NOT POSSIBLE +#define RAK_FS_ERR_NO_DELETED_BLOCKS SERVICE_FS_ERR_NO_DELETED_BLOCKS ///< FS_ERR NO DELETED BLOCKS +#define RAK_FS_ERR_FILE_EXISTS SERVICE_FS_ERR_FILE_EXISTS ///< FS_ERR FILE EXISTS +#define RAK_FS_ERR_NOT_A_FILE SERVICE_FS_ERR_NOT_A_FILE ///< FS_ERR NOT A FILE +#define RAK_FS_ERR_RO_NOT_IMPL SERVICE_FS_ERR_RO_NOT_IMPL ///< FS_ERR RO NOT IMPL +#define RAK_FS_ERR_RO_ABORTED_OPERATION SERVICE_FS_ERR_RO_ABORTED_OPERATION ///< FS_ERR RO ABORTED OPERATION +#define RAK_FS_ERR_PROBE_TOO_FEW_BLOCKS SERVICE_FS_ERR_PROBE_TOO_FEW_BLOCKS ///< FS_ERR PROBE TOO FEW BLOCKS +#define RAK_FS_ERR_PROBE_NOT_A_FS SERVICE_FS_ERR_PROBE_NOT_A_FS ///< FS_ERR PROBE NOT A FS +#define RAK_FS_ERR_NAME_TOO_LONG SERVICE_FS_ERR_NAME_TOO_LONG ///< FS_ERR NAME TOO LONG +#define RAK_FS_ERR_IX_MAP_UNMAPPED SERVICE_FS_ERR_IX_MAP_UNMAPPED ///< FS_ERR IX MAP UNMAPPED +#define RAK_FS_ERR_IX_MAP_MAPPED SERVICE_FS_ERR_IX_MAP_MAPPED ///< FS_ERR IX MAP MAPPED +#define RAK_FS_ERR_IX_MAP_BAD_RANGE SERVICE_FS_ERR_IX_MAP_BAD_RANGE ///< FS_ERR IX MAP BAD RANGE +#define RAK_FS_ERR_SEEK_BOUNDS SERVICE_FS_ERR_SEEK_BOUNDS ///< FS_ERR SEEK BOUNDS +#define RAK_FS_ERR_INTERNAL SERVICE_FS_ERR_INTERNAL ///< FS_ERR INTERNAL +#define RAK_FS_ERR_TEST SERVICE_FS_ERR_TEST ///< FS_ERR TEST +#define RAK_FS_ERR_CONTINUE SERVICE_FS_ERR_CONTINUE ///< FS_ERR CONTINUE + +/**@}*/ + class RAKSystem { public: RAKSystem(); @@ -33,7 +85,7 @@ class RAKSystem { * This api allow user to get the firmware version * @ingroup Firmware_Version * @par Syntax - * api.system.firmwreVersion.get() + * api.system.firmwareVersion.get() * @return firmware version(Type: string) * @par Example * @verbatim @@ -240,7 +292,9 @@ class RAKSystem { * @param passwd_Str the password to lock the Default Serial(Type: string) * @param passwd_Char the password to lock the Default Serial(Type: cahr *) * @param len the length of passwod - * @return true for successfully set a password, false for set a password fail + * @return bool + * @retval TRUE for successfully set a password + * @retval FALSE for set a password failure * @par Example * @verbatim int loopCount = 0; @@ -333,11 +387,11 @@ class RAKSystem { class bat { public: /**@par Description - * + * Get the current battery level * @ingroup System_Battery * @par Syntax * api.system.bat.get() - * @return + * @return float * @par Example * @verbatim void setup() @@ -361,13 +415,13 @@ class RAKSystem { class atMode { public: /**@par Description - * + * Provide developers to create AT CMD. * @par Syntax * api.system.atMode.add(cmd, usage, title, handle) - * @param cmd - * @param usage - * @param title - * @param handle + * @param cmd the cmd to define cmd name + * @param usage the cmd usage + * @param title the cmd title + * @param handle the handler that this command will execute * * @return * @par Example diff --git a/cores/nRF5/component/rui_v3_api/SPI.h b/cores/nRF5/component/rui_v3_api/SPI.h index 85ca86fe..2ec30c90 100644 --- a/cores/nRF5/component/rui_v3_api/SPI.h +++ b/cores/nRF5/component/rui_v3_api/SPI.h @@ -157,8 +157,7 @@ class SPIClass * * @par Syntax * - * @param - * @return + * @return void */ void usingInterrupt(); diff --git a/cores/nRF5/component/rui_v3_api/doxygenApiLayer.h b/cores/nRF5/component/rui_v3_api/doxygenApiLayer.h index 628fe7cc..6a664ab1 100644 --- a/cores/nRF5/component/rui_v3_api/doxygenApiLayer.h +++ b/cores/nRF5/component/rui_v3_api/doxygenApiLayer.h @@ -84,6 +84,10 @@ * @ingroup System */ + /**@defgroup File_System_Data_Type File System Data Type + * @ingroup File_System + */ + /**@defgroup Powersave Powersave * @ingroup System */ diff --git a/cores/nRF5/component/rui_v3_api/librui_v3_api.a b/cores/nRF5/component/rui_v3_api/librui_v3_api.a index 0e61e019..75767c96 100644 Binary files a/cores/nRF5/component/rui_v3_api/librui_v3_api.a and b/cores/nRF5/component/rui_v3_api/librui_v3_api.a differ diff --git a/cores/nRF5/component/rui_v3_api/ruiTop.h b/cores/nRF5/component/rui_v3_api/ruiTop.h index c6864639..20f2c60f 100644 --- a/cores/nRF5/component/rui_v3_api/ruiTop.h +++ b/cores/nRF5/component/rui_v3_api/ruiTop.h @@ -104,11 +104,11 @@ enum BitOrder { #define delayMicroseconds udrv_app_delay_us /**@par Description - * Returns the number of microseconds since the device began + * Returns the number of milliseconds passed since the device began * running the current program * @par Syntax - * millis(); - * @return the number of microseconds since the device began running the current program(Type: unsigned long) + * micros(); + * @return Number of milliseconds passed since the program started(Type: unsigned long) * @par Example * @verbatim unsigned long myTime; @@ -128,11 +128,11 @@ enum BitOrder { unsigned long millis(); /**@par Description - * Returns the number of milliseconds passed since the device began + * Returns the number of microseconds since the device began * running the current program * @par Syntax - * micros(); - * @return Number of milliseconds passed since the program started(Type: unsigned long) + * millis(); + * @return the number of microseconds since the device began running the current program(Type: unsigned long) * @par Example * @verbatim unsigned long time; diff --git a/cores/nRF5/component/service/lora/service_lora.c b/cores/nRF5/component/service/lora/service_lora.c index db72d80b..7f372e31 100755 --- a/cores/nRF5/component/service/lora/service_lora.c +++ b/cores/nRF5/component/service/lora/service_lora.c @@ -422,8 +422,24 @@ static void MlmeIndication(MlmeIndication_t *mlmeIndication) { case 0: beacon_bgw.GPS_coordinate = 0; + + beacon_bgw.latitude = (mlmeIndication->BeaconInfo.GwSpecific.Info[2] << 16)| + (mlmeIndication->BeaconInfo.GwSpecific.Info[1] << 8) | + (mlmeIndication->BeaconInfo.GwSpecific.Info[0]); + beacon_bgw.longitude = (mlmeIndication->BeaconInfo.GwSpecific.Info[5] << 16) | + (mlmeIndication->BeaconInfo.GwSpecific.Info[4] << 8) | + (mlmeIndication->BeaconInfo.GwSpecific.Info[3]); + break; case 1: beacon_bgw.GPS_coordinate = 1; + + beacon_bgw.latitude = (mlmeIndication->BeaconInfo.GwSpecific.Info[2] << 16)| + (mlmeIndication->BeaconInfo.GwSpecific.Info[1] << 8) | + (mlmeIndication->BeaconInfo.GwSpecific.Info[0]); + beacon_bgw.longitude = (mlmeIndication->BeaconInfo.GwSpecific.Info[5] << 16) | + (mlmeIndication->BeaconInfo.GwSpecific.Info[4] << 8) | + (mlmeIndication->BeaconInfo.GwSpecific.Info[3]); + break; case 2: beacon_bgw.GPS_coordinate = 2; diff --git a/cores/nRF5/component/service/mode/cli/atcmd.c b/cores/nRF5/component/service/mode/cli/atcmd.c index eb1f7a89..7a09d310 100755 --- a/cores/nRF5/component/service/mode/cli/atcmd.c +++ b/cores/nRF5/component/service/mode/cli/atcmd.c @@ -99,7 +99,7 @@ const char *atcmd_err_tbl[] = "AT_NO_CLASSB_ENABLE", "AT_NO_NETWORK_JOINED", "AT_RX_ERROR", - "AT_MODE_NO_SUPPORT" + "AT_MODE_NO_SUPPORT", }; const at_cmd_info atcmd_info_tbl[] = @@ -110,8 +110,8 @@ const at_cmd_info atcmd_info_tbl[] = {ATCMD_ATR, /*3*/ At_Restore, 0, "restore default parameters"}, {ATCMD_BOOT, /*4*/ At_Dfu, 0, "enter bootloader mode for firmware upgrade"}, #ifndef RUI_BOOTLOADER - {ATCMD_SN, /*87*/ At_Sn, 0, "get or set the serial number of the device"}, - {ATCMD_BAT, /*15*/ At_GetBat, 0, "get the battery level"}, + {ATCMD_SN, /*87*/ At_Sn, 0, "get or set the serial number of the device (max 18 char)"}, + {ATCMD_BAT, /*15*/ At_GetBat, 0, "get the battery level (volt)"}, {ATCMD_BUILDTIME,/*5*/ At_GetFwBuildTime, 0, "get the build time of the firmware"}, {ATCMD_REPOINFO, /*6*/ At_GetFwRepoInfo, 0, "get the commit ID of the firmware"}, {ATCMD_FWVER, /*7*/ At_GetFwVersion, 0, "get the version of the firmware"}, @@ -124,54 +124,54 @@ const at_cmd_info atcmd_info_tbl[] = //{ATCMD_AUTOSLEEP,/*86*/ At_AutoSleep, 0, "automatically and periodically enter sleep mode (ms)"}, /* Serial Port Command */ {ATCMD_LOCK, /*10*/ At_Lock, 0, "lock the serial port"}, - {ATCMD_PWORD, /*11*/ At_Pword, 0, "set the serial port locking password"}, + {ATCMD_PWORD, /*11*/ At_Pword, 0, "set the serial port locking password (max 8 char)"}, {ATCMD_BAUD, /*12*/ At_Baud, 0, "get or set the serial port baudrate"}, {ATCMD_ATM, /*72*/ At_AtCmdMode, 0, "switch to AT command mode"}, {ATCMD_APM, /*73*/ At_ApiMode, 0, "switch to API mode"}, #if WAN_TYPE == 0 {ATCMD_PAM, /*74*/ At_TransparentMode, 0, "switch to pass through mode"}, /* LoRaWAN Keys and IDs */ - {ATCMD_APPEUI, /*16*/ At_AppEui, 0, "get or set the application EUI"}, - {ATCMD_APPKEY, /*17*/ At_AppKey, 0, "get or set the application key"}, - {ATCMD_APPSKEY, /*18*/ At_AppSKey, 0, "get or set the application session key"}, - {ATCMD_DADDR, /*19*/ At_DevAddr, 0, "get or set the device address"}, - {ATCMD_DEUI, /*20*/ At_DevEui, 0, "get or set the device EUI"}, - {ATCMD_NETID, /*21*/ At_NetId, 0, "get the network identifier (NetID) of 3 octets"}, - {ATCMD_NWKSKEY, /*22*/ At_NwkSKey, 0, "get or set the network session key"}, + {ATCMD_APPEUI, /*16*/ At_AppEui, 0, "get or set the application EUI (8 bytes in hex)"}, + {ATCMD_APPKEY, /*17*/ At_AppKey, 0, "get or set the application key (16 bytes in hex)"}, + {ATCMD_APPSKEY, /*18*/ At_AppSKey, 0, "get or set the application session key (16 bytes in hex)"}, + {ATCMD_DADDR, /*19*/ At_DevAddr, 0, "get or set the device address (4 bytes in hex)"}, + {ATCMD_DEUI, /*20*/ At_DevEui, 0, "get or set the device EUI (8 bytes in hex)"}, + {ATCMD_NETID, /*21*/ At_NetId, 0, "get the network identifier (NetID) (3 bytes in hex)"}, + {ATCMD_NWKSKEY, /*22*/ At_NwkSKey, 0, "get or set the network session key (16 bytes in hex)"}, /* LoRaWAN Joining and Sending */ - {ATCMD_CFM, /*23*/ At_CfMode, 0, "get or set the confirmation mode (0-1)"}, - {ATCMD_CFS, /*24*/ At_CfStatus, 0, "get the confirmation status of the last AT+SEND (0-1)"}, + {ATCMD_CFM, /*23*/ At_CfMode, 0, "get or set the confirm mode (0 = off, 1 = on)"}, + {ATCMD_CFS, /*24*/ At_CfStatus, 0, "get the confirmation status of the last AT+SEND (0 = failure, 1 = success)"}, {ATCMD_JOIN, /*25*/ At_Join, 0, "join network"}, {ATCMD_NJM, /*26*/ At_NwkJoinMode, 0, "get or set the network join mode (0 = ABP, 1 = OTAA)"}, - {ATCMD_NJS, /*27*/ At_NwkJoinStatus, 0, "get the join status"}, + {ATCMD_NJS, /*27*/ At_NwkJoinStatus, 0, "get the join status (0 = not joined, 1 = joined)"}, {ATCMD_RECV, /*28*/ At_Recv, 0, "print the last received data in hex format"}, {ATCMD_SEND, /*29*/ At_Send, 0, "send data along with the application port"}, - {ATCMD_LPSEND, /*83*/ At_Lpsend, 0, "send long packet data (Maximum is 1024 bytes)"}, + {ATCMD_LPSEND, /*83*/ At_Lpsend, 0, "send long packet data (max 1024 bytes)"}, //{ATCMD_USEND, /*??*/ At_Lpsend, 0, "unified send packet along with the application port"}, {ATCMD_RETY, /*30*/ At_Retry, 0, "get or set the number of retransmission of confirm packet data"}, /* LoRaWAN Network Management */ {ATCMD_ADR, /*31*/ At_ADR, 0, "get or set the adaptive data rate setting (0 = off, 1 = on)"}, - {ATCMD_CLASS, /*32*/ At_Class, 0, "get or set the device class"}, + {ATCMD_CLASS, /*32*/ At_Class, 0, "get or set the device class (A = class A, B = class B, C = class C)"}, {ATCMD_DCS, /*33*/ At_DCS, 0, "get the ETSI duty cycle setting (0 = disabled, 1 = enabled)"}, - {ATCMD_DR, /*34*/ At_DataRate, 0, "get or set the data rate (0-7 correspond to DR_0-DR_7)"}, + {ATCMD_DR, /*34*/ At_DataRate, 0, "get or set the data rate"}, {ATCMD_JN1DL, /*35*/ At_RxWin1JoinDelay, 0, "get or set the join accept delay between the end of TX and the join RX window 1 in second"}, {ATCMD_JN2DL, /*36*/ At_RxWin2JoinDelay, 0, "get the join accept delay between the end of TX and the join RX window 2 in second"}, {ATCMD_PNM, /*37*/ At_PubNwkMode, 0, "get or set the public network mode (0 = off, 1 = on)"}, {ATCMD_RX1DL, /*38*/ At_RxWin1Delay, 0, "get or set the delay between the end of TX and the RX window 1 in second"}, {ATCMD_RX2DL, /*39*/ At_RxWin2Delay, 0, "get the delay between the end of TX and the RX window 2 in second"}, - {ATCMD_RX2DR, /*40*/ At_RxWin2DataRate, 0, "get or set the RX2 window data rate (0-7 correspond to DR_0-DR_7)"}, - {ATCMD_RX2FQ, /*41*/ At_RxWin2Freq, 0, "get the RX2 window frequency"}, + {ATCMD_RX2DR, /*40*/ At_RxWin2DataRate, 0, "get or set the RX2 window data rate"}, + {ATCMD_RX2FQ, /*41*/ At_RxWin2Freq, 0, "get the RX2 window frequency (Hz)"}, {ATCMD_TXP, /*42*/ At_TxPower, 0, "get or set the transmitting power"}, - {ATCMD_LINKCHECK,/*43*/ At_LinkCheck, 0, "Verify Network Link Status"}, + {ATCMD_LINKCHECK,/*43*/ At_LinkCheck, 0, "get or set the link check setting (0 = disabled, 1 = once, 2 = everytime)"}, /* LoRaWAN Class B */ - {ATCMD_PGSLOT, /*44*/ At_PingSlot, 0, "get or set the unicast ping slot periodicity"}, - {ATCMD_BFREQ, /*45*/ At_BeaconFreq, 0, "get the beacon frequency"}, - {ATCMD_BTIME, /*46*/ At_BeaconTime, 0, "get the beacon time (GPS Epoch time)"}, + {ATCMD_PGSLOT, /*44*/ At_PingSlot, 0, "get or set the unicast ping slot periodicity (0-7)"}, + {ATCMD_BFREQ, /*45*/ At_BeaconFreq, 0, "get the data rate and beacon frequency (MHz)"}, + {ATCMD_BTIME, /*46*/ At_BeaconTime, 0, "get the beacon time (seconds since GPS Epoch time)"}, {ATCMD_BGW, /*47*/ At_BGW, 0, "get the gateway GPS coordinate, NetID and GwID"}, - {ATCMD_LTIME, /*48*/ At_LocalTime, 0, "get the local time in UTC format"}, + {ATCMD_LTIME, /*48*/ At_LocalTime, 0, "get the local time"}, /* LoRaWAN Information */ {ATCMD_RSSI, /*49*/ At_Rssi, 0, "get the RSSI of the last received packet"}, - {ATCMD_ARSSI, /*75*/ At_Arssi, 0, "access all open channel rssi"}, + {ATCMD_ARSSI, /*75*/ At_Arssi, 0, "access all open channel RSSI"}, {ATCMD_SNR, /*50*/ At_Snr, 0, "get the SNR of the last received packet"}, /* Supplementary Command */ #if defined( REGION_CN470 ) || defined( REGION_US915 ) || \ @@ -180,20 +180,20 @@ const at_cmd_info atcmd_info_tbl[] = {ATCMD_CHE, /*52*/ At_Che, 0, "get or set eight channels mode (only for US915 AU915 CN470)"}, {ATCMD_CHS, /*53*/ At_Chs, 0, "get or set single channels mode (only for US915 AU915 CN470)"}, #endif - {ATCMD_BAND, /*54*/ At_Band, 0, "get or set the active region"}, + {ATCMD_BAND, /*54*/ At_Band, 0, "get or set the active region (0 = EU433, 1 = CN70, 2 = RU864, 3 = IN865, 4 = EU868, 5 = US915, 6 = AU915, 7 = KR920, 8 = AS923)"}, /* LoRaWAN P2P */ {ATCMD_NWM, /*55*/ At_NwkWorkMode, 0, "get or set the network working mode (0 = P2P_LORA, 1 = LoRaWAN, 2 = P2P_FSK)"}, - {ATCMD_PFREQ, /*56*/ At_P2pFreq, 0, "Configure P2P Frequency"}, - {ATCMD_PSF, /*57*/ At_P2pSF, 0, "Configure P2P Spreading Factor (5-12)"}, - {ATCMD_PBW, /*58*/ At_P2pBW, 0, "Configure P2P Bandwidth(LORA:125,250,500 FSK:4800-467000)"}, - {ATCMD_PCR, /*59*/ At_P2pCR, 0, "Configure P2P Code Rate(4/5=0, 4/6=1, 4/7=2, 4/8=3)"}, - {ATCMD_PPL, /*60*/ At_P2pPL, 0, "Configure P2P Preamble Length (5-65535)"}, - {ATCMD_PTP, /*61*/ At_P2pTP, 0, "Configure P2P TX Power(5-22)"}, - {ATCMD_PSEND, /*62*/ At_P2pSend, 0, "P2P Send Data"}, - {ATCMD_PRECV, /*63*/ At_P2pRecv, 0, "Set the timeout for the P2P window receive (0-65535)ms"}, - {ATCMD_PCRYPT, /*64*/ At_P2pCrypt, 0, "Enable the P2P mode with Encryption KEY"}, - {ATCMD_PKEY, /*65*/ At_P2pKey, 0, "Set the P2P mode with Encryption KEY"}, - {ATCMD_P2P, /*66*/ At_P2p, 0, "View P2P All Parameters"}, + {ATCMD_PFREQ, /*56*/ At_P2pFreq, 0, "configure P2P Frequency"}, + {ATCMD_PSF, /*57*/ At_P2pSF, 0, "configure P2P Spreading Factor (5-12)"}, + {ATCMD_PBW, /*58*/ At_P2pBW, 0, "configure P2P Bandwidth(LORA:125,250,500 FSK:4800-467000)"}, + {ATCMD_PCR, /*59*/ At_P2pCR, 0, "configure P2P Code Rate(0=4/5, 1=4/6, 2=4/7, 3=4/8)"}, + {ATCMD_PPL, /*60*/ At_P2pPL, 0, "configure P2P Preamble Length (5-65535)"}, + {ATCMD_PTP, /*61*/ At_P2pTP, 0, "configure P2P TX Power(5-22)"}, + {ATCMD_PSEND, /*62*/ At_P2pSend, 0, "send data in P2P mode"}, + {ATCMD_PRECV, /*63*/ At_P2pRecv, 0, "enter P2P RX mode for a period of time (ms)"}, + {ATCMD_PCRYPT, /*64*/ At_P2pCrypt, 0, "get or set the encryption status of P2P mode"}, + {ATCMD_PKEY, /*65*/ At_P2pKey, 0, "get or set the encryption key of P2P mode (8 bytes in hex)"}, + {ATCMD_P2P, /*66*/ At_P2p, 0, "get or set all P2P parameters"}, {ATCMD_PBR, /*67*/ At_Pbr, 0, "get or set the P2P FSK modem bitrate (600b/s-307200b/s)"}, {ATCMD_PFDEV, /*68*/ At_Pfdev, 0, "get or set the P2P FSK modem frequency deviation (4800-467000)"}, /* LoRaWAN Multicast Group */ @@ -203,12 +203,12 @@ const at_cmd_info atcmd_info_tbl[] = /* LoRaWAN RF Test */ {ATCMD_TRSSI, /*77*/ At_Trssi, 0, "start RF RSSI tone test"}, {ATCMD_TTONE, /*78*/ At_Ttone, 0, "start RF tone test"}, - {ATCMD_TTX, /*79*/ At_Ttx, 0, "set number of packets send with RF LoRa test"}, - {ATCMD_TRX, /*80*/ At_Trx, 0, "set number if packets receive for PER RF RX test"}, + {ATCMD_TTX, /*79*/ At_Ttx, 0, "set number of packets to be sent for PER RF TX test"}, + {ATCMD_TRX, /*80*/ At_Trx, 0, "set number of packets to be received for PER RF RX test"}, {ATCMD_TCONF, /*81*/ At_Tconf, 0, "configure LoRa RF test"}, - {ATCMD_TTH, /*82*/ At_Tth, 0, "Starts RF Tx hopping test from Fstart to Fstop, with Fdelta steps"}, + {ATCMD_TTH, /*82*/ At_Tth, 0, "start RF TX hopping test from Fstart to Fstop, with Fdelta steps"}, {ATCMD_TOFF, /*83*/ At_Toff, 0, "stop ongoing RF test"}, - {ATCMD_CERTIF, /*??*/ At_Certif, 0, "set the module in LoraWAN Certification mode"}, + {ATCMD_CERTIF, /*??*/ At_Certif, 0, "set the module in LoraWAN certification mode"}, #endif /* Miscellaneous Command */ //{ATCMD_DELBONDS, /*76*/ At_DelBLEBonds, 0, "delete all BLE bond information from flash memory"}, diff --git a/cores/nRF5/component/service/mode/cli/atcmd_class_b_mode_def.h b/cores/nRF5/component/service/mode/cli/atcmd_class_b_mode_def.h index 4c517275..c3721460 100644 --- a/cores/nRF5/component/service/mode/cli/atcmd_class_b_mode_def.h +++ b/cores/nRF5/component/service/mode/cli/atcmd_class_b_mode_def.h @@ -12,7 +12,7 @@ * * | Command | Input parameter | Return value | Return code | * |:------------------:|:------------------:|:------------------------------------------------------------------|:------------------:| - * | AT+PGSLOT? | -- | AT+PGSLOT: get or set the unicast ping slot periodicity | OK | + * | AT+PGSLOT? | -- | AT+PGSLOT: get or set the unicast ping slot periodicity (0-7) | OK | * | AT+PGSLOT=? | -- | 0, 1, 2, 3, 4, 5, 6 or 7 | OK | * | AT+PGSLOT=\ | 0, 1, 2, 3, 4, 5, 6 or 7 | -- | OK / AT_PARAM_ERROR| * | Example
AT+PGSLOT= | 1 | -- | OK | @@ -24,9 +24,9 @@ * * | Command | Input parameter | Return value | Return code | * |:------------------:|:------------------:|:------------------------------------------------------------------|:------------------:| - * | AT+BFREQ? | -- | AT+BFREQ: get the beacon frequency | OK | - * | AT+BFREQ=? | -- | BCON: <0,1,2,3,4,5,6 or 7>, | OK | - * | Example
AT+BFREQ=?| -- | BCON: 3, 869.525 | OK | + * | AT+BFREQ? | -- | AT+BFREQ: get the data rate and beacon frequency (MHz) | OK | + * | AT+BFREQ=? | -- | BCON: <0,1,2,3,4,5,6 or 7>, | OK | + * | Example
AT+BFREQ=?| -- | BCON: 3, 869.525 | OK | * * @subsection ATCMD_class_b_mode_3 AT+BTIME * @@ -34,13 +34,13 @@ * * | Command | Input parameter | Return value | Return code | * |:------------------:|:------------------:|:------------------------------------------------------------------|:------------------:| - * | AT+BTIME? | -- | AT+BTIME: get the beacon time (GPS Epoch time) | OK | - * | AT+BTIME=? | -- | BTIME: | OK | + * | AT+BTIME? | -- | AT+BTIME: get the beacon time (seconds since GPS Epoch time) | OK | + * | AT+BTIME=? | -- | BTIME: | OK | * | Example
AT+BTIME=?| -- | BTIME: 1226592311 | OK | * * @subsection ATCMD_class_b_mode_4 AT+BGW * - * This command allows the user to access the GW GPS coordinate, NetID and GwID. + * This command allows the user to access the gateway GPS coordinate, NetID and GwID. * * | Command | Input parameter | Return value | Return code | * |:------------------:|:------------------:|:------------------------------------------------------------------|:------------------:| @@ -49,11 +49,11 @@ * * @subsection ATCMD_class_b_mode_5 AT+LTIME * - * This command allows the user to access the local time in a UTC format. + * This command allows the user to access the local time in UTC format. * * | Command | Input parameter | Return value | Return code | * |:------------------:|:------------------:|:------------------------------------------------------------------|:------------------:| - * | AT+LTIME? | -- | AT+LTIME: get the local time in UTC format | OK | + * | AT+LTIME? | -- | AT+LTIME: get the local time | OK | * | AT+LTIME=? | -- | LTIME: hms -- | OK | * | Example
AT+LTIME=? | -- | LTIME: 00h37m58s 2018-11-14 | OK | * diff --git a/cores/nRF5/component/service/mode/cli/atcmd_general.c b/cores/nRF5/component/service/mode/cli/atcmd_general.c index ea0e30e3..9f72a788 100644 --- a/cores/nRF5/component/service/mode/cli/atcmd_general.c +++ b/cores/nRF5/component/service/mode/cli/atcmd_general.c @@ -104,7 +104,7 @@ int At_Sn (SERIAL_PORT port, char *cmd, stParam *param) } else if (param->argc == 1) { int32_t ret; - if (strlen(param->argv[0]) > 18) { + if (strlen(param->argv[0]) < 1 || strlen(param->argv[0]) > 18) { return AT_PARAM_ERROR; } diff --git a/cores/nRF5/component/service/mode/cli/atcmd_general_def.h b/cores/nRF5/component/service/mode/cli/atcmd_general_def.h index d1501acb..a783fbce 100644 --- a/cores/nRF5/component/service/mode/cli/atcmd_general_def.h +++ b/cores/nRF5/component/service/mode/cli/atcmd_general_def.h @@ -56,7 +56,7 @@ * * | Command | Input parameter | Return value | Return code | * |:------------------:|:------------------:|:------------------------------------------------------------------|:------------------:| - * | AT+FSN? | -- | AT+FSN: get or set the serial number of the device | OK | + * | AT+FSN? | -- | AT+FSN: get or set the serial number of the device (max 18 char) | OK | * | AT+FSN=? | -- | <18 char> | OK | * | AT+FSN=\ | \<18 char\> | -- | OK / AT_PARAM_ERROR| * @@ -66,7 +66,7 @@ * * | Command | Input parameter | Return value | Return code | * |:------------------:|:------------------:|:------------------------------------------------------------------|:------------------:| - * | AT+BAT? | -- | AT+BAT: get the battery level | OK | + * | AT+BAT? | -- | AT+BAT: get the battery level (volt) | OK | * | AT+BAT=? | -- | | OK | * | Example
AT+BAT=?| -- | 3.0 | OK | * diff --git a/cores/nRF5/component/service/mode/cli/atcmd_info_def.h b/cores/nRF5/component/service/mode/cli/atcmd_info_def.h index c9baa073..df7fa57c 100644 --- a/cores/nRF5/component/service/mode/cli/atcmd_info_def.h +++ b/cores/nRF5/component/service/mode/cli/atcmd_info_def.h @@ -22,7 +22,7 @@ * * | Command | Input parameter | Return value | Return code | * |:------------------:|:------------------:|:------------------------------------------------------------------|:------------------:| - * | AT+ARSSI? | -- | AT+ARSSI: access all open channel rssi | OK | + * | AT+ARSSI? | -- | AT+ARSSI: access all open channel RSSI | OK | * | AT+ARSSI=? | -- | | OK | * | Example
AT+ARSSI=?| | 0,-16 1,-18 2,-30 | OK | * diff --git a/cores/nRF5/component/service/mode/cli/atcmd_join_send_def.h b/cores/nRF5/component/service/mode/cli/atcmd_join_send_def.h index af3a73b8..cbece49b 100755 --- a/cores/nRF5/component/service/mode/cli/atcmd_join_send_def.h +++ b/cores/nRF5/component/service/mode/cli/atcmd_join_send_def.h @@ -12,7 +12,7 @@ * * | Command | Input parameter | Return value | Return code | * |:------------------:|:------------------:|:------------------------------------------------------------------|:------------------:| - * | AT+CFM? | -- | AT+CFM: get or set the confirm mode (0-1) | OK | + * | AT+CFM? | -- | AT+CFM: get or set the confirm mode (0 = off, 1 = on) | OK | * | AT+CFM=? | -- | 0 or 1 | OK | * | AT+CFM=\ | 0 or 1 | -- | OK / AT_PARAM_ERROR| * | Example
AT+CFM= | 1 | -- | OK | @@ -24,7 +24,7 @@ * * | Command | Input parameter | Return value | Return code | * |:------------------:|:------------------:|:------------------------------------------------------------------|:------------------:| - * | AT+CFS? | -- | AT+CFS: get the confirmation status of the last AT+SEND (0-1) | OK | + * | AT+CFS? | -- | AT+CFS: get the confirmation status of the last AT+SEND (0 = failure, 1 = success) | OK | * | AT+CFS=? | -- | 0 or 1 | OK | * | Example
AT+CFS=?| | 0 | OK | * @@ -40,6 +40,13 @@ * | Example
AT+JOIN=? | -- | 0,0,8,0 | OK | * | Example
AT+JOIN=| 1,1,10,8 | -- | OK | * + * represents manually join network: 0 means stop to join network; 1 means start to join network. The default value is 0.
+ * represents automatically join network: 0 means stop automatically joining network; 1 means start automatically joining network. The default value is 0.
+ * represents the join attempt period. The acceptance values are 7 to 255 (in seconds). The default value is 8.
+ * represents the maximum number of join attempts. The acceptance values are 0 to 255 (in seconds). The default value is 0.
+ * + * This is an asynchronous command. OK means that the join is being run. The completion of the JOIN can be verified with AT+NJS=?. + * * @subsection ATCMD_join_send_4 AT+NJM: LoRa network join mode * * This command allows the user to access the network join mode. @@ -59,7 +66,7 @@ * * | Command | Input parameter | Return value | Return code | * |:------------------:|:------------------:|:------------------------------------------------------------------|:------------------:| - * | AT+NJS? | -- | AT+NJS: get the join status | OK | + * | AT+NJS? | -- | AT+NJS: get the join status (0 = not joined, 1 = joined) | OK | * | AT+NJS=? | -- | 0 or 1 | OK | * | Example
AT+NJS=?| | 0 (network not joined) | OK | * | Example
AT+NJS=?| | 1 (network joined) | OK | @@ -90,7 +97,7 @@ * * | Command | Input parameter | Return value | Return code | * |:------------------:|:------------------:|:------------------------------------------------------------------|:------------------:| - * | AT+LPSEND? | -- | AT+LPSEND: This command provides the way to send long packet data | OK | + * | AT+LPSEND? | -- | AT+LPSEND: send long packet data (max 1024 bytes) | OK | * | AT+LPSEND=:: |::| | OK / AT_PARAM_ERROR| * | Example
AT+LPSEND=| 2:1:123456 | -- | OK | * diff --git a/cores/nRF5/component/service/mode/cli/atcmd_key_id_def.h b/cores/nRF5/component/service/mode/cli/atcmd_key_id_def.h index 6e262944..851744a2 100644 --- a/cores/nRF5/component/service/mode/cli/atcmd_key_id_def.h +++ b/cores/nRF5/component/service/mode/cli/atcmd_key_id_def.h @@ -12,7 +12,7 @@ * * | Command | Input parameter | Return value | Return code | * |:------------------:|:------------------:|:------------------------------------------------------------------|:------------------:| - * | AT+APPEUI? | -- | AT+APPEUI: get or set the application EUI | OK | + * | AT+APPEUI? | -- | AT+APPEUI: get or set the application EUI (8 bytes in hex) | OK | * | AT+APPEUI=? | -- | \<8 hex\> | OK | * | AT+APPEUI=\| \<8 hex\> | -- | OK / AT_PARAM_ERROR| * | Example
AT+APPEUI= | 0102030405060708 | -- | OK | @@ -25,7 +25,7 @@ * * | Command | Input parameter | Return value | Return code | * |:------------------:|:------------------:|:------------------------------------------------------------------|:------------------:| - * | AT+APPKEY? | -- | AT+APPKEY: get or set the application key | OK | + * | AT+APPKEY? | -- | AT+APPKEY: get or set the application key (16 bytes in hex) | OK | * | AT+APPKEY=? | -- | \<16 hex\> | OK | * | AT+APPKEY=\| \<16 hex\> | -- | OK / AT_PARAM_ERROR| * | Example
AT+APPKEY= | 0102030405060708090A0B0C0D0E0F00 | -- | OK | @@ -38,7 +38,7 @@ * * | Command | Input parameter | Return value | Return code | * |:------------------:|:------------------:|:------------------------------------------------------------------|:------------------:| - * | AT+APPSKEY? | -- | AT+APPSKEY: get or set the application session key | OK | + * | AT+APPSKEY? | -- | AT+APPSKEY: get or set the application session key (16 bytes in hex) | OK | * | AT+APPSKEY=? | -- | \<16 hex\> | OK | * | AT+APPSKEY=\| \<16 hex\> | -- | OK / AT_PARAM_ERROR| * | Example
AT+APPSKEY= | 0102030405060708090A0B0C0D0E0F00 | -- | OK | @@ -51,7 +51,7 @@ * * | Command | Input parameter | Return value | Return code | * |:------------------:|:------------------:|:------------------------------------------------------------------|:------------------:| - * | AT+DADDR? | -- | AT+DADDR: get or set the device address | OK | + * | AT+DADDR? | -- | AT+DADDR: get or set the device address (4 bytes in hex) | OK | * | AT+DADDR=? | -- | \<4 hex\> | OK | * | AT+DADDR=\ | \<4 hex\> | -- | OK / AT_PARAM_ERROR| * | Example
AT+DADDR= | 01020304 | -- | OK | @@ -64,7 +64,7 @@ * * | Command | Input parameter | Return value | Return code | * |:------------------:|:------------------:|:------------------------------------------------------------------|:------------------:| - * | AT+DEUI? | -- | AT+DEUI: get or set the device EUI | OK | + * | AT+DEUI? | -- | AT+DEUI: get or set the device EUI (8 bytes in hex) | OK | * | AT+DEUI=? | -- | \<8 hex\> | OK | * | AT+DEUI=\ | \<8 hex\> | -- | OK / AT_PARAM_ERROR| * | Example
AT+DEUI= | 0102030405060708 | -- | OK | @@ -77,7 +77,7 @@ * * | Command | Input parameter | Return value | Return code | * |:------------------:|:------------------:|:------------------------------------------------------------------|:------------------:| - * | AT+NETID? | -- | AT+NETID: get the network identifier (NetID) of 3 octets | OK | + * | AT+NETID? | -- | AT+NETID: get the network identifier (NetID) (3 bytes in hex) | OK | * | AT+NETID=? | -- | \<3 hex\> | OK | * | AT+NETID=\ | \<3 hex\> | -- | OK / AT_PARAM_ERROR| * | Example
AT+NETID=?| | 010203 | OK | @@ -88,7 +88,7 @@ * * | Command | Input parameter | Return value | Return code | * |:------------------:|:------------------:|:------------------------------------------------------------------|:------------------:| - * | AT+NWKSKEY? | -- | AT+NWKSKEY: get or set the network session key | OK | + * | AT+NWKSKEY? | -- | AT+NWKSKEY: get or set the network session key (16 bytes in hex) | OK | * | AT+NWKSKEY=? | -- | \<16 hex\> | OK | * | AT+NWKSKEY=\ | \<16 hex\> | -- | OK / AT_PARAM_ERROR| * | Example
AT+NWKSKEY= | 0102030405060708090A0B0C0D0E0F00 | -- | OK | diff --git a/cores/nRF5/component/service/mode/cli/atcmd_nwk_management_def.h b/cores/nRF5/component/service/mode/cli/atcmd_nwk_management_def.h index 8d126904..f59bdb2b 100644 --- a/cores/nRF5/component/service/mode/cli/atcmd_nwk_management_def.h +++ b/cores/nRF5/component/service/mode/cli/atcmd_nwk_management_def.h @@ -24,7 +24,7 @@ * * | Command | Input parameter | Return value | Return code | * |:------------------:|:------------------:|:------------------------------------------------------------------|:------------------:| - * | AT+CLASS? | -- | AT+CLASS: get or set the device class | OK | + * | AT+CLASS? | -- | AT+CLASS: get or set the device class (A = class A, B = class B, C = class C) | OK | * | AT+CLASS=? | -- | A, B or C | OK | * | AT+CLASS=\ | A, B or C | -- | OK / AT_PARAM_ERROR| * | Example
AT+CLASS=?| -- | A | OK | @@ -47,7 +47,7 @@ * * | Command | Input parameter | Return value | Return code | * |:------------------:|:------------------:|:------------------------------------------------------------------|:------------------:| - * | AT+DR? | -- | AT+DR: get or set the data rate
0-7 correspond to DR_0-DR_7 | OK | + * | AT+DR? | -- | AT+DR: get or set the data rate | OK | * | AT+DR=? | -- | 0, 1, 2, 3, 4, 5, 6 or 7 | OK | * | AT+DR=\ | 0, 1, 2, 3, 4, 5, 6 or 7 | -- | OK / AT_PARAM_ERROR| * | Example
AT+DR=? | -- | 3 | OK | @@ -81,7 +81,7 @@ * * | Command | Input parameter | Return value | Return code | * |:------------------:|:------------------:|:------------------------------------------------------------------|:------------------:| - * | AT+PNM? | -- | AT+PNM: get or set the public network mode
0 = off
1 = on | OK | + * | AT+PNM? | -- | AT+PNM: get or set the public network mode (0 = off, 1 = on) | OK | * | AT+PNM=? | -- | 0 or 1 | OK | * | AT+PNM=\ | 0 or 1 | -- | OK / AT_PARAM_ERROR| * | Example
AT+PNM=?| -- | 0 | OK | @@ -116,7 +116,7 @@ * * | Command | Input parameter | Return value | Return code | * |:------------------:|:------------------:|:------------------------------------------------------------------|:------------------:| - * | AT+RX2DR? | -- | AT+RX2DR: get or set the RX2 window data rate
0-7 correspond to DR_0-DR_7 | OK | + * | AT+RX2DR? | -- | AT+RX2DR: get or set the RX2 window data rate | OK | * | AT+RX2DR=? | -- | 0, 1, 2, 3, 4, 5, 6 or 7 | OK / AT_BUSY_ERROR | * | AT+RX2DR=\ | 0, 1, 2, 3, 4, 5, 6 or 7 | -- | OK / AT_PARAM_ERROR / AT_BUSY_ERROR | * | Example
AT+RX2DR=? | -- | 6 | OK | @@ -128,7 +128,7 @@ * * | Command | Input parameter | Return value | Return code | * |:------------------:|:------------------:|:------------------------------------------------------------------|:------------------:| - * | AT+RX2FQ? | -- | AT+RX2FQ: get or set the RX2 window frequency | OK | + * | AT+RX2FQ? | -- | AT+RX2FQ: get or set the RX2 window frequency (Hz) | OK | * | AT+RX2FQ=? | -- | | OK / AT_BUSY_ERROR | * | AT+RX2FQ=\ | | -- | OK / AT_PARAM_ERROR / AT_BUSY_ERROR | * | Example
AT+RX2FQ=? | -- | 869535000 | OK | @@ -140,12 +140,25 @@ * * | Command | Input parameter | Return value | Return code | * |:------------------:|:------------------:|:------------------------------------------------------------------|:------------------:| - * | AT+TXP? | -- | AT+RX2FQ: get or set the transmitting power | OK | + * | AT+TXP? | -- | AT+TXP: get or set the transmitting power | OK | * | AT+TXP=? | -- | | OK | * | AT+TXP=\ | | -- | OK / AT_PARAM_ERROR | * | Example
AT+TXP=?| -- | 1 | OK | * | Example
AT+TXP= | 4 | -- | OK | * + * @subsection ATCMD_nwk_mng_13 AT+LINKCHECK: link check + * + * This command allows the user to send the link check command + * + * | Command | Input parameter | Return value | Return code | + * |:------------------:|:------------------:|:------------------------------------------------------------------|:------------------:| + * | AT+LINKCHECK? | -- | AT+LINKCHECK: get or set the link check setting (0 = disabled, 1 = once, 2 = everytime) | OK | + * | AT+LINKCHECK=? | -- | <0-2> | OK | + * | AT+LINKCHECK=\ | <0-2> | -- | OK / AT_PARAM_ERROR | + * | Example
AT+LINKCHECK=?| -- | 1 | OK | + * | Example
AT+LINKCHECK= | 2 | -- | OK | + * + * */ #ifndef _ATCMD_NWK_MNG_DEF_H_ diff --git a/cores/nRF5/component/service/mode/cli/atcmd_p2p_def.h b/cores/nRF5/component/service/mode/cli/atcmd_p2p_def.h index 986e999b..dfd5c5bb 100755 --- a/cores/nRF5/component/service/mode/cli/atcmd_p2p_def.h +++ b/cores/nRF5/component/service/mode/cli/atcmd_p2p_def.h @@ -24,7 +24,7 @@ * * | Command | Input parameter | Return value | Return code | * |:------------------:|:------------------:|:------------------------------------------------------------------|:------------------:| - * | AT+PFREQ? | -- | AT+PFREQ: access the frequency in p2p mode | OK | + * | AT+PFREQ? | -- | AT+PFREQ: configure P2P Frequency | OK | * | AT+PFREQ=? | -- | | OK | * | AT+PFREQ=\ | | -- | OK / AT_PARAM_ERROR| * | Example
AT+PFREQ=?| -- | 868000000 | OK | @@ -35,7 +35,7 @@ * * | Command | Input parameter | Return value | Return code | * |:------------------:|:------------------:|:------------------------------------------------------------------|:------------------:| - * | AT+PSF? | -- | AT+PSF: access the spreading factor in p2p mode | OK | + * | AT+PSF? | -- | AT+PSF: configure P2P Spreading Factor (5-12) | OK | * | AT+PSF=? | -- | | OK | * | AT+PSF=\ | | -- | OK / AT_PARAM_ERROR| * | Example
AT+PSF=?| -- | 7 | OK | @@ -46,18 +46,18 @@ * * | Command | Input parameter | Return value | Return code | * |:------------------:|:------------------:|:------------------------------------------------------------------|:------------------:| - * | AT+PBW? | -- | AT+PBW: access the bandwidh in p2p mode | OK | + * | AT+PBW? | -- | AT+PBW: configure P2P Bandwidth(LORA:125,250,500 FSK:4800-467000) | OK | * | AT+PBW=? | -- | | OK | * | AT+PBW=\ | | -- | OK / AT_PARAM_ERROR| * | Example
AT+PSF=?| -- | 0 | OK | * - * @subsection ATCMD_p2p_5 AT+PCR: codingrate + * @subsection ATCMD_p2p_5 AT+PCR: coding rate * * This command allows the user to access the codingrate in p2p mode. * * | Command | Input parameter | Return value | Return code | * |:------------------:|:------------------:|:------------------------------------------------------------------|:------------------:| - * | AT+PCR? | -- | AT+PCR: access the codingrate in p2p mode | OK | + * | AT+PCR? | -- | AT+PCR: configure P2P Code Rate(0=4/5, 1=4/6, 2=4/7, 3=4/8) | OK | * | AT+PCR=? | -- | | OK | * | AT+PCR=\ | | -- | OK / AT_PARAM_ERROR| * | Example
AT+PCR=?| -- | 1 | OK | @@ -68,7 +68,7 @@ * * | Command | Input parameter | Return value | Return code | * |:------------------:|:------------------:|:------------------------------------------------------------------|:------------------:| - * | AT+PPL? | -- | AT+PPL: access the length of preamble in p2p mode | OK | + * | AT+PPL? | -- | AT+PPL: configure P2P Preamble Length (5-65535) | OK | * | AT+PPL=? | -- | | OK | * | AT+PPL=\ | | -- | OK / AT_PARAM_ERROR| * | Example
AT+PPL=?| -- | 8 | OK | @@ -79,7 +79,7 @@ * * | Command | Input parameter | Return value | Return code | * |:------------------:|:------------------:|:------------------------------------------------------------------|:------------------:| - * | AT+PTP? | -- | AT+PTP: access the tx power in p2p mode | OK | + * | AT+PTP? | -- | AT+PTP: configure P2P TX Power(5-22) | OK | * | AT+PTP=? | -- | | OK | * | AT+PTP=\ | | -- | OK / AT_PARAM_ERROR| * | Example
AT+PTP=?| -- | 14 | OK | @@ -90,7 +90,7 @@ * * | Command | Input parameter | Return value | Return code | * |:------------------:|:------------------:|:------------------------------------------------------------------|:------------------:| - * | AT+PSEND? | -- | AT+PSEND: send data in p2p mode. | OK | + * | AT+PSEND? | -- | AT+PSEND: send data in P2P mode | OK | * | AT+PSEND=? | -- | | OK | * | Example
AT+PSEND=?| -- | 32 | OK | * @@ -100,9 +100,9 @@ * * | Command | Input parameter | Return value | Return code | * |:------------------:|:------------------:|:------------------------------------------------------------------|:------------------:| - * | AT+PRECV? | -- | AT+PRECV: receive data in p2p mode | OK | - * | AT+PRECV=? | -- | | OK | - * | Example
AT+PRECV=?| -- | 5000 | OK | + * | AT+PRECV? | -- | AT+PRECV: enter P2P RX mode for a period of time (ms) | OK | + * | AT+PRECV= | | -- | OK | + * | Example
AT+PRECV=| 5000 | -- | OK | * * @subsection ATCMD_p2p_10 AT+PCRYPT: the crypt status * @@ -110,9 +110,11 @@ * * | Command | Input parameter | Return value | Return code | * |:------------------:|:------------------:|:------------------------------------------------------------------|:------------------:| - * | AT+PCRYPT? | -- | AT+PCRYPT: access the crypt status in p2p mode | OK | - * | AT+PCRYPT=? | -- | \ | OK | - * | Example
AT+PKEY=?| -- | 1 | OK | + * | AT+PCRYPT? | -- | AT+PCRYPT: get or set the encryption status of P2P mode | OK | + * | AT+PCRYPT=? | -- | \<0 or 1\> | OK | + * | AT+PCRYPT= | \<0 or 1\> | -- | OK | + * | Example
AT+PCRYPT=| 0 | -- | OK | + * | Example
AT+PCRYPT=?| -- | 1 | OK | * * @subsection ATCMD_p2p_11 AT+PKEY: the encryption and decryption key * @@ -120,20 +122,30 @@ * * | Command | Input parameter | Return value | Return code | * |:------------------:|:------------------:|:------------------------------------------------------------------|:------------------:| - * | AT+PKEY? | -- | AT+PKEY: access the encryption and decryption key in p2p mode | OK | + * | AT+PKEY? | -- | AT+PKEY: get or set the encryption key of P2P mode (8 bytes in hex) | OK | * | AT+PKEY=? | -- | \<8 hex\> | OK | + * | AT+PKEY= | \<8 hex\> | -- | OK | + * | Example
AT+PKEY=| 0011223344556677 | -- | OK | * | Example
AT+PKEY=?| -- | 0011223344556677 | OK | * - * @subsection ATCMD_p2p_12 AT+PFDEV: get or set the P2P FSK modem frequency deviation + * @subsection ATCMD_p2p_12 AT+P2P: all P2P parameters * - * This command allows the user to get or set the P2P FSK modem frequency deviation. + * This command provides a way to access all parameters for P2P mode * * | Command | Input parameter | Return value | Return code | * |:------------------:|:------------------:|:------------------------------------------------------------------|:------------------:| - * | AT+PFDEV? | -- | AT+PFDEV: get or set the P2P FSK modem frequency deviation | OK | - * | AT+PFDEV=? | -- | | OK | - * | AT+PFDEV=\ | | -- | OK / AT_PARAM_ERROR| - * | Example
AT+PFDEV=?| -- | 5000 | OK | + * | AT+P2P? | -- | AT+P2P: get or set all P2P parameters | OK | + * | AT+P2P=? | -- | \,\,\,\,\,\ | OK | + * | AT+P2P= | \,\,\,\,\,\ | | OK | + * | Example
AT+P2P= | 868500000,12,125,0,65535,20 | -- | OK | + * | Example
AT+P2P=?| -- | 868000000,7,125,0,8,14 | OK | + * + * Freq: 150000000-960000000
+ * SF: 6,7,8,9,10,11,12
+ * Bandwidth: 125, 250, 500
+ * CR: 0 = 4/5, 1 = 4/6, 2 = 4/7, 3 = 4/8
+ * Preamble Length: 2-65535
+ * TX Power = 5-22
* * @subsection ATCMD_p2p_13 AT+PBR: get or set the P2P FSK modem bitrate (600b/s-307200b/s) * @@ -146,6 +158,18 @@ * | AT+PBR=\ | | -- | OK / AT_PARAM_ERROR| * | Example
AT+PBR=?| -- | 4915 | OK | * + * @subsection ATCMD_p2p_14 AT+PFDEV: get or set the P2P FSK modem frequency deviation + * + * This command allows the user to get or set the P2P FSK modem frequency deviation. + * + * | Command | Input parameter | Return value | Return code | + * |:------------------:|:------------------:|:------------------------------------------------------------------|:------------------:| + * | AT+PFDEV? | -- | AT+PFDEV: get or set the P2P FSK modem frequency deviation (4800-467000) | OK | + * | AT+PFDEV=? | -- | | OK | + * | AT+PFDEV=\ | | -- | OK / AT_PARAM_ERROR| + * | Example
AT+PFDEV=?| -- | 5000 | OK | + * + * */ diff --git a/cores/nRF5/component/service/mode/cli/atcmd_serial_port_def.h b/cores/nRF5/component/service/mode/cli/atcmd_serial_port_def.h index 753f43c3..cbea1011 100644 --- a/cores/nRF5/component/service/mode/cli/atcmd_serial_port_def.h +++ b/cores/nRF5/component/service/mode/cli/atcmd_serial_port_def.h @@ -21,7 +21,7 @@ * * | Command | Input parameter | Return value | Return code | * |:------------------:|:------------------:|:------------------------------------------------------------------|:------------------:| - * | AT+PWORD? | -- | AT+PWORD: set the serial port locking password | OK | + * | AT+PWORD? | -- | AT+PWORD: set the serial port locking password (max 8 char) | OK | * | AT+PWORD=\ | <1-8 hex> | -- | OK | * | Example
AT+PWORD=88888888 | <1-8 hex> | -- | OK | * @@ -66,6 +66,15 @@ * | AT+PAM | -- | | OK | * | AT+PAM=\ | | | OK / AT_PARAM_ERROR| * + * @subsection ATCMD_serial_port_7 +++: Exit transparent transmission mode + * + * This command provides Exit data transparent transmission mode + * + * | Command | Input parameter | Return value | Return code | + * |:------------------:|:------------------:|:------------------------------------------------------------------|:------------------:| + * | +++ | -- | -- | -- | + * + * */ #ifndef _ATCMD_SERIAL_PORT_DEF_H_ diff --git a/cores/nRF5/component/service/mode/cli/atcmd_supplement_def.h b/cores/nRF5/component/service/mode/cli/atcmd_supplement_def.h index 2c688d29..33813136 100755 --- a/cores/nRF5/component/service/mode/cli/atcmd_supplement_def.h +++ b/cores/nRF5/component/service/mode/cli/atcmd_supplement_def.h @@ -24,7 +24,7 @@ * * | Command | Input parameter | Return value | Return code | * |:------------------:|:------------------:|:------------------------------------------------------------------|:------------------:| - * | AT+BAND? | -- | AT+BAND: get or set the active region | OK | + * | AT+BAND? | -- | AT+BAND: get or set the active region (0 = EU433, 1 = CN70, 2 = RU864, 3 = IN865, 4 = EU868, 5 = US915, 6 = AU915, 7 = KR920, 8 = AS923) | OK | * | AT+BAND=? | -- | [0,1,2,3,4,5,6,7,8] | OK | * | AT+BAND=\ | [0,1,2,3,4,5,6,7,8]| -- | OK / AT_PARAM_ERROR| * | Example
AT+BAND=| 1 | -- | OK | diff --git a/cores/nRF5/component/service/mode/protocol/service_mode_proto_builtin_handler.c b/cores/nRF5/component/service/mode/protocol/service_mode_proto_builtin_handler.c index 2b9fc1bd..8457d483 100644 --- a/cores/nRF5/component/service/mode/protocol/service_mode_proto_builtin_handler.c +++ b/cores/nRF5/component/service/mode/protocol/service_mode_proto_builtin_handler.c @@ -61,10 +61,10 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa return; } - if (atcmd_id > At_CmdGetTotalNum()) { - service_mode_proto_atcmd_report_error(port, atcmd_id, AT_PARAM_ERROR); - return; - } + //if (atcmd_id > At_CmdGetTotalNum()) { + // service_mode_proto_atcmd_report_error(port, atcmd_id, AT_PARAM_ERROR); + // return; + //} switch (atcmd_id) { case SERVICE_MODE_PROTO_ATCMD_ATTENTION: @@ -77,6 +77,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa break; } case SERVICE_MODE_PROTO_ATCMD_REBOOT: + { if (flag & PROTO_ATCMD_FLAG_WR_OR_EXE) { udrv_system_reboot(); nRet = AT_OK; @@ -84,7 +85,9 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa nRet = AT_PARAM_ERROR; } break; + } case SERVICE_MODE_PROTO_ATCMD_ATR: + { if (flag & PROTO_ATCMD_FLAG_WR_OR_EXE) { ret = service_lora_set_lora_default(); if (ret == UDRV_RETURN_OK) @@ -101,7 +104,9 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa nRet = AT_PARAM_ERROR; } break; + } case SERVICE_MODE_PROTO_ATCMD_BOOT: + { if (flag & PROTO_ATCMD_FLAG_WR_OR_EXE) { udrv_enter_dfu(); nRet = AT_OK; @@ -109,6 +114,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa nRet = AT_PARAM_ERROR; } break; + } case SERVICE_MODE_PROTO_ATCMD_BAT: { if (flag & PROTO_ATCMD_FLAG_WR_OR_EXE) { @@ -249,8 +255,48 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa break; } case SERVICE_MODE_PROTO_ATCMD_LOCK: + { + //if (flag & PROTO_ATCMD_FLAG_WR_OR_EXE) { + // udrv_serial_lock(port); + // nRet = AT_OK; + //} else { + // nRet = AT_PARAM_ERROR; + //} + nRet = AT_MODE_NO_SUPPORT; + break; + } case SERVICE_MODE_PROTO_ATCMD_PWORD: { + //uint8_t rbuff[8]; + //uint32_t len; + + //if (flag & PROTO_ATCMD_FLAG_WR_OR_EXE) { + // if (payload_len < 1 || payload_len > 8) { + // nRet = AT_PARAM_ERROR; + // goto out; + // } + + // if (udrv_serial_set_passwd(arg, payload_len) == UDRV_RETURN_OK) { + // nRet = AT_OK; + // } else { + // nRet = AT_ERROR; + // } + //} else { + // if ((len = udrv_serial_get_passwd(rbuff, 8)) <= 0) { + // nRet = AT_ERROR; + // goto out; + // } + // memset(buff, 0, 256); + // reply_len = len; + // memcpy(buff+sizeof(header), rbuff, len); + // header.length = __builtin_bswap16(reply_len); + // header.flag = PROTO_ATCMD_FLAG_RESPONSE; + // header.atcmd_id = atcmd_id; + // memcpy(buff, &header, sizeof(header)); + + // service_mode_proto_send(port, PROTO_FLAG_RESPONSE, 0x01, buff, sizeof(header)+reply_len, NULL); + // nRet = AT_OK; + //} nRet = AT_MODE_NO_SUPPORT; break; } @@ -261,7 +307,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (payload_len != 4) { nRet = AT_PARAM_ERROR; - break; + goto out; } baud = __builtin_bswap32(*(uint32_t *)arg); @@ -294,7 +340,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (payload_len != 0) { nRet = AT_PARAM_ERROR; - break; + goto out; } if ((old_mode = service_nvm_get_mode_type_from_nvm(port)) != SERVICE_MODE_TYPE_CLI) @@ -302,7 +348,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if ((ret = service_nvm_set_mode_type_to_nvm(port, SERVICE_MODE_TYPE_CLI)) != UDRV_RETURN_OK) { nRet = AT_ERROR; - break; + goto out; } switch (old_mode) @@ -343,7 +389,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if ((ret = service_nvm_set_mode_type_to_nvm(port, SERVICE_MODE_TYPE_PROTOCOL)) != UDRV_RETURN_OK) { nRet = AT_ERROR; - break; + goto out; } switch (old_mode) @@ -385,7 +431,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (service_lora_get_njs() == false) { nRet = AT_NO_NETWORK_JOINED; - break; + goto out; } if ((old_mode = service_nvm_get_mode_type_from_nvm(port)) != SERVICE_MODE_TYPE_TRANSPARENT) @@ -393,7 +439,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if ((ret = service_nvm_set_mode_type_to_nvm(port, SERVICE_MODE_TYPE_TRANSPARENT)) != UDRV_RETURN_OK) { nRet = AT_ERROR; - break; + goto out; } switch (old_mode) @@ -420,7 +466,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa } else { if (payload_len != 1) { nRet = AT_PARAM_ERROR; - break; + goto out; } tp_port = *arg; @@ -428,7 +474,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (tp_port < 1 || tp_port > 223) { ret = AT_PARAM_ERROR; - break; + goto out; } if (service_nvm_set_tp_port_to_nvm(port, tp_port) == UDRV_RETURN_OK) { @@ -455,13 +501,13 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (SERVICE_LORAWAN != service_lora_get_nwm()) { nRet = AT_MODE_NO_SUPPORT; - break; + goto out; } if (flag & PROTO_ATCMD_FLAG_WR_OR_EXE) { if (payload_len != 8) { nRet = AT_PARAM_ERROR; - break; + goto out; } if (service_lora_set_app_eui(arg, 8) == UDRV_RETURN_OK) { nRet = AT_OK; @@ -472,7 +518,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa uint8_t rbuff[8]; if (service_lora_get_app_eui(rbuff, 8) != UDRV_RETURN_OK) { nRet = AT_ERROR; - break; + goto out; } memset(buff, 0, 256); reply_len = 8; @@ -492,13 +538,13 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (SERVICE_LORAWAN != service_lora_get_nwm()) { nRet = AT_MODE_NO_SUPPORT; - break; + goto out; } if (flag & PROTO_ATCMD_FLAG_WR_OR_EXE) { if (payload_len != 16) { nRet = AT_PARAM_ERROR; - break; + goto out; } if (service_lora_set_app_key(arg, 16) == UDRV_RETURN_OK) { nRet = AT_OK; @@ -509,7 +555,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa uint8_t rbuff[16]; if (service_lora_get_app_key(rbuff, 16) != UDRV_RETURN_OK) { nRet = AT_ERROR; - break; + goto out; } memset(buff, 0, 256); reply_len = 16; @@ -529,13 +575,13 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (SERVICE_LORAWAN != service_lora_get_nwm()) { nRet = AT_MODE_NO_SUPPORT; - break; + goto out; } if (flag & PROTO_ATCMD_FLAG_WR_OR_EXE) { if (payload_len != 16) { nRet = AT_PARAM_ERROR; - break; + goto out; } if (service_lora_set_app_skey(arg, 16) == UDRV_RETURN_OK) { nRet = AT_OK; @@ -546,7 +592,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa uint8_t rbuff[16]; if (service_lora_get_app_skey(rbuff, 16) != UDRV_RETURN_OK) { nRet = AT_ERROR; - break; + goto out; } memset(buff, 0, 256); reply_len = 16; @@ -566,13 +612,13 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (SERVICE_LORAWAN != service_lora_get_nwm()) { nRet = AT_MODE_NO_SUPPORT; - break; + goto out; } if (flag & PROTO_ATCMD_FLAG_WR_OR_EXE) { if (payload_len != 4) { nRet = AT_PARAM_ERROR; - break; + goto out; } if (service_lora_set_dev_addr(arg, 4) == UDRV_RETURN_OK) { nRet = AT_OK; @@ -583,7 +629,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa uint8_t rbuff[4]; if (service_lora_get_dev_addr(rbuff, 4) != UDRV_RETURN_OK) { nRet = AT_ERROR; - break; + goto out; } memset(buff, 0, 256); reply_len = 4; @@ -603,7 +649,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (flag & PROTO_ATCMD_FLAG_WR_OR_EXE) { if (payload_len != 8) { nRet = AT_PARAM_ERROR; - break; + goto out; } if (service_lora_set_dev_eui(arg, 8) == UDRV_RETURN_OK) { nRet = AT_OK; @@ -614,7 +660,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa uint8_t rbuff[8]; if (service_lora_get_dev_eui(rbuff, 8) != UDRV_RETURN_OK) { nRet = AT_ERROR; - break; + goto out; } memset(buff, 0, 256); reply_len = 8; @@ -634,7 +680,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (SERVICE_LORAWAN != service_lora_get_nwm()) { nRet = AT_MODE_NO_SUPPORT; - break; + goto out; } if (flag & PROTO_ATCMD_FLAG_WR_OR_EXE) { @@ -643,7 +689,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa uint8_t rbuff[4]; if (service_lora_get_net_id(rbuff, 4) != UDRV_RETURN_OK) { nRet = AT_ERROR; - break; + goto out; } memset(buff, 0, 256); reply_len = 3; @@ -663,13 +709,13 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (SERVICE_LORAWAN != service_lora_get_nwm()) { nRet = AT_MODE_NO_SUPPORT; - break; + goto out; } if (flag & PROTO_ATCMD_FLAG_WR_OR_EXE) { if (payload_len != 16) { nRet = AT_PARAM_ERROR; - break; + goto out; } if (service_lora_set_nwk_skey(arg, 16) == UDRV_RETURN_OK) { nRet = AT_OK; @@ -680,7 +726,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa uint8_t rbuff[16]; if (service_lora_get_nwk_skey(rbuff, 16) != UDRV_RETURN_OK) { nRet = AT_ERROR; - break; + goto out; } memset(buff, 0, 256); reply_len = 16; @@ -700,7 +746,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (SERVICE_LORAWAN != service_lora_get_nwm()) { nRet = AT_MODE_NO_SUPPORT; - break; + goto out; } if (flag & PROTO_ATCMD_FLAG_WR_OR_EXE) { @@ -708,14 +754,14 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (payload_len != 1) { nRet = AT_PARAM_ERROR; - break; + goto out; } mode = *arg; if (mode != 0 && mode != 1) { nRet = AT_PARAM_ERROR; - break; + goto out; } if (service_lora_set_cfm((SERVICE_LORA_CONFIRM_MODE)mode) == UDRV_RETURN_OK) { @@ -741,7 +787,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (SERVICE_LORAWAN != service_lora_get_nwm()) { nRet = AT_MODE_NO_SUPPORT; - break; + goto out; } if (flag & PROTO_ATCMD_FLAG_WR_OR_EXE) { @@ -764,7 +810,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (SERVICE_LORAWAN != service_lora_get_nwm()) { nRet = AT_MODE_NO_SUPPORT; - break; + goto out; } if (flag & PROTO_ATCMD_FLAG_WR_OR_EXE) { @@ -773,7 +819,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (argc != 1 && argc != 2 && argc != 3 && argc != 4) { nRet = AT_PARAM_ERROR; - break; + goto out; } for (int i = 0 ; i < argc ; i++) { @@ -782,22 +828,22 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (argc > 0 && (val[0] != 0 && val[0] != 1)) { nRet = AT_PARAM_ERROR; - break; + goto out; } if (argc > 1 && (val[1] != 0 && val[1] != 1)) { nRet = AT_PARAM_ERROR; - break; + goto out; } if (argc > 2 && (val[2] < 7 && val[2] > 255)) { nRet = AT_PARAM_ERROR; - break; + goto out; } if (argc > 3 && (val[3] < 0 && val[3] > 255)) { nRet = AT_PARAM_ERROR; - break; + goto out; } ret = service_lora_join(val[0], val[1], val[2], val[3]); @@ -834,7 +880,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (SERVICE_LORAWAN != service_lora_get_nwm()) { nRet = AT_MODE_NO_SUPPORT; - break; + goto out; } if (flag & PROTO_ATCMD_FLAG_WR_OR_EXE) { @@ -842,14 +888,14 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (payload_len != 1) { nRet = AT_PARAM_ERROR; - break; + goto out; } mode = *arg; if (mode != 0 && mode != 1) { nRet = AT_PARAM_ERROR; - break; + goto out; } if (service_lora_set_njm((SERVICE_LORA_JOIN_MODE)mode, true) == UDRV_RETURN_OK) { @@ -875,7 +921,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (SERVICE_LORAWAN != service_lora_get_nwm()) { nRet = AT_MODE_NO_SUPPORT; - break; + goto out; } if (flag & PROTO_ATCMD_FLAG_WR_OR_EXE) { @@ -898,7 +944,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (SERVICE_LORAWAN != service_lora_get_nwm()) { nRet = AT_MODE_NO_SUPPORT; - break; + goto out; } if (flag & PROTO_ATCMD_FLAG_WR_OR_EXE) { @@ -928,33 +974,46 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (SERVICE_LORAWAN != service_lora_get_nwm()) { nRet = AT_MODE_NO_SUPPORT; - break; + goto out; } if (flag & PROTO_ATCMD_FLAG_WR_OR_EXE) { SERVICE_LORA_SEND_INFO info; - uint8_t port; + uint8_t fport; + int32_t ret; if (payload_len < 2 || payload_len > 251) {//1 byte for port, and data length is 1~250 bytes nRet = AT_PARAM_ERROR; - break; + goto out; } - port = *arg; + fport = *arg; - if (port < 1 || port > 223) + if (fport < 1 || fport > 223) { nRet = AT_PARAM_ERROR; - break; + goto out; } - info.port = port; + info.port = fport; info.retry_valid = true; info.retry = 8; info.confirm_valid = false; - if (service_lora_send(arg+1, payload_len-1, info, false) == UDRV_RETURN_OK) { + ret = service_lora_send(arg+1, payload_len-1, info, false); + if (ret == UDRV_RETURN_OK) + { nRet = AT_OK; - } else { + } + else if (ret == -UDRV_NO_WAN_CONNECTION) + { + nRet = AT_NO_NETWORK_JOINED; + } + else if (ret == -UDRV_BUSY) + { + nRet = AT_BUSY_ERROR; + } + else + { nRet = AT_ERROR; } } else { @@ -964,7 +1023,52 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa } case SERVICE_MODE_PROTO_ATCMD_LPSEND: { - //TODO + if (SERVICE_LORAWAN != service_lora_get_nwm()) + { + nRet = AT_MODE_NO_SUPPORT; + goto out; + } + + if (flag & PROTO_ATCMD_FLAG_WR_OR_EXE) { + SERVICE_LORA_SEND_INFO info; + uint8_t fport, ack; + int32_t ret; + + if (payload_len < 2 || payload_len > 251) {//1 byte for port, and data length is 1~250 bytes + nRet = AT_PARAM_ERROR; + goto out; + } + + fport = *arg; + + if (fport < 1 || fport > 223) + { + nRet = AT_PARAM_ERROR; + goto out; + } + + ack = *(arg+1); + + ret = service_lora_lptp_send(fport, ack, arg+2, payload_len-2); + if (ret == UDRV_RETURN_OK) + { + nRet = AT_OK; + } + else if (ret == -UDRV_NO_WAN_CONNECTION) + { + nRet = AT_NO_NETWORK_JOINED; + } + else if (ret == -UDRV_BUSY) + { + nRet = AT_BUSY_ERROR; + } + else + { + nRet = AT_ERROR; + } + } else { + nRet = AT_PARAM_ERROR; + } break; } case SERVICE_MODE_PROTO_ATCMD_RETY: @@ -972,7 +1076,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (SERVICE_LORAWAN != service_lora_get_nwm()) { nRet = AT_MODE_NO_SUPPORT; - break; + goto out; } if (flag & PROTO_ATCMD_FLAG_WR_OR_EXE) { @@ -980,7 +1084,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (payload_len != 1) { nRet = AT_PARAM_ERROR; - break; + goto out; } retry_times = *arg; @@ -1008,7 +1112,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (SERVICE_LORAWAN != service_lora_get_nwm()) { nRet = AT_MODE_NO_SUPPORT; - break; + goto out; } if (flag & PROTO_ATCMD_FLAG_WR_OR_EXE) { @@ -1016,14 +1120,14 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (payload_len != 1) { nRet = AT_PARAM_ERROR; - break; + goto out; } adr = *arg; if (adr != 0 && adr != 1) { nRet = AT_PARAM_ERROR; - break; + goto out; } if (service_lora_set_adr((bool)adr, true) == UDRV_RETURN_OK) { @@ -1049,13 +1153,13 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (SERVICE_LORAWAN != service_lora_get_nwm()) { nRet = AT_MODE_NO_SUPPORT; - break; + goto out; } if (flag & PROTO_ATCMD_FLAG_WR_OR_EXE) { if (payload_len != 1) { nRet = AT_PARAM_ERROR; - break; + goto out; } switch (*arg) { @@ -1125,7 +1229,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (SERVICE_LORAWAN != service_lora_get_nwm()) { nRet = AT_MODE_NO_SUPPORT; - break; + goto out; } if (flag & PROTO_ATCMD_FLAG_WR_OR_EXE) { @@ -1133,14 +1237,14 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (payload_len != 1) { nRet = AT_PARAM_ERROR; - break; + goto out; } dcs = *arg; if (dcs != 0 && dcs != 1) { nRet = AT_PARAM_ERROR; - break; + goto out; } if (service_lora_set_dcs(dcs, true) == UDRV_RETURN_OK) { @@ -1166,7 +1270,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (SERVICE_LORAWAN != service_lora_get_nwm()) { nRet = AT_MODE_NO_SUPPORT; - break; + goto out; } if (flag & PROTO_ATCMD_FLAG_WR_OR_EXE) { @@ -1174,7 +1278,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (payload_len != 1) { nRet = AT_PARAM_ERROR; - break; + goto out; } dr = *arg; @@ -1202,7 +1306,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (SERVICE_LORAWAN != service_lora_get_nwm()) { nRet = AT_MODE_NO_SUPPORT; - break; + goto out; } if (flag & PROTO_ATCMD_FLAG_WR_OR_EXE) { @@ -1210,14 +1314,14 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (payload_len != 1) { nRet = AT_PARAM_ERROR; - break; + goto out; } jn1dl = (uint32_t)(*arg); if (jn1dl == 0 || jn1dl > 15) {//unit is second nRet = AT_PARAM_ERROR; - break; + goto out; } if (service_lora_set_jn1dl(jn1dl*1000, true) == UDRV_RETURN_OK) {//change unit from s to ms @@ -1243,7 +1347,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (SERVICE_LORAWAN != service_lora_get_nwm()) { nRet = AT_MODE_NO_SUPPORT; - break; + goto out; } if (flag & PROTO_ATCMD_FLAG_WR_OR_EXE) { @@ -1266,7 +1370,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (SERVICE_LORAWAN != service_lora_get_nwm()) { nRet = AT_MODE_NO_SUPPORT; - break; + goto out; } if (flag & PROTO_ATCMD_FLAG_WR_OR_EXE) { @@ -1274,14 +1378,14 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (payload_len != 1) { nRet = AT_PARAM_ERROR; - break; + goto out; } pnm = *arg; if (pnm != 0 && pnm != 1) { nRet = AT_PARAM_ERROR; - break; + goto out; } if (service_lora_set_pub_nwk_mode((bool)pnm, true) == UDRV_RETURN_OK) { @@ -1307,7 +1411,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (SERVICE_LORAWAN != service_lora_get_nwm()) { nRet = AT_MODE_NO_SUPPORT; - break; + goto out; } if (flag & PROTO_ATCMD_FLAG_WR_OR_EXE) { @@ -1315,14 +1419,14 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (payload_len != 1) { nRet = AT_PARAM_ERROR; - break; + goto out; } rx1dl = (uint32_t)*arg; if (rx1dl == 0 || rx1dl > 15) {//unit is second nRet = AT_PARAM_ERROR; - break; + goto out; } if (service_lora_set_rx1dl(rx1dl*1000, true) == UDRV_RETURN_OK) {//change unit from s to ms @@ -1348,7 +1452,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (SERVICE_LORAWAN != service_lora_get_nwm()) { nRet = AT_MODE_NO_SUPPORT; - break; + goto out; } if (flag & PROTO_ATCMD_FLAG_WR_OR_EXE) { @@ -1371,7 +1475,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (SERVICE_LORAWAN != service_lora_get_nwm()) { nRet = AT_MODE_NO_SUPPORT; - break; + goto out; } if (flag & PROTO_ATCMD_FLAG_WR_OR_EXE) { @@ -1379,7 +1483,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (payload_len != 1) { nRet = AT_PARAM_ERROR; - break; + goto out; } dr = *arg; @@ -1407,14 +1511,14 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (SERVICE_LORAWAN != service_lora_get_nwm()) { nRet = AT_MODE_NO_SUPPORT; - break; + goto out; } if (flag & PROTO_ATCMD_FLAG_WR_OR_EXE) { nRet = AT_PARAM_ERROR; } else { memset(buff, 0, 256); - *(uint32_t *)(buff+sizeof(header)) = service_lora_get_rx2freq(); + *(uint32_t *)(buff+sizeof(header)) = __builtin_bswap32(service_lora_get_rx2freq()); header.length = __builtin_bswap16(4); header.flag = PROTO_ATCMD_FLAG_RESPONSE; header.atcmd_id = atcmd_id; @@ -1430,7 +1534,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (SERVICE_LORAWAN != service_lora_get_nwm()) { nRet = AT_MODE_NO_SUPPORT; - break; + goto out; } if (flag & PROTO_ATCMD_FLAG_WR_OR_EXE) { @@ -1438,14 +1542,14 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (payload_len != 1) { nRet = AT_PARAM_ERROR; - break; + goto out; } txp = *arg; if (txp > SERVICE_LORA_TX_POWER_MAX) { nRet = AT_PARAM_ERROR; - break; + goto out; } if (service_lora_set_txpower(txp, true) == UDRV_RETURN_OK) { @@ -1471,7 +1575,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (SERVICE_LORAWAN != service_lora_get_nwm()) { nRet = AT_MODE_NO_SUPPORT; - break; + goto out; } if (flag & PROTO_ATCMD_FLAG_WR_OR_EXE) { @@ -1479,7 +1583,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (payload_len != 1) { nRet = AT_PARAM_ERROR; - break; + goto out; } linkcheck_mode = *arg; @@ -1507,7 +1611,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (SERVICE_LORAWAN != service_lora_get_nwm()) { nRet = AT_MODE_NO_SUPPORT; - break; + goto out; } if (flag & PROTO_ATCMD_FLAG_WR_OR_EXE) { @@ -1515,7 +1619,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (payload_len != 1) { nRet = AT_PARAM_ERROR; - break; + goto out; } periodicity = *arg; @@ -1523,7 +1627,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (periodicity > 7) { nRet = AT_PARAM_ERROR; - break; + goto out; } if (service_lora_set_ping_slot_periodicity(periodicity) == UDRV_RETURN_OK) { @@ -1549,14 +1653,18 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (SERVICE_LORAWAN != service_lora_get_nwm()) { nRet = AT_MODE_NO_SUPPORT; - break; + goto out; } if (flag & PROTO_ATCMD_FLAG_WR_OR_EXE) { nRet = AT_PARAM_ERROR; } else { + uint32_t freq; + + freq = service_lora_get_beacon_freq(); + memset(buff, 0, 256); - *(uint32_t *)(buff+sizeof(header)) = service_lora_get_beacon_freq(); + *(uint32_t *)(buff+sizeof(header)) = __builtin_bswap32(freq); header.length = __builtin_bswap16(4); header.flag = PROTO_ATCMD_FLAG_RESPONSE; header.atcmd_id = atcmd_id; @@ -1572,14 +1680,18 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (SERVICE_LORAWAN != service_lora_get_nwm()) { nRet = AT_MODE_NO_SUPPORT; - break; + goto out; } if (flag & PROTO_ATCMD_FLAG_WR_OR_EXE) { nRet = AT_PARAM_ERROR; } else { + uint32_t time; + + time = service_lora_get_beacon_time(); + memset(buff, 0, 256); - *(uint32_t *)(buff+sizeof(header)) = service_lora_get_beacon_time(); + *(uint32_t *)(buff+sizeof(header)) = __builtin_bswap32(time); header.length = __builtin_bswap16(4); header.flag = PROTO_ATCMD_FLAG_RESPONSE; header.atcmd_id = atcmd_id; @@ -1595,7 +1707,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (SERVICE_LORAWAN != service_lora_get_nwm()) { nRet = AT_MODE_NO_SUPPORT; - break; + goto out; } if (flag & PROTO_ATCMD_FLAG_WR_OR_EXE) { @@ -1624,7 +1736,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (SERVICE_LORAWAN != service_lora_get_nwm()) { nRet = AT_MODE_NO_SUPPORT; - break; + goto out; } if (flag & PROTO_ATCMD_FLAG_WR_OR_EXE) { @@ -1649,7 +1761,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (SERVICE_LORAWAN != service_lora_get_nwm()) { nRet = AT_MODE_NO_SUPPORT; - break; + goto out; } if (flag & PROTO_ATCMD_FLAG_WR_OR_EXE) { @@ -1677,7 +1789,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (SERVICE_LORAWAN != service_lora_get_nwm()) { nRet = AT_MODE_NO_SUPPORT; - break; + goto out; } if (flag & PROTO_ATCMD_FLAG_WR_OR_EXE) { @@ -1704,13 +1816,13 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (SERVICE_LORAWAN != service_lora_get_nwm()) { nRet = AT_MODE_NO_SUPPORT; - break; + goto out; } if (flag & PROTO_ATCMD_FLAG_WR_OR_EXE) { if (payload_len != 2) { nRet = AT_PARAM_ERROR; - break; + goto out; } ch_mask = __builtin_bswap16(*(uint16_t *)arg); @@ -1758,7 +1870,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (SERVICE_LORAWAN != service_lora_get_nwm()) { nRet = AT_MODE_NO_SUPPORT; - break; + goto out; } if (flag & PROTO_ATCMD_FLAG_WR_OR_EXE) { @@ -1766,7 +1878,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (payload_len != 4) { nRet = AT_PARAM_ERROR; - break; + goto out; } freq = __builtin_bswap32(*(uint32_t *)arg); @@ -1782,7 +1894,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if((freq = service_lora_get_chs()) < 0) { nRet = AT_ERROR; - break; + goto out; } memset(buff, 0, 256); @@ -1803,7 +1915,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (SERVICE_LORAWAN != service_lora_get_nwm()) { nRet = AT_MODE_NO_SUPPORT; - break; + goto out; } if (flag & PROTO_ATCMD_FLAG_WR_OR_EXE) { @@ -1812,7 +1924,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (payload_len != 1) { nRet = AT_PARAM_ERROR; - break; + goto out; } input = *arg; @@ -1925,14 +2037,14 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (payload_len != 1) { nRet = AT_PARAM_ERROR; - break; + goto out; } mode = *arg; if (mode != 0 && mode != 1 && mode != 2) { nRet = AT_PARAM_ERROR; - break; + goto out; } if (service_lora_set_nwm((SERVICE_LORA_WORK_MODE)mode) == UDRV_RETURN_OK) { @@ -1958,7 +2070,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (SERVICE_LORAWAN == service_lora_get_nwm()) { nRet = AT_MODE_NO_SUPPORT; - break; + goto out; } if (flag & PROTO_ATCMD_FLAG_WR_OR_EXE) { @@ -1966,14 +2078,14 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (payload_len != 4) { nRet = AT_PARAM_ERROR; - break; + goto out; } frequency = __builtin_bswap32(*(uint32_t *)arg); if ((frequency < 150e6) || (frequency > 960e6)) { nRet = AT_PARAM_ERROR; - break; + goto out; } ret = service_lora_p2p_set_freq(frequency); @@ -2000,7 +2112,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (SERVICE_LORAWAN == service_lora_get_nwm()) { nRet = AT_MODE_NO_SUPPORT; - break; + goto out; } if (flag & PROTO_ATCMD_FLAG_WR_OR_EXE) { @@ -2008,14 +2120,14 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (payload_len != 1) { nRet = AT_PARAM_ERROR; - break; + goto out; } spreading_factor = *arg; if ((spreading_factor < 6) || (spreading_factor > 12)) { nRet = AT_PARAM_ERROR; - break; + goto out; } ret = service_lora_p2p_set_sf(spreading_factor); @@ -2042,7 +2154,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (SERVICE_LORAWAN == service_lora_get_nwm()) { nRet = AT_MODE_NO_SUPPORT; - break; + goto out; } if (flag & PROTO_ATCMD_FLAG_WR_OR_EXE) { @@ -2050,7 +2162,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (payload_len != 4) { nRet = AT_PARAM_ERROR; - break; + goto out; } bandwidth = __builtin_bswap32(*(uint32_t *)arg); @@ -2079,7 +2191,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (SERVICE_LORAWAN == service_lora_get_nwm()) { nRet = AT_MODE_NO_SUPPORT; - break; + goto out; } if (flag & PROTO_ATCMD_FLAG_WR_OR_EXE) { @@ -2087,7 +2199,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (payload_len != 1) { nRet = AT_PARAM_ERROR; - break; + goto out; } coding_rate = *arg; @@ -2116,7 +2228,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (SERVICE_LORAWAN == service_lora_get_nwm()) { nRet = AT_MODE_NO_SUPPORT; - break; + goto out; } if (flag & PROTO_ATCMD_FLAG_WR_OR_EXE) { @@ -2124,7 +2236,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (payload_len != 2) { nRet = AT_PARAM_ERROR; - break; + goto out; } preamble_length = __builtin_bswap16(*(uint16_t *)arg); @@ -2153,7 +2265,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (SERVICE_LORAWAN == service_lora_get_nwm()) { nRet = AT_MODE_NO_SUPPORT; - break; + goto out; } if (flag & PROTO_ATCMD_FLAG_WR_OR_EXE) { @@ -2161,7 +2273,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (payload_len != 1) { nRet = AT_PARAM_ERROR; - break; + goto out; } txpower = *arg; @@ -2190,7 +2302,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (SERVICE_LORAWAN == service_lora_get_nwm()) { nRet = AT_MODE_NO_SUPPORT; - break; + goto out; } if (flag & PROTO_ATCMD_FLAG_WR_OR_EXE) { @@ -2199,7 +2311,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (payload_len == 0 || payload_len > 255) { nRet = AT_PARAM_ERROR; - break; + goto out; } if (service_lora_p2p_send(arg, payload_len) == UDRV_RETURN_OK) { @@ -2219,7 +2331,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (payload_len != 4) { nRet = AT_PARAM_ERROR; - break; + goto out; } timeout = __builtin_bswap32(*(uint32_t *)arg); @@ -2240,7 +2352,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (SERVICE_LORAWAN == service_lora_get_nwm()) { nRet = AT_MODE_NO_SUPPORT; - break; + goto out; } if (flag & PROTO_ATCMD_FLAG_WR_OR_EXE) { @@ -2248,7 +2360,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (payload_len != 1) { nRet = AT_PARAM_ERROR; - break; + goto out; } crypto_enable = *arg; @@ -2277,13 +2389,13 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (SERVICE_LORAWAN == service_lora_get_nwm()) { nRet = AT_MODE_NO_SUPPORT; - break; + goto out; } if (flag & PROTO_ATCMD_FLAG_WR_OR_EXE) { if (payload_len != 8) { nRet = AT_PARAM_ERROR; - break; + goto out; } if (service_lora_p2p_set_crypto_key(arg, 8) == UDRV_RETURN_OK) { nRet = AT_OK; @@ -2294,7 +2406,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa uint8_t rbuff[8]; if (service_lora_p2p_get_crypto_key(rbuff, 8) != UDRV_RETURN_OK) { nRet = AT_ERROR; - break; + goto out; } memset(buff, 0, 256); reply_len = 8; @@ -2311,10 +2423,10 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa } case SERVICE_MODE_PROTO_ATCMD_PBR: { - if (SERVICE_LORAWAN == service_lora_get_nwm()) + if (SERVICE_LORA_FSK != service_lora_get_nwm()) { nRet = AT_MODE_NO_SUPPORT; - break; + goto out; } if (flag & PROTO_ATCMD_FLAG_WR_OR_EXE) { @@ -2322,7 +2434,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (payload_len != 4) { nRet = AT_PARAM_ERROR; - break; + goto out; } bitrate = __builtin_bswap32(*(uint32_t *)arg); @@ -2348,10 +2460,10 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa } case SERVICE_MODE_PROTO_ATCMD_PFDEV: { - if (SERVICE_LORAWAN == service_lora_get_nwm()) + if (SERVICE_LORA_FSK != service_lora_get_nwm()) { nRet = AT_MODE_NO_SUPPORT; - break; + goto out; } if (flag & PROTO_ATCMD_FLAG_WR_OR_EXE) { @@ -2359,7 +2471,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa if (payload_len != 4) { nRet = AT_PARAM_ERROR; - break; + goto out; } fdev = __builtin_bswap32(*(uint32_t *)arg); @@ -2398,10 +2510,86 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa //TODO break; } + case SERVICE_MODE_PROTO_ATCMD_SN: + { + uint8_t rbuff[18]; + + if (flag & PROTO_ATCMD_FLAG_WR_OR_EXE) { + if (payload_len < 1 || payload_len > 18) { + nRet = AT_PARAM_ERROR; + goto out; + } + + if (service_nvm_get_sn_from_nvm(rbuff, 18) != UDRV_RETURN_OK) { + nRet = AT_ERROR; + goto out; + } else { + for (int i = 0 ; i < 18 ; i++) { + if (rbuff[i] != 0) { + nRet = AT_ERROR; + goto out; + } + } + } + + for (int i = 0 ; i < payload_len ; i++) { + if (!(arg[i] >= 0x30 && arg[i] <= 0x39) && + !(arg[i] >= 0x41 && arg[i] <= 0x5A) && + !(arg[i] >= 0x61 && arg[i] <= 0x7A)) { + nRet = AT_PARAM_ERROR; + goto out; + } + } + + if (service_nvm_set_sn_to_nvm(arg, payload_len) == UDRV_RETURN_OK) { + nRet = AT_OK; + } else { + nRet = AT_ERROR; + } + } else { + if (service_nvm_get_sn_from_nvm(rbuff, 18) != UDRV_RETURN_OK) { + nRet = AT_ERROR; + goto out; + } + memset(buff, 0, 256); + reply_len = 18; + memcpy(buff+sizeof(header), rbuff, 18); + header.length = __builtin_bswap16(reply_len); + header.flag = PROTO_ATCMD_FLAG_RESPONSE; + header.atcmd_id = atcmd_id; + memcpy(buff, &header, sizeof(header)); + + service_mode_proto_send(port, PROTO_FLAG_RESPONSE, 0x01, buff, sizeof(header)+reply_len, NULL); + nRet = AT_OK; + } + break; + } + case SERVICE_MODE_PROTO_ATCMD_SLEEP: + { + if (flag & PROTO_ATCMD_FLAG_WR_OR_EXE) { + uint32_t input; + + if (payload_len != 4) { + nRet = AT_PARAM_ERROR; + goto out; + } + + input = __builtin_bswap32(*(uint32_t *)arg); + + udrv_sleep_ms(input); + nRet = AT_OK; + } else { + nRet = AT_PARAM_ERROR; + } + break; + } case SERVICE_MODE_PROTO_ATCMD_P2P: + { + nRet = AT_MODE_NO_SUPPORT; + break; + } //case SERVICE_MODE_PROTO_ATCMD_DELBONDS: - case SERVICE_MODE_PROTO_ATCMD_SLEEP: - case SERVICE_MODE_PROTO_ATCMD_AUTOSLEEP: + //case SERVICE_MODE_PROTO_ATCMD_AUTOSLEEP: default: { /* do nothing */ @@ -2409,6 +2597,7 @@ void service_mode_proto_atcmd_request_handler (SERIAL_PORT port, uint8_t *payloa } } +out: //if (nRet != AT_OK) { service_mode_proto_atcmd_report_error(port, atcmd_id, nRet); //} diff --git a/cores/nRF5/component/service/mode/protocol/service_mode_proto_builtin_handler.h b/cores/nRF5/component/service/mode/protocol/service_mode_proto_builtin_handler.h index 9b7169cb..da21d920 100644 --- a/cores/nRF5/component/service/mode/protocol/service_mode_proto_builtin_handler.h +++ b/cores/nRF5/component/service/mode/protocol/service_mode_proto_builtin_handler.h @@ -12,11 +12,12 @@ extern "C" { #include typedef enum SERVICE_MODE_PROTO_ATCMD_ID_ { -/* General Commands */ +/* General Command */ SERVICE_MODE_PROTO_ATCMD_ATTENTION = 0, /*0*/ SERVICE_MODE_PROTO_ATCMD_REBOOT = 1, /*1*/ SERVICE_MODE_PROTO_ATCMD_ATR = 3, /*3*/ SERVICE_MODE_PROTO_ATCMD_BOOT = 4, /*4*/ + SERVICE_MODE_PROTO_ATCMD_SN = 87, /*87*/ SERVICE_MODE_PROTO_ATCMD_BAT = 15, /*15*/ SERVICE_MODE_PROTO_ATCMD_BUILDTIME = 5, /*5*/ SERVICE_MODE_PROTO_ATCMD_REPOINFO = 6, /*6*/ @@ -25,17 +26,17 @@ typedef enum SERVICE_MODE_PROTO_ATCMD_ID_ { SERVICE_MODE_PROTO_ATCMD_APIVER = 9, /*9*/ SERVICE_MODE_PROTO_ATCMD_HWMODEL = 13, /*13*/ SERVICE_MODE_PROTO_ATCMD_HWID = 14, /*14*/ -/* Sleep */ +/* Sleep Command */ SERVICE_MODE_PROTO_ATCMD_SLEEP = 85, /*85*/ - SERVICE_MODE_PROTO_ATCMD_AUTOSLEEP = 86, /*86*/ -/* Serial */ + //SERVICE_MODE_PROTO_ATCMD_AUTOSLEEP = 86, /*86*/ +/* Serial Port Command */ SERVICE_MODE_PROTO_ATCMD_LOCK = 10, /*10*/ SERVICE_MODE_PROTO_ATCMD_PWORD = 11, /*11*/ SERVICE_MODE_PROTO_ATCMD_BAUD = 12, /*12*/ SERVICE_MODE_PROTO_ATCMD_ATM = 72, /*72*/ SERVICE_MODE_PROTO_ATCMD_APM = 73, /*73*/ SERVICE_MODE_PROTO_ATCMD_PAM = 74, /*74*/ -/* Keys, IDs and EUIs Management */ +/* LoRaWAN Keys and IDs */ SERVICE_MODE_PROTO_ATCMD_APPEUI = 16, /*16*/ SERVICE_MODE_PROTO_ATCMD_APPKEY = 17, /*17*/ SERVICE_MODE_PROTO_ATCMD_APPSKEY = 18, /*18*/ @@ -43,7 +44,7 @@ typedef enum SERVICE_MODE_PROTO_ATCMD_ID_ { SERVICE_MODE_PROTO_ATCMD_DEUI = 20, /*20*/ SERVICE_MODE_PROTO_ATCMD_NETID = 21, /*21*/ SERVICE_MODE_PROTO_ATCMD_NWKSKEY = 22, /*22*/ -/* Joining and Sending Data on LoRaWAN Network */ +/* LoRaWAN Joining and Sending */ SERVICE_MODE_PROTO_ATCMD_CFM = 23, /*23*/ SERVICE_MODE_PROTO_ATCMD_CFS = 24, /*24*/ SERVICE_MODE_PROTO_ATCMD_JOIN = 25, /*25*/ @@ -68,22 +69,22 @@ typedef enum SERVICE_MODE_PROTO_ATCMD_ID_ { SERVICE_MODE_PROTO_ATCMD_RX2FQ = 41, /*41*/ SERVICE_MODE_PROTO_ATCMD_TXP = 42, /*42*/ SERVICE_MODE_PROTO_ATCMD_LINKCHECK = 43, /*43*/ -/* Class B Mode */ +/* LoRaWAN Class B */ SERVICE_MODE_PROTO_ATCMD_PGSLOT = 44, /*44*/ SERVICE_MODE_PROTO_ATCMD_BFREQ = 45, /*45*/ SERVICE_MODE_PROTO_ATCMD_BTIME = 46, /*46*/ SERVICE_MODE_PROTO_ATCMD_BGW = 47, /*47*/ SERVICE_MODE_PROTO_ATCMD_LTIME = 48, /*48*/ -/* Information */ +/* LoRaWAN Information */ SERVICE_MODE_PROTO_ATCMD_RSSI = 49, /*49*/ SERVICE_MODE_PROTO_ATCMD_ARSSI = 75, /*75*/ SERVICE_MODE_PROTO_ATCMD_SNR = 50, /*50*/ -/* Supplement */ +/* Supplementary Command */ SERVICE_MODE_PROTO_ATCMD_MASK = 51, /*51*/ SERVICE_MODE_PROTO_ATCMD_CHE = 52, /*52*/ SERVICE_MODE_PROTO_ATCMD_CHS = 53, /*53*/ SERVICE_MODE_PROTO_ATCMD_BAND = 54, /*54*/ -/* P2P */ +/* LoRaWAN P2P */ SERVICE_MODE_PROTO_ATCMD_NWM = 55, /*55*/ SERVICE_MODE_PROTO_ATCMD_PFREQ = 56, /*56*/ SERVICE_MODE_PROTO_ATCMD_PSF = 57, /*57*/ @@ -98,11 +99,11 @@ typedef enum SERVICE_MODE_PROTO_ATCMD_ID_ { SERVICE_MODE_PROTO_ATCMD_P2P = 66, /*66*/ SERVICE_MODE_PROTO_ATCMD_PBR = 67, /*67*/ SERVICE_MODE_PROTO_ATCMD_PFDEV = 68, /*68*/ -/* Multicast Group */ +/* LoRaWAN Multicast Group */ SERVICE_MODE_PROTO_ATCMD_ADDMULC = 69, /*69*/ SERVICE_MODE_PROTO_ATCMD_RMVMULC = 70, /*70*/ SERVICE_MODE_PROTO_ATCMD_LSTMULC = 71, /*71*/ -/* RF Test */ +/* LoRaWAN RF Test */ //SERVICE_MODE_PROTO_ATCMD_TRSSI = 77, /*77*/ //SERVICE_MODE_PROTO_ATCMD_TTONE = 78, /*78*/ //SERVICE_MODE_PROTO_ATCMD_TTX = 79, /*79*/ @@ -111,7 +112,7 @@ typedef enum SERVICE_MODE_PROTO_ATCMD_ID_ { //SERVICE_MODE_PROTO_ATCMD_TTH = 82, /*82*/ //SERVICE_MODE_PROTO_ATCMD_TOFF = 83, /*83*/ //SERVICE_MODE_PROTO_ATCMD_CERTIF = ??, /*??*/ -/* Misc */ +/* Miscellaneous Command */ //SERVICE_MODE_PROTO_ATCMD_DELBONDS = 76, /*76*/ } SERVICE_MODE_PROTO_ATCMD_ID; diff --git a/cores/nRF5/component/udrv/adc/libudrv_adc.a b/cores/nRF5/component/udrv/adc/libudrv_adc.a index 6c1b8b11..a8823d07 100644 Binary files a/cores/nRF5/component/udrv/adc/libudrv_adc.a and b/cores/nRF5/component/udrv/adc/libudrv_adc.a differ diff --git a/cores/nRF5/component/udrv/ble/libudrv_ble.a b/cores/nRF5/component/udrv/ble/libudrv_ble.a index 654a6a86..1dff959f 100644 Binary files a/cores/nRF5/component/udrv/ble/libudrv_ble.a and b/cores/nRF5/component/udrv/ble/libudrv_ble.a differ diff --git a/cores/nRF5/component/udrv/delay/libudrv_delay.a b/cores/nRF5/component/udrv/delay/libudrv_delay.a index 927db882..c4993ef2 100644 Binary files a/cores/nRF5/component/udrv/delay/libudrv_delay.a and b/cores/nRF5/component/udrv/delay/libudrv_delay.a differ diff --git a/cores/nRF5/component/udrv/dfu/libudrv_dfu.a b/cores/nRF5/component/udrv/dfu/libudrv_dfu.a index 8165d454..24c609de 100644 Binary files a/cores/nRF5/component/udrv/dfu/libudrv_dfu.a and b/cores/nRF5/component/udrv/dfu/libudrv_dfu.a differ diff --git a/cores/nRF5/component/udrv/flash/libudrv_flash.a b/cores/nRF5/component/udrv/flash/libudrv_flash.a index 720f7ffc..eba1d31e 100644 Binary files a/cores/nRF5/component/udrv/flash/libudrv_flash.a and b/cores/nRF5/component/udrv/flash/libudrv_flash.a differ diff --git a/cores/nRF5/component/udrv/gpio/libudrv_gpio.a b/cores/nRF5/component/udrv/gpio/libudrv_gpio.a index fd40e58c..81936400 100644 Binary files a/cores/nRF5/component/udrv/gpio/libudrv_gpio.a and b/cores/nRF5/component/udrv/gpio/libudrv_gpio.a differ diff --git a/cores/nRF5/component/udrv/nfc/libudrv_raknfc.a b/cores/nRF5/component/udrv/nfc/libudrv_raknfc.a index 7537855c..94c3172d 100644 Binary files a/cores/nRF5/component/udrv/nfc/libudrv_raknfc.a and b/cores/nRF5/component/udrv/nfc/libudrv_raknfc.a differ diff --git a/cores/nRF5/component/udrv/powersave/libudrv_powersave.a b/cores/nRF5/component/udrv/powersave/libudrv_powersave.a index 2dfee083..8bd42938 100644 Binary files a/cores/nRF5/component/udrv/powersave/libudrv_powersave.a and b/cores/nRF5/component/udrv/powersave/libudrv_powersave.a differ diff --git a/cores/nRF5/component/udrv/pwm/libudrv_pwm.a b/cores/nRF5/component/udrv/pwm/libudrv_pwm.a index 7e245173..c74a8cdc 100644 Binary files a/cores/nRF5/component/udrv/pwm/libudrv_pwm.a and b/cores/nRF5/component/udrv/pwm/libudrv_pwm.a differ diff --git a/cores/nRF5/component/udrv/rtc/libudrv_rtc.a b/cores/nRF5/component/udrv/rtc/libudrv_rtc.a index ce78d7aa..fb5bd656 100644 Binary files a/cores/nRF5/component/udrv/rtc/libudrv_rtc.a and b/cores/nRF5/component/udrv/rtc/libudrv_rtc.a differ diff --git a/cores/nRF5/component/udrv/serial/libudrv_serial.a b/cores/nRF5/component/udrv/serial/libudrv_serial.a index 080aff3f..f9eee16c 100644 Binary files a/cores/nRF5/component/udrv/serial/libudrv_serial.a and b/cores/nRF5/component/udrv/serial/libudrv_serial.a differ diff --git a/cores/nRF5/component/udrv/spimst/libudrv_spimst.a b/cores/nRF5/component/udrv/spimst/libudrv_spimst.a index f89ce716..fd16e8ff 100644 Binary files a/cores/nRF5/component/udrv/spimst/libudrv_spimst.a and b/cores/nRF5/component/udrv/spimst/libudrv_spimst.a differ diff --git a/cores/nRF5/component/udrv/system/libudrv_system.a b/cores/nRF5/component/udrv/system/libudrv_system.a index 1f19e22e..3e8c00cb 100644 Binary files a/cores/nRF5/component/udrv/system/libudrv_system.a and b/cores/nRF5/component/udrv/system/libudrv_system.a differ diff --git a/cores/nRF5/component/udrv/timer/libudrv_timer.a b/cores/nRF5/component/udrv/timer/libudrv_timer.a index 8d7ea4a7..fa0d3264 100644 Binary files a/cores/nRF5/component/udrv/timer/libudrv_timer.a and b/cores/nRF5/component/udrv/timer/libudrv_timer.a differ diff --git a/cores/nRF5/component/udrv/twimst/libudrv_twimst.a b/cores/nRF5/component/udrv/twimst/libudrv_twimst.a index 6929777c..9c79b506 100644 Binary files a/cores/nRF5/component/udrv/twimst/libudrv_twimst.a and b/cores/nRF5/component/udrv/twimst/libudrv_twimst.a differ diff --git a/cores/nRF5/component/udrv/wdt/libudrv_wdt.a b/cores/nRF5/component/udrv/wdt/libudrv_wdt.a index 1fd5eabc..ec932873 100644 Binary files a/cores/nRF5/component/udrv/wdt/libudrv_wdt.a and b/cores/nRF5/component/udrv/wdt/libudrv_wdt.a differ diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/ble_advertising/ble_advertising.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/ble_advertising/ble_advertising.c index bcba5e76..c4910867 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/ble_advertising/ble_advertising.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/ble_advertising/ble_advertising.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/ble_db_discovery/ble_db_discovery.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/ble_db_discovery/ble_db_discovery.c index d2677bed..7b31e0de 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/ble_db_discovery/ble_db_discovery.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/ble_db_discovery/ble_db_discovery.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/ble_link_ctx_manager/ble_link_ctx_manager.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/ble_link_ctx_manager/ble_link_ctx_manager.c index 7f8c0d86..02a6303f 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/ble_link_ctx_manager/ble_link_ctx_manager.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/ble_link_ctx_manager/ble_link_ctx_manager.c @@ -34745,7 +34745,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/ble_services/ble_bas/ble_bas.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/ble_services/ble_bas/ble_bas.c index 6e7b6020..44cd023f 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/ble_services/ble_bas/ble_bas.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/ble_services/ble_bas/ble_bas.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/ble_services/ble_dfu/ble_dfu.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/ble_services/ble_dfu/ble_dfu.c index 350343cf..b9d3c49d 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/ble_services/ble_dfu/ble_dfu.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/ble_services/ble_dfu/ble_dfu.c @@ -34911,7 +34911,7 @@ static inline void * nrf_section_iter_get(nrf_section_iter_t const * p_iter) -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/ble_services/ble_dfu/ble_dfu_bonded.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/ble_services/ble_dfu/ble_dfu_bonded.c index 3910ee75..62fedad8 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/ble_services/ble_dfu/ble_dfu_bonded.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/ble_services/ble_dfu/ble_dfu_bonded.c @@ -30496,7 +30496,7 @@ _Static_assert(sizeof(nrf_svc_func_reg_t) % 4 == 0, "unspecified message"); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/ble_services/ble_dfu/ble_dfu_unbonded.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/ble_services/ble_dfu/ble_dfu_unbonded.c index 93544947..0dc4fea6 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/ble_services/ble_dfu/ble_dfu_unbonded.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/ble_services/ble_dfu/ble_dfu_unbonded.c @@ -30496,7 +30496,7 @@ _Static_assert(sizeof(nrf_svc_func_reg_t) % 4 == 0, "unspecified message"); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/ble_services/ble_dis/ble_dis.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/ble_services/ble_dis/ble_dis.c index ff4ad7ba..730ffa9e 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/ble_services/ble_dis/ble_dis.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/ble_services/ble_dis/ble_dis.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/ble_services/ble_hids/ble_hids.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/ble_services/ble_hids/ble_hids.c index b02c8e12..1445fa80 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/ble_services/ble_hids/ble_hids.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/ble_services/ble_hids/ble_hids.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/ble_services/ble_nus/ble_nus.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/ble_services/ble_nus/ble_nus.c index a39f38d1..02bbd12b 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/ble_services/ble_nus/ble_nus.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/ble_services/ble_nus/ble_nus.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 @@ -37675,7 +37675,7 @@ uint32_t ble_nus_init(ble_nus_t * p_nus, ble_nus_init_t const * p_nus_init) memset(&add_char_params, 0, sizeof(add_char_params)); add_char_params.uuid = 0x0002; add_char_params.uuid_type = p_nus->uuid_type; - add_char_params.max_len = (67 - 1 - 2); + add_char_params.max_len = (247 - 1 - 2); add_char_params.init_len = sizeof(uint8_t); add_char_params.is_var_len = # 282 "/home/jenkins/workspace/RAK4631/rui-v3/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/ble_services/ble_nus/ble_nus.c" 3 4 @@ -37699,7 +37699,7 @@ uint32_t ble_nus_init(ble_nus_t * p_nus, ble_nus_init_t const * p_nus_init) memset(&add_char_params, 0, sizeof(add_char_params)); add_char_params.uuid = 0x0003; add_char_params.uuid_type = p_nus->uuid_type; - add_char_params.max_len = (67 - 1 - 2); + add_char_params.max_len = (247 - 1 - 2); add_char_params.init_len = sizeof(uint8_t); add_char_params.is_var_len = # 302 "/home/jenkins/workspace/RAK4631/rui-v3/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/ble_services/ble_nus/ble_nus.c" 3 4 @@ -37749,7 +37749,7 @@ uint32_t ble_nus_data_send(ble_nus_t * p_nus, return ((0x0) + 8); } - if (*p_length > (67 - 1 - 2)) + if (*p_length > (247 - 1 - 2)) { return ((0x0) + 7); } diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/ble_services/ble_nus_c/ble_nus_c.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/ble_services/ble_nus_c/ble_nus_c.c index fb629421..eaf3476c 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/ble_services/ble_nus_c/ble_nus_c.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/ble_services/ble_nus_c/ble_nus_c.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 @@ -40321,7 +40321,7 @@ uint32_t ble_nus_c_string_send(ble_nus_c_t * p_ble_nus_c, uint8_t * p_string, ui memset(&write_req, 0, sizeof(nrf_ble_gq_req_t)); - if (length > (67 - 1 - 2)) + if (length > (247 - 1 - 2)) { if (1 && (4 >= NRF_LOG_SEVERITY_WARNING) && (NRF_LOG_SEVERITY_WARNING <= 4)) { if (NRF_LOG_SEVERITY_DEBUG >= NRF_LOG_SEVERITY_WARNING) { nrf_log_frontend_std_0(((NRF_LOG_SEVERITY_WARNING) | (((uint32_t)(&m_nrf_log_ble_nus_c_logs_data_const) - (uint32_t)&__start_log_const_data) / sizeof(nrf_log_module_const_data_t)) << 16), "Content too long."); } }; return ((0x0) + 7); diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/common/ble_advdata.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/common/ble_advdata.c index dee6090d..f055ac81 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/common/ble_advdata.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/common/ble_advdata.c @@ -34737,7 +34737,7 @@ typedef union -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/common/ble_conn_params.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/common/ble_conn_params.c index e42cd4dd..a4c739b3 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/common/ble_conn_params.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/common/ble_conn_params.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/common/ble_conn_state.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/common/ble_conn_state.c index 35e0fe2a..bc146314 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/common/ble_conn_state.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/common/ble_conn_state.c @@ -34736,7 +34736,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/nrf_ble_gatt/nrf_ble_gatt.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/nrf_ble_gatt/nrf_ble_gatt.c index d3ae327e..0b07c6b6 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/nrf_ble_gatt/nrf_ble_gatt.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/nrf_ble_gatt/nrf_ble_gatt.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 @@ -36723,7 +36723,7 @@ _Static_assert(27 < 252, "unspecified message"); static void link_init(nrf_ble_gatt_link_t * p_link) { - p_link->att_mtu_desired = 67; + p_link->att_mtu_desired = 247; p_link->att_mtu_effective = 23; p_link->att_mtu_exchange_pending = # 64 "/home/jenkins/workspace/RAK4631/rui-v3/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/nrf_ble_gatt/nrf_ble_gatt.c" 3 4 @@ -37035,8 +37035,8 @@ ret_code_t nrf_ble_gatt_init(nrf_ble_gatt_t * p_gatt, nrf_ble_gatt_evt_handler_t ))) { return ((0x0) + 14); } } while (0); p_gatt->evt_handler = evt_handler; - p_gatt->att_mtu_desired_periph = 67; - p_gatt->att_mtu_desired_central = 67; + p_gatt->att_mtu_desired_periph = 247; + p_gatt->att_mtu_desired_central = 247; p_gatt->data_length = 27; for (uint32_t i = 0; i < (1 + 5); i++) @@ -37056,7 +37056,7 @@ ret_code_t nrf_ble_gatt_att_mtu_periph_set(nrf_ble_gatt_t * p_gatt, uint16_t des # 389 "/home/jenkins/workspace/RAK4631/rui-v3/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/nrf_ble_gatt/nrf_ble_gatt.c" ))) { return ((0x0) + 14); } } while (0); - if ((desired_mtu < 23) || (desired_mtu > 67)) + if ((desired_mtu < 23) || (desired_mtu > 247)) { return ((0x0) + 7); } @@ -37074,7 +37074,7 @@ ret_code_t nrf_ble_gatt_att_mtu_central_set(nrf_ble_gatt_t * p_gatt, uint16_t de # 403 "/home/jenkins/workspace/RAK4631/rui-v3/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/nrf_ble_gatt/nrf_ble_gatt.c" ))) { return ((0x0) + 14); } } while (0); - if ((desired_mtu < 23) || (desired_mtu > 67)) + if ((desired_mtu < 23) || (desired_mtu > 247)) { return ((0x0) + 7); } diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/nrf_ble_gq/nrf_ble_gq.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/nrf_ble_gq/nrf_ble_gq.c index 416fdf32..6fad2388 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/nrf_ble_gq/nrf_ble_gq.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/nrf_ble_gq/nrf_ble_gq.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/nrf_ble_qwr/nrf_ble_qwr.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/nrf_ble_qwr/nrf_ble_qwr.c index 10299b1e..78f1ebb8 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/nrf_ble_qwr/nrf_ble_qwr.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/nrf_ble_qwr/nrf_ble_qwr.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/nrf_ble_scan/nrf_ble_scan.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/nrf_ble_scan/nrf_ble_scan.c index 7ce81248..7410d00e 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/nrf_ble_scan/nrf_ble_scan.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/nrf_ble_scan/nrf_ble_scan.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/peer_manager/auth_status_tracker.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/peer_manager/auth_status_tracker.c index 9a677436..821e00f4 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/peer_manager/auth_status_tracker.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/peer_manager/auth_status_tracker.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/peer_manager/gatt_cache_manager.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/peer_manager/gatt_cache_manager.c index 15f21c86..aeb89b05 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/peer_manager/gatt_cache_manager.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/peer_manager/gatt_cache_manager.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/peer_manager/gatts_cache_manager.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/peer_manager/gatts_cache_manager.c index f8ee9a25..0c389f7f 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/peer_manager/gatts_cache_manager.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/peer_manager/gatts_cache_manager.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/peer_manager/id_manager.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/peer_manager/id_manager.c index 510fb23e..2f5d6c59 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/peer_manager/id_manager.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/peer_manager/id_manager.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/peer_manager/nrf_ble_lesc.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/peer_manager/nrf_ble_lesc.c index cefbe627..12422d14 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/peer_manager/nrf_ble_lesc.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/peer_manager/nrf_ble_lesc.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/peer_manager/peer_data_storage.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/peer_manager/peer_data_storage.c index 31a1e61a..2c74a473 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/peer_manager/peer_data_storage.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/peer_manager/peer_data_storage.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/peer_manager/peer_database.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/peer_manager/peer_database.c index 96d636d1..3f8bc05f 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/peer_manager/peer_database.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/peer_manager/peer_database.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/peer_manager/peer_id.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/peer_manager/peer_id.c index 9b6e422d..e8f69571 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/peer_manager/peer_id.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/peer_manager/peer_id.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/peer_manager/peer_manager.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/peer_manager/peer_manager.c index 18b24324..f422676c 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/peer_manager/peer_manager.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/peer_manager/peer_manager.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/peer_manager/peer_manager_handler.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/peer_manager/peer_manager_handler.c index 52951266..54cc6b62 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/peer_manager/peer_manager_handler.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/peer_manager/peer_manager_handler.c @@ -34734,7 +34734,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/peer_manager/pm_buffer.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/peer_manager/pm_buffer.c index ad1134e6..67acc033 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/peer_manager/pm_buffer.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/peer_manager/pm_buffer.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/peer_manager/security_dispatcher.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/peer_manager/security_dispatcher.c index f9e2b3bf..da0316b6 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/peer_manager/security_dispatcher.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/peer_manager/security_dispatcher.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/peer_manager/security_manager.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/peer_manager/security_manager.c index 98c452f9..a010b419 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/peer_manager/security_manager.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/peer_manager/security_manager.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/boards/boards.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/boards/boards.c index f0bd423d..be867d3d 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/boards/boards.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/boards/boards.c @@ -5243,7 +5243,7 @@ -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/atomic/nrf_atomic.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/atomic/nrf_atomic.c index 5713aa8b..61d6f530 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/atomic/nrf_atomic.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/atomic/nrf_atomic.c @@ -7067,7 +7067,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/atomic_fifo/nrf_atfifo.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/atomic_fifo/nrf_atfifo.c index e602131d..2e281003 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/atomic_fifo/nrf_atfifo.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/atomic_fifo/nrf_atfifo.c @@ -31496,7 +31496,7 @@ static inline -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/atomic_flags/nrf_atflags.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/atomic_flags/nrf_atflags.c index 331d1838..73b3010d 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/atomic_flags/nrf_atflags.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/atomic_flags/nrf_atflags.c @@ -30619,7 +30619,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/balloc/nrf_balloc.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/balloc/nrf_balloc.c index 0f78211f..ac4ba249 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/balloc/nrf_balloc.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/balloc/nrf_balloc.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/bootloader/dfu/nrf_dfu_svci.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/bootloader/dfu/nrf_dfu_svci.c index be797105..df3548b9 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/bootloader/dfu/nrf_dfu_svci.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/bootloader/dfu/nrf_dfu_svci.c @@ -7069,7 +7069,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/bsp/bsp.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/bsp/bsp.c index b28a2194..9bbac100 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/bsp/bsp.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/bsp/bsp.c @@ -5849,7 +5849,7 @@ typedef __uint_least64_t uint_least64_t; -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/bsp/bsp_btn_ble.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/bsp/bsp_btn_ble.c index 9230cc48..9188cdc3 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/bsp/bsp_btn_ble.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/bsp/bsp_btn_ble.c @@ -33524,7 +33524,7 @@ typedef union -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/button/app_button.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/button/app_button.c index baee89c2..6ad2752f 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/button/app_button.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/button/app_button.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/cc310/cc310_backend_aes.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/cc310/cc310_backend_aes.c index 4e5dbba8..d9db43ae 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/cc310/cc310_backend_aes.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/cc310/cc310_backend_aes.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/cc310/cc310_backend_aes_aead.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/cc310/cc310_backend_aes_aead.c index 0fec2e25..4960305f 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/cc310/cc310_backend_aes_aead.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/cc310/cc310_backend_aes_aead.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/cc310/cc310_backend_chacha_poly_aead.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/cc310/cc310_backend_chacha_poly_aead.c index c3c733bc..894c49f7 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/cc310/cc310_backend_chacha_poly_aead.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/cc310/cc310_backend_chacha_poly_aead.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/cc310/cc310_backend_ecc.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/cc310/cc310_backend_ecc.c index d9df4599..afba6dbb 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/cc310/cc310_backend_ecc.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/cc310/cc310_backend_ecc.c @@ -5226,7 +5226,7 @@ -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/cc310/cc310_backend_ecdh.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/cc310/cc310_backend_ecdh.c index ba550541..541ae674 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/cc310/cc310_backend_ecdh.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/cc310/cc310_backend_ecdh.c @@ -5226,7 +5226,7 @@ -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/cc310/cc310_backend_ecdsa.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/cc310/cc310_backend_ecdsa.c index 3591d30d..bbb64e75 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/cc310/cc310_backend_ecdsa.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/cc310/cc310_backend_ecdsa.c @@ -5226,7 +5226,7 @@ -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/cc310/cc310_backend_eddsa.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/cc310/cc310_backend_eddsa.c index 13bf2541..e1e5f812 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/cc310/cc310_backend_eddsa.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/cc310/cc310_backend_eddsa.c @@ -5226,7 +5226,7 @@ -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/cc310/cc310_backend_hash.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/cc310/cc310_backend_hash.c index 8068f4c5..d3d29aa8 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/cc310/cc310_backend_hash.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/cc310/cc310_backend_hash.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/cc310/cc310_backend_hmac.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/cc310/cc310_backend_hmac.c index 8bd0c0ef..ed22c25f 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/cc310/cc310_backend_hmac.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/cc310/cc310_backend_hmac.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/cc310/cc310_backend_init.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/cc310/cc310_backend_init.c index f18017b0..ec86cf87 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/cc310/cc310_backend_init.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/cc310/cc310_backend_init.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/cc310/cc310_backend_mutex.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/cc310/cc310_backend_mutex.c index 30a6bb8e..f8e00e99 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/cc310/cc310_backend_mutex.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/cc310/cc310_backend_mutex.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/cc310/cc310_backend_rng.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/cc310/cc310_backend_rng.c index 9b87cbb7..217e8f68 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/cc310/cc310_backend_rng.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/cc310/cc310_backend_rng.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/cc310/cc310_backend_shared.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/cc310/cc310_backend_shared.c index ec604a49..f4713550 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/cc310/cc310_backend_shared.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/cc310/cc310_backend_shared.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/nrf_hw/nrf_hw_backend_init.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/nrf_hw/nrf_hw_backend_init.c index 0718ac9e..e7b0b49b 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/nrf_hw/nrf_hw_backend_init.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/nrf_hw/nrf_hw_backend_init.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/nrf_hw/nrf_hw_backend_rng.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/nrf_hw/nrf_hw_backend_rng.c index d3dbe664..3250adc6 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/nrf_hw/nrf_hw_backend_rng.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/nrf_hw/nrf_hw_backend_rng.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/nrf_hw/nrf_hw_backend_rng_mbedtls.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/nrf_hw/nrf_hw_backend_rng_mbedtls.c index 356f07a2..f5ae1dd1 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/nrf_hw/nrf_hw_backend_rng_mbedtls.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/nrf_hw/nrf_hw_backend_rng_mbedtls.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/oberon/oberon_backend_chacha_poly_aead.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/oberon/oberon_backend_chacha_poly_aead.c index 5249fc2f..d94bfd94 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/oberon/oberon_backend_chacha_poly_aead.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/oberon/oberon_backend_chacha_poly_aead.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/oberon/oberon_backend_ecc.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/oberon/oberon_backend_ecc.c index 042a7983..a92b745c 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/oberon/oberon_backend_ecc.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/oberon/oberon_backend_ecc.c @@ -5226,7 +5226,7 @@ -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/oberon/oberon_backend_ecdh.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/oberon/oberon_backend_ecdh.c index 0dd11881..39efefaa 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/oberon/oberon_backend_ecdh.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/oberon/oberon_backend_ecdh.c @@ -5226,7 +5226,7 @@ -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/oberon/oberon_backend_ecdsa.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/oberon/oberon_backend_ecdsa.c index cae00d1c..79aa3a94 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/oberon/oberon_backend_ecdsa.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/oberon/oberon_backend_ecdsa.c @@ -5226,7 +5226,7 @@ -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/oberon/oberon_backend_eddsa.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/oberon/oberon_backend_eddsa.c index 180e9efa..10590a6b 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/oberon/oberon_backend_eddsa.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/oberon/oberon_backend_eddsa.c @@ -5226,7 +5226,7 @@ -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/oberon/oberon_backend_hash.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/oberon/oberon_backend_hash.c index 04944723..0600364b 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/oberon/oberon_backend_hash.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/oberon/oberon_backend_hash.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/oberon/oberon_backend_hmac.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/oberon/oberon_backend_hmac.c index 65fcd34c..857c43e8 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/oberon/oberon_backend_hmac.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/oberon/oberon_backend_hmac.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/nrf_crypto_aead.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/nrf_crypto_aead.c index c5911f66..abf49d98 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/nrf_crypto_aead.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/nrf_crypto_aead.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/nrf_crypto_aes.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/nrf_crypto_aes.c index 564b26aa..b66ea44c 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/nrf_crypto_aes.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/nrf_crypto_aes.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/nrf_crypto_aes_shared.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/nrf_crypto_aes_shared.c index b2aa3e4b..51e84f8c 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/nrf_crypto_aes_shared.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/nrf_crypto_aes_shared.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/nrf_crypto_ecc.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/nrf_crypto_ecc.c index 4f7e2ed5..d84e5587 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/nrf_crypto_ecc.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/nrf_crypto_ecc.c @@ -7318,7 +7318,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/nrf_crypto_ecdh.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/nrf_crypto_ecdh.c index 21dba2ab..039e56e5 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/nrf_crypto_ecdh.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/nrf_crypto_ecdh.c @@ -7218,7 +7218,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/nrf_crypto_ecdsa.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/nrf_crypto_ecdsa.c index 3f8d2c48..3ffa030d 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/nrf_crypto_ecdsa.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/nrf_crypto_ecdsa.c @@ -6162,7 +6162,7 @@ ret_code_t nrf_crypto_internal_ecc_raw_input_check( -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/nrf_crypto_eddsa.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/nrf_crypto_eddsa.c index 9363b05f..93fd3154 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/nrf_crypto_eddsa.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/nrf_crypto_eddsa.c @@ -6162,7 +6162,7 @@ ret_code_t nrf_crypto_internal_ecc_raw_input_check( -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/nrf_crypto_error.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/nrf_crypto_error.c index 358d928c..582c44e9 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/nrf_crypto_error.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/nrf_crypto_error.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/nrf_crypto_hash.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/nrf_crypto_hash.c index 03f0fe84..a3f6d9a4 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/nrf_crypto_hash.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/nrf_crypto_hash.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/nrf_crypto_hkdf.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/nrf_crypto_hkdf.c index 0aa969b9..6d261697 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/nrf_crypto_hkdf.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/nrf_crypto_hkdf.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/nrf_crypto_hmac.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/nrf_crypto_hmac.c index 4b8614fa..78fc262a 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/nrf_crypto_hmac.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/nrf_crypto_hmac.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/nrf_crypto_init.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/nrf_crypto_init.c index 568d4f08..51db8333 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/nrf_crypto_init.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/nrf_crypto_init.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/nrf_crypto_rng.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/nrf_crypto_rng.c index 9744405d..b8ad06c4 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/nrf_crypto_rng.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/nrf_crypto_rng.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/nrf_crypto_shared.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/nrf_crypto_shared.c index 8c6896c3..c56e1142 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/nrf_crypto_shared.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/nrf_crypto_shared.c @@ -5226,7 +5226,7 @@ -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/experimental_section_vars/nrf_section_iter.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/experimental_section_vars/nrf_section_iter.c index ce58a391..a23f0809 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/experimental_section_vars/nrf_section_iter.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/experimental_section_vars/nrf_section_iter.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/fds/fds.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/fds/fds.c index 5678f71d..6a2a43f1 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/fds/fds.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/fds/fds.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/fifo/app_fifo.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/fifo/app_fifo.c index 3a1bf86f..afa3ba43 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/fifo/app_fifo.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/fifo/app_fifo.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/fstorage/nrf_fstorage.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/fstorage/nrf_fstorage.c index 1c54afed..543bf7ce 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/fstorage/nrf_fstorage.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/fstorage/nrf_fstorage.c @@ -5226,7 +5226,7 @@ -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/fstorage/nrf_fstorage_sd.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/fstorage/nrf_fstorage_sd.c index 56fd2d7d..10f0f5f7 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/fstorage/nrf_fstorage_sd.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/fstorage/nrf_fstorage_sd.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/hardfault/hardfault_implementation.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/hardfault/hardfault_implementation.c index 957db5c1..1e1b3cd6 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/hardfault/hardfault_implementation.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/hardfault/hardfault_implementation.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/hardfault/nrf52/handler/hardfault_handler_gcc.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/hardfault/nrf52/handler/hardfault_handler_gcc.c index 4ed26de2..d6bd7c12 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/hardfault/nrf52/handler/hardfault_handler_gcc.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/hardfault/nrf52/handler/hardfault_handler_gcc.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/log/src/nrf_log_backend_rtt.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/log/src/nrf_log_backend_rtt.c index ad74c56b..353e0907 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/log/src/nrf_log_backend_rtt.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/log/src/nrf_log_backend_rtt.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/log/src/nrf_log_backend_serial.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/log/src/nrf_log_backend_serial.c index da541f05..334887b9 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/log/src/nrf_log_backend_serial.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/log/src/nrf_log_backend_serial.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/log/src/nrf_log_backend_uart.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/log/src/nrf_log_backend_uart.c index 751b34f2..3f20be00 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/log/src/nrf_log_backend_uart.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/log/src/nrf_log_backend_uart.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/log/src/nrf_log_default_backends.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/log/src/nrf_log_default_backends.c index 2737c839..3c213f40 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/log/src/nrf_log_default_backends.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/log/src/nrf_log_default_backends.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/log/src/nrf_log_frontend.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/log/src/nrf_log_frontend.c index f5817ba6..7765d3d6 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/log/src/nrf_log_frontend.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/log/src/nrf_log_frontend.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/log/src/nrf_log_str_formatter.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/log/src/nrf_log_str_formatter.c index 16abc93f..430c2f4a 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/log/src/nrf_log_str_formatter.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/log/src/nrf_log_str_formatter.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/mem_manager/mem_manager.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/mem_manager/mem_manager.c index 8420a1b7..8068e8fb 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/mem_manager/mem_manager.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/mem_manager/mem_manager.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/memobj/nrf_memobj.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/memobj/nrf_memobj.c index c1505ec7..457a81ad 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/memobj/nrf_memobj.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/memobj/nrf_memobj.c @@ -7298,7 +7298,7 @@ typedef uint32_t ret_code_t; -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/pwm/app_pwm.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/pwm/app_pwm.c index 2abe2eec..1bafac47 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/pwm/app_pwm.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/pwm/app_pwm.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/pwr_mgmt/nrf_pwr_mgmt.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/pwr_mgmt/nrf_pwr_mgmt.c index 321f7258..6415dd62 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/pwr_mgmt/nrf_pwr_mgmt.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/pwr_mgmt/nrf_pwr_mgmt.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/queue/nrf_queue.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/queue/nrf_queue.c index 936b1611..0ccb87c0 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/queue/nrf_queue.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/queue/nrf_queue.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/ringbuf/nrf_ringbuf.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/ringbuf/nrf_ringbuf.c index 1de1f47b..6d1220a7 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/ringbuf/nrf_ringbuf.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/ringbuf/nrf_ringbuf.c @@ -7072,7 +7072,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/scheduler/app_scheduler.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/scheduler/app_scheduler.c index b54de119..58c4b514 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/scheduler/app_scheduler.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/scheduler/app_scheduler.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/sortlist/nrf_sortlist.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/sortlist/nrf_sortlist.c index 616fb03c..d299fdf0 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/sortlist/nrf_sortlist.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/sortlist/nrf_sortlist.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/strerror/nrf_strerror.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/strerror/nrf_strerror.c index 5beb10ff..31a4d237 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/strerror/nrf_strerror.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/strerror/nrf_strerror.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/timer/app_timer2.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/timer/app_timer2.c index f0b4777e..fbe208f9 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/timer/app_timer2.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/timer/app_timer2.c @@ -5229,7 +5229,7 @@ -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/timer/drv_rtc.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/timer/drv_rtc.c index d5c704b9..76655d8b 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/timer/drv_rtc.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/timer/drv_rtc.c @@ -5235,7 +5235,7 @@ -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/uart/app_uart_fifo.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/uart/app_uart_fifo.c index 415b81df..da616854 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/uart/app_uart_fifo.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/uart/app_uart_fifo.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/usbd/app_usbd.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/usbd/app_usbd.c index ee672c37..e421f8fd 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/usbd/app_usbd.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/usbd/app_usbd.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/usbd/app_usbd_core.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/usbd/app_usbd_core.c index 18b626fa..a083f20d 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/usbd/app_usbd_core.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/usbd/app_usbd_core.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/usbd/app_usbd_serial_num.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/usbd/app_usbd_serial_num.c index 431a82df..bb02b049 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/usbd/app_usbd_serial_num.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/usbd/app_usbd_serial_num.c @@ -7972,7 +7972,7 @@ extern uintmax_t _wcstoumax_r(struct _reent *, const wchar_t *restrict, wchar_t -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/usbd/app_usbd_string_desc.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/usbd/app_usbd_string_desc.c index 31f4de53..ee97e0f7 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/usbd/app_usbd_string_desc.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/usbd/app_usbd_string_desc.c @@ -5226,7 +5226,7 @@ -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/usbd/class/cdc/acm/app_usbd_cdc_acm.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/usbd/class/cdc/acm/app_usbd_cdc_acm.c index 25d50176..6948634f 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/usbd/class/cdc/acm/app_usbd_cdc_acm.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/usbd/class/cdc/acm/app_usbd_cdc_acm.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/util/app_error_handler_gcc.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/util/app_error_handler_gcc.c index c8982757..2cd13a2f 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/util/app_error_handler_gcc.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/util/app_error_handler_gcc.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/util/app_error_weak.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/util/app_error_weak.c index 1996dd3a..ea74fb6b 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/util/app_error_weak.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/util/app_error_weak.c @@ -31461,7 +31461,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/nfc/ndef/generic/message/nfc_ndef_msg.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/nfc/ndef/generic/message/nfc_ndef_msg.c index eb0008f7..f6ecdc4c 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/nfc/ndef/generic/message/nfc_ndef_msg.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/nfc/ndef/generic/message/nfc_ndef_msg.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/nfc/ndef/generic/record/nfc_ndef_record.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/nfc/ndef/generic/record/nfc_ndef_record.c index ead79485..e308331b 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/nfc/ndef/generic/record/nfc_ndef_record.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/nfc/ndef/generic/record/nfc_ndef_record.c @@ -5226,7 +5226,7 @@ -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/nfc/ndef/text/nfc_text_rec.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/nfc/ndef/text/nfc_text_rec.c index f833b180..ea13fe06 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/nfc/ndef/text/nfc_text_rec.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/nfc/ndef/text/nfc_text_rec.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/nfc/platform/nfc_platform.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/nfc/platform/nfc_platform.c index 50ea0650..53d158e2 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/nfc/platform/nfc_platform.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/nfc/platform/nfc_platform.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/softdevice/common/nrf_sdh.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/softdevice/common/nrf_sdh.c index 7f8f9588..0a5dcd1f 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/softdevice/common/nrf_sdh.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/softdevice/common/nrf_sdh.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/softdevice/common/nrf_sdh_ble.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/softdevice/common/nrf_sdh_ble.c index 54bf2a5b..bf1785cf 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/softdevice/common/nrf_sdh_ble.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/softdevice/common/nrf_sdh_ble.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 @@ -37554,7 +37554,7 @@ ret_code_t nrf_sdh_ble_default_cfg_set(uint8_t conn_cfg_tag, uint32_t * p_ram_st memset(&ble_cfg, 0x00, sizeof(ble_cfg)); ble_cfg.conn_cfg.conn_cfg_tag = conn_cfg_tag; - ble_cfg.conn_cfg.params.gatt_conn_cfg.att_mtu = 67; + ble_cfg.conn_cfg.params.gatt_conn_cfg.att_mtu = 247; ret_code = sd_ble_cfg_set(BLE_CONN_CFG_GATT, &ble_cfg, *p_ram_start); if (ret_code != ((0x0) + 0)) @@ -37696,7 +37696,7 @@ static void nrf_sdh_ble_evts_poll(void * p_context) # 281 "/home/jenkins/workspace/RAK4631/rui-v3/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/softdevice/common/nrf_sdh_ble.c" 3 4 ) # 281 "/home/jenkins/workspace/RAK4631/rui-v3/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/softdevice/common/nrf_sdh_ble.c" - + ((67) - 1) / 4 * sizeof(ble_gattc_service_t) )]; + + ((247) - 1) / 4 * sizeof(ble_gattc_service_t) )]; ble_evt_t * p_ble_evt; diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/softdevice/common/nrf_sdh_soc.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/softdevice/common/nrf_sdh_soc.c index 74b6a8ac..9074e960 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/softdevice/common/nrf_sdh_soc.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/softdevice/common/nrf_sdh_soc.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/external/fprintf/nrf_fprintf.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/external/fprintf/nrf_fprintf.c index 87cd10ce..bb0c74c2 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/external/fprintf/nrf_fprintf.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/external/fprintf/nrf_fprintf.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/external/fprintf/nrf_fprintf_format.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/external/fprintf/nrf_fprintf_format.c index aeb0df25..3a999e5d 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/external/fprintf/nrf_fprintf_format.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/external/fprintf/nrf_fprintf_format.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/external/segger_rtt/SEGGER_RTT.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/external/segger_rtt/SEGGER_RTT.c index 9be1645b..1d653da6 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/external/segger_rtt/SEGGER_RTT.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/external/segger_rtt/SEGGER_RTT.c @@ -32862,7 +32862,7 @@ uint8_t privilege_level_get(void); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/external/segger_rtt/SEGGER_RTT_Syscalls_GCC.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/external/segger_rtt/SEGGER_RTT_Syscalls_GCC.c index 278b2e45..b0889126 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/external/segger_rtt/SEGGER_RTT_Syscalls_GCC.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/external/segger_rtt/SEGGER_RTT_Syscalls_GCC.c @@ -5226,7 +5226,7 @@ -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/external/segger_rtt/SEGGER_RTT_printf.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/external/segger_rtt/SEGGER_RTT_printf.c index 36259db9..c949a79c 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/external/segger_rtt/SEGGER_RTT_printf.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/external/segger_rtt/SEGGER_RTT_printf.c @@ -32862,7 +32862,7 @@ uint8_t privilege_level_get(void); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/integration/nrfx/legacy/nrf_drv_clock.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/integration/nrfx/legacy/nrf_drv_clock.c index 47325f30..92b25c1a 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/integration/nrfx/legacy/nrf_drv_clock.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/integration/nrfx/legacy/nrf_drv_clock.c @@ -5340,7 +5340,7 @@ -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/integration/nrfx/legacy/nrf_drv_power.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/integration/nrfx/legacy/nrf_drv_power.c index fc0728df..65a37bad 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/integration/nrfx/legacy/nrf_drv_power.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/integration/nrfx/legacy/nrf_drv_power.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/integration/nrfx/legacy/nrf_drv_ppi.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/integration/nrfx/legacy/nrf_drv_ppi.c index 539cc651..2d57e081 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/integration/nrfx/legacy/nrf_drv_ppi.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/integration/nrfx/legacy/nrf_drv_ppi.c @@ -5243,7 +5243,7 @@ -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/integration/nrfx/legacy/nrf_drv_rng.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/integration/nrfx/legacy/nrf_drv_rng.c index 7656b82b..af8c3074 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/integration/nrfx/legacy/nrf_drv_rng.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/integration/nrfx/legacy/nrf_drv_rng.c @@ -7063,7 +7063,7 @@ char *strsignal (int __signo); -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/integration/nrfx/legacy/nrf_drv_spi.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/integration/nrfx/legacy/nrf_drv_spi.c index 2aa1445b..a7686250 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/integration/nrfx/legacy/nrf_drv_spi.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/integration/nrfx/legacy/nrf_drv_spi.c @@ -5239,7 +5239,7 @@ -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/integration/nrfx/legacy/nrf_drv_swi.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/integration/nrfx/legacy/nrf_drv_swi.c index ec4327a5..a896bf0a 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/integration/nrfx/legacy/nrf_drv_swi.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/integration/nrfx/legacy/nrf_drv_swi.c @@ -5243,7 +5243,7 @@ -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/integration/nrfx/legacy/nrf_drv_twi.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/integration/nrfx/legacy/nrf_drv_twi.c index eb07a0a6..a6ddd6d7 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/integration/nrfx/legacy/nrf_drv_twi.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/integration/nrfx/legacy/nrf_drv_twi.c @@ -5239,7 +5239,7 @@ -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/integration/nrfx/legacy/nrf_drv_uart.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/integration/nrfx/legacy/nrf_drv_uart.c index c3e7deb8..cf5e6148 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/integration/nrfx/legacy/nrf_drv_uart.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/integration/nrfx/legacy/nrf_drv_uart.c @@ -5239,7 +5239,7 @@ -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_clock.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_clock.c index b5b5f2a2..3d77c7bc 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_clock.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_clock.c @@ -5235,7 +5235,7 @@ -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_gpiote.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_gpiote.c index 8778585e..be866a26 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_gpiote.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_gpiote.c @@ -5235,7 +5235,7 @@ -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_nfct.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_nfct.c index ca1a1629..01b0c815 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_nfct.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_nfct.c @@ -5235,7 +5235,7 @@ -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_power.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_power.c index 70ca3a69..fe07f861 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_power.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_power.c @@ -5235,7 +5235,7 @@ -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_ppi.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_ppi.c index 640a71d3..85f8d1bc 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_ppi.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_ppi.c @@ -5235,7 +5235,7 @@ -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_rng.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_rng.c index 59a68e4f..a1fa33e7 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_rng.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_rng.c @@ -5235,7 +5235,7 @@ -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_rtc.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_rtc.c index 951c660a..65059fb1 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_rtc.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_rtc.c @@ -5235,7 +5235,7 @@ -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_saadc.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_saadc.c index c0a6006b..0b98b7a3 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_saadc.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_saadc.c @@ -5235,7 +5235,7 @@ -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_spi.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_spi.c index be8d3bbc..a8ef2cc6 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_spi.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_spi.c @@ -5235,7 +5235,7 @@ -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_spim.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_spim.c index 361a7809..63c9009f 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_spim.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_spim.c @@ -5235,7 +5235,7 @@ -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_timer.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_timer.c index 38a12988..de41a040 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_timer.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_timer.c @@ -5235,7 +5235,7 @@ -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_twi.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_twi.c index 7411ec4e..9346971f 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_twi.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_twi.c @@ -5235,7 +5235,7 @@ -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_twim.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_twim.c index b4558de8..097981f0 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_twim.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_twim.c @@ -5235,7 +5235,7 @@ -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_uart.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_uart.c index c3c018ec..4f003379 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_uart.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_uart.c @@ -5235,7 +5235,7 @@ -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_uarte.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_uarte.c index 275fe1c9..318883ac 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_uarte.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_uarte.c @@ -5235,7 +5235,7 @@ -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_usbd.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_usbd.c index b827aea4..8488c5a3 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_usbd.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_usbd.c @@ -5235,7 +5235,7 @@ -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_wdt.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_wdt.c index 1fd06430..af8d7570 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_wdt.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/nrfx_wdt.c @@ -5235,7 +5235,7 @@ -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/prs/nrfx_prs.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/prs/nrfx_prs.c index 7bb7d9ad..d21d23d3 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/prs/nrfx_prs.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/prs/nrfx_prs.c @@ -5235,7 +5235,7 @@ -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/hal/nrf_nvmc.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/hal/nrf_nvmc.c index 930cbcf3..712e15e0 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/hal/nrf_nvmc.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/hal/nrf_nvmc.c @@ -5235,7 +5235,7 @@ -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/soc/nrfx_atomic.c b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/soc/nrfx_atomic.c index 8e2a3609..5f3e708a 100644 --- a/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/soc/nrfx_atomic.c +++ b/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/soc/nrfx_atomic.c @@ -5239,7 +5239,7 @@ -#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 67 +#define NRF_SDH_BLE_GATT_MAX_MTU_SIZE 247 diff --git a/cores/nRF5/version.c b/cores/nRF5/version.c index 71267b32..3c87e7bc 100644 --- a/cores/nRF5/version.c +++ b/cores/nRF5/version.c @@ -1,11 +1,11 @@ -#define FW_REVISION "8.0.0-p1_rc6.41" +#define FW_REVISION "3.0.0-p1_final.42" #define MODEL_ID "rak4631" #define CHIP_ID "nrf52840" -#define BUILD_DATE "20211020" -#define BUILD_TIME "105617" -#define REPO_INFO "ac72dae7,b8c1c040,80d9adae,990edfe4,e3fedcfe,62e31219,2b8aeaeb,2c4ff1a0,82f69ed1,b2afbcdf,ddbcaa4d,94cb0435,38ead93e," -#define CLI_REVISION "2.0.0" -#define API_REVISION "6.0.0" +#define BUILD_DATE "20211029" +#define BUILD_TIME "040444" +#define REPO_INFO "482116f5,7aa83c0d,d0b8a376,740e1079,e3fedcfe,62e31219,2b8aeaeb,2c4ff1a0,82f69ed1,b2afbcdf,ddbcaa4d,cec4f219,38ead93e," +#define CLI_REVISION "1.0.0" +#define API_REVISION "1.0.0" const char *sw_version = {FW_REVISION}; const char *model_id = {MODEL_ID}; const char *chip_id = {CHIP_ID}; diff --git a/libraries/RUI_V3_examples/examples/Application_Scenario/BLE/Environment_Detect/Environment_Detect.ino b/libraries/RUI_V3_examples/examples/Application_Scenario/BLE/Environment_Detect/Environment_Detect.ino index 544b6dfa..5203b5c8 100644 --- a/libraries/RUI_V3_examples/examples/Application_Scenario/BLE/Environment_Detect/Environment_Detect.ino +++ b/libraries/RUI_V3_examples/examples/Application_Scenario/BLE/Environment_Detect/Environment_Detect.ino @@ -28,7 +28,6 @@ uint32_t encoded_tmeperature; uint32_t celciusX100; RAKBleCharacteristic htsc = RAKBleCharacteristic(CUS_BLE_UUID_TEMPERATURE_MEASUREMENT_CHAR); - void cccd_callback(uint16_t chars_uuid, uint8_t *cccd_value) { if (chars_uuid == CUS_BLE_UUID_TEMPERATURE_MEASUREMENT_CHAR) @@ -50,7 +49,7 @@ void cccd_callback(uint16_t chars_uuid, uint8_t *cccd_value) Serial.println(""); Serial.print("notify value : "); - for(int i=0 ;i < CUS_BLE_TEMPERATURE_MEASUREMENT_CHAR_LEN; i++) + for (int i = 0; i < CUS_BLE_TEMPERATURE_MEASUREMENT_CHAR_LEN; i++) { Serial.print("0x"); Serial.printf("%02X ", cccd_value[i]); @@ -58,21 +57,26 @@ void cccd_callback(uint16_t chars_uuid, uint8_t *cccd_value) Serial.println(""); } - void setup() { + Serial.begin(115200); + delay(5000); + Serial.println("RAKwireless Environment Detect Example"); + Serial.println("------------------------------------------------------"); + Wire.begin(); // check if snesor Rak1901 is work if (th_sensor.init()) Serial.println("Rak1901 init success"); - else { - Serial.println("Rak1901 init fail"); } + else + { + Serial.println("Rak1901 init fail"); + } //Base 128-bit UUID (SIG Base) : 0x0000xxxx-0000-1000-8000-00805F9B34FB //--The 3rd and 4th byte '1809' means Service 16bit UUID - - uint8_t base_uuid[]={0x00, 0x00, 0x18, 0x09, 0x00, 0x00, 0x10, 0x00, 0x80, 0x00, 0x00, 0x80, 0x5F, 0x9B, 0x34, 0xFB}; - Serial.begin(115200); + + uint8_t base_uuid[] = {0x00, 0x00, 0x18, 0x09, 0x00, 0x00, 0x10, 0x00, 0x80, 0x00, 0x00, 0x80, 0x5F, 0x9B, 0x34, 0xFB}; api.ble.customer.init(); RAKBleService hts = RAKBleService(base_uuid); hts.begin(); @@ -87,28 +91,29 @@ void setup() api.ble.customer.start(); } - void loop() { - if (th_sensor.update()) { + if (th_sensor.update()) + { Serial.println("--------------------"); Serial.print("Tmeperature : "); Serial.println(th_sensor.temperature()); Serial.println("--------------------"); celciusX100 = (th_sensor.temperature() * 100); - encoded_tmeperature = ((-2 << 24) & 0xFF000000) | ((celciusX100 << 0) & 0x00FFFFFF); - - hts_tmep[1] = (uint8_t) ((encoded_tmeperature & 0x000000FF) >> 0); - hts_tmep[2] = (uint8_t) ((encoded_tmeperature & 0x0000FF00) >> 8); - hts_tmep[3] = (uint8_t) ((encoded_tmeperature & 0x00FF0000) >> 16); - hts_tmep[4] = (uint8_t) ((encoded_tmeperature & 0xFF000000) >> 24); - + encoded_tmeperature = ((-2 << 24) & 0xFF000000) | ((celciusX100 << 0) & 0x00FFFFFF); + + hts_tmep[1] = (uint8_t)((encoded_tmeperature & 0x000000FF) >> 0); + hts_tmep[2] = (uint8_t)((encoded_tmeperature & 0x0000FF00) >> 8); + hts_tmep[3] = (uint8_t)((encoded_tmeperature & 0x00FF0000) >> 16); + hts_tmep[4] = (uint8_t)((encoded_tmeperature & 0xFF000000) >> 24); + htsc.notify(hts_tmep); - - } else { + } + else + { Serial.println("Please plug in the sensor RAK1901"); - } - + } + delay(2000); } diff --git a/libraries/RUI_V3_examples/examples/Application_Scenario/LoRa/Smart_Farm/Smart_Farm.ino b/libraries/RUI_V3_examples/examples/Application_Scenario/LoRa/Smart_Farm/Smart_Farm.ino index 7ab80059..ff7d05b0 100644 --- a/libraries/RUI_V3_examples/examples/Application_Scenario/LoRa/Smart_Farm/Smart_Farm.ino +++ b/libraries/RUI_V3_examples/examples/Application_Scenario/LoRa/Smart_Farm/Smart_Farm.ino @@ -9,11 +9,15 @@ rak1902 p_sensor; /** Packet buffer for sending */ uint8_t collected_data[64] = {0}; +bool ret; + void setup() { - api.ble.uart.stop(); // Stop BLE broadcast - - Serial.begin(115200, AT_MODE); + api.ble.uart.stop(); // Stop BLE broadcast + Serial.begin(115200, AT_MODE); + delay(5000); + Serial.println("RAKwireless Smart Farm Example"); + Serial.println("------------------------------------------------------"); pinMode(LED_GREEN, OUTPUT); digitalWrite(LED_GREEN, HIGH); @@ -26,10 +30,23 @@ void setup() uint8_t node_app_eui[8] = {0x0E, 0x0D, 0x0D, 0x01, 0x0E, 0x01, 0x02, 0x0E}; // OTAA Application Key MSB uint8_t node_app_key[16] = {0x2B, 0x7E, 0x15, 0x16, 0x28, 0xAE, 0xD2, 0xA6, 0xAB, 0xF7, 0x15, 0x88, 0x09, 0xCF, 0x4F, 0x3E}; + + if(!(ret = api.lorawan.appeui.set(node_app_eui, 8))) + { + Serial.printf("LoRaWan Smart Farm - set device EUI is incorrect! \r\n"); + return; + } + if(!(ret = api.lorawan.appkey.set(node_app_key, 16))) + { + Serial.printf("LoRaWan Smart Farm - set application EUI is incorrect! \r\n"); + return; + } + if(!(ret = api.lorawan.deui.set(node_device_eui, 8))) + { + Serial.printf("LoRaWan Smart Farm - set application key is incorrect! \r\n"); + return; + } - api.lorawan.appeui.set(node_app_eui, 8); // Set the LoRawan AppEUI - api.lorawan.appkey.set(node_app_key, 16); // Set the LoRaWan AppKey - api.lorawan.deui.set(node_device_eui, 8); // Set the LoRaWan DeviceEUI /************************************* LoRaWAN band setting: @@ -45,19 +62,35 @@ void setup() * ************************************/ - api.lorawan.band.set(RAK_REGION_EU868); // Set the LoRa region to EU868 - api.lorawan.deviceClass.set(0); - api.lorawan.njm.set(RAK_LORA_OTAA); // Set the network join mode to OTAA - api.lorawan.join(); // Join to Gateway + if(!(ret = api.lorawan.band.set(RAK_REGION_EU868))) // Set the LoRa region to EU868 + { + Serial.printf("LoRaWan Smart Farm - set band is incorrect! \r\n"); + return; + } + if(!(ret = api.lorawan.deviceClass.set(0))) + { + Serial.printf("LoRaWan Smart Farm - set device class is incorrect! \r\n"); + return; + } + if(!(ret = api.lorawan.njm.set(RAK_LORA_OTAA))) // Set the network join mode to OTAA + { + Serial.printf("LoRaWan Smart Farm - set network join mode is incorrect! \r\n"); + return; + } + if(!(ret = api.lorawan.join())) // Join to Gateway + { + Serial.printf("LoRaWan Smart Farm - join fail! \r\n"); + return; + } Serial.println("++++++++++++++++++++++++++"); Serial.println("RUI V3 Environment Sensing"); Serial.println("++++++++++++++++++++++++++"); - Wire.begin(); // Start I2C Bus + Wire.begin(); // Start I2C Bus Serial.printf("RAK1901 init %s\n\r", th_sensor.init() ? "success" : "fail"); // Check if RAK1901 init success Serial.printf("RAK1902 init %s\n\r", p_sensor.init() ? "success" : "fail"); // Check if RAK1902 init success - + /**Wait for Join success */ while (api.lorawan.njs.get() == 0) { @@ -66,9 +99,22 @@ void setup() delay(10000); } digitalWrite(LED_GREEN, LOW); - api.lorawan.adr.set(true); - api.lorawan.rety.set(1); - api.lorawan.cfm.set(1); + + if(!(ret = api.lorawan.adr.set(true))) + { + Serial.printf("LoRaWan Smart Farm - set adaptive data rate is incorrect! \r\n"); + return; + } + if(!(ret = api.lorawan.rety.set(1))) + { + Serial.printf("LoRaWan Smart Farm - set retry times is incorrect! \r\n"); + return; + } + if(!(ret = api.lorawan.cfm.set(1))) + { + Serial.printf("LoRaWan Smart Farm - set confirm mode is incorrect! \r\n"); + return; + } /**Check LoRaWan Status*/ Serial.printf("Dutycycle is %s\n", api.lorawan.dcs.get() ? "ON" : "OFF"); // Check Duty Cycle status @@ -112,8 +158,8 @@ void loop() collected_data[data_len++] = 0; collected_data[data_len++] = 0; collected_data[data_len++] = 0; - collected_data[data_len++] = (uint8_t) (batt >> 8); - collected_data[data_len++] = (uint8_t) batt; + collected_data[data_len++] = (uint8_t)(batt >> 8); + collected_data[data_len++] = (uint8_t)batt; Serial.println("Data Packet:"); for (int i = 0; i < data_len; i++) @@ -131,11 +177,11 @@ void loop() { Serial.println("Send failed"); } - + digitalWrite(LED_BLUE, LOW); - Serial.printf("Keep radio & MCU truned on for %u ms (RX2 delay)\r\n", api.lorawan.rx2dl.get()*1000); - delay(api.lorawan.rx2dl.get()*1000); - delay(4000);//additional processing time + Serial.printf("Keep radio & MCU truned on for %u ms (RX2 delay)\r\n", api.lorawan.rx2dl.get() * 1000); + delay(api.lorawan.rx2dl.get() * 1000); + delay(4000); //additional processing time api.system.sleep.all(20000); } diff --git a/libraries/RUI_V3_examples/examples/Example/Arduino_Advance_IO/Arduino_Advance_IO.ino b/libraries/RUI_V3_examples/examples/Example/Arduino_Advance_IO/Arduino_Advance_IO.ino index 00bbd41c..f7292d18 100644 --- a/libraries/RUI_V3_examples/examples/Example/Arduino_Advance_IO/Arduino_Advance_IO.ino +++ b/libraries/RUI_V3_examples/examples/Example/Arduino_Advance_IO/Arduino_Advance_IO.ino @@ -1,26 +1,30 @@ -uint8_t ledPin = 36; +uint8_t ledPin = 36; uint8_t pulsePin = 13; unsigned long duration; -void setup() { +void setup() +{ Serial.begin(115200); + delay(5000); + Serial.println("RAKwireless Arduino Advance IO Example"); + Serial.println("------------------------------------------------------"); + pinMode(pulsePin, INPUT_PULLUP); pinMode(ledPin, OUTPUT); } -void loop() { +void loop() +{ duration = pulseIn(pulsePin, LOW); Serial.print("Pulse duration = "); - Serial.print((float)duration/1000000); + Serial.print((float)duration / 1000000); Serial.println(" sec"); - if(duration >= 15000000) + if (duration >= 15000000) noTone(ledPin); - else if(duration >= 10000000) + else if (duration >= 10000000) tone(ledPin, 494, 5000); - else if(duration >= 5000000) + else if (duration >= 5000000) tone(ledPin, 494); - - } diff --git a/libraries/RUI_V3_examples/examples/Example/Arduino_Analog/Arduino_Analog.ino b/libraries/RUI_V3_examples/examples/Example/Arduino_Analog/Arduino_Analog.ino index d5ce516f..37fc0ba1 100644 --- a/libraries/RUI_V3_examples/examples/Example/Arduino_Analog/Arduino_Analog.ino +++ b/libraries/RUI_V3_examples/examples/Example/Arduino_Analog/Arduino_Analog.ino @@ -2,6 +2,9 @@ void setup() { Serial.begin(115200); + delay(5000); + Serial.println("RAKwireless Arduino Analog Example"); + Serial.println("------------------------------------------------------"); } void loop() diff --git a/libraries/RUI_V3_examples/examples/Example/Arduino_Bit_And_Byte/Arduino_Bit_And_Byte.ino b/libraries/RUI_V3_examples/examples/Example/Arduino_Bit_And_Byte/Arduino_Bit_And_Byte.ino index 7db3d47b..11258835 100644 --- a/libraries/RUI_V3_examples/examples/Example/Arduino_Bit_And_Byte/Arduino_Bit_And_Byte.ino +++ b/libraries/RUI_V3_examples/examples/Example/Arduino_Bit_And_Byte/Arduino_Bit_And_Byte.ino @@ -35,7 +35,7 @@ void test_bitSet() Serial.print("After bitSet(6, 0) => "); int value = 6; int pos = 0; - Serial.println(bitSet(value,pos), BIN); + Serial.println(bitSet(value, pos), BIN); Serial.println(""); } @@ -48,7 +48,7 @@ void test_bitClear() Serial.print("After bitClear(6, 1) => "); int value = 6; int pos = 1; - Serial.println(bitClear(value,pos), BIN); + Serial.println(bitClear(value, pos), BIN); Serial.println(""); } @@ -60,13 +60,13 @@ void test_bitWrite() Serial.print("Before bitWrite(): 6 => "); Serial.println(target, BIN); Serial.print("After bitWrite(target, 0, 1) => "); - Serial.println(bitWrite(target, 0,1), BIN); + Serial.println(bitWrite(target, 0, 1), BIN); Serial.print("After bitWrite(target, 1, 0) => "); - Serial.println(bitWrite(target, 1,0), BIN); + Serial.println(bitWrite(target, 1, 0), BIN); Serial.print("After bitWrite(target, 2, 0) => "); - Serial.println(bitWrite(target, 2,0), BIN); + Serial.println(bitWrite(target, 2, 0), BIN); Serial.print("After bitWrite(target, 3, 1) => "); - Serial.println(bitWrite(target, 3,1), BIN); + Serial.println(bitWrite(target, 3, 1), BIN); Serial.println(""); Serial.println("target now should be 9(1001)"); Serial.print("target = "); @@ -88,12 +88,13 @@ void test_lowByte_highByte() Serial.println(""); } - void setup() { Serial.begin(115200); - delay(2000); - + delay(5000); + Serial.println("RAKwireless Arduino Bit and Byte Example"); + Serial.println("------------------------------------------------------"); + test_bit(); test_bitSet(); test_bitClear(); @@ -105,4 +106,3 @@ void setup() void loop() { } - diff --git a/libraries/RUI_V3_examples/examples/Example/Arduino_Characters/Arduino_Characters.ino b/libraries/RUI_V3_examples/examples/Example/Arduino_Characters/Arduino_Characters.ino index b7b97d31..42fbadec 100644 --- a/libraries/RUI_V3_examples/examples/Example/Arduino_Characters/Arduino_Characters.ino +++ b/libraries/RUI_V3_examples/examples/Example/Arduino_Characters/Arduino_Characters.ino @@ -1,117 +1,117 @@ -char j; +char j; void checkCharacter() { - for (int i=0; i<6; i++) { - - switch(i){ - case 0: - j = ' '; - break; - case 1: - j = 'A'; - break; - case 2: - j = 'a'; - break; - case 3: - j = '\n'; - break; - case 4: - j = '1'; - break; - case 5: - j = '!'; - break; - } - - Serial.print(">>>>>>>>>>>>Check Character :"); - Serial.print((String)j); + for (int i = 0; i < 6; i++) + { + + switch (i) + { + case 0: + j = ' '; + break; + case 1: + j = 'A'; + break; + case 2: + j = 'a'; + break; + case 3: + j = '\n'; + break; + case 4: + j = '1'; + break; + case 5: + j = '!'; + break; + } + + Serial.print(">>>>>>>>>>>>Check Character :"); + Serial.print((String)j); Serial.println(" <<<<<<<<<<<"); - if(isWhitespace(j)) + if (isWhitespace(j)) Serial.println("is white space: O"); else Serial.println("is white space: X"); - - if(isUpperCase(j)) + + if (isUpperCase(j)) Serial.println("is uppercase: O"); else Serial.println("is uppercase: X"); - - if(isSpace(j)) + + if (isSpace(j)) Serial.println("is space: O"); else Serial.println("is space: X"); - - if(isPunct(j)) + + if (isPunct(j)) Serial.println("is punct: O"); else Serial.println("is punct: X"); - - if(isPrintable(j)) + + if (isPrintable(j)) Serial.println("is printable: O"); else Serial.println("is printable: X"); - - if(isLowerCase(j)) + + if (isLowerCase(j)) Serial.println("is lowercase: O"); else Serial.println("is lowercase: X"); - - if(isHexadecimalDigit(j)) + + if (isHexadecimalDigit(j)) Serial.println("is HexadecimalDigit: O"); else Serial.println("is HexadecimalDigit: X"); - - if(isDigit(j)) + + if (isDigit(j)) Serial.println("is digit: O"); else Serial.println("is digit: X"); - - if(isControl(j)) + + if (isControl(j)) Serial.println("is control: O"); else Serial.println("is control: X"); - - if(isAscii(j)) + + if (isAscii(j)) Serial.println("is ascii: O"); else Serial.println("is ascii: X"); - - if(isAlphaNumeric(j)) + + if (isAlphaNumeric(j)) Serial.println("is AlphaNumeric: O"); else Serial.println("is AlphaNumeric: X"); - - if(isAlpha(j)) + + if (isAlpha(j)) Serial.println("is alpha: O"); else Serial.println("is alpha: X"); - - if(isGraph(j)) + + if (isGraph(j)) Serial.println("is graph: O"); else Serial.println("is graph: X"); - Serial.println(""); + Serial.println(""); } } - void setup() { - Serial.begin(115200);//UART0 baudrate 115200 - - delay(2000); + Serial.begin(115200); //UART0 baudrate 115200 + delay(5000); + Serial.println("RAKwireless Arduino Characters Example"); + Serial.println("------------------------------------------------------"); Serial.println("check characters START"); Serial.println(""); checkCharacter(); - } void loop() { } - diff --git a/libraries/RUI_V3_examples/examples/Example/Arduino_Digital/Arduino_Digital.ino b/libraries/RUI_V3_examples/examples/Example/Arduino_Digital/Arduino_Digital.ino index 1f2142d3..3bd483b0 100644 --- a/libraries/RUI_V3_examples/examples/Example/Arduino_Digital/Arduino_Digital.ino +++ b/libraries/RUI_V3_examples/examples/Example/Arduino_Digital/Arduino_Digital.ino @@ -1,9 +1,14 @@ uint8_t ledPin = 36; -uint8_t inputPin = 13; +uint8_t inputPin = 13; void setup() { + Serial.begin(115200); + delay(5000); + Serial.println("RAKwireless Arduino Digital Example"); + Serial.println("------------------------------------------------------"); + pinMode(ledPin, OUTPUT); pinMode(inputPin, INPUT_PULLUP); } @@ -13,7 +18,6 @@ void loop() int val = digitalRead(inputPin); if (val == LOW) digitalWrite(ledPin, HIGH); - else + else digitalWrite(ledPin, LOW); } - diff --git a/libraries/RUI_V3_examples/examples/Example/Arduino_Interrupt/Arduino_Interrupt.ino b/libraries/RUI_V3_examples/examples/Example/Arduino_Interrupt/Arduino_Interrupt.ino index 5b0b8ba2..5df60bdd 100644 --- a/libraries/RUI_V3_examples/examples/Example/Arduino_Interrupt/Arduino_Interrupt.ino +++ b/libraries/RUI_V3_examples/examples/Example/Arduino_Interrupt/Arduino_Interrupt.ino @@ -14,6 +14,9 @@ void blink() void setup() { Serial.begin(115200); + delay(5000); + Serial.println("RAKwireless Arduino Interrupt Example"); + Serial.println("------------------------------------------------------"); pinMode(ledPin, OUTPUT); pinMode(interruptPin, INPUT_PULLUP); attachInterrupt(interruptPin, blink, CHANGE); @@ -25,7 +28,7 @@ void loop() Serial.println(millis() - startTime); //After 20sec will disable ISR for pin13 - if(millis() - startTime >= 20*1000) + if (millis() - startTime >= 20 * 1000) detachInterrupt(13); noInterrupts(); @@ -36,5 +39,3 @@ void loop() digitalWrite(ledPin, state); } - - diff --git a/libraries/RUI_V3_examples/examples/Example/Arduino_Led_Breathing/Arduino_Led_Breathing.ino b/libraries/RUI_V3_examples/examples/Example/Arduino_Led_Breathing/Arduino_Led_Breathing.ino index 221c61b9..4c4d1501 100644 --- a/libraries/RUI_V3_examples/examples/Example/Arduino_Led_Breathing/Arduino_Led_Breathing.ino +++ b/libraries/RUI_V3_examples/examples/Example/Arduino_Led_Breathing/Arduino_Led_Breathing.ino @@ -6,30 +6,35 @@ bool ledSwitch = false; void valChage() { state = !state; - if(val == 0) + if (val == 0) ledSwitch = !ledSwitch; } -void setup() { +void setup() +{ + Serial.begin(115200); + delay(5000); + Serial.println("RAKwireless Arduino LED Breathing Example"); + Serial.println("------------------------------------------------------"); // put your setup code here, to run once: pinMode(GREEN_LED, OUTPUT); pinMode(BLUE_LED, OUTPUT); } -void loop() { +void loop() +{ // put your main code here, to run repeatedly: - if(val == 0 || val == 255) - valChage(); + if (val == 0 || val == 255) + valChage(); // To determine to make the led lighter or darker - if(state) + if (state) val++; else val--; // To switch the lighting led - if(ledSwitch) - analogWrite(GREEN_LED ,val); // Light the green led + if (ledSwitch) + analogWrite(GREEN_LED, val); // Light the green led else analogWrite(BLUE_LED, val); //Light the blue led - } diff --git a/libraries/RUI_V3_examples/examples/Example/Arduino_Random/Arduino_Random.ino b/libraries/RUI_V3_examples/examples/Example/Arduino_Random/Arduino_Random.ino index 6c563c8c..872aae44 100755 --- a/libraries/RUI_V3_examples/examples/Example/Arduino_Random/Arduino_Random.ino +++ b/libraries/RUI_V3_examples/examples/Example/Arduino_Random/Arduino_Random.ino @@ -1,8 +1,10 @@ void setup() { - Serial.begin(115200);//UART0 baudrate 115200 - + Serial.begin(115200); //UART0 baudrate 115200 + delay(5000); + Serial.println("RAKwireless Arduino Random Example"); + Serial.println("------------------------------------------------------"); randomSeed(analogRead(0)); } @@ -10,6 +12,6 @@ void loop() { Serial.print("Random number(0 ~ 999) : "); uint32_t l = random(1000); - Serial.println(l); + Serial.println(l); delay(1000); } diff --git a/libraries/RUI_V3_examples/examples/Example/Arduino_Serial/Arduino_Serial.ino b/libraries/RUI_V3_examples/examples/Example/Arduino_Serial/Arduino_Serial.ino index af51ce1f..b54fb577 100644 --- a/libraries/RUI_V3_examples/examples/Example/Arduino_Serial/Arduino_Serial.ino +++ b/libraries/RUI_V3_examples/examples/Example/Arduino_Serial/Arduino_Serial.ino @@ -6,10 +6,10 @@ void setup() { Serial.begin(115200, AT_MODE); Serial1.begin(9600, CUSTOM_MODE); - - delay(2000); - - //get the timeout on Serial1 and set it to 2000 + delay(5000); + Serial.println("RAKwireless Arduino Serial Example"); + Serial.println("------------------------------------------------------"); + //get the timeout on Serial1 and set it to 2000 Serial1.print("Time out: "); Serial1.println(Serial1.getTimeout()); Serial1.println("Set Timeout to 5000"); @@ -19,7 +19,12 @@ void setup() //Lock Serial(USB) with password => 12345678 string password = "12345678"; - Serial.password(password); + int32_t ret; + if ((ret = Serial.password(password)) != true) + { + Serial.printf("Arduino Serial - set password parameter is incorrect! \r\n"); + return; + } Serial.lock(true); } @@ -31,73 +36,79 @@ void loop() Serial.printf("======= Loop Count: %d =======\n", loopCount); // After 60seconds close all Serial Port - if (loopCount == 60) { + if (loopCount == 60) + { Serial.end(); - Serial1.end(); + Serial1.end(); } Serial1.println("press any word to start reading"); //In Serial1(UART) type any word will show on screen - if(Serial1.available() > 0) { - Serial1.print("peek the first word: "); + if (Serial1.available() > 0) + { + Serial1.print("peek the first word: "); Serial1.println((char)Serial1.peek()); Serial1.print("read the first word: "); Serial1.println((char)Serial1.read()); - //readBytes() - Serial1.println("Start readByte() please type 5 words in 5seconds"); + //readBytes() + Serial1.println("Start readByte() please type 5 words in 5seconds"); returnBytes = Serial1.readBytes(readBuf, 5); - if(returnBytes == 0) - Serial1.println("read nothing"); - else { - Serial1.print("Typed: "); - for (int i=0; iBufferSize ; i++) { + for (int i = 0; i < data->BufferSize; i++) + { Serial.printf("%x", data->Buffer[i]); } Serial.print("\r\n"); } -void join_cb(int32_t status) { +void join_cb(int32_t status) +{ Serial.printf("Join status: %d\r\n", status); } -void send_cb(int32_t status) { +void send_cb(int32_t status) +{ Serial.printf("Send status: %d\r\n", status); } void setup() { - //Serial.begin(115200); - -// ABP Device Address -uint8_t node_dev_addr[4] = {0x05, 0x05, 0x06, 0x06}; -// ABP Application Session Key -uint8_t node_app_skey[16] = {0x25, 0xC4, 0xF1, 0xD1, 0x78, 0xC8, 0x8D, 0x01, 0xA8, 0x80, 0xC2, 0x79, 0xA7, 0x9F, 0x34, 0x3B}; -// ABP Network Session Key -uint8_t node_nwk_skey[16] = {0xD6, 0x03, 0x37, 0xAC, 0x97, 0x4C, 0x43, 0x2F, 0xF3, 0x7A, 0xF9, 0xA7, 0x9B, 0xE8, 0x50, 0xF7}; - - api.lorawan.daddr.set(node_dev_addr, 4); - api.lorawan.appskey.set(node_app_skey, 16); - api.lorawan.nwkskey.set(node_nwk_skey, 16); + Serial.begin(115200); + delay(5000); + Serial.println("RAKwireless LoRaWan ABP Example"); + Serial.println("------------------------------------------------------"); + // ABP Device Address + uint8_t node_dev_addr[4] = {0x05, 0x05, 0x06, 0x06}; + // ABP Application Session Key + uint8_t node_app_skey[16] = {0x25, 0xC4, 0xF1, 0xD1, 0x78, 0xC8, 0x8D, 0x01, 0xA8, 0x80, 0xC2, 0x79, 0xA7, 0x9F, 0x34, 0x3B}; + // ABP Network Session Key + uint8_t node_nwk_skey[16] = {0xD6, 0x03, 0x37, 0xAC, 0x97, 0x4C, 0x43, 0x2F, 0xF3, 0x7A, 0xF9, 0xA7, 0x9B, 0xE8, 0x50, 0xF7}; + + if(!(ret = api.lorawan.daddr.set(node_dev_addr, 4))) + { + Serial.printf("LoRaWan ABP - set device addr is incorrect! \r\n"); + return; + } + if(!(ret = api.lorawan.appskey.set(node_app_skey, 16))) + { + Serial.printf("LoRaWan ABP - set apps key is incorrect! \r\n"); + return; + } + if(!(ret = api.lorawan.nwkskey.set(node_nwk_skey, 16))) + { + Serial.printf("LoRaWan ABP - set network session key is incorrect! \r\n"); + return; + } + /************************************* * * LoRaWAN band setting: @@ -44,9 +63,23 @@ uint8_t node_nwk_skey[16] = {0xD6, 0x03, 0x37, 0xAC, 0x97, 0x4C, 0x43, 0x2F, 0xF * * ************************************/ - api.lorawan.band.set(4); - api.lorawan.njm.set(0); - api.lorawan.join(); + + if(!(ret = api.lorawan.band.set(4))) + { + Serial.printf("LoRaWan ABP - set band is incorrect! \r\n"); + return; + } + if(!(ret = api.lorawan.njm.set(0))) + { + Serial.printf("LoRaWan ABP - set network join mode is incorrect! \r\n"); + return; + } + if(!(ret = api.lorawan.join())) + { + Serial.printf("LoRaWan ABP - join fail! \r\n"); + return; + } + api.lorawan.registerRecvCallback(recv_cb); api.lorawan.registerJoinCallback(join_cb); api.lorawan.registerSendCallback(send_cb); @@ -70,53 +103,64 @@ void loop() api.lorawan.deui.get(rbuff, 8); Serial.print("Device EUI=0x"); - for (int i = 0 ; i < 8 ; i++) { + for (int i = 0; i < 8; i++) + { Serial.printf("%02x", rbuff[i]); } Serial.print("\r\n"); api.lorawan.appeui.get(rbuff, 8); Serial.print("Application EUI=0x"); - for (int i = 0 ; i < 8 ; i++) { + for (int i = 0; i < 8; i++) + { Serial.printf("%02x", rbuff[i]); } Serial.print("\r\n"); api.lorawan.appkey.get(rbuff, 16); Serial.print("Application Key=0x"); - for (int i = 0 ; i < 8 ; i++) { + for (int i = 0; i < 8; i++) + { Serial.printf("%02x", rbuff[i]); } Serial.print("\r\n"); api.lorawan.appskey.get(rbuff, 16); Serial.print("Application Session Key=0x"); - for (int i = 0 ; i < 16 ; i++) { + for (int i = 0; i < 16; i++) + { Serial.printf("%02x", rbuff[i]); } Serial.print("\r\n"); api.lorawan.nwkskey.get(rbuff, 16); Serial.print("Network Session Key=0x"); - for (int i = 0 ; i < 16 ; i++) { + for (int i = 0; i < 16; i++) + { Serial.printf("%02x", rbuff[i]); } Serial.print("\r\n"); api.lorawan.netid.get(rbuff, 16); Serial.print("24-bit Network Identifier(NetId)=0x"); - for (int i = 0 ; i < 3 ; i++) { + for (int i = 0; i < 3; i++) + { Serial.printf("%02x", rbuff[i]); } Serial.print("\r\n"); api.lorawan.daddr.get(rbuff, 16); Serial.print("Device Address=0x"); - for (int i = 0 ; i < 4 ; i++) { + for (int i = 0; i < 4; i++) + { Serial.printf("%02x", rbuff[i]); } Serial.print("\r\n"); - api.lorawan.send(sizeof(payload), payload, 129, false, 0); + if(!(ret = api.lorawan.send(sizeof(payload), payload, 129, false, 0))) + { + Serial.printf("LoRaWan ABP - send fail! \r\n"); + return; + } delay(1000); } diff --git a/libraries/RUI_V3_examples/examples/Example/LoRaWan_Class_B/LoRaWan_Class_B.ino b/libraries/RUI_V3_examples/examples/Example/LoRaWan_Class_B/LoRaWan_Class_B.ino index 08e95caa..522bc961 100644 --- a/libraries/RUI_V3_examples/examples/Example/LoRaWan_Class_B/LoRaWan_Class_B.ino +++ b/libraries/RUI_V3_examples/examples/Example/LoRaWan_Class_B/LoRaWan_Class_B.ino @@ -1,20 +1,35 @@ beacon_bgw_t beaconBGW; - +bool ret; void setup() { - //Serial.begin(115200); + Serial.begin(115200); + delay(5000); + Serial.println("RAKwireless LoRaWan Ckass B Example"); + Serial.println("------------------------------------------------------"); + // OTAA Device EUI MSB + uint8_t node_device_eui[8] = {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08}; + // OTAA Application EUI MSB + uint8_t node_app_eui[8] = {0x0E, 0x0D, 0x0D, 0x01, 0x0E, 0x01, 0x02, 0x03}; + // OTAA Application Key MSB + uint8_t node_app_key[16] = {0x2B, 0x7E, 0x15, 0x16, 0x28, 0xAE, 0xD2, 0xA6, 0xAB, 0xF7, 0x15, 0x88, 0x09, 0xCF, 0x4F, 0x3C}; -// OTAA Device EUI MSB -uint8_t node_device_eui[8] = {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08}; -// OTAA Application EUI MSB -uint8_t node_app_eui[8] = {0x0E, 0x0D, 0x0D, 0x01, 0x0E, 0x01, 0x02, 0x03}; -// OTAA Application Key MSB -uint8_t node_app_key[16] = {0x2B, 0x7E, 0x15, 0x16, 0x28, 0xAE, 0xD2, 0xA6, 0xAB, 0xF7, 0x15, 0x88, 0x09, 0xCF, 0x4F, 0x3C}; + if(!(ret = api.lorawan.appeui.set(node_app_eui, 8))) + { + Serial.printf("LoRaWan Class B - set device EUI is incorrect! \r\n"); + return; + } + if(!(ret = api.lorawan.appkey.set(node_app_key, 16))) + { + Serial.printf("LoRaWan Class B - set application EUI is incorrect! \r\n"); + return; + } + if(!(ret = api.lorawan.deui.set(node_device_eui, 8))) + { + Serial.printf("LoRaWan Class B - set application key is incorrect! \r\n"); + return; + } - api.lorawan.appeui.set(node_app_eui, 8); - api.lorawan.appkey.set(node_app_key, 16); - api.lorawan.deui.set(node_device_eui, 8); /************************************* * * LoRaWAN band setting: @@ -30,10 +45,26 @@ uint8_t node_app_key[16] = {0x2B, 0x7E, 0x15, 0x16, 0x28, 0xAE, 0xD2, 0xA6, 0xAB * * ************************************/ - api.lorawan.band.set(4); - api.lorawan.deviceClass.set(1); - api.lorawan.njm.set(1); - api.lorawan.join(); + if(!(ret = api.lorawan.band.set(4))) + { + Serial.printf("LoRaWan Class B - set band is incorrect! \r\n"); + return; + } + if(!(ret = api.lorawan.deviceClass.set(1))) + { + Serial.printf("LoRaWan Class B - set device class is incorrect! \r\n"); + return; + } + if(!(ret = api.lorawan.njm.set(1))) + { + Serial.printf("LoRaWan Class B - set network join mode is incorrect! \r\n"); + return; + } + if(!(ret = api.lorawan.join())) + { + Serial.printf("LoRaWan Class B - join fail! \r\n"); + return; + } /**Wait for Join success */ while (api.lorawan.njs.get() == 0) @@ -53,28 +84,32 @@ void loop() api.lorawan.appskey.get(rbuff, 16); Serial.print("Application Session Key=0x"); - for (int i = 0 ; i < 16 ; i++) { + for (int i = 0; i < 16; i++) + { Serial.printf("%x", rbuff[i]); } Serial.print("\r\n"); api.lorawan.nwkskey.get(rbuff, 16); Serial.print("Network Session Key=0x"); - for (int i = 0 ; i < 16 ; i++) { + for (int i = 0; i < 16; i++) + { Serial.printf("%x", rbuff[i]); } Serial.print("\r\n"); api.lorawan.netid.get(rbuff, 16); Serial.print("24-bit Network Identifier(NetId)=0x"); - for (int i = 0 ; i < 3 ; i++) { + for (int i = 0; i < 3; i++) + { Serial.printf("%x", rbuff[i]); } Serial.print("\r\n"); api.lorawan.daddr.get(rbuff, 16); Serial.print("Device Address=0x"); - for (int i = 0 ; i < 4 ; i++) { + for (int i = 0; i < 4; i++) + { Serial.printf("%x", rbuff[i]); } Serial.print("\r\n"); @@ -82,8 +117,8 @@ void loop() beaconBGW = api.lorawan.bgw.get(); Serial.printf("GPS Coordinate = %u\r\n", (unsigned int)beaconBGW.GPS_coordinate); - Serial.printf("Latitude = %f\r\n", (float)beaconBGW.latitude*(float)90/(float)8388607); - Serial.printf("longitude = %f\r\n", (float)beaconBGW.longitude*(float)180/(float)8388607); + Serial.printf("Latitude = %f\r\n", (float)beaconBGW.latitude * (float)90 / (float)8388607); + Serial.printf("longitude = %f\r\n", (float)beaconBGW.longitude * (float)180 / (float)8388607); Serial.printf("Net ID = %u\r\n", (unsigned int)beaconBGW.net_ID); Serial.printf("Gateway ID = %u\r\n", (unsigned int)beaconBGW.gateway_ID); diff --git a/libraries/RUI_V3_examples/examples/Example/LoRaWan_Info/LoRaWan_Info.ino b/libraries/RUI_V3_examples/examples/Example/LoRaWan_Info/LoRaWan_Info.ino index c02dbde0..311c8060 100644 --- a/libraries/RUI_V3_examples/examples/Example/LoRaWan_Info/LoRaWan_Info.ino +++ b/libraries/RUI_V3_examples/examples/Example/LoRaWan_Info/LoRaWan_Info.ino @@ -1,18 +1,33 @@ - +bool ret; void setup() { - //Serial.begin(115200); + Serial.begin(115200); + delay(5000); + Serial.println("RAKwireless LoRaWan Info Example"); + Serial.println("------------------------------------------------------"); + // OTAA Device EUI MSB + uint8_t node_device_eui[8] = {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0xA8}; + // OTAA Application EUI MSB + uint8_t node_app_eui[8] = {0x0E, 0x0D, 0x0D, 0x01, 0x0E, 0x01, 0x02, 0x03}; + // OTAA Application Key MSB + uint8_t node_app_key[16] = {0x2B, 0x7E, 0x15, 0x16, 0x28, 0xAE, 0xD2, 0xA6, 0xAB, 0xF7, 0x15, 0x88, 0x09, 0xCF, 0x4F, 0x3F}; -// OTAA Device EUI MSB -uint8_t node_device_eui[8] = {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0xA8}; -// OTAA Application EUI MSB -uint8_t node_app_eui[8] = {0x0E, 0x0D, 0x0D, 0x01, 0x0E, 0x01, 0x02, 0x03}; -// OTAA Application Key MSB -uint8_t node_app_key[16] = {0x2B, 0x7E, 0x15, 0x16, 0x28, 0xAE, 0xD2, 0xA6, 0xAB, 0xF7, 0x15, 0x88, 0x09, 0xCF, 0x4F, 0x3F}; + if(!(ret = api.lorawan.appeui.set(node_app_eui, 8))) + { + Serial.printf("LoRaWan Info - set device EUI is incorrect! \r\n"); + return; + } + if(!(ret = api.lorawan.appkey.set(node_app_key, 16))) + { + Serial.printf("LoRaWan Info - set application EUI is incorrect! \r\n"); + return; + } + if(!(ret = api.lorawan.deui.set(node_device_eui, 8))) + { + Serial.printf("LoRaWan Info - set application key is incorrect! \r\n"); + return; + } - api.lorawan.appeui.set(node_app_eui, 8); - api.lorawan.appkey.set(node_app_key, 16); - api.lorawan.deui.set(node_device_eui, 8); /************************************* * * LoRaWAN band setting: @@ -28,10 +43,22 @@ uint8_t node_app_key[16] = {0x2B, 0x7E, 0x15, 0x16, 0x28, 0xAE, 0xD2, 0xA6, 0xAB * * ************************************/ - api.lorawan.band.set(4); - api.lorawan.njm.set(1); - api.lorawan.join(); - + if(!(ret = api.lorawan.band.set(4))) + { + Serial.printf("LoRaWan Info - set band is incorrect! \r\n"); + return; + } + if(!(ret = api.lorawan.njm.set(1))) + { + Serial.printf("LoRaWan Info - set network join mode is incorrect! \r\n"); + return; + } + if(!(ret = api.lorawan.join())) + { + Serial.printf("LoRaWan Info - join fail! \r\n"); + return; + } + /**Wait for Join success */ while (api.lorawan.njs.get() == 0) { @@ -47,7 +74,7 @@ void loop() Serial.print("Get RSSI ="); Serial.println(api.lorawan.rssi.get()); - + Serial.print("Get Signal Noise Ratio ="); Serial.println(api.lorawan.snr.get()); @@ -55,14 +82,14 @@ void loop() Serial.println(api.lorawan.ver.get()); Serial.print("Get All open channel RSSI ="); - while (api.lorawan.arssi(&chan_arssi) == true) { - if (chan_arssi.mask != 0) { + while (api.lorawan.arssi(&chan_arssi) == true) + { + if (chan_arssi.mask != 0) + { Serial.printf("channel : %d,mask : %d, rssi : %d\r\n", chan_arssi.chan, chan_arssi.mask, chan_arssi.rssi); } } - + Serial.print("\r\n"); delay(1000); } - - diff --git a/libraries/RUI_V3_examples/examples/Example/LoRaWan_Multicast/LoRaWan_Multicast.ino b/libraries/RUI_V3_examples/examples/Example/LoRaWan_Multicast/LoRaWan_Multicast.ino index 32e58ebe..55b481fc 100644 --- a/libraries/RUI_V3_examples/examples/Example/LoRaWan_Multicast/LoRaWan_Multicast.ino +++ b/libraries/RUI_V3_examples/examples/Example/LoRaWan_Multicast/LoRaWan_Multicast.ino @@ -1,38 +1,50 @@ - +bool ret; void setup() { Serial.begin(115200); + delay(5000); + Serial.println("RAKwireless LoRaWan Multicast Example"); + Serial.println("------------------------------------------------------"); + // OTAA Device EUI MSB + uint8_t node_device_eui[8] = {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x88}; + // OTAA Application EUI MSB + uint8_t node_app_eui[8] = {0x0E, 0x0D, 0x0D, 0x01, 0x0E, 0x01, 0x02, 0x0E}; + // OTAA Application Key MSB + uint8_t node_app_key[16] = {0x2B, 0x7E, 0x15, 0x16, 0x28, 0xAE, 0xD2, 0xA6, 0xAB, 0xF7, 0x15, 0x88, 0x09, 0xCF, 0x4F, 0x3E}; -// OTAA Device EUI MSB -uint8_t node_device_eui[8] = {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x88}; -// OTAA Application EUI MSB -uint8_t node_app_eui[8] = {0x0E, 0x0D, 0x0D, 0x01, 0x0E, 0x01, 0x02, 0x0E}; -// OTAA Application Key MSB -uint8_t node_app_key[16] = {0x2B, 0x7E, 0x15, 0x16, 0x28, 0xAE, 0xD2, 0xA6, 0xAB, 0xF7, 0x15, 0x88, 0x09, 0xCF, 0x4F, 0x3E}; - - - -/**LoRaWan Multicast Session*/ + /**LoRaWan Multicast Session*/ -uint8_t node_mc_address[4] = {0x01, 0x02, 0x03, 0x04}; -uint8_t node_mc_AppSKey[16] = {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08}; -uint8_t node_mc_NwkSKey[16] = {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08}; + uint8_t node_mc_address[4] = {0x01, 0x02, 0x03, 0x04}; + uint8_t node_mc_AppSKey[16] = {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08}; + uint8_t node_mc_NwkSKey[16] = {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08}; -RAK_LORA_McSession session = { - .McDevclass = 2, - .McAddress = node_mc_address[0]<<24 | node_mc_address[1]<<16 | node_mc_address[2]<<8 | node_mc_address[3], - .McFrequency = 869525000, - .McDatarate = 0, - .McPeriodicity = 0, - .McGroupID = 2, - .entry = 0, -}; + RAK_LORA_McSession session = { + .McDevclass = 2, + .McAddress = node_mc_address[0] << 24 | node_mc_address[1] << 16 | node_mc_address[2] << 8 | node_mc_address[3], + .McFrequency = 869525000, + .McDatarate = 0, + .McPeriodicity = 0, + .McGroupID = 2, + .entry = 0, + }; memcpy(session.McAppSKey, node_mc_AppSKey, 16); memcpy(session.McNwkSKey, node_mc_NwkSKey, 16); - api.lorawan.appeui.set(node_app_eui, 8); - api.lorawan.appkey.set(node_app_key, 16); - api.lorawan.deui.set(node_device_eui, 8); + if(!(ret = api.lorawan.appeui.set(node_app_eui, 8))) + { + Serial.printf("LoRaWan Multicast - set device EUI is incorrect! \r\n"); + return; + } + if(!(ret = api.lorawan.appkey.set(node_app_key, 16))) + { + Serial.printf("LoRaWan Multicast - set application EUI is incorrect! \r\n"); + return; + } + if(!(ret = api.lorawan.deui.set(node_device_eui, 8))) + { + Serial.printf("LoRaWan Multicast - set application key is incorrect! \r\n"); + return; + } /************************************* * * LoRaWAN band setting: @@ -47,11 +59,28 @@ RAK_LORA_McSession session = { * AS923: 8 * * ************************************/ - - api.lorawan.band.set(4); - api.lorawan.njm.set(1); - api.lorawan.deviceClass.set(2); - api.lorawan.join(); + + if(!(ret = api.lorawan.band.set(4))) + { + Serial.printf("LoRaWan Multicast - set band is incorrect! \r\n"); + return; + } + if(!(ret = api.lorawan.njm.set(1))) + { + Serial.printf("LoRaWan Multicast - set network join mode is incorrect! \r\n"); + return; + } + if(!(ret = api.lorawan.deviceClass.set(2))) + { + Serial.printf("LoRaWan Multicast - set device class is incorrect! \r\n"); + return; + } + + if(!(ret = api.lorawan.join())) + { + Serial.printf("LoRaWan Multicast - join fail! \r\n"); + return; + } /**Wait for Join success */ while (api.lorawan.njs.get() == 0) @@ -66,15 +95,16 @@ RAK_LORA_McSession session = { api.lorawan.cfm.set(1); /**LoRaWAN Multicast Setting*/ - if(api.lorawan.addmulc(session) == true) { + if (api.lorawan.addmulc(session) == true) + { Serial.println("Add Multicast Success"); - } else { + } + else + { Serial.println("Add Multicast Fail"); } - } void loop() { - } diff --git a/libraries/RUI_V3_examples/examples/Example/LoRaWan_OTAA/LoRaWan_OTAA.ino b/libraries/RUI_V3_examples/examples/Example/LoRaWan_OTAA/LoRaWan_OTAA.ino index e5955b20..2d584538 100644 --- a/libraries/RUI_V3_examples/examples/Example/LoRaWan_OTAA/LoRaWan_OTAA.ino +++ b/libraries/RUI_V3_examples/examples/Example/LoRaWan_OTAA/LoRaWan_OTAA.ino @@ -1,18 +1,32 @@ - +bool ret; void setup() { - //Serial.begin(115200); - -// OTAA Device EUI MSB -uint8_t node_device_eui[8] = {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08}; -// OTAA Application EUI MSB -uint8_t node_app_eui[8] = {0x0E, 0x0D, 0x0D, 0x01, 0x0E, 0x01, 0x02, 0x03}; -// OTAA Application Key MSB -uint8_t node_app_key[16] = {0x2B, 0x7E, 0x15, 0x16, 0x28, 0xAE, 0xD2, 0xA6, 0xAB, 0xF7, 0x15, 0x88, 0x09, 0xCF, 0x4F, 0x3C}; + Serial.begin(115200); + delay(5000); + Serial.println("RAKwireless LoRaWan OTAA Example"); + Serial.println("------------------------------------------------------"); + // OTAA Device EUI MSB + uint8_t node_device_eui[8] = {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08}; + // OTAA Application EUI MSB + uint8_t node_app_eui[8] = {0x0E, 0x0D, 0x0D, 0x01, 0x0E, 0x01, 0x02, 0x03}; + // OTAA Application Key MSB + uint8_t node_app_key[16] = {0x2B, 0x7E, 0x15, 0x16, 0x28, 0xAE, 0xD2, 0xA6, 0xAB, 0xF7, 0x15, 0x88, 0x09, 0xCF, 0x4F, 0x3C}; - api.lorawan.appeui.set(node_app_eui, 8); - api.lorawan.appkey.set(node_app_key, 16); - api.lorawan.deui.set(node_device_eui, 8); + if(!(ret = api.lorawan.appeui.set(node_app_eui, 8))) + { + Serial.printf("LoRaWan OTAA - set device EUI is incorrect! \r\n"); + return; + } + if(!(ret = api.lorawan.appkey.set(node_app_key, 16))) + { + Serial.printf("LoRaWan OTAA - set application EUI is incorrect! \r\n"); + return; + } + if(!(ret = api.lorawan.deui.set(node_device_eui, 8))) + { + Serial.printf("LoRaWan OTAA - set application key is incorrect! \r\n"); + return; + } /************************************* * * LoRaWAN band setting: @@ -28,9 +42,21 @@ uint8_t node_app_key[16] = {0x2B, 0x7E, 0x15, 0x16, 0x28, 0xAE, 0xD2, 0xA6, 0xAB * * ************************************/ - api.lorawan.band.set(4); - api.lorawan.njm.set(1); - api.lorawan.join(); + if(!(ret = api.lorawan.band.set(4))) + { + Serial.printf("LoRaWan OTAA - set band is incorrect! \r\n"); + return; + } + if(!(ret = api.lorawan.njm.set(1))) + { + Serial.printf("LoRaWan OTAA - set network join mode is incorrect! \r\n"); + return; + } + if(!(ret = api.lorawan.join())) + { + Serial.printf("LoRaWan OTAA - join fail! \r\n"); + return; + } } void loop() @@ -42,28 +68,32 @@ void loop() api.lorawan.appskey.get(rbuff, 16); Serial.print("Application Session Key=0x"); - for (int i = 0 ; i < 16 ; i++) { + for (int i = 0; i < 16; i++) + { Serial.printf("%x", rbuff[i]); } Serial.print("\r\n"); api.lorawan.nwkskey.get(rbuff, 16); Serial.print("Network Session Key=0x"); - for (int i = 0 ; i < 16 ; i++) { + for (int i = 0; i < 16; i++) + { Serial.printf("%x", rbuff[i]); } Serial.print("\r\n"); api.lorawan.netid.get(rbuff, 16); Serial.print("24-bit Network Identifier(NetId)=0x"); - for (int i = 0 ; i < 3 ; i++) { + for (int i = 0; i < 3; i++) + { Serial.printf("%x", rbuff[i]); } Serial.print("\r\n"); api.lorawan.daddr.get(rbuff, 16); Serial.print("Device Address=0x"); - for (int i = 0 ; i < 4 ; i++) { + for (int i = 0; i < 4; i++) + { Serial.printf("%x", rbuff[i]); } Serial.print("\r\n"); diff --git a/libraries/RUI_V3_examples/examples/Example/LoRaWan_P2P/LoRaWan_P2P.ino b/libraries/RUI_V3_examples/examples/Example/LoRaWan_P2P/LoRaWan_P2P.ino index 5eeeed73..fc4bbe6d 100644 --- a/libraries/RUI_V3_examples/examples/Example/LoRaWan_P2P/LoRaWan_P2P.ino +++ b/libraries/RUI_V3_examples/examples/Example/LoRaWan_P2P/LoRaWan_P2P.ino @@ -4,12 +4,14 @@ long startTime; void setup() { Serial.begin(115200); - + delay(5000); + Serial.println("RAKwireless LoRaWan P2P Example"); + Serial.println("------------------------------------------------------"); delay(2000); startTime = millis(); Serial.println("P2P Start"); - + Serial.printf("Set Node device work mode %s\r\n", api.lorawan.nwm.set(0) ? "Success" : "Fail"); Serial.printf("Set P2P mode frequency %s\r\n", api.lorawan.pfreq.set(868000000) ? "Success" : "Fail"); Serial.printf("Set P2P mode spreading factor %s\r\n", api.lorawan.psf.set(12) ? "Success" : "Fail"); @@ -28,15 +30,17 @@ void loop() int rxDelay = random(3000, 5000); /* Receive P2P data every 10 seconds**/ - if(millis() - startTime >= 10*1000) { + if (millis() - startTime >= 10 * 1000) + { Serial.printf("P2P Rx start for %d millisSconds\r\n", rxDelay); startTime = millis(); - Serial.printf("P2P set Rx mode %s\r\n",api.lorawan.precv(rxDelay) ? "Success" : "Fail"); + Serial.printf("P2P set Rx mode %s\r\n", api.lorawan.precv(rxDelay) ? "Success" : "Fail"); delay(rxDelay); - } else { - - Serial.printf("P2P send %s\r\n", api.lorawan.psend(sizeof(payload), payload)? "Success" : "Fail"); - delay(1000); } + else + { + Serial.printf("P2P send %s\r\n", api.lorawan.psend(sizeof(payload), payload) ? "Success" : "Fail"); + delay(1000); + } } diff --git a/libraries/RUI_V3_examples/examples/Example/RAK4631/RAK4631.ino b/libraries/RUI_V3_examples/examples/Example/RAK4631/RAK4631.ino index 9f914184..8dfc4f26 100644 --- a/libraries/RUI_V3_examples/examples/Example/RAK4631/RAK4631.ino +++ b/libraries/RUI_V3_examples/examples/Example/RAK4631/RAK4631.ino @@ -1,6 +1,9 @@ void setup() { + delay(5000); + Serial.println("RAKwireless RAK4631 Example"); + Serial.println("------------------------------------------------------"); } void loop() diff --git a/libraries/RUI_V3_examples/examples/Example/System_Custom_ATCMD/System_Custom_ATCMD.ino b/libraries/RUI_V3_examples/examples/Example/System_Custom_ATCMD/System_Custom_ATCMD.ino index e9730e3b..750ab665 100644 --- a/libraries/RUI_V3_examples/examples/Example/System_Custom_ATCMD/System_Custom_ATCMD.ino +++ b/libraries/RUI_V3_examples/examples/Example/System_Custom_ATCMD/System_Custom_ATCMD.ino @@ -1,28 +1,37 @@ uint32_t led_status; -int led_handle(SERIAL_PORT port, char *cmd, stParam *param) { - if (param->argc == 1 && !strcmp(param->argv[0], "?")) { +int led_handle(SERIAL_PORT port, char *cmd, stParam *param) +{ + if (param->argc == 1 && !strcmp(param->argv[0], "?")) + { Serial.print(cmd); Serial.print("="); - Serial.println(led_status?"HIGH":"LOW"); - } else if (param->argc == 1) { - for (int i = 0 ; i < strlen(param->argv[0]) ; i++) { - if (!isdigit(*(param->argv[0]+i))) { + Serial.println(led_status ? "HIGH" : "LOW"); + } + else if (param->argc == 1) + { + for (int i = 0; i < strlen(param->argv[0]); i++) + { + if (!isdigit(*(param->argv[0] + i))) + { return AT_PARAM_ERROR; } } led_status = strtoul(param->argv[0], NULL, 10); - if (led_status != 0 && led_status != 1) { + if (led_status != 0 && led_status != 1) + { return AT_PARAM_ERROR; } pinMode(GREEN_LED, OUTPUT); pinMode(BLUE_LED, OUTPUT); - digitalWrite(GREEN_LED, (led_status == 1)?HIGH:LOW); - digitalWrite(BLUE_LED, (led_status == 1)?HIGH:LOW); - } else { + digitalWrite(GREEN_LED, (led_status == 1) ? HIGH : LOW); + digitalWrite(BLUE_LED, (led_status == 1) ? HIGH : LOW); + } + else + { return AT_PARAM_ERROR; } @@ -31,6 +40,9 @@ int led_handle(SERIAL_PORT port, char *cmd, stParam *param) { void setup() { + delay(5000); + Serial.println("RAKwireless Custom ATCMD Example"); + Serial.println("------------------------------------------------------"); api.system.atMode.add("LED", "This controls both green and blue LEDs.", "LED", led_handle); } diff --git a/libraries/RUI_V3_examples/examples/Example/System_FS/System_FS.ino b/libraries/RUI_V3_examples/examples/Example/System_FS/System_FS.ino index ffb3594f..841200ac 100644 --- a/libraries/RUI_V3_examples/examples/Example/System_FS/System_FS.ino +++ b/libraries/RUI_V3_examples/examples/Example/System_FS/System_FS.ino @@ -3,15 +3,17 @@ SERVICE_FS fs; uint32_t i = 0; -static void test_fs() { +static void test_fs() +{ int32_t ret; uint8_t buf[12]; char fname[16]; - sprintf(fname, "my_file_%u", ++i%10); + sprintf(fname, "my_file_%u", ++i % 10); SERVICE_FS_FILE file = api.system.fs.open(fs, fname, SPIFFS_CREAT | SPIFFS_TRUNC | SPIFFS_RDWR, 0); - if ((ret = api.system.fs.write(fs, file, (uint8_t *)"Hello world", 12)) < 0) { + if ((ret = api.system.fs.write(fs, file, (uint8_t *)"Hello world", 12)) < 0) + { Serial.printf("write file error! %d\r\n", ret); api.system.fs.close(fs, file); return; @@ -19,7 +21,8 @@ static void test_fs() { api.system.fs.close(fs, file); file = api.system.fs.open(fs, fname, SPIFFS_RDWR, 0); - if ((ret = api.system.fs.read(fs, file, buf, 12)) < 0) { + if ((ret = api.system.fs.read(fs, file, buf, 12)) < 0) + { Serial.printf("read file error! %d\r\n", ret); api.system.fs.close(fs, file); return; @@ -32,6 +35,8 @@ static void test_fs() { void setup() { delay(5000); + Serial.println("RAKwireless File System Example"); + Serial.println("------------------------------------------------------"); fs = api.system.fs.init(); } @@ -41,16 +46,19 @@ void loop() SERVICE_FS_DIRENT entry; SERVICE_FS_DIR dir; - if ((ret = api.system.fs.opendir(fs, "/", &dir)) != SERVICE_FS_OK) { + if ((ret = api.system.fs.opendir(fs, "/", &dir)) != RAK_FS_OK) + { Serial.printf("open dir error! %d\r\n", ret); return; } - while (api.system.fs.list(fs, &dir, &entry) != SERVICE_FS_OK) { + while (api.system.fs.list(fs, &dir, &entry) != RAK_FS_OK) + { Serial.printf("%s size:%u\r\n", entry.dirent.name, entry.dirent.size); } - if ((ret = api.system.fs.closedir(fs, &dir)) != SERVICE_FS_OK) { + if ((ret = api.system.fs.closedir(fs, &dir)) != RAK_FS_OK) + { Serial.printf("close dir error! %d\r\n", ret); return; } diff --git a/libraries/RUI_V3_examples/examples/Example/System_General/System_General.ino b/libraries/RUI_V3_examples/examples/Example/System_General/System_General.ino index 5f54f7db..267da654 100644 --- a/libraries/RUI_V3_examples/examples/Example/System_General/System_General.ino +++ b/libraries/RUI_V3_examples/examples/Example/System_General/System_General.ino @@ -3,12 +3,16 @@ int i; void setup() { + delay(5000); + Serial.println("RAKwireless System General Example"); + Serial.println("------------------------------------------------------"); api.system.restoreDefault(); } void loop() { - if (++i == 20) { + if (++i == 20) + { Serial.printf("Reboot now..\r\n"); api.system.reboot(); } diff --git a/libraries/RUI_V3_examples/examples/Example/System_Powersave/System_Powersave.ino b/libraries/RUI_V3_examples/examples/Example/System_Powersave/System_Powersave.ino index 44d16b21..2030f3a0 100644 --- a/libraries/RUI_V3_examples/examples/Example/System_Powersave/System_Powersave.ino +++ b/libraries/RUI_V3_examples/examples/Example/System_Powersave/System_Powersave.ino @@ -3,6 +3,9 @@ void setup() { api.ble.uart.stop(); Serial.begin(115200); + delay(5000); + Serial.println("RAKwireless System Powersave Example"); + Serial.println("------------------------------------------------------"); } void loop() diff --git a/libraries/RUI_V3_examples/examples/Example/System_Serial_Lock/System_Serial_Lock.ino b/libraries/RUI_V3_examples/examples/Example/System_Serial_Lock/System_Serial_Lock.ino index 794c1cd6..72516dee 100644 --- a/libraries/RUI_V3_examples/examples/Example/System_Serial_Lock/System_Serial_Lock.ino +++ b/libraries/RUI_V3_examples/examples/Example/System_Serial_Lock/System_Serial_Lock.ino @@ -5,15 +5,21 @@ bool locked; void setup() { Serial.begin(115200, AT_MODE); - /* Wait 5s for USB to be plugged in, or the log messages will be gone */ delay(5000); - + Serial.println("RAKwireless System Serial Lock Example"); + Serial.println("------------------------------------------------------"); /* Lock serial port with password => 12345678 */ string password = "12345678"; Serial.println("Type 12345678 and then press enter to unlock the serial port:"); Serial.println("(If the password is not correct, the serial port will be auto unlocked after 30s..)"); - api.system.pword.set(password); + + bool ret; + if(!(ret = api.system.pword.set(password))) + { + Serial.printf("System serial Lock - set password parameter is incorrect! \r\n"); + return; + } api.system.pword.lock(); locked = true; start = millis(); @@ -23,10 +29,11 @@ void loop() { now = millis(); - if ((elapsed = (now - start)) > 30000 && locked == true) { + if ((elapsed = (now - start)) > 30000 && locked == true) + { Serial.println("Serial port is auto unlocked now..\r\n"); api.system.pword.unlock(); - locked = false; + locked = false; } Serial.println("========="); Serial.printf("start=%lu\r\n", start); @@ -34,4 +41,3 @@ void loop() Serial.printf("elapsed time=%lu\r\n", elapsed); delay(1000); } - diff --git a/libraries/RUI_V3_examples/library.properties b/libraries/RUI_V3_examples/library.properties index ddaa6dfc..f5847d93 100644 --- a/libraries/RUI_V3_examples/library.properties +++ b/libraries/RUI_V3_examples/library.properties @@ -6,4 +6,4 @@ paragraph= category=Communication url= architectures=* -version=3.0.0 +version=1.0.0 diff --git a/platform.txt b/platform.txt index 502a3210..577938fc 100644 --- a/platform.txt +++ b/platform.txt @@ -152,4 +152,4 @@ build.flags.feature= -DSUPPORT_LORA -DLORA_IO_SPI_PORT=1 -DATCMD_IO_SERIAL_PORT= build.flags.lib_path=-L{runtime.platform.path}/cores/nRF5/app -L{runtime.platform.path}/cores/nRF5/component/core/soc/nrf52840 -L{runtime.platform.path}/cores/nRF5/component/core/soc/nrf52840/uhal -L{runtime.platform.path}/cores/nRF5/external -L{runtime.platform.path}/cores/nRF5/component/core/board/rak4631 -L{runtime.platform.path}/cores/nRF5/component/udrv/serial -L{runtime.platform.path}/cores/nRF5/component/udrv/timer -L{runtime.platform.path}/cores/nRF5/component/udrv/delay -L{runtime.platform.path}/cores/nRF5/component/udrv/spimst -L{runtime.platform.path}/cores/nRF5/component/udrv/powersave -L{runtime.platform.path}/cores/nRF5/component/udrv/gpio -L{runtime.platform.path}/cores/nRF5/component/udrv/rtc -L{runtime.platform.path}/cores/nRF5/component/udrv/twimst -L{runtime.platform.path}/cores/nRF5/component/udrv/dfu -L{runtime.platform.path}/cores/nRF5/component/udrv/pwm -L{runtime.platform.path}/cores/nRF5/component/udrv/adc -L{runtime.platform.path}/cores/nRF5/component/udrv/system -L{runtime.platform.path}/cores/nRF5/component/udrv/ble -L{runtime.platform.path}/cores/nRF5/component/udrv/flash -L{runtime.platform.path}/cores/nRF5/component/udrv/wdt -L{runtime.platform.path}/cores/nRF5/component/udrv/nfc -L{runtime.platform.path}/cores/nRF5/component/service/lora -L{runtime.platform.path}/cores/nRF5/component/service/nvm -L{runtime.platform.path}/cores/nRF5/component/service/battery -L{runtime.platform.path}/cores/nRF5/component/service/mode -L{runtime.platform.path}/cores/nRF5/component/service/fs -L{runtime.platform.path}/cores/nRF5/component/rui_v3_api -L{runtime.platform.path}/cores/nRF5/component/helper -L{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/external/nrf_cc310/lib/cortex-m4/hard-float -L{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/external/nrf_oberon/lib/cortex-m4/hard-float build.flags.lib=-lboot -luhal -ludrv_serial -ludrv_timer -ludrv_delay -ludrv_spimst -ludrv_powersave -ludrv_gpio -ludrv_rtc -ludrv_twimst -ludrv_dfu -ludrv_pwm -ludrv_adc -ludrv_system -ludrv_ble -ludrv_flash -ludrv_wdt -ludrv_raknfc -lrui_v3_api -lnrf_cc310_0.9.13 -loberon_3.0.6 build.flags.inc_path=-Iapp/RAK4631/src -I{runtime.platform.path}/cores/nRF5/component/inc -I{runtime.platform.path}/cores/nRF5/component/core/soc/nrf52840 -I{runtime.platform.path}/cores/nRF5/component/core/soc/nrf52840/uhal -I{runtime.platform.path}/cores/nRF5/component/core/soc/nrf52840/uhal/serial -I{runtime.platform.path}/cores/nRF5/component/core/soc/none/uhal -I{runtime.platform.path}/cores/nRF5/component/core/board/rak4631 -I{runtime.platform.path}/cores/nRF5/component/udrv -I{runtime.platform.path}/cores/nRF5/component/udrv/serial -I{runtime.platform.path}/cores/nRF5/component/udrv/timer -I{runtime.platform.path}/cores/nRF5/component/udrv/delay -I{runtime.platform.path}/cores/nRF5/component/udrv/spimst -I{runtime.platform.path}/cores/nRF5/component/udrv/powersave -I{runtime.platform.path}/cores/nRF5/component/udrv/gpio -I{runtime.platform.path}/cores/nRF5/component/udrv/rtc -I{runtime.platform.path}/cores/nRF5/component/udrv/twimst -I{runtime.platform.path}/cores/nRF5/component/udrv/dfu -I{runtime.platform.path}/cores/nRF5/component/udrv/pwm -I{runtime.platform.path}/cores/nRF5/component/udrv/adc -I{runtime.platform.path}/cores/nRF5/component/udrv/system -I{runtime.platform.path}/cores/nRF5/component/udrv/ble -I{runtime.platform.path}/cores/nRF5/component/udrv/flash -I{runtime.platform.path}/cores/nRF5/component/udrv/wdt -I{runtime.platform.path}/cores/nRF5/component/udrv/nfc -I{runtime.platform.path}/cores/nRF5/component/service/lora -I{runtime.platform.path}/cores/nRF5/component/service/nvm -I{runtime.platform.path}/cores/nRF5/component/service/battery -I{runtime.platform.path}/cores/nRF5/component/service/mode -I{runtime.platform.path}/cores/nRF5/component/service/mode/cli -I{runtime.platform.path}/cores/nRF5/component/service/mode/transparent -I{runtime.platform.path}/cores/nRF5/component/service/mode/protocol -I{runtime.platform.path}/cores/nRF5/component/service/fs -I{runtime.platform.path}/cores/nRF5/component/rui_v3_api -I{runtime.platform.path}/cores/nRF5/component/helper -I{runtime.platform.path}/cores/nRF5/external/lora/LoRaMac-node-4.4.7/src/mac -I{runtime.platform.path}/cores/nRF5/external/lora/LoRaMac-node-4.4.7/src/mac/region -I{runtime.platform.path}/cores/nRF5/external/lora/LoRaMac-node-4.4.7/src/radio -I{runtime.platform.path}/cores/nRF5/external/lora/LoRaMac-node-4.4.7/src/system -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/log -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/ringbuf -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/log/src -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/memobj -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/mutex -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/softdevice/s140/headers -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/softdevice/s140/headers/nrf52 -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/nrf_ble_scan -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/serial -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/queue -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/RUI/Source/nordic/service/wdt -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/include -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/hal -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/integration/nrfx/legacy -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/usbd -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/usbd/class/cdc/acm -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/usbd/class/cdc -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/external/utf_converter -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/drivers_nrf/usbd -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/ble_services/ble_dfu -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/bootloader -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/bootloader/ble_dfu -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/bootloader/dfu -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/pwr_mgmt -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/svc -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/mutex -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/RUI/Source/nordic/app -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/integration/nrfx/legacy -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/experimental_section_vars -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/strerror -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/fstorage -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/softdevice/common -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/util/ -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/ble_link_ctx_manager -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/atomic/ -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/atomic_flags -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/ble_db_discovery -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/nrf_ble_gatt -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/balloc -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/boards -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/peer_manager -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/softdevice/common -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/common -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/ble_services/ble_nus -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/ble_services/ble_nus_c -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/ble_link_ctx_manager -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/ble_advertising -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/atomic_flags -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/timer -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/fds -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/fifo -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/atomic -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/atomic_fifo -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/uart -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/fstorage -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crc32 -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/sha256 -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/cc310 -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/cc310_bl -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/nrf_sw -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/mbedtls -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/oberon -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/micro_ecc -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/bootloader/dfu -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/nrf_ble_gatt -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/uart/ -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/mdk -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/RUI/build/nordic/RTE -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/hal -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src/prs -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/balloc -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/delay -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/integration/nrfx -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/bsp -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/external/segger_rtt -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/RUI/Source/nordic/include -I{runtime.platform.path}/cores/nRF5/external/micro_ecc -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/strerror -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/boards -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/toolchain/cmsis/include -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/util -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/external/fprintf -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/external/segger_rtt -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/include -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/util -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/ble_advertising -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/fds -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/button -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/bsp -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/include -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/hal/ -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/RUI/Source/nordic/service/ble_central -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/ble_db_discovery -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/bootloader -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/pwr_mgmt -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/mutex -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/pwm -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/nrf_ble_gq -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/optiga -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/nrf_hw -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/external/mbedtls/include -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/external/mbedtls/include/mbedtls -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/crypto/backend/cifra -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/stack_info -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/sortlist -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/timer -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/cli -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/cli/uart -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/nrf_ble_qwr -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/ble_services/ble_hids -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/ble_services/ble_bas -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/ble/ble_services/ble_dis -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/sensorsim -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/scheduler -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/external/nrf_cc310_bl/include -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/mutex -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/external/nrf_cc310/include -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/nfc/t2t_lib -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/nfc/ndef/generic/message -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/nfc/ndef/text -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/nfc/ndef/generic/record -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/hardfault -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/modules/nrfx/drivers/src -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/nfc/platform -I{runtime.platform.path}/cores/nRF5/external/nRF5_SDK/nRF5_SDK_17.0.2_d674dde/components/libraries/hardfault/nrf52 -I{runtime.platform.path}/cores/nRF5/external/FatFs/source -I{runtime.platform.path}/cores/nRF5/external/spiffs/src -version=8.0.0 +version=3.0.0