diff --git a/cores/arduino/Serial.cpp b/cores/arduino/Serial.cpp index 92a31a40e..7221e52d4 100644 --- a/cores/arduino/Serial.cpp +++ b/cores/arduino/Serial.cpp @@ -133,7 +133,10 @@ void UART::end() { if (_serial->obj != NULL) { delete _serial->obj; _serial->obj = NULL; + delete _serial; + _serial = NULL; } + rx_buffer.clear(); } int UART::available() { diff --git a/cores/arduino/mbed/targets/TARGET_RASPBERRYPI/TARGET_RP2040/objects.h b/cores/arduino/mbed/targets/TARGET_RASPBERRYPI/TARGET_RP2040/objects.h index cdbd5655e..280f166d4 100644 --- a/cores/arduino/mbed/targets/TARGET_RASPBERRYPI/TARGET_RP2040/objects.h +++ b/cores/arduino/mbed/targets/TARGET_RASPBERRYPI/TARGET_RP2040/objects.h @@ -20,6 +20,7 @@ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wtype-limits" #pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wunused-value" #ifdef __cplusplus #include diff --git a/cores/arduino/wiring_pulse.cpp b/cores/arduino/wiring_pulse.cpp index 2a4615699..afe41e936 100644 --- a/cores/arduino/wiring_pulse.cpp +++ b/cores/arduino/wiring_pulse.cpp @@ -190,6 +190,84 @@ unsigned long pulseIn(PinName pin, PinStatus state, unsigned long timeout) return pulseTime; } + +#elif defined(TARGET_RP2040) + +#include "pinDefinitions.h" + +unsigned long pulseIn(PinName pin, PinStatus state, unsigned long timeout) +{ + unsigned long startMicros = micros(); + + // wait for any previous pulse to end + while (gpio_get(pin) == state) { + tight_loop_contents(); + if (micros() - startMicros > timeout) + return 0; + } + + // wait for the pulse to start + while (gpio_get(pin) != state) { + tight_loop_contents(); + if (micros() - startMicros > timeout) + return 0; + } + + unsigned long start = micros(); + // wait for the pulse to stop + while (gpio_get(pin) == state) { + tight_loop_contents(); + if (micros() - startMicros > timeout) + return 0; + } + return micros() - start; +} + +#elif defined(TARGET_STM32H7) + +extern "C" { + #include "gpio_api.h" + GPIO_TypeDef *Set_GPIO_Clock(uint32_t port_idx); +} + +#include "pinDefinitions.h" + +unsigned long pulseIn(PinName pin, PinStatus state, unsigned long timeout) +{ + + uint32_t port_index = STM_PORT(pin); + GPIO_TypeDef *gpio = Set_GPIO_Clock(port_index); + + volatile uint32_t *reg_in = &gpio->IDR; + uint32_t mask = gpio_set(pin); + + unsigned long startMicros = micros(); + + // wait for any previous pulse to end + while ((*reg_in & mask) == state) { + if (micros() - startMicros > timeout) + return 0; + } + + // wait for the pulse to start + while ((*reg_in & mask) != state) { + if (micros() - startMicros > timeout) + return 0; + } + + unsigned long start = micros(); + // wait for the pulse to stop + while ((*reg_in & mask) == state) { + if (micros() - startMicros > timeout) + return 0; + } + return micros() - start; +} + +#endif + +// generic, overloaded implementations + unsigned long pulseIn(uint8_t pin, uint8_t state, unsigned long timeout) { return pulseIn(digitalPinToPinName(pin), (PinStatus)state, timeout); @@ -203,6 +281,4 @@ unsigned long pulseInLong(uint8_t pin, uint8_t state, unsigned long timeout) unsigned long pulseInLong(PinName pin, PinStatus state, unsigned long timeout) { return pulseIn(pin, state, timeout); -} - -#endif +} \ No newline at end of file diff --git a/libraries/Ethernet/src/Portenta_Ethernet.h b/libraries/Ethernet/src/Portenta_Ethernet.h new file mode 100644 index 000000000..6761ba5ed --- /dev/null +++ b/libraries/Ethernet/src/Portenta_Ethernet.h @@ -0,0 +1 @@ +// placeholder to allow the discovery of this library \ No newline at end of file diff --git a/libraries/SPI/SPI.cpp b/libraries/SPI/SPI.cpp index ce3f7a48a..b2b970ee5 100644 --- a/libraries/SPI/SPI.cpp +++ b/libraries/SPI/SPI.cpp @@ -33,7 +33,13 @@ struct _mbed_spi { }; -arduino::MbedSPI::MbedSPI(int miso, int mosi, int sck) : _miso(miso), _mosi(mosi), _sck(sck) { +arduino::MbedSPI::MbedSPI(int miso, int mosi, int sck) : + _miso(digitalPinToPinName(miso)), _mosi(digitalPinToPinName(mosi)), _sck(digitalPinToPinName(sck)) { + +} + +arduino::MbedSPI::MbedSPI(PinName miso, PinName mosi, PinName sck) : _miso(miso), _mosi(mosi), _sck(sck) { + } uint8_t arduino::MbedSPI::transfer(uint8_t data) { @@ -95,7 +101,7 @@ void arduino::MbedSPI::begin() { dev->obj = NULL; } if (dev->obj == NULL) { - dev->obj = new mbed::SPI((PinName)_mosi, (PinName)_miso, (PinName)_sck); + dev->obj = new mbed::SPI(_mosi, _miso, _sck); } } diff --git a/libraries/SPI/SPI.h b/libraries/SPI/SPI.h index dbdca6f93..f29657d8c 100644 --- a/libraries/SPI/SPI.h +++ b/libraries/SPI/SPI.h @@ -29,6 +29,7 @@ class MbedSPI : public SPIClass { public: MbedSPI(int miso, int mosi, int sck); + MbedSPI(PinName miso, PinName mosi, PinName sck); virtual uint8_t transfer(uint8_t data); virtual uint16_t transfer16(uint16_t data); virtual void transfer(void *buf, size_t count); @@ -49,9 +50,9 @@ class MbedSPI : public SPIClass private: SPISettings settings = SPISettings(0, MSBFIRST, SPI_MODE0); _mbed_spi* dev = NULL; - int _miso; - int _mosi; - int _sck; + PinName _miso; + PinName _mosi; + PinName _sck; }; } diff --git a/libraries/WiFi/src/utility/arm_hal_random.c b/libraries/WiFi/src/utility/arm_hal_random.c new file mode 100644 index 000000000..b7bd3402b --- /dev/null +++ b/libraries/WiFi/src/utility/arm_hal_random.c @@ -0,0 +1,40 @@ +#include "mbed_config.h" + +#if !defined(NS_USE_EXTERNAL_MBED_TLS) + +#include "ns_types.h" +#include "arm_hal_random.h" + +#include "mbedtls/entropy_poll.h" + +#ifdef MBEDTLS_ENTROPY_HARDWARE_ALT +#if defined(MBEDTLS_PLATFORM_C) +#include "mbedtls/platform.h" +#endif +#endif + +void arm_random_module_init(void) +{ +} + +uint32_t arm_random_seed_get(void) +{ + uint32_t result = 0; +#ifdef MBEDTLS_ENTROPY_HARDWARE_ALT +#if defined(MBEDTLS_PLATFORM_C) + int ret = mbedtls_platform_setup(NULL); + if (ret != 0) { + return result; + } +#endif /* MBEDTLS_PLATFORM_C */ + /* Grab a seed from a function we provide for mbedtls */ + size_t len; + mbedtls_hardware_poll(NULL, (uint8_t *) &result, sizeof result, &len); +#if defined(MBEDTLS_PLATFORM_C) + mbedtls_platform_teardown(NULL); +#endif /* MBEDTLS_PLATFORM_C */ +#endif + return result; +} + +#endif \ No newline at end of file diff --git a/libraries/Wire/Wire.cpp b/libraries/Wire/Wire.cpp index 93bcd9154..c958881ef 100644 --- a/libraries/Wire/Wire.cpp +++ b/libraries/Wire/Wire.cpp @@ -23,10 +23,12 @@ #include "Wire.h" #include "pinDefinitions.h" -arduino::MbedI2C::MbedI2C(int sda, int scl) : _sda(sda), _scl(scl), usedTxBuffer(0) {} +arduino::MbedI2C::MbedI2C(int sda, int scl) : _sda(digitalPinToPinName(sda)), _scl(digitalPinToPinName(scl)), usedTxBuffer(0) {} + +arduino::MbedI2C::MbedI2C(PinName sda, PinName scl) : _sda(sda), _scl(scl), usedTxBuffer(0) {} void arduino::MbedI2C::begin() { - master = new mbed::I2C((PinName)_sda, (PinName)_scl); + master = new mbed::I2C(_sda, _scl); } void arduino::MbedI2C::begin(uint8_t slaveAddr) { diff --git a/libraries/Wire/Wire.h b/libraries/Wire/Wire.h index a1dd82bbb..227f0cc18 100644 --- a/libraries/Wire/Wire.h +++ b/libraries/Wire/Wire.h @@ -35,6 +35,7 @@ class MbedI2C : public HardwareI2C { public: MbedI2C(int sda, int scl); + MbedI2C(PinName sda, PinName scl); virtual void begin(); #ifndef DEVICE_I2CSLAVE virtual void __attribute__ ((error("I2C Slave mode is not supported"))) begin(uint8_t address); @@ -72,8 +73,8 @@ class MbedI2C : public HardwareI2C mbed::I2CSlave* slave = NULL; #endif mbed::I2C* master = NULL; - int _sda; - int _scl; + PinName _sda; + PinName _scl; int _address; RingBufferN<256> rxBuffer; uint8_t txBuffer[256]; diff --git a/patches/0084-RP2040-FLASH-fix-multipage-write.patch b/patches/0084-RP2040-FLASH-fix-multipage-write.patch new file mode 100644 index 000000000..7450fa33a --- /dev/null +++ b/patches/0084-RP2040-FLASH-fix-multipage-write.patch @@ -0,0 +1,41 @@ +From e8e2a401550e456862311fcd191a2abb7bd3a7b7 Mon Sep 17 00:00:00 2001 +From: Martino Facchin +Date: Tue, 13 Apr 2021 12:20:06 +0200 +Subject: [PATCH] RP2040: FLASH: fix multipage write + +--- + .../TARGET_RASPBERRYPI/TARGET_RP2040/flash_api.c | 16 ++++++---------- + 1 file changed, 6 insertions(+), 10 deletions(-) + +diff --git a/targets/TARGET_RASPBERRYPI/TARGET_RP2040/flash_api.c b/targets/TARGET_RASPBERRYPI/TARGET_RP2040/flash_api.c +index fb1a28dd7f..2ebfc40a04 100644 +--- a/targets/TARGET_RASPBERRYPI/TARGET_RP2040/flash_api.c ++++ b/targets/TARGET_RASPBERRYPI/TARGET_RP2040/flash_api.c +@@ -71,18 +71,14 @@ int32_t flash_program_page(flash_t *obj, uint32_t address, const uint8_t *data, + return -1; + } + +- uint8_t buf[FLASH_PAGE_SIZE]; +- +- for (int j = 0; j < size/FLASH_PAGE_SIZE; j++) { +- for (int i = 0; i < FLASH_PAGE_SIZE; i++) { +- buf[i] = data[j*FLASH_PAGE_SIZE + i]; +- } +- address = address + j*FLASH_PAGE_SIZE; +- core_util_critical_section_enter(); +- flash_range_program(address, buf, FLASH_PAGE_SIZE); +- core_util_critical_section_exit(); ++ size_t pages = size/FLASH_PAGE_SIZE; ++ if (size%FLASH_PAGE_SIZE != 0) { ++ pages += 1; + } + ++ core_util_critical_section_enter(); ++ flash_range_program(address, data, FLASH_PAGE_SIZE * pages); ++ core_util_critical_section_exit(); + + return 0; + +-- +2.30.1 + diff --git a/patches/0085-RP2040-i2c-remove-debug-prints.patch b/patches/0085-RP2040-i2c-remove-debug-prints.patch new file mode 100644 index 000000000..1d4654e49 --- /dev/null +++ b/patches/0085-RP2040-i2c-remove-debug-prints.patch @@ -0,0 +1,25 @@ +From 47e01b04b6ea5d97d0f37a54ec6dd011916ddf1a Mon Sep 17 00:00:00 2001 +From: Martino Facchin +Date: Tue, 16 Mar 2021 17:19:42 +0100 +Subject: [PATCH 1/3] RP2040: i2c: remove debug prints + +--- + targets/TARGET_RASPBERRYPI/TARGET_RP2040/i2c_api.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/targets/TARGET_RASPBERRYPI/TARGET_RP2040/i2c_api.c b/targets/TARGET_RASPBERRYPI/TARGET_RP2040/i2c_api.c +index 9d7510bedf..2b776562a1 100644 +--- a/targets/TARGET_RASPBERRYPI/TARGET_RP2040/i2c_api.c ++++ b/targets/TARGET_RASPBERRYPI/TARGET_RP2040/i2c_api.c +@@ -13,7 +13,7 @@ + * DEFINE + ******************************************************************************/ + +-#if 1 ++#if 0 + #define DEBUG_PRINTF(...) printf(__VA_ARGS__) + #else + #define DEBUG_PRINTF(...) +-- +2.30.1 + diff --git a/portenta.variables b/portenta.variables index 843abf711..1294f2bd2 100644 --- a/portenta.variables +++ b/portenta.variables @@ -1,5 +1,5 @@ export FLAVOUR="portenta" export VARIANTS=("PORTENTA_H7_M7 PORTENTA_H7_M4") export FQBNS=("envie_m7 envie_m4") -export LIBRARIES=("doom MRI Portenta_SDRAM SPI WiFi ea_malloc openamp_arduino Portenta_System ThreadDebug Himax_HM01B0 PDM Portenta_Video USBAudio KernelDebug Portenta_Audio RPC USBHID Wire LittleVGL Portenta_Camera rpclib USBHOST mbed-memory-status Portenta_SDCARD Scheduler USBMSD") +export LIBRARIES=("doom Ethernet MRI Portenta_SDRAM SPI WiFi ea_malloc openamp_arduino Portenta_System ThreadDebug Himax_HM01B0 PDM Portenta_Video USBAudio KernelDebug Portenta_Audio RPC USBHID Wire LittleVGL Portenta_Camera rpclib USBHOST mbed-memory-status Portenta_SDCARD Scheduler USBMSD") export BOOTLOADERS=("PORTENTA_H7") diff --git a/variants/ARDUINO_NANO33BLE/defines.txt b/variants/ARDUINO_NANO33BLE/defines.txt index d5b78c71d..66a551cf3 100644 --- a/variants/ARDUINO_NANO33BLE/defines.txt +++ b/variants/ARDUINO_NANO33BLE/defines.txt @@ -30,7 +30,7 @@ -DFEATURE_CRYPTOCELL310=1 -DFEATURE_STORAGE=1 -DMBEDTLS_CONFIG_HW_SUPPORT --DMBED_BUILD_TIMESTAMP=1617783867.1831396 +-DMBED_BUILD_TIMESTAMP=1618322697.3620598 -DMBED_MPU_CUSTOM -DMBED_TICKLESS -DNRF52840_XXAA diff --git a/variants/ARDUINO_NANO33BLE/includes.txt b/variants/ARDUINO_NANO33BLE/includes.txt index 4ee478827..cc640dd98 100644 --- a/variants/ARDUINO_NANO33BLE/includes.txt +++ b/variants/ARDUINO_NANO33BLE/includes.txt @@ -93,33 +93,6 @@ -iwithprefixbefore/mbed/connectivity/drivers/802.15.4_RF/stm-s2lp-rf-driver/source -iwithprefixbefore/mbed/connectivity/drivers/802.15.4_RF/stm-s2lp-rf-driver/stm-s2lp-rf-driver -iwithprefixbefore/mbed/connectivity/drivers/ble/FEATURE_BLE/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x --iwithprefixbefore/mbed/connectivity/drivers/cellular --iwithprefixbefore/mbed/connectivity/drivers/cellular/Altair --iwithprefixbefore/mbed/connectivity/drivers/cellular/Altair/ALT1250 --iwithprefixbefore/mbed/connectivity/drivers/cellular/Altair/ALT1250/PPP --iwithprefixbefore/mbed/connectivity/drivers/cellular/GEMALTO --iwithprefixbefore/mbed/connectivity/drivers/cellular/GEMALTO/CINTERION --iwithprefixbefore/mbed/connectivity/drivers/cellular/GENERIC --iwithprefixbefore/mbed/connectivity/drivers/cellular/GENERIC/GENERIC_AT3GPP --iwithprefixbefore/mbed/connectivity/drivers/cellular/MultiTech --iwithprefixbefore/mbed/connectivity/drivers/cellular/MultiTech/DragonflyNano --iwithprefixbefore/mbed/connectivity/drivers/cellular/MultiTech/DragonflyNano/PPP --iwithprefixbefore/mbed/connectivity/drivers/cellular/QUECTEL --iwithprefixbefore/mbed/connectivity/drivers/cellular/QUECTEL/BC95 --iwithprefixbefore/mbed/connectivity/drivers/cellular/QUECTEL/BG96 --iwithprefixbefore/mbed/connectivity/drivers/cellular/QUECTEL/EC2X --iwithprefixbefore/mbed/connectivity/drivers/cellular/QUECTEL/M26 --iwithprefixbefore/mbed/connectivity/drivers/cellular/QUECTEL/UG96 --iwithprefixbefore/mbed/connectivity/drivers/cellular/RiotMicro --iwithprefixbefore/mbed/connectivity/drivers/cellular/RiotMicro/AT --iwithprefixbefore/mbed/connectivity/drivers/cellular/TELIT --iwithprefixbefore/mbed/connectivity/drivers/cellular/TELIT/HE910 --iwithprefixbefore/mbed/connectivity/drivers/cellular/TELIT/ME310 --iwithprefixbefore/mbed/connectivity/drivers/cellular/TELIT/ME910 --iwithprefixbefore/mbed/connectivity/drivers/cellular/UBLOX --iwithprefixbefore/mbed/connectivity/drivers/cellular/UBLOX/AT --iwithprefixbefore/mbed/connectivity/drivers/cellular/UBLOX/N2XX --iwithprefixbefore/mbed/connectivity/drivers/cellular/UBLOX/PPP -iwithprefixbefore/mbed/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310 -iwithprefixbefore/mbed/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/TARGET_MCU_NRF52840 -iwithprefixbefore/mbed/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include @@ -177,99 +150,6 @@ -iwithprefixbefore/mbed/connectivity/mbedtls/platform -iwithprefixbefore/mbed/connectivity/mbedtls/platform/inc -iwithprefixbefore/mbed/connectivity/mbedtls/source --iwithprefixbefore/mbed/connectivity/nanostack --iwithprefixbefore/mbed/connectivity/nanostack/coap-service --iwithprefixbefore/mbed/connectivity/nanostack/coap-service/coap-service --iwithprefixbefore/mbed/connectivity/nanostack/coap-service/source --iwithprefixbefore/mbed/connectivity/nanostack/coap-service/source/include --iwithprefixbefore/mbed/connectivity/nanostack/include --iwithprefixbefore/mbed/connectivity/nanostack/include/nanostack-interface --iwithprefixbefore/mbed/connectivity/nanostack/mbed-mesh-api --iwithprefixbefore/mbed/connectivity/nanostack/mbed-mesh-api/mbed-mesh-api --iwithprefixbefore/mbed/connectivity/nanostack/mbed-mesh-api/source --iwithprefixbefore/mbed/connectivity/nanostack/mbed-mesh-api/source/include --iwithprefixbefore/mbed/connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack-eventloop --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack-eventloop/nanostack-event-loop --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack-eventloop/nanostack-event-loop/platform --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack-eventloop/source --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/nanostack --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/nanostack/platform --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Bootstraps --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Fragmentation --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Mesh --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ND --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/NVM --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/BorderRouter --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Core --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Core/include --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/DHCPv6_Server --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/DHCPv6_client --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/MAC --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4 --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/MAC/virtual_rf --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/MLE --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/MPL --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/NWK_INTERFACE --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/Include --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/RPL --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Security --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Security/Common --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Security/PANA --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Security/TLS --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Security/eapol --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Security/kmp --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Security/protocols --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/eap_tls_sec_prot --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/fwh_sec_prot --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/gkh_sec_prot --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/key_sec_prot --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/radius_sec_prot --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/tls_sec_prot --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/Neighbor_cache --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/Trickle --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/blacklist --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/etx --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/fhss --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/fnv_hash --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/hmac --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/ieee_802_11 --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/load_balance --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mac_neighbor_table --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/port --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/port/compiler --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/port/cpu --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/dns --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/mdns --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/poll --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/serial --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/nd_proxy --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/nist_aes_kw --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/pan_blacklist --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/random_early_detection --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/utils --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/whiteboard --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/configs --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/configs/base --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/ipv6_stack --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/libDHCPv6 --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/libNET --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/libNET/src -iwithprefixbefore/mbed/connectivity/netsocket -iwithprefixbefore/mbed/connectivity/netsocket/include -iwithprefixbefore/mbed/connectivity/netsocket/include/netsocket diff --git a/variants/ARDUINO_NANO33BLE/libs/libmbed.a b/variants/ARDUINO_NANO33BLE/libs/libmbed.a index cd69100cf..ec3dfd868 100644 Binary files a/variants/ARDUINO_NANO33BLE/libs/libmbed.a and b/variants/ARDUINO_NANO33BLE/libs/libmbed.a differ diff --git a/variants/ARDUINO_NANO33BLE/mbed_config.h b/variants/ARDUINO_NANO33BLE/mbed_config.h index 45a03a47c..eecb63c1e 100644 --- a/variants/ARDUINO_NANO33BLE/mbed_config.h +++ b/variants/ARDUINO_NANO33BLE/mbed_config.h @@ -58,8 +58,6 @@ #define L2C_COC_REG_MAX 1 // set by library:cordio #define LHCI_ENABLE_VS 0 // set by library:cordio-ll #define MBED_ALL_STATS_ENABLED 1 // set by application[*] -#define MBED_CONF_ALT1250_PPP_BAUDRATE 115200 // set by library:ALT1250_PPP -#define MBED_CONF_ALT1250_PPP_PROVIDE_DEFAULT 0 // set by library:ALT1250_PPP #define MBED_CONF_ATMEL_RF_ASSUME_SPACED_SPI 0 // set by library:atmel-rf #define MBED_CONF_ATMEL_RF_FULL_SPI_SPEED 7500000 // set by library:atmel-rf #define MBED_CONF_ATMEL_RF_FULL_SPI_SPEED_BYTE_SPACING 250 // set by library:atmel-rf @@ -178,10 +176,6 @@ #define MBED_CONF_FILESYSTEM_PRESENT 1 // set by library:filesystem #define MBED_CONF_FLASHIAP_BLOCK_DEVICE_BASE_ADDRESS 0xFFFFFFFF // set by library:flashiap-block-device #define MBED_CONF_FLASHIAP_BLOCK_DEVICE_SIZE 0 // set by library:flashiap-block-device -#define MBED_CONF_GEMALTO_CINTERION_BAUDRATE 115200 // set by library:GEMALTO_CINTERION -#define MBED_CONF_GEMALTO_CINTERION_PROVIDE_DEFAULT 0 // set by library:GEMALTO_CINTERION -#define MBED_CONF_GENERIC_AT3GPP_BAUDRATE 115200 // set by library:GENERIC_AT3GPP -#define MBED_CONF_GENERIC_AT3GPP_PROVIDE_DEFAULT 0 // set by library:GENERIC_AT3GPP #define MBED_CONF_LORA_ADR_ON 1 // set by library:lora #define MBED_CONF_LORA_APPLICATION_EUI {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} // set by library:lora #define MBED_CONF_LORA_APPLICATION_KEY {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} // set by library:lora @@ -245,56 +239,7 @@ #define MBED_CONF_LWIP_TCP_WND (4 * TCP_MSS) // set by library:lwip #define MBED_CONF_LWIP_UDP_SOCKET_MAX 4 // set by library:lwip #define MBED_CONF_LWIP_USE_MBED_TRACE 0 // set by library:lwip -#define MBED_CONF_MBED_MESH_API_6LOWPAN_ND_CHANNEL 0 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_6LOWPAN_ND_CHANNEL_MASK 0x7fff800 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_6LOWPAN_ND_CHANNEL_PAGE 0 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_6LOWPAN_ND_DEVICE_TYPE NET_6LOWPAN_ROUTER // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_6LOWPAN_ND_PANID_FILTER 0xffff // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_6LOWPAN_ND_PSK_KEY {0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf} // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_6LOWPAN_ND_PSK_KEY_ID 1 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_6LOWPAN_ND_SECURITY_MODE NONE // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_6LOWPAN_ND_SEC_LEVEL 5 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_HEAP_SIZE 32500 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_HEAP_STAT_INFO NULL // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_MAC_NEIGH_TABLE_SIZE 32 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_RADIUS_RETRY_COUNT 3 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_RADIUS_RETRY_IMAX 30 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_RADIUS_RETRY_IMIN 20 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_THREAD_CONFIG_CHANNEL 22 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_THREAD_CONFIG_CHANNEL_MASK 0x7fff800 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_THREAD_CONFIG_CHANNEL_PAGE 0 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_THREAD_CONFIG_COMMISSIONING_DATASET_TIMESTAMP 0x10000 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_THREAD_CONFIG_EXTENDED_PANID {0xf1, 0xb5, 0xa1, 0xb2,0xc4, 0xd5, 0xa1, 0xbd } // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_THREAD_CONFIG_ML_PREFIX {0xfd, 0x0, 0x0d, 0xb8, 0x0, 0x0, 0x0, 0x0} // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_THREAD_CONFIG_NETWORK_NAME "Thread Network" // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_THREAD_CONFIG_PANID 0x0700 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_THREAD_CONFIG_PSKC {0xc8, 0xa6, 0x2e, 0xae, 0xf3, 0x68, 0xf3, 0x46, 0xa9, 0x9e, 0x57, 0x85, 0x98, 0x9d, 0x1c, 0xd0} // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_THREAD_DEVICE_TYPE MESH_DEVICE_TYPE_THREAD_ROUTER // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_THREAD_MASTER_KEY {0x10, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff} // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_THREAD_PSKD "ABCDEFGH" // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_THREAD_SECURITY_POLICY 255 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_THREAD_USE_STATIC_LINK_CONFIG 1 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_USE_MALLOC_FOR_HEAP 0 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_WISUN_BC_CHANNEL_FUNCTION 255 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_WISUN_BC_DWELL_INTERVAL 0 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_WISUN_BC_FIXED_CHANNEL 65535 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_WISUN_BC_INTERVAL 0 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_WISUN_DEVICE_TYPE MESH_DEVICE_TYPE_WISUN_ROUTER // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_WISUN_NETWORK_NAME "Wi-SUN Network" // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_WISUN_OPERATING_CLASS 255 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_WISUN_OPERATING_MODE 255 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_WISUN_REGULATORY_DOMAIN 3 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_WISUN_UC_CHANNEL_FUNCTION 255 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_WISUN_UC_DWELL_INTERVAL 255 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_WISUN_UC_FIXED_CHANNEL 65535 // set by library:mbed-mesh-api #define MBED_CONF_MCR20A_PROVIDE_DEFAULT 0 // set by library:mcr20a -#define MBED_CONF_NANOSTACK_CONFIGURATION nanostack_full // set by library:nanostack -#define MBED_CONF_NANOSTACK_HAL_CRITICAL_SECTION_USABLE_FROM_INTERRUPT 0 // set by library:nanostack-hal -#define MBED_CONF_NANOSTACK_HAL_EVENT_LOOP_DISPATCH_FROM_APPLICATION 0 // set by library:nanostack-hal -#define MBED_CONF_NANOSTACK_HAL_EVENT_LOOP_THREAD_STACK_SIZE 6144 // set by library:nanostack-hal -#define MBED_CONF_NANOSTACK_HAL_EVENT_LOOP_USE_MBED_EVENTS 0 // set by library:nanostack-hal -#define MBED_CONF_NANOSTACK_HAL_KVSTORE_PATH "/kv/" // set by library:nanostack-hal -#define MBED_CONF_NANOSTACK_HAL_USE_KVSTORE 0 // set by library:nanostack-hal #define MBED_CONF_NANOSTACK_LIBSERVICE_NSDYNMEM_TRACKER_ENABLED 0 // set by library:nanostack-libservice #define MBED_CONF_NANOSTACK_LIBSERVICE_PRESENT 1 // set by library:nanostack-libservice #define MBED_CONF_NORDIC_NRF_LF_CLOCK_CALIB_MODE_CONFIG 0 // set by target:MCU_NRF52840 @@ -340,19 +285,6 @@ #define MBED_CONF_PPP_IPV6_ENABLED 0 // set by library:ppp #define MBED_CONF_PPP_MBED_EVENT_QUEUE 0 // set by library:ppp #define MBED_CONF_PPP_THREAD_STACKSIZE 816 // set by library:ppp -#define MBED_CONF_QUECTEL_BC95_BAUDRATE 9600 // set by library:QUECTEL_BC95 -#define MBED_CONF_QUECTEL_BC95_PROVIDE_DEFAULT 0 // set by library:QUECTEL_BC95 -#define MBED_CONF_QUECTEL_BG96_BAUDRATE 115200 // set by library:QUECTEL_BG96 -#define MBED_CONF_QUECTEL_BG96_PROVIDE_DEFAULT 0 // set by library:QUECTEL_BG96 -#define MBED_CONF_QUECTEL_EC2X_BAUDRATE 115200 // set by library:QUECTEL_EC2X -#define MBED_CONF_QUECTEL_EC2X_PROVIDE_DEFAULT 0 // set by library:QUECTEL_EC2X -#define MBED_CONF_QUECTEL_EC2X_START_TIMEOUT 15000 // set by library:QUECTEL_EC2X -#define MBED_CONF_QUECTEL_M26_BAUDRATE 115200 // set by library:QUECTEL_M26 -#define MBED_CONF_QUECTEL_M26_PROVIDE_DEFAULT 0 // set by library:QUECTEL_M26 -#define MBED_CONF_QUECTEL_UG96_BAUDRATE 115200 // set by library:QUECTEL_UG96 -#define MBED_CONF_QUECTEL_UG96_PROVIDE_DEFAULT 0 // set by library:QUECTEL_UG96 -#define MBED_CONF_RM1000_AT_BAUDRATE 230400 // set by library:RM1000_AT -#define MBED_CONF_RM1000_AT_PROVIDE_DEFAULT 0 // set by library:RM1000_AT #define MBED_CONF_RTOS_API_PRESENT 1 // set by library:rtos-api #define MBED_CONF_RTOS_EVFLAGS_NUM 0 // set by library:rtos #define MBED_CONF_RTOS_IDLE_THREAD_STACK_SIZE 512 // set by library:rtos @@ -370,8 +302,6 @@ #define MBED_CONF_RTOS_TIMER_NUM 0 // set by library:rtos #define MBED_CONF_RTOS_TIMER_THREAD_STACK_SIZE 768 // set by library:rtos #define MBED_CONF_S2LP_PROVIDE_DEFAULT 0 // set by library:s2lp -#define MBED_CONF_SARA4_PPP_BAUDRATE 115200 // set by library:SARA4_PPP -#define MBED_CONF_SARA4_PPP_PROVIDE_DEFAULT 0 // set by library:SARA4_PPP #define MBED_CONF_STORAGE_DEFAULT_KV kv // set by library:storage #define MBED_CONF_STORAGE_FILESYSTEM_BLOCKDEVICE default // set by library:storage_filesystem #define MBED_CONF_STORAGE_FILESYSTEM_EXTERNAL_BASE_ADDRESS 0 // set by library:storage_filesystem @@ -410,18 +340,6 @@ #define MBED_CONF_TARGET_UART_0_FIFO_SIZE 32 // set by target:MCU_NRF52840 #define MBED_CONF_TARGET_UART_1_FIFO_SIZE 32 // set by target:MCU_NRF52840 #define MBED_CONF_TARGET_XIP_ENABLE 0 // set by target:Target -#define MBED_CONF_TELIT_HE910_BAUDRATE 115200 // set by library:TELIT_HE910 -#define MBED_CONF_TELIT_HE910_PROVIDE_DEFAULT 0 // set by library:TELIT_HE910 -#define MBED_CONF_TELIT_ME310_BAUDRATE 115200 // set by library:TELIT_ME310 -#define MBED_CONF_TELIT_ME310_PROVIDE_DEFAULT 0 // set by library:TELIT_ME310 -#define MBED_CONF_TELIT_ME910_BAUDRATE 115200 // set by library:TELIT_ME910 -#define MBED_CONF_TELIT_ME910_PROVIDE_DEFAULT 0 // set by library:TELIT_ME910 -#define MBED_CONF_UBLOX_AT_BAUDRATE 115200 // set by library:UBLOX_AT -#define MBED_CONF_UBLOX_AT_PROVIDE_DEFAULT 0 // set by library:UBLOX_AT -#define MBED_CONF_UBLOX_N2XX_BAUDRATE 9600 // set by library:UBLOX_N2XX -#define MBED_CONF_UBLOX_N2XX_PROVIDE_DEFAULT 0 // set by library:UBLOX_N2XX -#define MBED_CONF_UBLOX_PPP_BAUDRATE 115200 // set by library:UBLOX_PPP -#define MBED_CONF_UBLOX_PPP_PROVIDE_DEFAULT 0 // set by library:UBLOX_PPP #define MBED_CRC_TABLE_SIZE 16 // set by library:drivers #define MBED_LFS2_BLOCK_CYCLES 1024 // set by library:littlefs2 #define MBED_LFS2_BLOCK_SIZE 512 // set by library:littlefs2 @@ -455,7 +373,6 @@ #define NRFX_GPIOTE_CONFIG_NUM_OF_LOW_POWER_EVENTS 8 // defined by application #define NSAPI_PPP_AVAILABLE (MBED_CONF_PPP_ENABLED || MBED_CONF_LWIP_PPP_ENABLED) // defined by library:ppp #define NSDYNMEM_TRACKER_ENABLED MBED_CONF_NANOSTACK_LIBSERVICE_NSDYNMEM_TRACKER_ENABLED // defined by library:nanostack-libservice -#define NS_USE_EXTERNAL_MBED_TLS // defined by library:nanostack #define UNITY_INCLUDE_CONFIG_H // defined by library:utest #define WSF_MS_PER_TICK 1 // defined by library:cordio #define _RTE_ // defined by library:rtos diff --git a/variants/EDGE_CONTROL/defines.txt b/variants/EDGE_CONTROL/defines.txt index e19ab1579..46ea33434 100644 --- a/variants/EDGE_CONTROL/defines.txt +++ b/variants/EDGE_CONTROL/defines.txt @@ -35,7 +35,7 @@ -DFEATURE_CRYPTOCELL310=1 -DFEATURE_STORAGE=1 -DMBEDTLS_CONFIG_HW_SUPPORT --DMBED_BUILD_TIMESTAMP=1617783885.7921329 +-DMBED_BUILD_TIMESTAMP=1618322903.9083302 -DMBED_MPU_CUSTOM -DMBED_TICKLESS -DNRF52840_XXAA diff --git a/variants/EDGE_CONTROL/includes.txt b/variants/EDGE_CONTROL/includes.txt index 6fc52da87..fd76e3704 100644 --- a/variants/EDGE_CONTROL/includes.txt +++ b/variants/EDGE_CONTROL/includes.txt @@ -93,33 +93,6 @@ -iwithprefixbefore/mbed/connectivity/drivers/802.15.4_RF/stm-s2lp-rf-driver/source -iwithprefixbefore/mbed/connectivity/drivers/802.15.4_RF/stm-s2lp-rf-driver/stm-s2lp-rf-driver -iwithprefixbefore/mbed/connectivity/drivers/ble/FEATURE_BLE/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x --iwithprefixbefore/mbed/connectivity/drivers/cellular --iwithprefixbefore/mbed/connectivity/drivers/cellular/Altair --iwithprefixbefore/mbed/connectivity/drivers/cellular/Altair/ALT1250 --iwithprefixbefore/mbed/connectivity/drivers/cellular/Altair/ALT1250/PPP --iwithprefixbefore/mbed/connectivity/drivers/cellular/GEMALTO --iwithprefixbefore/mbed/connectivity/drivers/cellular/GEMALTO/CINTERION --iwithprefixbefore/mbed/connectivity/drivers/cellular/GENERIC --iwithprefixbefore/mbed/connectivity/drivers/cellular/GENERIC/GENERIC_AT3GPP --iwithprefixbefore/mbed/connectivity/drivers/cellular/MultiTech --iwithprefixbefore/mbed/connectivity/drivers/cellular/MultiTech/DragonflyNano --iwithprefixbefore/mbed/connectivity/drivers/cellular/MultiTech/DragonflyNano/PPP --iwithprefixbefore/mbed/connectivity/drivers/cellular/QUECTEL --iwithprefixbefore/mbed/connectivity/drivers/cellular/QUECTEL/BC95 --iwithprefixbefore/mbed/connectivity/drivers/cellular/QUECTEL/BG96 --iwithprefixbefore/mbed/connectivity/drivers/cellular/QUECTEL/EC2X --iwithprefixbefore/mbed/connectivity/drivers/cellular/QUECTEL/M26 --iwithprefixbefore/mbed/connectivity/drivers/cellular/QUECTEL/UG96 --iwithprefixbefore/mbed/connectivity/drivers/cellular/RiotMicro --iwithprefixbefore/mbed/connectivity/drivers/cellular/RiotMicro/AT --iwithprefixbefore/mbed/connectivity/drivers/cellular/TELIT --iwithprefixbefore/mbed/connectivity/drivers/cellular/TELIT/HE910 --iwithprefixbefore/mbed/connectivity/drivers/cellular/TELIT/ME310 --iwithprefixbefore/mbed/connectivity/drivers/cellular/TELIT/ME910 --iwithprefixbefore/mbed/connectivity/drivers/cellular/UBLOX --iwithprefixbefore/mbed/connectivity/drivers/cellular/UBLOX/AT --iwithprefixbefore/mbed/connectivity/drivers/cellular/UBLOX/N2XX --iwithprefixbefore/mbed/connectivity/drivers/cellular/UBLOX/PPP -iwithprefixbefore/mbed/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310 -iwithprefixbefore/mbed/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/TARGET_MCU_NRF52840 -iwithprefixbefore/mbed/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include @@ -177,99 +150,6 @@ -iwithprefixbefore/mbed/connectivity/mbedtls/platform -iwithprefixbefore/mbed/connectivity/mbedtls/platform/inc -iwithprefixbefore/mbed/connectivity/mbedtls/source --iwithprefixbefore/mbed/connectivity/nanostack --iwithprefixbefore/mbed/connectivity/nanostack/coap-service --iwithprefixbefore/mbed/connectivity/nanostack/coap-service/coap-service --iwithprefixbefore/mbed/connectivity/nanostack/coap-service/source --iwithprefixbefore/mbed/connectivity/nanostack/coap-service/source/include --iwithprefixbefore/mbed/connectivity/nanostack/include --iwithprefixbefore/mbed/connectivity/nanostack/include/nanostack-interface --iwithprefixbefore/mbed/connectivity/nanostack/mbed-mesh-api --iwithprefixbefore/mbed/connectivity/nanostack/mbed-mesh-api/mbed-mesh-api --iwithprefixbefore/mbed/connectivity/nanostack/mbed-mesh-api/source --iwithprefixbefore/mbed/connectivity/nanostack/mbed-mesh-api/source/include --iwithprefixbefore/mbed/connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack-eventloop --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack-eventloop/nanostack-event-loop --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack-eventloop/nanostack-event-loop/platform --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack-eventloop/source --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/nanostack --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/nanostack/platform --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Bootstraps --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Fragmentation --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Mesh --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ND --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/NVM --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/BorderRouter --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Core --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Core/include --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/DHCPv6_Server --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/DHCPv6_client --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/MAC --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4 --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/MAC/virtual_rf --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/MLE --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/MPL --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/NWK_INTERFACE --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/Include --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/RPL --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Security --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Security/Common --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Security/PANA --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Security/TLS --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Security/eapol --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Security/kmp --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Security/protocols --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/eap_tls_sec_prot --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/fwh_sec_prot --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/gkh_sec_prot --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/key_sec_prot --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/radius_sec_prot --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/tls_sec_prot --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/Neighbor_cache --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/Trickle --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/blacklist --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/etx --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/fhss --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/fnv_hash --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/hmac --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/ieee_802_11 --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/load_balance --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mac_neighbor_table --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/port --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/port/compiler --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/port/cpu --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/dns --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/mdns --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/poll --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/serial --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/nd_proxy --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/nist_aes_kw --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/pan_blacklist --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/random_early_detection --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/utils --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/whiteboard --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/configs --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/configs/base --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/ipv6_stack --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/libDHCPv6 --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/libNET --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/libNET/src -iwithprefixbefore/mbed/connectivity/netsocket -iwithprefixbefore/mbed/connectivity/netsocket/include -iwithprefixbefore/mbed/connectivity/netsocket/include/netsocket diff --git a/variants/EDGE_CONTROL/libs/libmbed.a b/variants/EDGE_CONTROL/libs/libmbed.a index aebf4a0ee..39bae9bb2 100644 Binary files a/variants/EDGE_CONTROL/libs/libmbed.a and b/variants/EDGE_CONTROL/libs/libmbed.a differ diff --git a/variants/EDGE_CONTROL/mbed_config.h b/variants/EDGE_CONTROL/mbed_config.h index d9a440d54..599d39dbe 100644 --- a/variants/EDGE_CONTROL/mbed_config.h +++ b/variants/EDGE_CONTROL/mbed_config.h @@ -57,8 +57,6 @@ #define L2C_COC_CHAN_MAX 1 // set by library:cordio #define L2C_COC_REG_MAX 1 // set by library:cordio #define LHCI_ENABLE_VS 0 // set by library:cordio-ll -#define MBED_CONF_ALT1250_PPP_BAUDRATE 115200 // set by library:ALT1250_PPP -#define MBED_CONF_ALT1250_PPP_PROVIDE_DEFAULT 0 // set by library:ALT1250_PPP #define MBED_CONF_ATMEL_RF_ASSUME_SPACED_SPI 0 // set by library:atmel-rf #define MBED_CONF_ATMEL_RF_FULL_SPI_SPEED 7500000 // set by library:atmel-rf #define MBED_CONF_ATMEL_RF_FULL_SPI_SPEED_BYTE_SPACING 250 // set by library:atmel-rf @@ -177,10 +175,6 @@ #define MBED_CONF_FILESYSTEM_PRESENT 1 // set by library:filesystem #define MBED_CONF_FLASHIAP_BLOCK_DEVICE_BASE_ADDRESS 0xFFFFFFFF // set by library:flashiap-block-device #define MBED_CONF_FLASHIAP_BLOCK_DEVICE_SIZE 0 // set by library:flashiap-block-device -#define MBED_CONF_GEMALTO_CINTERION_BAUDRATE 115200 // set by library:GEMALTO_CINTERION -#define MBED_CONF_GEMALTO_CINTERION_PROVIDE_DEFAULT 0 // set by library:GEMALTO_CINTERION -#define MBED_CONF_GENERIC_AT3GPP_BAUDRATE 115200 // set by library:GENERIC_AT3GPP -#define MBED_CONF_GENERIC_AT3GPP_PROVIDE_DEFAULT 0 // set by library:GENERIC_AT3GPP #define MBED_CONF_LORA_ADR_ON 1 // set by library:lora #define MBED_CONF_LORA_APPLICATION_EUI {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} // set by library:lora #define MBED_CONF_LORA_APPLICATION_KEY {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} // set by library:lora @@ -244,56 +238,7 @@ #define MBED_CONF_LWIP_TCP_WND (4 * TCP_MSS) // set by library:lwip #define MBED_CONF_LWIP_UDP_SOCKET_MAX 4 // set by library:lwip #define MBED_CONF_LWIP_USE_MBED_TRACE 0 // set by library:lwip -#define MBED_CONF_MBED_MESH_API_6LOWPAN_ND_CHANNEL 0 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_6LOWPAN_ND_CHANNEL_MASK 0x7fff800 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_6LOWPAN_ND_CHANNEL_PAGE 0 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_6LOWPAN_ND_DEVICE_TYPE NET_6LOWPAN_ROUTER // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_6LOWPAN_ND_PANID_FILTER 0xffff // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_6LOWPAN_ND_PSK_KEY {0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf} // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_6LOWPAN_ND_PSK_KEY_ID 1 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_6LOWPAN_ND_SECURITY_MODE NONE // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_6LOWPAN_ND_SEC_LEVEL 5 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_HEAP_SIZE 32500 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_HEAP_STAT_INFO NULL // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_MAC_NEIGH_TABLE_SIZE 32 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_RADIUS_RETRY_COUNT 3 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_RADIUS_RETRY_IMAX 30 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_RADIUS_RETRY_IMIN 20 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_THREAD_CONFIG_CHANNEL 22 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_THREAD_CONFIG_CHANNEL_MASK 0x7fff800 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_THREAD_CONFIG_CHANNEL_PAGE 0 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_THREAD_CONFIG_COMMISSIONING_DATASET_TIMESTAMP 0x10000 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_THREAD_CONFIG_EXTENDED_PANID {0xf1, 0xb5, 0xa1, 0xb2,0xc4, 0xd5, 0xa1, 0xbd } // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_THREAD_CONFIG_ML_PREFIX {0xfd, 0x0, 0x0d, 0xb8, 0x0, 0x0, 0x0, 0x0} // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_THREAD_CONFIG_NETWORK_NAME "Thread Network" // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_THREAD_CONFIG_PANID 0x0700 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_THREAD_CONFIG_PSKC {0xc8, 0xa6, 0x2e, 0xae, 0xf3, 0x68, 0xf3, 0x46, 0xa9, 0x9e, 0x57, 0x85, 0x98, 0x9d, 0x1c, 0xd0} // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_THREAD_DEVICE_TYPE MESH_DEVICE_TYPE_THREAD_ROUTER // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_THREAD_MASTER_KEY {0x10, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff} // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_THREAD_PSKD "ABCDEFGH" // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_THREAD_SECURITY_POLICY 255 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_THREAD_USE_STATIC_LINK_CONFIG 1 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_USE_MALLOC_FOR_HEAP 0 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_WISUN_BC_CHANNEL_FUNCTION 255 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_WISUN_BC_DWELL_INTERVAL 0 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_WISUN_BC_FIXED_CHANNEL 65535 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_WISUN_BC_INTERVAL 0 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_WISUN_DEVICE_TYPE MESH_DEVICE_TYPE_WISUN_ROUTER // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_WISUN_NETWORK_NAME "Wi-SUN Network" // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_WISUN_OPERATING_CLASS 255 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_WISUN_OPERATING_MODE 255 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_WISUN_REGULATORY_DOMAIN 3 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_WISUN_UC_CHANNEL_FUNCTION 255 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_WISUN_UC_DWELL_INTERVAL 255 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_WISUN_UC_FIXED_CHANNEL 65535 // set by library:mbed-mesh-api #define MBED_CONF_MCR20A_PROVIDE_DEFAULT 0 // set by library:mcr20a -#define MBED_CONF_NANOSTACK_CONFIGURATION nanostack_full // set by library:nanostack -#define MBED_CONF_NANOSTACK_HAL_CRITICAL_SECTION_USABLE_FROM_INTERRUPT 0 // set by library:nanostack-hal -#define MBED_CONF_NANOSTACK_HAL_EVENT_LOOP_DISPATCH_FROM_APPLICATION 0 // set by library:nanostack-hal -#define MBED_CONF_NANOSTACK_HAL_EVENT_LOOP_THREAD_STACK_SIZE 6144 // set by library:nanostack-hal -#define MBED_CONF_NANOSTACK_HAL_EVENT_LOOP_USE_MBED_EVENTS 0 // set by library:nanostack-hal -#define MBED_CONF_NANOSTACK_HAL_KVSTORE_PATH "/kv/" // set by library:nanostack-hal -#define MBED_CONF_NANOSTACK_HAL_USE_KVSTORE 0 // set by library:nanostack-hal #define MBED_CONF_NANOSTACK_LIBSERVICE_NSDYNMEM_TRACKER_ENABLED 0 // set by library:nanostack-libservice #define MBED_CONF_NANOSTACK_LIBSERVICE_PRESENT 1 // set by library:nanostack-libservice #define MBED_CONF_NORDIC_NRF_LF_CLOCK_CALIB_MODE_CONFIG 0 // set by target:MCU_NRF52840 @@ -351,19 +296,6 @@ #define MBED_CONF_QSPIF_QSPI_MIN_READ_SIZE 4 // set by library:qspif[MCU_NRF52840] #define MBED_CONF_QSPIF_QSPI_POLARITY_MODE 0 // set by library:qspif #define MBED_CONF_QSPIF_QSPI_SCK MBED_CONF_DRIVERS_QSPI_SCK // set by library:qspif -#define MBED_CONF_QUECTEL_BC95_BAUDRATE 9600 // set by library:QUECTEL_BC95 -#define MBED_CONF_QUECTEL_BC95_PROVIDE_DEFAULT 0 // set by library:QUECTEL_BC95 -#define MBED_CONF_QUECTEL_BG96_BAUDRATE 115200 // set by library:QUECTEL_BG96 -#define MBED_CONF_QUECTEL_BG96_PROVIDE_DEFAULT 0 // set by library:QUECTEL_BG96 -#define MBED_CONF_QUECTEL_EC2X_BAUDRATE 115200 // set by library:QUECTEL_EC2X -#define MBED_CONF_QUECTEL_EC2X_PROVIDE_DEFAULT 0 // set by library:QUECTEL_EC2X -#define MBED_CONF_QUECTEL_EC2X_START_TIMEOUT 15000 // set by library:QUECTEL_EC2X -#define MBED_CONF_QUECTEL_M26_BAUDRATE 115200 // set by library:QUECTEL_M26 -#define MBED_CONF_QUECTEL_M26_PROVIDE_DEFAULT 0 // set by library:QUECTEL_M26 -#define MBED_CONF_QUECTEL_UG96_BAUDRATE 115200 // set by library:QUECTEL_UG96 -#define MBED_CONF_QUECTEL_UG96_PROVIDE_DEFAULT 0 // set by library:QUECTEL_UG96 -#define MBED_CONF_RM1000_AT_BAUDRATE 230400 // set by library:RM1000_AT -#define MBED_CONF_RM1000_AT_PROVIDE_DEFAULT 0 // set by library:RM1000_AT #define MBED_CONF_RTOS_API_PRESENT 1 // set by library:rtos-api #define MBED_CONF_RTOS_EVFLAGS_NUM 0 // set by library:rtos #define MBED_CONF_RTOS_IDLE_THREAD_STACK_SIZE 512 // set by library:rtos @@ -381,8 +313,6 @@ #define MBED_CONF_RTOS_TIMER_NUM 0 // set by library:rtos #define MBED_CONF_RTOS_TIMER_THREAD_STACK_SIZE 768 // set by library:rtos #define MBED_CONF_S2LP_PROVIDE_DEFAULT 0 // set by library:s2lp -#define MBED_CONF_SARA4_PPP_BAUDRATE 115200 // set by library:SARA4_PPP -#define MBED_CONF_SARA4_PPP_PROVIDE_DEFAULT 0 // set by library:SARA4_PPP #define MBED_CONF_SD_CMD0_IDLE_STATE_RETRIES 5 // set by library:sd #define MBED_CONF_SD_CMD_TIMEOUT 10000 // set by library:sd #define MBED_CONF_SD_CRC_ENABLED 0 // set by library:sd @@ -438,18 +368,6 @@ #define MBED_CONF_TARGET_UART_0_FIFO_SIZE 32 // set by target:MCU_NRF52840 #define MBED_CONF_TARGET_UART_1_FIFO_SIZE 32 // set by target:MCU_NRF52840 #define MBED_CONF_TARGET_XIP_ENABLE 0 // set by target:Target -#define MBED_CONF_TELIT_HE910_BAUDRATE 115200 // set by library:TELIT_HE910 -#define MBED_CONF_TELIT_HE910_PROVIDE_DEFAULT 0 // set by library:TELIT_HE910 -#define MBED_CONF_TELIT_ME310_BAUDRATE 115200 // set by library:TELIT_ME310 -#define MBED_CONF_TELIT_ME310_PROVIDE_DEFAULT 0 // set by library:TELIT_ME310 -#define MBED_CONF_TELIT_ME910_BAUDRATE 115200 // set by library:TELIT_ME910 -#define MBED_CONF_TELIT_ME910_PROVIDE_DEFAULT 0 // set by library:TELIT_ME910 -#define MBED_CONF_UBLOX_AT_BAUDRATE 115200 // set by library:UBLOX_AT -#define MBED_CONF_UBLOX_AT_PROVIDE_DEFAULT 0 // set by library:UBLOX_AT -#define MBED_CONF_UBLOX_N2XX_BAUDRATE 9600 // set by library:UBLOX_N2XX -#define MBED_CONF_UBLOX_N2XX_PROVIDE_DEFAULT 0 // set by library:UBLOX_N2XX -#define MBED_CONF_UBLOX_PPP_BAUDRATE 115200 // set by library:UBLOX_PPP -#define MBED_CONF_UBLOX_PPP_PROVIDE_DEFAULT 0 // set by library:UBLOX_PPP #define MBED_CRC_TABLE_SIZE 16 // set by library:drivers #define MBED_LFS2_BLOCK_CYCLES 1024 // set by library:littlefs2 #define MBED_LFS2_BLOCK_SIZE 512 // set by library:littlefs2 @@ -487,7 +405,6 @@ #define NRFX_WDT_ENABLED 1 // defined by application #define NSAPI_PPP_AVAILABLE (MBED_CONF_PPP_ENABLED || MBED_CONF_LWIP_PPP_ENABLED) // defined by library:ppp #define NSDYNMEM_TRACKER_ENABLED MBED_CONF_NANOSTACK_LIBSERVICE_NSDYNMEM_TRACKER_ENABLED // defined by library:nanostack-libservice -#define NS_USE_EXTERNAL_MBED_TLS // defined by library:nanostack #define UNITY_INCLUDE_CONFIG_H // defined by library:utest #define WSF_MS_PER_TICK 1 // defined by library:cordio #define _RTE_ // defined by library:rtos diff --git a/variants/NANO_RP2040_CONNECT/defines.txt b/variants/NANO_RP2040_CONNECT/defines.txt index 92a27db6d..875e0f4d1 100644 --- a/variants/NANO_RP2040_CONNECT/defines.txt +++ b/variants/NANO_RP2040_CONNECT/defines.txt @@ -16,7 +16,7 @@ -DDEVICE_USBDEVICE=1 -DDEVICE_USTICKER=1 -DDEVICE_WATCHDOG=1 --DMBED_BUILD_TIMESTAMP=1617783864.1531968 +-DMBED_BUILD_TIMESTAMP=1618322670.0109062 -DMBED_MPU_CUSTOM -DPICO_NO_BINARY_INFO=1 -DPICO_ON_DEVICE=1 diff --git a/variants/RASPBERRY_PI_PICO/double_tap_usb_boot.c b/variants/NANO_RP2040_CONNECT/double_tap_usb_boot.cpp similarity index 65% rename from variants/RASPBERRY_PI_PICO/double_tap_usb_boot.c rename to variants/NANO_RP2040_CONNECT/double_tap_usb_boot.cpp index 719750d21..b7e93113b 100644 --- a/variants/RASPBERRY_PI_PICO/double_tap_usb_boot.c +++ b/variants/NANO_RP2040_CONNECT/double_tap_usb_boot.cpp @@ -1,6 +1,10 @@ -#include "pico.h" -#include "pico/time.h" -#include "pico/bootrom.h" +extern "C" { + #include "pico.h" + #include "pico/time.h" + #include "pico/bootrom.h" +} +#include "macros.h" +#include "pins_arduino.h" // Allow user override of the LED mask #ifndef USB_BOOT_LED_ACTIVITY_MASK @@ -17,21 +21,30 @@ static const uint32_t magic_token[] = { static uint32_t __uninitialized_ram(magic_location)[count_of(magic_token)]; // run at initialization time -static void __attribute__((constructor)) boot_double_tap_check() { +static void boot_double_tap_check() { for (uint i = 0; i < count_of(magic_token); i++) { if (magic_location[i] != magic_token[i]) { // Arm for 100 ms then disarm and continue booting for (i = 0; i < count_of(magic_token); i++) { magic_location[i] = magic_token[i]; } - busy_wait_us(100000); + busy_wait_us(500000); magic_location[0] = 0; return; } } magic_location[0] = 0; - reset_usb_boot(USB_BOOT_LED_ACTIVITY_MASK, 0); + reset_usb_boot(1 << digitalPinToPinName(LED_BUILTIN), 0); } +class DoubleTap { +public: + DoubleTap() { + boot_double_tap_check(); + } +}; + +DoubleTap dt __attribute__ ((init_priority (101))); + #endif \ No newline at end of file diff --git a/variants/NANO_RP2040_CONNECT/libs/libmbed.a b/variants/NANO_RP2040_CONNECT/libs/libmbed.a index 1640925b7..4f9b8199d 100644 Binary files a/variants/NANO_RP2040_CONNECT/libs/libmbed.a and b/variants/NANO_RP2040_CONNECT/libs/libmbed.a differ diff --git a/variants/NANO_RP2040_CONNECT/variant.cpp b/variants/NANO_RP2040_CONNECT/variant.cpp index 800bff8b9..6fdcd744c 100644 --- a/variants/NANO_RP2040_CONNECT/variant.cpp +++ b/variants/NANO_RP2040_CONNECT/variant.cpp @@ -91,7 +91,7 @@ uint8_t getUniqueSerialNumber(uint8_t* name) { } void _ontouch1200bps_() { - reset_usb_boot(0, 0); + reset_usb_boot(1 << digitalPinToPinName(LED_BUILTIN), 1); } #endif diff --git a/variants/PORTENTA_H7_M4/conf/.mbedignore b/variants/PORTENTA_H7_M4/conf/.mbedignore new file mode 100644 index 000000000..d10167ba6 --- /dev/null +++ b/variants/PORTENTA_H7_M4/conf/.mbedignore @@ -0,0 +1 @@ +mbed-os/connectivity/nanostack/* \ No newline at end of file diff --git a/variants/PORTENTA_H7_M4/defines.txt b/variants/PORTENTA_H7_M4/defines.txt index 4cfe22ed0..be0ac8a50 100644 --- a/variants/PORTENTA_H7_M4/defines.txt +++ b/variants/PORTENTA_H7_M4/defines.txt @@ -40,7 +40,7 @@ -DFEATURE_BLE=1 -DMBEDTLS_FS_IO -DMBEDTLS_SHA1_C --DMBED_BUILD_TIMESTAMP=1617783880.3887506 +-DMBED_BUILD_TIMESTAMP=1618322839.3327847 -DMBED_MPU_CUSTOM -DMBED_TICKLESS -DMETAL_INTERNAL diff --git a/variants/PORTENTA_H7_M4/includes.txt b/variants/PORTENTA_H7_M4/includes.txt index 358693ba2..674f53a9b 100644 --- a/variants/PORTENTA_H7_M4/includes.txt +++ b/variants/PORTENTA_H7_M4/includes.txt @@ -161,99 +161,6 @@ -iwithprefixbefore/mbed/connectivity/mbedtls/platform -iwithprefixbefore/mbed/connectivity/mbedtls/platform/inc -iwithprefixbefore/mbed/connectivity/mbedtls/source --iwithprefixbefore/mbed/connectivity/nanostack --iwithprefixbefore/mbed/connectivity/nanostack/coap-service --iwithprefixbefore/mbed/connectivity/nanostack/coap-service/coap-service --iwithprefixbefore/mbed/connectivity/nanostack/coap-service/source --iwithprefixbefore/mbed/connectivity/nanostack/coap-service/source/include --iwithprefixbefore/mbed/connectivity/nanostack/include --iwithprefixbefore/mbed/connectivity/nanostack/include/nanostack-interface --iwithprefixbefore/mbed/connectivity/nanostack/mbed-mesh-api --iwithprefixbefore/mbed/connectivity/nanostack/mbed-mesh-api/mbed-mesh-api --iwithprefixbefore/mbed/connectivity/nanostack/mbed-mesh-api/source --iwithprefixbefore/mbed/connectivity/nanostack/mbed-mesh-api/source/include --iwithprefixbefore/mbed/connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack-eventloop --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack-eventloop/nanostack-event-loop --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack-eventloop/nanostack-event-loop/platform --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack-eventloop/source --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/nanostack --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/nanostack/platform --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Bootstraps --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Fragmentation --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Mesh --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ND --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/NVM --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/BorderRouter --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Core --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Core/include --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/DHCPv6_Server --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/DHCPv6_client --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/MAC --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4 --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/MAC/virtual_rf --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/MLE --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/MPL --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/NWK_INTERFACE --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/Include --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/RPL --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Security --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Security/Common --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Security/PANA --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Security/TLS --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Security/eapol --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Security/kmp --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Security/protocols --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/eap_tls_sec_prot --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/fwh_sec_prot --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/gkh_sec_prot --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/key_sec_prot --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/radius_sec_prot --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/tls_sec_prot --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/Neighbor_cache --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/Trickle --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/blacklist --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/etx --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/fhss --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/fnv_hash --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/hmac --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/ieee_802_11 --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/load_balance --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mac_neighbor_table --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/port --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/port/compiler --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/port/cpu --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/dns --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/mdns --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/poll --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/serial --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/nd_proxy --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/nist_aes_kw --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/pan_blacklist --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/random_early_detection --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/utils --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/whiteboard --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/configs --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/configs/base --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/ipv6_stack --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/libDHCPv6 --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/libNET --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/libNET/src -iwithprefixbefore/mbed/connectivity/netsocket -iwithprefixbefore/mbed/connectivity/netsocket/include -iwithprefixbefore/mbed/connectivity/netsocket/include/netsocket diff --git a/variants/PORTENTA_H7_M4/libs/libmbed.a b/variants/PORTENTA_H7_M4/libs/libmbed.a index d3dc5c8d4..96a62109c 100644 Binary files a/variants/PORTENTA_H7_M4/libs/libmbed.a and b/variants/PORTENTA_H7_M4/libs/libmbed.a differ diff --git a/variants/PORTENTA_H7_M4/mbed_config.h b/variants/PORTENTA_H7_M4/mbed_config.h index 53c183652..eb5dee6cb 100644 --- a/variants/PORTENTA_H7_M4/mbed_config.h +++ b/variants/PORTENTA_H7_M4/mbed_config.h @@ -231,56 +231,7 @@ #define MBED_CONF_LWIP_TCP_WND (4 * TCP_MSS) // set by library:lwip #define MBED_CONF_LWIP_UDP_SOCKET_MAX 4 // set by library:lwip #define MBED_CONF_LWIP_USE_MBED_TRACE 0 // set by library:lwip -#define MBED_CONF_MBED_MESH_API_6LOWPAN_ND_CHANNEL 0 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_6LOWPAN_ND_CHANNEL_MASK 0x7fff800 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_6LOWPAN_ND_CHANNEL_PAGE 0 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_6LOWPAN_ND_DEVICE_TYPE NET_6LOWPAN_ROUTER // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_6LOWPAN_ND_PANID_FILTER 0xffff // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_6LOWPAN_ND_PSK_KEY {0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf} // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_6LOWPAN_ND_PSK_KEY_ID 1 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_6LOWPAN_ND_SECURITY_MODE NONE // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_6LOWPAN_ND_SEC_LEVEL 5 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_HEAP_SIZE 32500 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_HEAP_STAT_INFO NULL // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_MAC_NEIGH_TABLE_SIZE 32 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_RADIUS_RETRY_COUNT 3 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_RADIUS_RETRY_IMAX 30 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_RADIUS_RETRY_IMIN 20 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_THREAD_CONFIG_CHANNEL 22 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_THREAD_CONFIG_CHANNEL_MASK 0x7fff800 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_THREAD_CONFIG_CHANNEL_PAGE 0 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_THREAD_CONFIG_COMMISSIONING_DATASET_TIMESTAMP 0x10000 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_THREAD_CONFIG_EXTENDED_PANID {0xf1, 0xb5, 0xa1, 0xb2,0xc4, 0xd5, 0xa1, 0xbd } // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_THREAD_CONFIG_ML_PREFIX {0xfd, 0x0, 0x0d, 0xb8, 0x0, 0x0, 0x0, 0x0} // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_THREAD_CONFIG_NETWORK_NAME "Thread Network" // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_THREAD_CONFIG_PANID 0x0700 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_THREAD_CONFIG_PSKC {0xc8, 0xa6, 0x2e, 0xae, 0xf3, 0x68, 0xf3, 0x46, 0xa9, 0x9e, 0x57, 0x85, 0x98, 0x9d, 0x1c, 0xd0} // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_THREAD_DEVICE_TYPE MESH_DEVICE_TYPE_THREAD_ROUTER // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_THREAD_MASTER_KEY {0x10, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff} // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_THREAD_PSKD "ABCDEFGH" // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_THREAD_SECURITY_POLICY 255 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_THREAD_USE_STATIC_LINK_CONFIG 1 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_USE_MALLOC_FOR_HEAP 0 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_WISUN_BC_CHANNEL_FUNCTION 255 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_WISUN_BC_DWELL_INTERVAL 0 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_WISUN_BC_FIXED_CHANNEL 65535 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_WISUN_BC_INTERVAL 0 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_WISUN_DEVICE_TYPE MESH_DEVICE_TYPE_WISUN_ROUTER // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_WISUN_NETWORK_NAME "Wi-SUN Network" // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_WISUN_OPERATING_CLASS 255 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_WISUN_OPERATING_MODE 255 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_WISUN_REGULATORY_DOMAIN 3 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_WISUN_UC_CHANNEL_FUNCTION 255 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_WISUN_UC_DWELL_INTERVAL 255 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_WISUN_UC_FIXED_CHANNEL 65535 // set by library:mbed-mesh-api #define MBED_CONF_MCR20A_PROVIDE_DEFAULT 0 // set by library:mcr20a -#define MBED_CONF_NANOSTACK_CONFIGURATION nanostack_full // set by library:nanostack -#define MBED_CONF_NANOSTACK_HAL_CRITICAL_SECTION_USABLE_FROM_INTERRUPT 0 // set by library:nanostack-hal -#define MBED_CONF_NANOSTACK_HAL_EVENT_LOOP_DISPATCH_FROM_APPLICATION 0 // set by library:nanostack-hal -#define MBED_CONF_NANOSTACK_HAL_EVENT_LOOP_THREAD_STACK_SIZE 6144 // set by library:nanostack-hal -#define MBED_CONF_NANOSTACK_HAL_EVENT_LOOP_USE_MBED_EVENTS 0 // set by library:nanostack-hal -#define MBED_CONF_NANOSTACK_HAL_KVSTORE_PATH "/kv/" // set by library:nanostack-hal -#define MBED_CONF_NANOSTACK_HAL_USE_KVSTORE 0 // set by library:nanostack-hal #define MBED_CONF_NANOSTACK_LIBSERVICE_NSDYNMEM_TRACKER_ENABLED 0 // set by library:nanostack-libservice #define MBED_CONF_NANOSTACK_LIBSERVICE_PRESENT 1 // set by library:nanostack-libservice #define MBED_CONF_NSAPI_DEFAULT_MESH_TYPE THREAD // set by library:nsapi @@ -460,7 +411,6 @@ #define MBEDTLS_CIPHER_MODE_CTR // defined by library:SecureStore #define NSAPI_PPP_AVAILABLE (MBED_CONF_PPP_ENABLED || MBED_CONF_LWIP_PPP_ENABLED) // defined by library:ppp #define NSDYNMEM_TRACKER_ENABLED MBED_CONF_NANOSTACK_LIBSERVICE_NSDYNMEM_TRACKER_ENABLED // defined by library:nanostack-libservice -#define NS_USE_EXTERNAL_MBED_TLS // defined by library:nanostack #define UNITY_INCLUDE_CONFIG_H // defined by library:utest #define WSF_MS_PER_TICK 1 // defined by library:cordio #define _RTE_ // defined by library:rtos diff --git a/variants/PORTENTA_H7_M7/conf/.mbedignore b/variants/PORTENTA_H7_M7/conf/.mbedignore new file mode 100644 index 000000000..d10167ba6 --- /dev/null +++ b/variants/PORTENTA_H7_M7/conf/.mbedignore @@ -0,0 +1 @@ +mbed-os/connectivity/nanostack/* \ No newline at end of file diff --git a/variants/PORTENTA_H7_M7/defines.txt b/variants/PORTENTA_H7_M7/defines.txt index c4b1ea9f2..06173ce4d 100644 --- a/variants/PORTENTA_H7_M7/defines.txt +++ b/variants/PORTENTA_H7_M7/defines.txt @@ -41,7 +41,7 @@ -DFEATURE_BLE=1 -DMBEDTLS_FS_IO -DMBEDTLS_SHA1_C --DMBED_BUILD_TIMESTAMP=1617783875.005763 +-DMBED_BUILD_TIMESTAMP=1618322769.8412757 -DMBED_TICKLESS -DMETAL_INTERNAL -DMETAL_MAX_DEVICE_REGIONS=2 diff --git a/variants/PORTENTA_H7_M7/includes.txt b/variants/PORTENTA_H7_M7/includes.txt index 14a87f2b2..d0c9fa41a 100644 --- a/variants/PORTENTA_H7_M7/includes.txt +++ b/variants/PORTENTA_H7_M7/includes.txt @@ -161,99 +161,6 @@ -iwithprefixbefore/mbed/connectivity/mbedtls/platform -iwithprefixbefore/mbed/connectivity/mbedtls/platform/inc -iwithprefixbefore/mbed/connectivity/mbedtls/source --iwithprefixbefore/mbed/connectivity/nanostack --iwithprefixbefore/mbed/connectivity/nanostack/coap-service --iwithprefixbefore/mbed/connectivity/nanostack/coap-service/coap-service --iwithprefixbefore/mbed/connectivity/nanostack/coap-service/source --iwithprefixbefore/mbed/connectivity/nanostack/coap-service/source/include --iwithprefixbefore/mbed/connectivity/nanostack/include --iwithprefixbefore/mbed/connectivity/nanostack/include/nanostack-interface --iwithprefixbefore/mbed/connectivity/nanostack/mbed-mesh-api --iwithprefixbefore/mbed/connectivity/nanostack/mbed-mesh-api/mbed-mesh-api --iwithprefixbefore/mbed/connectivity/nanostack/mbed-mesh-api/source --iwithprefixbefore/mbed/connectivity/nanostack/mbed-mesh-api/source/include --iwithprefixbefore/mbed/connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack-eventloop --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack-eventloop/nanostack-event-loop --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack-eventloop/nanostack-event-loop/platform --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack-eventloop/source --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/nanostack --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/nanostack/platform --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Bootstraps --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Fragmentation --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/IPHC_Decode --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/MAC --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Mesh --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ND --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/NVM --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/Thread --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/6LoWPAN/ws --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/BorderRouter --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Core --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Core/include --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/DHCPv6_Server --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/DHCPv6_client --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/MAC --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4 --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/MAC/virtual_rf --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/MLE --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/MPL --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/NWK_INTERFACE --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/NWK_INTERFACE/Include --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/RPL --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Security --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Security/Common --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Security/PANA --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Security/TLS --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Security/eapol --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Security/kmp --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Security/protocols --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/eap_tls_sec_prot --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/fwh_sec_prot --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/gkh_sec_prot --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/key_sec_prot --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/radius_sec_prot --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Security/protocols/tls_sec_prot --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/Neighbor_cache --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/Trickle --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/blacklist --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/etx --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/fhss --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/fnv_hash --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/hmac --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/ieee_802_11 --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/load_balance --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mac_neighbor_table --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/port --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/port/compiler --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/port/cpu --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/dns --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/mdns --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/poll --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/services/serial --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet/fnet_stack/stack --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mle_service --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/nd_proxy --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/nist_aes_kw --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/pan_blacklist --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/random_early_detection --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/utils --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/whiteboard --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/configs --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/configs/base --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/ipv6_stack --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/libDHCPv6 --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/libNET --iwithprefixbefore/mbed/connectivity/nanostack/sal-stack-nanostack/source/libNET/src -iwithprefixbefore/mbed/connectivity/netsocket -iwithprefixbefore/mbed/connectivity/netsocket/include -iwithprefixbefore/mbed/connectivity/netsocket/include/netsocket diff --git a/variants/PORTENTA_H7_M7/libs/libmbed.a b/variants/PORTENTA_H7_M7/libs/libmbed.a index 042ffb61d..1516145fb 100644 Binary files a/variants/PORTENTA_H7_M7/libs/libmbed.a and b/variants/PORTENTA_H7_M7/libs/libmbed.a differ diff --git a/variants/PORTENTA_H7_M7/mbed_config.h b/variants/PORTENTA_H7_M7/mbed_config.h index c44e58d05..e7e322381 100644 --- a/variants/PORTENTA_H7_M7/mbed_config.h +++ b/variants/PORTENTA_H7_M7/mbed_config.h @@ -231,56 +231,7 @@ #define MBED_CONF_LWIP_TCP_WND (4 * TCP_MSS) // set by library:lwip #define MBED_CONF_LWIP_UDP_SOCKET_MAX 4 // set by library:lwip #define MBED_CONF_LWIP_USE_MBED_TRACE 0 // set by library:lwip -#define MBED_CONF_MBED_MESH_API_6LOWPAN_ND_CHANNEL 0 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_6LOWPAN_ND_CHANNEL_MASK 0x7fff800 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_6LOWPAN_ND_CHANNEL_PAGE 0 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_6LOWPAN_ND_DEVICE_TYPE NET_6LOWPAN_ROUTER // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_6LOWPAN_ND_PANID_FILTER 0xffff // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_6LOWPAN_ND_PSK_KEY {0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf} // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_6LOWPAN_ND_PSK_KEY_ID 1 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_6LOWPAN_ND_SECURITY_MODE NONE // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_6LOWPAN_ND_SEC_LEVEL 5 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_HEAP_SIZE 32500 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_HEAP_STAT_INFO NULL // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_MAC_NEIGH_TABLE_SIZE 32 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_RADIUS_RETRY_COUNT 3 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_RADIUS_RETRY_IMAX 30 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_RADIUS_RETRY_IMIN 20 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_THREAD_CONFIG_CHANNEL 22 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_THREAD_CONFIG_CHANNEL_MASK 0x7fff800 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_THREAD_CONFIG_CHANNEL_PAGE 0 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_THREAD_CONFIG_COMMISSIONING_DATASET_TIMESTAMP 0x10000 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_THREAD_CONFIG_EXTENDED_PANID {0xf1, 0xb5, 0xa1, 0xb2,0xc4, 0xd5, 0xa1, 0xbd } // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_THREAD_CONFIG_ML_PREFIX {0xfd, 0x0, 0x0d, 0xb8, 0x0, 0x0, 0x0, 0x0} // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_THREAD_CONFIG_NETWORK_NAME "Thread Network" // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_THREAD_CONFIG_PANID 0x0700 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_THREAD_CONFIG_PSKC {0xc8, 0xa6, 0x2e, 0xae, 0xf3, 0x68, 0xf3, 0x46, 0xa9, 0x9e, 0x57, 0x85, 0x98, 0x9d, 0x1c, 0xd0} // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_THREAD_DEVICE_TYPE MESH_DEVICE_TYPE_THREAD_ROUTER // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_THREAD_MASTER_KEY {0x10, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff} // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_THREAD_PSKD "ABCDEFGH" // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_THREAD_SECURITY_POLICY 255 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_THREAD_USE_STATIC_LINK_CONFIG 1 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_USE_MALLOC_FOR_HEAP 0 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_WISUN_BC_CHANNEL_FUNCTION 255 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_WISUN_BC_DWELL_INTERVAL 0 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_WISUN_BC_FIXED_CHANNEL 65535 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_WISUN_BC_INTERVAL 0 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_WISUN_DEVICE_TYPE MESH_DEVICE_TYPE_WISUN_ROUTER // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_WISUN_NETWORK_NAME "Wi-SUN Network" // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_WISUN_OPERATING_CLASS 255 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_WISUN_OPERATING_MODE 255 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_WISUN_REGULATORY_DOMAIN 3 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_WISUN_UC_CHANNEL_FUNCTION 255 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_WISUN_UC_DWELL_INTERVAL 255 // set by library:mbed-mesh-api -#define MBED_CONF_MBED_MESH_API_WISUN_UC_FIXED_CHANNEL 65535 // set by library:mbed-mesh-api #define MBED_CONF_MCR20A_PROVIDE_DEFAULT 0 // set by library:mcr20a -#define MBED_CONF_NANOSTACK_CONFIGURATION nanostack_full // set by library:nanostack -#define MBED_CONF_NANOSTACK_HAL_CRITICAL_SECTION_USABLE_FROM_INTERRUPT 0 // set by library:nanostack-hal -#define MBED_CONF_NANOSTACK_HAL_EVENT_LOOP_DISPATCH_FROM_APPLICATION 0 // set by library:nanostack-hal -#define MBED_CONF_NANOSTACK_HAL_EVENT_LOOP_THREAD_STACK_SIZE 6144 // set by library:nanostack-hal -#define MBED_CONF_NANOSTACK_HAL_EVENT_LOOP_USE_MBED_EVENTS 0 // set by library:nanostack-hal -#define MBED_CONF_NANOSTACK_HAL_KVSTORE_PATH "/kv/" // set by library:nanostack-hal -#define MBED_CONF_NANOSTACK_HAL_USE_KVSTORE 0 // set by library:nanostack-hal #define MBED_CONF_NANOSTACK_LIBSERVICE_NSDYNMEM_TRACKER_ENABLED 0 // set by library:nanostack-libservice #define MBED_CONF_NANOSTACK_LIBSERVICE_PRESENT 1 // set by library:nanostack-libservice #define MBED_CONF_NSAPI_DEFAULT_MESH_TYPE THREAD // set by library:nsapi @@ -461,7 +412,6 @@ #define MBEDTLS_CIPHER_MODE_CTR // defined by library:SecureStore #define NSAPI_PPP_AVAILABLE (MBED_CONF_PPP_ENABLED || MBED_CONF_LWIP_PPP_ENABLED) // defined by library:ppp #define NSDYNMEM_TRACKER_ENABLED MBED_CONF_NANOSTACK_LIBSERVICE_NSDYNMEM_TRACKER_ENABLED // defined by library:nanostack-libservice -#define NS_USE_EXTERNAL_MBED_TLS // defined by library:nanostack #define UNITY_INCLUDE_CONFIG_H // defined by library:utest #define WSF_MS_PER_TICK 1 // defined by library:cordio #define _RTE_ // defined by library:rtos diff --git a/variants/RASPBERRY_PI_PICO/defines.txt b/variants/RASPBERRY_PI_PICO/defines.txt index 2bae90e00..8afd66a72 100644 --- a/variants/RASPBERRY_PI_PICO/defines.txt +++ b/variants/RASPBERRY_PI_PICO/defines.txt @@ -16,7 +16,7 @@ -DDEVICE_USBDEVICE=1 -DDEVICE_USTICKER=1 -DDEVICE_WATCHDOG=1 --DMBED_BUILD_TIMESTAMP=1617783871.9758618 +-DMBED_BUILD_TIMESTAMP=1618322741.2578108 -DMBED_MPU_CUSTOM -DPICO_NO_BINARY_INFO=1 -DPICO_ON_DEVICE=1 diff --git a/variants/NANO_RP2040_CONNECT/double_tap_usb_boot.c b/variants/RASPBERRY_PI_PICO/double_tap_usb_boot.cpp similarity index 66% rename from variants/NANO_RP2040_CONNECT/double_tap_usb_boot.c rename to variants/RASPBERRY_PI_PICO/double_tap_usb_boot.cpp index 719750d21..4c3173a2d 100644 --- a/variants/NANO_RP2040_CONNECT/double_tap_usb_boot.c +++ b/variants/RASPBERRY_PI_PICO/double_tap_usb_boot.cpp @@ -1,11 +1,10 @@ -#include "pico.h" -#include "pico/time.h" -#include "pico/bootrom.h" - -// Allow user override of the LED mask -#ifndef USB_BOOT_LED_ACTIVITY_MASK -#define USB_BOOT_LED_ACTIVITY_MASK 1 -#endif +extern "C" { + #include "pico.h" + #include "pico/time.h" + #include "pico/bootrom.h" +} +#include "macros.h" +#include "pins_arduino.h" // Doesn't make any sense for a RAM only binary #if !PICO_NO_FLASH @@ -17,7 +16,7 @@ static const uint32_t magic_token[] = { static uint32_t __uninitialized_ram(magic_location)[count_of(magic_token)]; // run at initialization time -static void __attribute__((constructor)) boot_double_tap_check() { +static void boot_double_tap_check() { for (uint i = 0; i < count_of(magic_token); i++) { if (magic_location[i] != magic_token[i]) { // Arm for 100 ms then disarm and continue booting @@ -31,7 +30,16 @@ static void __attribute__((constructor)) boot_double_tap_check() { } magic_location[0] = 0; - reset_usb_boot(USB_BOOT_LED_ACTIVITY_MASK, 0); + reset_usb_boot(1 << LED_BUILTIN, 0); } +class DoubleTap { +public: + DoubleTap() { + boot_double_tap_check(); + } +}; + +DoubleTap dt __attribute__ ((init_priority (101))); + #endif \ No newline at end of file diff --git a/variants/RASPBERRY_PI_PICO/libs/libmbed.a b/variants/RASPBERRY_PI_PICO/libs/libmbed.a index 179bd5419..f1241b8eb 100644 Binary files a/variants/RASPBERRY_PI_PICO/libs/libmbed.a and b/variants/RASPBERRY_PI_PICO/libs/libmbed.a differ diff --git a/variants/RASPBERRY_PI_PICO/variant.cpp b/variants/RASPBERRY_PI_PICO/variant.cpp index 58e59c692..18980efa0 100644 --- a/variants/RASPBERRY_PI_PICO/variant.cpp +++ b/variants/RASPBERRY_PI_PICO/variant.cpp @@ -80,7 +80,7 @@ uint8_t getUniqueSerialNumber(uint8_t* name) { } void _ontouch1200bps_() { - reset_usb_boot(0, 0); + reset_usb_boot(1 << digitalPinToPinName(LED_BUILTIN), 1); } #endif