diff --git a/cores/arduino/mbed/connectivity/cellular/include/cellular/framework/AT/AT_CellularContext.h b/cores/arduino/mbed/connectivity/cellular/include/cellular/framework/AT/AT_CellularContext.h index eb3bf5afd..6291bb11d 100644 --- a/cores/arduino/mbed/connectivity/cellular/include/cellular/framework/AT/AT_CellularContext.h +++ b/cores/arduino/mbed/connectivity/cellular/include/cellular/framework/AT/AT_CellularContext.h @@ -109,7 +109,7 @@ class AT_CellularContext : public CellularContext { * @return NIDD context text, e.g. Non-IP or NONIP */ virtual const char *get_nonip_context_type_str(); - virtual void enable_access_technology(); + virtual nsapi_error_t enable_access_technology(); virtual void set_cid(int cid); private: @@ -135,8 +135,6 @@ class AT_CellularContext : public CellularContext { PinName _dcd_pin; bool _active_high; - RadioAccessTechnologyType _rat; - FrequencyBand _band; protected: char _found_apn[MAX_APN_LENGTH]; @@ -144,6 +142,8 @@ class AT_CellularContext : public CellularContext { bool _cp_req; bool _is_connected; ATHandler &_at; + RadioAccessTechnologyType _rat; + FrequencyBand _band; }; } // namespace mbed diff --git a/cores/arduino/mbed/connectivity/drivers/cellular/GEMALTO/CINTERION/GEMALTO_CINTERION_CellularContext.h b/cores/arduino/mbed/connectivity/drivers/cellular/GEMALTO/CINTERION/GEMALTO_CINTERION_CellularContext.h index 0645b2b87..24ff87bc0 100644 --- a/cores/arduino/mbed/connectivity/drivers/cellular/GEMALTO/CINTERION/GEMALTO_CINTERION_CellularContext.h +++ b/cores/arduino/mbed/connectivity/drivers/cellular/GEMALTO/CINTERION/GEMALTO_CINTERION_CellularContext.h @@ -34,6 +34,7 @@ class GEMALTO_CINTERION_CellularContext: public AT_CellularContext { virtual NetworkStack *get_stack(); #endif // NSAPI_PPP_AVAILABLE virtual nsapi_error_t do_user_authentication(); + virtual nsapi_error_t enable_access_technology(); }; } /* namespace mbed */ diff --git a/cores/arduino/mbed/platform/include/platform/Callback.h b/cores/arduino/mbed/platform/include/platform/Callback.h index a7dd4e003..e76a4f197 100644 --- a/cores/arduino/mbed/platform/include/platform/Callback.h +++ b/cores/arduino/mbed/platform/include/platform/Callback.h @@ -26,14 +26,6 @@ #include #include -#pragma GCC push_options -// This prevents the GCC compiler from applying optimizations that assume the code follows strict aliasing rules. -// In order to prevent bugs arising from undefined behavior that is tricky to find in the Callback implementation, -// or simply from compiler bugs in GCC. -#pragma GCC optimize("-fno-strict-aliasing") -// This prevents the GCC compiler from generating incorrect inline code for the Callback constructor. -#pragma GCC optimize("-fno-inline") - // Controlling switches from config: // MBED_CONF_PLATFORM_CALLBACK_NONTRIVIAL - support storing non-trivial function objects // MBED_CONF_PLATFORM_CALLBACK_COMPARABLE - support memcmp comparing stored objects (requires zero padding) @@ -44,6 +36,7 @@ #define MBED_CONF_PLATFORM_CALLBACK_NONTRIVIAL 1 #endif + namespace mbed { /** \addtogroup platform-public-api */ /** @{*/ @@ -842,6 +835,4 @@ Callback(R(*func)(const volatile T *, ArgTs...), const volatile U *arg) -> Callb } // namespace mbed -#pragma GCC pop_options - #endif diff --git a/variants/EDGE_CONTROL/defines.txt b/variants/EDGE_CONTROL/defines.txt index 0198e4a12..1d081f7a7 100644 --- a/variants/EDGE_CONTROL/defines.txt +++ b/variants/EDGE_CONTROL/defines.txt @@ -38,7 +38,7 @@ -DFEATURE_STORAGE=1 -D__FPU_PRESENT=1 -D__MBED__=1 --DMBED_BUILD_TIMESTAMP=1690447154.5646534 +-DMBED_BUILD_TIMESTAMP=1700127377.3953335 -D__MBED_CMSIS_RTOS_CM -DMBED_MPU_CUSTOM -DMBED_TICKLESS diff --git a/variants/EDGE_CONTROL/includes.txt b/variants/EDGE_CONTROL/includes.txt index 238ddb925..cbd9ed0fd 100644 --- a/variants/EDGE_CONTROL/includes.txt +++ b/variants/EDGE_CONTROL/includes.txt @@ -94,6 +94,33 @@ -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 diff --git a/variants/EDGE_CONTROL/libs/libmbed.a b/variants/EDGE_CONTROL/libs/libmbed.a index 69085f107..3fc128d6b 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 83a45d8be..c61166166 100644 --- a/variants/EDGE_CONTROL/mbed_config.h +++ b/variants/EDGE_CONTROL/mbed_config.h @@ -58,6 +58,8 @@ #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 @@ -69,10 +71,11 @@ #define MBED_CONF_BLE_API_IMPLEMENTATION_MAX_CHARACTERISTIC_AUTHORISATION_COUNT 20 // set by library:ble-api-implementation #define MBED_CONF_BLE_PRESENT 1 // set by library:ble #define MBED_CONF_BLE_TRACE_HUMAN_READABLE_ENUMS 0 // set by library:ble -#define MBED_CONF_CELLULAR_AT_HANDLER_BUFFER_SIZE 32 // set by library:cellular +#define MBED_CONF_CELLULAR_AT_HANDLER_BUFFER_SIZE 1024 // set by application[*] #define MBED_CONF_CELLULAR_CONTROL_PLANE_OPT 0 // set by library:cellular -#define MBED_CONF_CELLULAR_DEBUG_AT 0 // set by library:cellular +#define MBED_CONF_CELLULAR_DEBUG_AT 1 // set by application[*] #define MBED_CONF_CELLULAR_MAX_CP_DATA_RECV_LEN 1358 // set by library:cellular +#define MBED_CONF_CELLULAR_OFFLOAD_DNS_QUERIES 1 // set by application[*] #define MBED_CONF_CELLULAR_PRESENT 1 // set by library:cellular #define MBED_CONF_CELLULAR_RANDOM_MAX_START_DELAY 0 // set by library:cellular #define MBED_CONF_CELLULAR_USE_APN_LOOKUP 0 // set by library:cellular @@ -182,6 +185,10 @@ #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 @@ -247,6 +254,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_TRACE_ENABLE 1 // set by application[*] #define MBED_CONF_MCR20A_PROVIDE_DEFAULT 0 // set by library:mcr20a #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 @@ -307,13 +315,26 @@ #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_ENABLE_ALL_RTX_EVENTS 0 // set by library:rtos #define MBED_CONF_RTOS_EVFLAGS_NUM 0 // set by library:rtos #define MBED_CONF_RTOS_IDLE_THREAD_STACK_SIZE 512 // set by library:rtos #define MBED_CONF_RTOS_IDLE_THREAD_STACK_SIZE_DEBUG_EXTRA 0 // set by library:rtos #define MBED_CONF_RTOS_IDLE_THREAD_STACK_SIZE_TICKLESS_EXTRA 256 // set by library:rtos -#define MBED_CONF_RTOS_MAIN_THREAD_STACK_SIZE 32768 // set by application[*] +#define MBED_CONF_RTOS_MAIN_THREAD_STACK_SIZE 4096 // set by application[*] #define MBED_CONF_RTOS_MSGQUEUE_DATA_SIZE 0 // set by library:rtos #define MBED_CONF_RTOS_MSGQUEUE_NUM 0 // set by library:rtos #define MBED_CONF_RTOS_MUTEX_NUM 0 // set by library:rtos @@ -325,6 +346,8 @@ #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 @@ -380,6 +403,18 @@ #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 @@ -412,6 +447,7 @@ #define LHCI_ENABLE_VS 0 // defined by library:cordio-nordic-ll #define LL_MAX_PER_SCAN 3 // defined by library:cordio-nordic-ll #define MBEDTLS_CIPHER_MODE_CTR // defined by library:SecureStore +#define MBEDTLS_SHA1_C 1 // defined by application #define MBED_HEAP_STATS_ENABLED 1 // defined by application #define MBED_MEM_TRACING_ENABLED 1 // defined by application #define MBED_STACK_STATS_ENABLED 1 // defined by application