Skip to content

Commit 314a35e

Browse files
jeromecoutantbulislaw
authored andcommitted
#6536 rebase correction
1 parent 9635d3f commit 314a35e

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

hal/mbed_lp_ticker_api.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ static const ticker_interface_t lp_interface = {
2828
.read = lp_ticker_read,
2929
.disable_interrupt = lp_ticker_disable_interrupt,
3030
.clear_interrupt = lp_ticker_clear_interrupt,
31-
#if LOWPOWERTIMER_DELAY_TICKS > 0
31+
#if LPTICKER_DELAY_TICKS > 0
3232
.set_interrupt = lp_ticker_set_interrupt_wrapper,
3333
#else
3434
.set_interrupt = lp_ticker_set_interrupt,

hal/mbed_lp_ticker_wrapper.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
*/
1616
#include "hal/lp_ticker_api.h"
1717

18-
#if DEVICE_LOWPOWERTIMER && (LOWPOWERTIMER_DELAY_TICKS > 0)
18+
#if DEVICE_LPTICKER && (LPTICKER_DELAY_TICKS > 0)
1919

2020
#include "Timeout.h"
2121
#include "mbed_critical.h"
2222

23-
static const timestamp_t min_delta = LOWPOWERTIMER_DELAY_TICKS;
23+
static const timestamp_t min_delta = LPTICKER_DELAY_TICKS;
2424

2525
static bool init = false;
2626
static bool pending = false;
@@ -108,7 +108,7 @@ static void set_interrupt_later()
108108
* Wrapper around lp_ticker_set_interrupt to prevent blocking
109109
*
110110
* Problems this function is solving:
111-
* 1. Interrupt may not fire if set earlier than LOWPOWERTIMER_DELAY_TICKS low power clock cycles
111+
* 1. Interrupt may not fire if set earlier than LPTICKER_DELAY_TICKS low power clock cycles
112112
* 2. Setting the interrupt back-to-back will block
113113
*
114114
* This wrapper function prevents lp_ticker_set_interrupt from being called

targets/targets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -729,7 +729,7 @@
729729
"public": false,
730730
"extra_labels": ["STM"],
731731
"supported_toolchains": ["ARM", "uARM", "IAR", "GCC_ARM"],
732-
"macros": ["TRANSACTION_QUEUE_SIZE_SPI=2"],
732+
"macros": ["TRANSACTION_QUEUE_SIZE_SPI=2", "LPTICKER_DELAY_TICKS=3"],
733733
"config": {
734734
"lse_available": {
735735
"help": "Define if a Low Speed External xtal (LSE) is available on the board (0 = No, 1 = Yes). If Yes, the LSE will be used to clock the RTC, LPUART, ... otherwise the Low Speed Internal clock (LSI) will be used",

0 commit comments

Comments
 (0)