Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
63b7f04
Add can_api.c for efm32
petroborys Mar 6, 2019
1188209
Add can_api.c for efm32: wrap in presence of the base peripheral
Apr 26, 2019
86f7984
Add can_api.c for efm32:review build-IAR
Apr 30, 2019
2b8ac5d
Allow application to override LWIP_RAW
andrewc-arm Apr 26, 2019
b20a70c
TRAVIS: turn off upload python test code coverage
May 2, 2019
1dd94c5
Py3 fixes for test scripts
May 8, 2019
6065e39
C027 Fix for modemOn flag
May 3, 2019
7bf5657
cellular target name change for ublox cellular instance
mudassar-ublox May 3, 2019
75b113e
Correct the default pins for the spi flash for the mts dragonfly - on…
Mar 17, 2019
ef21cf1
Fix handoff issue from the bootloader to the application on MTS_DRAGO…
linlingao Mar 29, 2019
2b33d06
Add option to keep post_binary_hook and make it default. It can be di…
linlingao Apr 25, 2019
3af4e0b
Increase tcpip thread size for MTS_DRAGONFLY_F411RE
linlingao May 2, 2019
80b3399
Nuvoton: Add COMPONENT_FLASHIAP support
ccli8 May 2, 2019
7f276fc
This removes many const char* warnings related with LWIP_ASSERT()
andrewc-arm Apr 27, 2019
a677e43
STM32WB: Update Flash size
LMESTM Apr 5, 2019
f73e6cd
Update FLASH_SIZE backup value
LMESTM Apr 26, 2019
b262080
Typo fix for MBED_APP_SIZE
LMESTM May 9, 2019
63c8915
requirements: update urllib3 to 1.24.2
0xc0170 Apr 30, 2019
96f2c42
Removing FLASHIAP support form general_filesystem tests as it is mark…
May 2, 2019
01e35e0
Enabled crash reporting for DISCO_F407VG target
masoudr May 7, 2019
9ad5fd3
Enabled crash reporting for DISCO_F407VG on all other toolchains
masoudr May 7, 2019
c015bb3
Cellular: WISE-1570 needs greater receiving timeout to pass UDPSOCKET…
May 8, 2019
e6fcada
added QSPI support to target RHOMBIO_L476DMW1K
guialonsoalb May 7, 2019
ed5ae0e
error in tabulation fixed
guialonsoalb May 7, 2019
dcfe27d
Add mbed studio flag during assembly
bridadan May 7, 2019
e6e86b0
Fix optimization error with NVIC_SetVector/NVIC_GetVector on ARMC6
ccli8 May 6, 2019
78b0d9b
STM32 astyle updates
jeromecoutant May 10, 2019
982acef
SPI: Prime asynch transaction buffer on construction
kjbracey Apr 25, 2019
4c43bd8
Change "aplication" to "application"
AGlass0fMilk May 13, 2019
15d0a94
not include attribute write cback for CCC
paul-szczepanek-arm May 14, 2019
7b1d57c
no read callback for CCC
paul-szczepanek-arm May 14, 2019
4536193
cellular: fix Quectel BG96 missing unlock at socket_connect
kevinong0108 May 14, 2019
f179be9
cellular: fix style
kevinong0108 May 14, 2019
2d2823d
Modify PinName file to keep correspondence with spec
ThunderSoft123 May 14, 2019
27d3b1e
PSOC6: move mbed_sdk_init to mbed_overrides.c
vmedcy Apr 23, 2019
6030b14
PSOC6: simplify the mbed_sdk_init sequence
vmedcy May 2, 2019
815a00d
Permit non-TrustZone ARMv8 build
kjbracey May 2, 2019
618297f
Update Mbed version block
adbridge May 17, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,6 @@ matrix:
pylint>=1.9,<2
hypothesis>=3,<4
coverage>=4.5,<5
coveralls>=1.5,<2
"
- python -m pip install --upgrade pip==18.1
- python -m pip install --upgrade setuptools==40.4.3
Expand All @@ -176,7 +175,6 @@ matrix:
- python tools/test/pylint.py
- coverage run -a tools/project.py -S | sed -n '/^Total/p'
- coverage html
- coveralls

