Skip to content

Fix rebase error for LP ticker feature branch #6469

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 27, 2018
Merged

Fix rebase error for LP ticker feature branch #6469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5513915
Fix rebase error
bulislaw Mar 27, 2018
b5bd47b
Disable failing MTB_LAIRD_BL652 board
bulislaw Mar 27, 2018
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: 1 addition & 1 deletion TESTS/mbed_drivers/timeout/timeout_tests.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ void test_sleep(void)
timeout.detach();
}

#if DEVICE_LOWPOWERTIMER
#if DEVICE_LPTICKER
/** Template for tests: timeout during deepsleep
*
* Test timeout during deepsleep
Expand Down
6 changes: 3 additions & 3 deletions TESTS/mbedmicro-rtos-mbed/systimer/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#error [NOT_SUPPORTED] Tickless mode not supported for this target.
#endif

#if !DEVICE_LOWPOWERTIMER
#if !DEVICE_LPTICKER
#error [NOT_SUPPORTED] Current SysTimer implementation requires lp ticker support.
#endif

Expand Down Expand Up @@ -208,7 +208,7 @@ void test_sleep(void)
TEST_ASSERT_UINT64_WITHIN(DELAY_DELTA_US, DELAY_US, timer.read_high_resolution_us());
}

#if DEVICE_LOWPOWERTIMER
#if DEVICE_LPTICKER
/** Test wake up from deepsleep
*
* Given a SysTimer with a tick scheduled in the future
Expand Down Expand Up @@ -260,7 +260,7 @@ Case cases[] = {
Case("Schedule zero ticks", test_schedule_zero),
Case("Handler called once", test_handler_called_once),
Case("Wake up from sleep", test_sleep),
#if DEVICE_LOWPOWERTIMER
#if DEVICE_LPTICKER
Case("Wake up from deep sleep", test_deepsleep),
#endif

Expand Down
2 changes: 1 addition & 1 deletion features/unsupported/tests/utest/lp_ticker/lp_ticker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
/* Low power timer test.
*/

#if !DEVICE_LOWPOWERTIMER
#if !DEVICE_LPTICKER
#error This test unit requires low power to be defined for a target
#endif

Expand Down
2 changes: 1 addition & 1 deletion rtos/TARGET_CORTEX/SysTimer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
*/
#include "rtos/TARGET_CORTEX/SysTimer.h"

#if DEVICE_LOWPOWERTIMER
#if DEVICE_LPTICKER

#include "hal/lp_ticker_api.h"
#include "rtx_core_cm.h"
Expand Down
2 changes: 1 addition & 1 deletion rtos/TARGET_CORTEX/SysTimer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#ifndef MBED_SYS_TIMER_H
#define MBED_SYS_TIMER_H

#if defined(DEVICE_LOWPOWERTIMER) || defined(DOXYGEN_ONLY)
#if defined(DEVICE_LPTICKER) || defined(DOXYGEN_ONLY)

#include "platform/NonCopyable.h"
#include "drivers/TimerEvent.h"
Expand Down
2 changes: 1 addition & 1 deletion targets/targets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3540,7 +3540,7 @@
"macros_add": ["BOARD_PCA10040", "NRF52_PAN_12", "NRF52_PAN_15", "NRF52_PAN_58", "NRF52_PAN_55", "NRF52_PAN_54", "NRF52_PAN_31", "NRF52_PAN_30", "NRF52_PAN_51", "NRF52_PAN_36", "NRF52_PAN_53", "S132", "CONFIG_GPIO_AS_PINRESET", "BLE_STACK_SUPPORT_REQD", "SWI_DISABLE0", "NRF52_PAN_20", "NRF52_PAN_64", "NRF52_PAN_62", "NRF52_PAN_63"],
"device_has_add": ["ANALOGIN", "I2C", "I2C_ASYNCH", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SERIAL_FC", "SLEEP", "SPI", "SPI_ASYNCH", "SPISLAVE"],
"extra_labels_add": ["MTB_LAIRD_BL652"],
"release_versions": ["5"],
"release_versions": [],
"device_name": "nRF52832_xxAA",
"bootloader_supported": true,
"config": {
Expand Down