Skip to content

Commit b0e45dd

Browse files
Fix some CI issues
1 parent bc5a23a commit b0e45dd

File tree

4 files changed

+26
-20
lines changed

4 files changed

+26
-20
lines changed

features/CMakeLists.txt

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,15 @@
44
# List of all features libraries available.
55
add_library(mbed-fpga-ci-test-shield INTERFACE)
66
add_library(mbed-client-cli INTERFACE)
7-
add_library(mbed-unity STATIC EXCLUDE_FROM_ALL)
8-
add_library(mbed-utest STATIC EXCLUDE_FROM_ALL)
97

108
add_subdirectory(frameworks/COMPONENT_FPGA_CI_TEST_SHIELD)
119
add_subdirectory(frameworks/mbed-client-cli)
12-
add_subdirectory(frameworks/unity)
13-
add_subdirectory(frameworks/utest)
14-
add_subdirectory(frameworks/mbed-greentea-io)
1510
add_subdirectory(frameworks/cy_rtos_rtx_adapter)
11+
12+
if(MBED_ENABLE_TESTING)
13+
add_library(mbed-unity STATIC EXCLUDE_FROM_ALL)
14+
add_library(mbed-utest STATIC EXCLUDE_FROM_ALL)
15+
add_subdirectory(frameworks/unity)
16+
add_subdirectory(frameworks/utest)
17+
add_subdirectory(frameworks/mbed-greentea-io)
18+
endif()

hal/include/hal/us_ticker_api.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,12 @@ void us_ticker_set_interrupt(timestamp_t timestamp);
278278
*/
279279
void us_ticker_disable_interrupt(void);
280280

281-
/** Clear us ticker interrupt
281+
/**
282+
* @brief Clear the us ticker interrupt.
283+
*
284+
* This is required to be called from the interrupt handler to stop the interrupt handler
285+
* from being executed again after it returns. This does not do anything if called before the interrupt
286+
* fires (e.g. it doesn't cancel the interrupt if it's set in the future).
282287
*
283288
* Pseudo Code:
284289
* @code

hal/tests/TESTS/mbed_hal/common_tickers/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -642,7 +642,7 @@ utest::v1::status_t lp_ticker_teardown(const Case *const source, const size_t pa
642642

643643
utest::v1::status_t test_setup(const size_t number_of_cases)
644644
{
645-
GREENTEA_SETUP(120, "default_auto");
645+
GREENTEA_SETUP(80, "default_auto");
646646
return verbose_test_setup_handler(number_of_cases);
647647
}
648648

targets/TARGET_Ambiq_Micro/TARGET_Apollo3/TARGET_SFE_ARTEMIS/PinNames.h

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -75,19 +75,6 @@ typedef enum
7575
A9 = D9,
7676
A10 = D10,
7777

78-
// I2C
79-
I2C_SCL = AM_BSP_QWIIC_I2C_SCL_PIN,
80-
I2C_SDA = AM_BSP_QWIIC_I2C_SDA_PIN,
81-
82-
// Qwiic
83-
QWIIC_SCL = I2C_SCL,
84-
QWIIC_SDA = I2C_SDA,
85-
86-
// SPI
87-
SPI_CLK = AM_BSP_PRIM_SPI_CLK_PIN,
88-
SPI_SDO = AM_BSP_PRIM_SPI_SDO_PIN,
89-
SPI_SDI = AM_BSP_PRIM_SPI_SDI_PIN,
90-
9178
// UART
9279
SERIAL_TX = AM_BSP_PRIM_UART_TX_PIN,
9380
SERIAL_RX = AM_BSP_PRIM_UART_RX_PIN,
@@ -104,6 +91,17 @@ typedef enum
10491
// LEDs
10592
#define LED1 D13 // Blue LED
10693

94+
// I2C bus
95+
#define I2C_SCL D15
96+
#define I2C_SDA D14
97+
#define QWIIC_SCL I2C_SCL
98+
#define QWIIC_SDA I2C_SDA
99+
100+
// SPI bus
101+
#define SPI_CLK D13
102+
#define SPI_SDO D11
103+
#define SPI_SDI D12
104+
107105
#if defined(MBED_CONF_TARGET_STDIO_UART_TX)
108106
#define STDIO_UART_TX MBED_CONF_TARGET_STDIO_UART_TX
109107
#else

0 commit comments

Comments
 (0)