- <<: *pytools-vm
name: "tools-py35"
Expand Down
2 changes: 1 addition & 1 deletion TESTS/host_tests/rtc_reset.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def setup(self):
"""Register callbacks required for the test"""
self._error = False
generator = self.rtc_reset_test()
generator.next()
next(generator)

def run_gen(key, value, time):
"""Run the generator, and fail testing if the iterator stops"""
Expand Down
8 changes: 8 additions & 0 deletions TESTS/mbed_hal/qspi/flash_configs/flash_configs.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,14 @@
#undef QSPI_CMD_WRITE_DPI
#undef QSPI_CMD_WRITE_QPI

#elif defined(TARGET_RHOMBIO_L476DMW1K)
#include "MT25Q_config.h" // MT25QL128ABA1EW7
/* See STM32L476 Errata Sheet, it is not possible to use Dual-/Quad-mode for the command phase */
#undef QSPI_CMD_READ_DPI
#undef QSPI_CMD_READ_QPI
#undef QSPI_CMD_WRITE_DPI
#undef QSPI_CMD_WRITE_QPI

#elif defined(TARGET_DISCO_L496AG)
#include "MX25RXX35F_config.h" // MX25R6435F

Expand Down
2 changes: 1 addition & 1 deletion TESTS/netsocket/udp/udpsocket_echotest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ namespace {
static const int SIGNAL_SIGIO_RX = 0x1;
static const int SIGNAL_SIGIO_TX = 0x2;
static const int SIGIO_TIMEOUT = 5000; //[ms]
static const int WAIT2RECV_TIMEOUT = 2000; //[ms]
static const int WAIT2RECV_TIMEOUT = 5000; //[ms]
static const int RETRIES = 2;

static const double EXPECTED_LOSS_RATIO = 0.0;
Expand Down
6 changes: 3 additions & 3 deletions components/TARGET_PSA/TARGET_TFM/tf-m-integration.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ TF-M is built as bare-metal in a secure target, in order to build a secure targe
## Build hooks

Mbed-OS testing tools are designed to work with a single image (`.bin` or `.hex`).
When building mbed-os for ARMv8-M targets two images are created. One for normal world(NW) and one for TrustZone(TZ).
When building mbed-os for TF-M targets two images are created. One for normal world(NW) and one for TrustZone(TZ).
Mbed-OS build system provides `post_binary_hook` that allows executing arbitrary Python script for merging NW and TZ images. Typically `post_binary_hook` is added to NW target and assumes TZ target images as a prerequisite.

## Porting ARMv8-M targets
## Porting TF-M targets

Typically firmware for ARMv8-M targets consist of 2 or more images: normal world and TrustZone image. More images can be present in case boot loaders are used.
Typically firmware for TF-M targets consist of 2 or more images: normal world and TrustZone image. More images can be present in case boot loaders are used.
Two images must be built and linked separately. TrustZone image must be built first.

There may be code and/or header files sharing between the two targets.
Expand Down
20 changes: 13 additions & 7 deletions components/storage/blockdevice/COMPONENT_SPIF/mbed_lib.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,25 +32,25 @@
"SPI_CLK": "PE_12",
"SPI_CS": "PE_11"
},
"MTB_ADV_WISE_1530": {
"MTB_ADV_WISE_1530": {
"SPI_MOSI": "PC_3",
"SPI_MISO": "PC_2",
"SPI_CLK": "PB_13",
"SPI_CS": "PC_12"
"SPI_CS": "PC_12"
},
"MTB_MXCHIP_EMW3166": {
"MTB_MXCHIP_EMW3166": {
"SPI_MOSI": "PB_15",
"SPI_MISO": "PB_14",
"SPI_CLK": "PB_13",
"SPI_CS": "PA_10"
"SPI_CS": "PA_10"
},
"MTB_USI_WM_BN_BM_22": {
"MTB_USI_WM_BN_BM_22": {
"SPI_MOSI": "PC_3",
"SPI_MISO": "PC_2",
"SPI_CLK": "PB_13",
"SPI_CS": "PA_6"
"SPI_CS": "PA_6"
},
"MTB_ADV_WISE_1570": {
"MTB_ADV_WISE_1570": {
"SPI_MOSI": "PA_7",
"SPI_MISO": "PA_6",
"SPI_CLK": "PA_5",
Expand All @@ -62,6 +62,12 @@
"SPI_MISO": "PE_13",
"SPI_CLK": "PE_12",
"SPI_CS": "PE_11"
},
"MTS_DRAGONFLY_F411RE": {
"SPI_MOSI": "SPI3_MOSI",
"SPI_MISO": "SPI3_MISO",
"SPI_CLK": "SPI3_SCK",
"SPI_CS": "SPI_CS1"
}
}
}
6 changes: 6 additions & 0 deletions drivers/SPI.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,12 @@ void SPI::_do_construct()
_peripheral->name = name;
}
core_util_critical_section_exit();

#if DEVICE_SPI_ASYNCH && TRANSACTION_QUEUE_SIZE_SPI
// prime the SingletonPtr, so we don't have a problem trying to
// construct the buffer if asynch operation initiated from IRQ
_peripheral->transaction_buffer.get();
#endif
// we don't need to _acquire at this stage.
// this will be done anyway before any operation.
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,7 @@ ble_error_t GattServer::insert_descriptor(
#endif // BLE_FEATURE_SECURITY
}

if (properties & READ_PROPERTY) {
if (properties & READ_PROPERTY && !(attribute_it->settings & ATTS_SET_CCC)) {
attribute_it->settings |= ATTS_SET_READ_CBACK;
}
}
Expand Down Expand Up @@ -543,7 +543,7 @@ ble_error_t GattServer::insert_descriptor(
#endif // BLE_FEATURE_SECURITY
}

if (properties & WRITABLE_PROPERTIES) {
if (properties & WRITABLE_PROPERTIES && !(attribute_it->settings & ATTS_SET_CCC)) {
attribute_it->settings |= ATTS_SET_WRITE_CBACK;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ nsapi_error_t QUECTEL_BG96_CellularStack::socket_connect(nsapi_socket_t handle,
if ((_at.get_last_error() == NSAPI_ERROR_OK) && err) {
if (err == BG96_SOCKET_BIND_FAIL) {
socket->created = false;
_at.unlock();
return NSAPI_ERROR_PARAMETER;
}
_at.cmd_start("AT+QICLOSE=");
Expand Down Expand Up @@ -177,6 +178,7 @@ void QUECTEL_BG96_CellularStack::handle_open_socket_response(int &modem_connect_
modem_connect_id = _at.read_int();
err = _at.read_int();
}

nsapi_error_t QUECTEL_BG96_CellularStack::create_socket_impl(CellularSocket *socket)
{
int modem_connect_id = -1;
Expand Down
2 changes: 1 addition & 1 deletion features/lwipstack/lwip-sys/arch/cc.h
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ MBED_NORETURN void lwip_mbed_assert_fail(const char *msg, const char *func, cons
#else // MBED_CONF_LWIP_USE_MBED_TRACE
#include <stdio.h>

MBED_NORETURN void assert_printf(char *msg, int line, char *file);
MBED_NORETURN void assert_printf(const char *msg, int line, const char *file);

/* Plaform specific diagnostic output */
#define LWIP_PLATFORM_DIAG(vars) printf vars
Expand Down
2 changes: 1 addition & 1 deletion features/lwipstack/lwip-sys/arch/lwip_sys_arch.c
Original file line number Diff line number Diff line change
Expand Up @@ -605,7 +605,7 @@ MBED_NORETURN void lwip_mbed_assert_fail(const char *msg, const char *func, cons
\param[in] line Line number in file with error
\param[in] file Filename with error
*/
MBED_NORETURN void assert_printf(char *msg, int line, char *file) {
MBED_NORETURN void assert_printf(const char *msg, int line, const char *file) {
if (msg)
error("%s:%d in file %s\n", msg, line, file);
else
Expand Down
2 changes: 2 additions & 0 deletions features/lwipstack/lwipopts.h
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,9 @@

#define SYS_LIGHTWEIGHT_PROT 1

#ifndef LWIP_RAW
#define LWIP_RAW 0
#endif

#define TCPIP_MBOX_SIZE 8
#define DEFAULT_TCP_RECVMBOX_SIZE 8
Expand Down
3 changes: 3 additions & 0 deletions features/lwipstack/mbed_lib.json
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,9 @@
},
"FVP_MPS2_M3": {
"mem-size": 36560
},
"MTS_DRAGONFLY_F411RE": {
"tcpip-thread-stacksize": 1600
}
}
}
Loading