Skip to content

Commit 28013dd

Browse files
sg-sg-
authored
Merge pull request #2650 from svastm/lp_timer_f3
STM32F3 - Add low power timer
2 parents a994f47 + e70921a commit 28013dd

File tree

5 files changed

+272
-30
lines changed

5 files changed

+272
-30
lines changed

‎hal/targets.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -717,7 +717,7 @@
717717
"inherits": ["Target"],
718718
"progen": {"target": "nucleo-f302r8"},
719719
"detect_code": ["0705"],
720-
"device_has": ["ANALOGIN", "ANALOGOUT", "CAN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
720+
"device_has": ["ANALOGIN", "ANALOGOUT", "CAN", "I2C", "I2CSLAVE", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
721721
"default_lib": "small",
722722
"release_versions": ["2"]
723723
},
@@ -732,7 +732,7 @@
732732
"progen": {"target": "nucleo-f303k8"},
733733
"detect_code": ["0775"],
734734
"default_lib": "small",
735-
"device_has": ["ANALOGIN", "ANALOGOUT", "CAN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
735+
"device_has": ["ANALOGIN", "ANALOGOUT", "CAN", "I2C", "I2CSLAVE", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
736736
"release_versions": ["2"]
737737
},
738738
"NUCLEO_F303RE": {
@@ -744,7 +744,7 @@
744744
"inherits": ["Target"],
745745
"progen": {"target": "nucleo-f303re"},
746746
"detect_code": ["0745"],
747-
"device_has": ["ANALOGIN", "ANALOGOUT", "CAN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
747+
"device_has": ["ANALOGIN", "ANALOGOUT", "CAN", "I2C", "I2CSLAVE", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
748748
"release_versions": ["2", "5"]
749749
},
750750
"NUCLEO_F303ZE": {
@@ -769,7 +769,7 @@
769769
"inherits": ["Target"],
770770
"progen": {"target": "nucleo-f334r8"},
771771
"detect_code": ["0735"],
772-
"device_has": ["ANALOGIN", "ANALOGOUT", "CAN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
772+
"device_has": ["ANALOGIN", "ANALOGOUT", "CAN", "I2C", "I2CSLAVE", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
773773
"default_lib": "small",
774774
"release_versions": ["2"]
775775
},
@@ -1045,7 +1045,7 @@
10451045
"extra_labels": ["STM", "STM32F3", "STM32F303", "STM32F303VC"],
10461046
"macros": ["DEVICE_RTC_LSI=1"],
10471047
"supported_toolchains": ["GCC_ARM"],
1048-
"device_has": ["ANALOGIN", "ANALOGOUT", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "RTC_LSI", "SERIAL", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"]
1048+
"device_has": ["ANALOGIN", "ANALOGOUT", "I2C", "I2CSLAVE", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "RTC_LSI", "SERIAL", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"]
10491049
},
10501050
"DISCO_F334C8": {
10511051
"inherits": ["Target"],
@@ -1056,7 +1056,7 @@
10561056
"supported_toolchains": ["ARM", "uARM", "IAR", "GCC_ARM"],
10571057
"progen": {"target": "disco-f334c8"},
10581058
"detect_code": ["0810"],
1059-
"device_has": ["ANALOGIN", "ANALOGOUT", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "RTC_LSI", "SERIAL", "SERIAL_ASYNCH", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
1059+
"device_has": ["ANALOGIN", "ANALOGOUT", "I2C", "I2CSLAVE", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "RTC_LSI", "SERIAL", "SERIAL_ASYNCH", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
10601060
"default_lib": "small",
10611061
"release_versions": ["2"]
10621062
},

‎hal/targets/hal/TARGET_STM/TARGET_STM32F3/lp_ticker.c

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
/* mbed Microcontroller Library
2+
*******************************************************************************
3+
* Copyright (c) 2016, STMicroelectronics
4+
* All rights reserved.
5+
*
6+
* Redistribution and use in source and binary forms, with or without
7+
* modification, are permitted provided that the following conditions are met:
8+
*
9+
* 1. Redistributions of source code must retain the above copyright notice,
10+
* this list of conditions and the following disclaimer.
11+
* 2. Redistributions in binary form must reproduce the above copyright notice,
12+
* this list of conditions and the following disclaimer in the documentation
13+
* and/or other materials provided with the distribution.
14+
* 3. Neither the name of STMicroelectronics nor the names of its contributors
15+
* may be used to endorse or promote products derived from this software
16+
* without specific prior written permission.
17+
*
18+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
19+
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
20+
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
21+
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
22+
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
23+
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
24+
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
25+
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
26+
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
27+
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28+
*******************************************************************************
29+
*/
30+
#include "device.h"
31+
32+
#if DEVICE_LOWPOWERTIMER
33+
34+
#include "ticker_api.h"
35+
#include "lp_ticker_api.h"
36+
#include "rtc_api.h"
37+
#include "rtc_api_hal.h"
38+
39+
static uint8_t lp_ticker_inited = 0;
40+
41+
void lp_ticker_init(void)
42+
{
43+
if (lp_ticker_inited) return;
44+
lp_ticker_inited = 1;
45+
46+
rtc_init();
47+
rtc_set_irq_handler((uint32_t) lp_ticker_irq_handler);
48+
}
49+
50+
uint32_t lp_ticker_read(void)
51+
{
52+
uint32_t usecs;
53+
time_t time;
54+
55+
lp_ticker_init();
56+
57+
do {
58+
time = rtc_read();
59+
usecs = rtc_read_subseconds();
60+
} while (time != rtc_read());
61+
62+
return (time * 1000000) + usecs;
63+
}
64+
65+
void lp_ticker_set_interrupt(timestamp_t timestamp)
66+
{
67+
uint32_t delta;
68+
69+
delta = timestamp - lp_ticker_read();
70+
rtc_set_wake_up_timer(delta);
71+
}
72+
73+
void lp_ticker_disable_interrupt(void)
74+
{
75+
rtc_deactivate_wake_up_timer();
76+
}
77+
78+
void lp_ticker_clear_interrupt(void)
79+
{
80+
81+
}
82+
83+
#endif

‎hal/targets/hal/TARGET_STM/TARGET_STM32F3/rtc_api.c

Lines changed: 99 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* mbed Microcontroller Library
22
*******************************************************************************
3-
* Copyright (c) 2014, STMicroelectronics
3+
* Copyright (c) 2016, STMicroelectronics
44
* All rights reserved.
55
*
66
* Redistribution and use in source and binary forms, with or without
@@ -28,23 +28,43 @@
2828
*******************************************************************************
2929
*/
3030
#include "rtc_api.h"
31+
#include "rtc_api_hal.h"
3132

3233
#if DEVICE_RTC
3334

3435
#include "mbed_error.h"
3536

3637
#if DEVICE_RTC_LSI
37-
static int rtc_inited = 0;
38+
static int rtc_inited = 0;
3839
#endif
3940

4041
static RTC_HandleTypeDef RtcHandle;
4142

43+
#if DEVICE_RTC_LSI
44+
#define RTC_CLOCK LSI_VALUE
45+
#else
46+
#define RTC_CLOCK LSE_VALUE
47+
#endif
48+
49+
#if DEVICE_LOWPOWERTIMER
50+
#define RTC_ASYNCH_PREDIV ((RTC_CLOCK - 1) / 0x8000)
51+
#define RTC_SYNCH_PREDIV (RTC_CLOCK / (RTC_ASYNCH_PREDIV + 1) - 1)
52+
#else
53+
#define RTC_ASYNCH_PREDIV (0x007F)
54+
#define RTC_SYNCH_PREDIV (RTC_CLOCK / (RTC_ASYNCH_PREDIV + 1) - 1)
55+
#endif
56+
57+
#if DEVICE_LOWPOWERTIMER
58+
static void (*irq_handler)(void);
59+
static void RTC_IRQHandler();
60+
#endif
61+
4262
void rtc_init(void)
4363
{
4464
RCC_OscInitTypeDef RCC_OscInitStruct;
45-
uint32_t rtc_freq = 0;
4665

4766
#if DEVICE_RTC_LSI
67+
if (rtc_inited) return;
4868
rtc_inited = 1;
4969
#endif
5070

@@ -58,13 +78,11 @@ void rtc_init(void)
5878
if (HAL_RCC_OscConfig(&RCC_OscInitStruct) == HAL_OK) {
5979
// Connect LSE to RTC
6080
__HAL_RCC_RTC_CONFIG(RCC_RTCCLKSOURCE_LSE);
61-
rtc_freq = LSE_VALUE;
62-
}
63-
else {
64-
error("RTC error: LSE clock initialization failed.");
81+
} else {
82+
error("RTC error: LSE clock initialization failed.");
6583
}
6684
#else
67-
// Enable Power clock
85+
// Enable Power clock
6886
__PWR_CLK_ENABLE();
6987

7088
// Enable access to Backup domain
@@ -73,35 +91,46 @@ void rtc_init(void)
7391
// Reset Backup domain
7492
__HAL_RCC_BACKUPRESET_FORCE();
7593
__HAL_RCC_BACKUPRESET_RELEASE();
76-
77-
// Enable LSI clock
78-
RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSI | RCC_OSCILLATORTYPE_LSE;
79-
RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE; // Mandatory, otherwise the PLL is reconfigured!
80-
RCC_OscInitStruct.LSEState = RCC_LSE_OFF;
81-
RCC_OscInitStruct.LSIState = RCC_LSI_ON;
82-
if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) {
83-
error("RTC error: LSI clock initialization failed.");
84-
}
85-
// Connect LSI to RTC
86-
__HAL_RCC_RTC_CONFIG(RCC_RTCCLKSOURCE_LSI);
87-
// Note: The LSI clock can be measured precisely using a timer input capture.
88-
rtc_freq = LSI_VALUE;
89-
#endif
9094

95+
// Enable LSI clock
96+
RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSI | RCC_OSCILLATORTYPE_LSE;
97+
RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE; // Mandatory, otherwise the PLL is reconfigured!
98+
RCC_OscInitStruct.LSEState = RCC_LSE_OFF;
99+
RCC_OscInitStruct.LSIState = RCC_LSI_ON;
100+
if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) {
101+
error("RTC error: LSI clock initialization failed.");
102+
}
103+
// Connect LSI to RTC
104+
__HAL_RCC_RTC_CONFIG(RCC_RTCCLKSOURCE_LSI);
105+
#endif
91106

92107
// Enable RTC
93108
__HAL_RCC_RTC_ENABLE();
94109

95110
RtcHandle.Init.HourFormat = RTC_HOURFORMAT_24;
96-
RtcHandle.Init.AsynchPrediv = 127;
97-
RtcHandle.Init.SynchPrediv = (rtc_freq / 128) - 1;
111+
RtcHandle.Init.AsynchPrediv = RTC_ASYNCH_PREDIV;
112+
RtcHandle.Init.SynchPrediv = RTC_SYNCH_PREDIV;
98113
RtcHandle.Init.OutPut = RTC_OUTPUT_DISABLE;
99114
RtcHandle.Init.OutPutPolarity = RTC_OUTPUT_POLARITY_HIGH;
100115
RtcHandle.Init.OutPutType = RTC_OUTPUT_TYPE_OPENDRAIN;
101116

102117
if (HAL_RTC_Init(&RtcHandle) != HAL_OK) {
103118
error("RTC error: RTC initialization failed.");
104119
}
120+
121+
#if DEVICE_LOWPOWERTIMER
122+
#if DEVICE_RTC_LSI
123+
rtc_write(0);
124+
#else
125+
if (!rtc_isenabled()) {
126+
rtc_write(0);
127+
}
128+
#endif
129+
NVIC_ClearPendingIRQ(RTC_WKUP_IRQn);
130+
NVIC_DisableIRQ(RTC_WKUP_IRQn);
131+
NVIC_SetVector(RTC_WKUP_IRQn, (uint32_t)RTC_IRQHandler);
132+
NVIC_EnableIRQ(RTC_WKUP_IRQn);
133+
#endif
105134
}
106135

107136
void rtc_free(void)
@@ -218,4 +247,50 @@ void rtc_write(time_t t)
218247
HAL_RTC_SetTime(&RtcHandle, &timeStruct, FORMAT_BIN);
219248
}
220249

250+
#if DEVICE_LOWPOWERTIMER
251+
252+
static void RTC_IRQHandler()
253+
{
254+
HAL_RTCEx_WakeUpTimerIRQHandler(&RtcHandle);
255+
}
256+
257+
void HAL_RTCEx_WakeUpTimerEventCallback(RTC_HandleTypeDef *hrtc)
258+
{
259+
if (irq_handler) {
260+
// Fire the user callback
261+
irq_handler();
262+
}
263+
}
264+
265+
void rtc_set_irq_handler(uint32_t handler)
266+
{
267+
irq_handler = (void (*)(void))handler;
268+
}
269+
270+
uint32_t rtc_read_subseconds(void)
271+
{
272+
return 1000000.f * ((double)(RTC_SYNCH_PREDIV - RTC->SSR) / (RTC_SYNCH_PREDIV + 1));
273+
}
274+
275+
void rtc_set_wake_up_timer(uint32_t delta)
276+
{
277+
uint32_t wake_up_counter = delta / (2000000 / RTC_CLOCK);
278+
279+
if (HAL_RTCEx_SetWakeUpTimer_IT(&RtcHandle, wake_up_counter,
280+
RTC_WAKEUPCLOCK_RTCCLK_DIV2) != HAL_OK) {
281+
error("Set wake up timer failed\n");
282+
}
283+
}
284+
285+
void rtc_deactivate_wake_up_timer(void)
286+
{
287+
HAL_RTCEx_DeactivateWakeUpTimer(&RtcHandle);
288+
}
289+
290+
void rtc_synchronize(void)
291+
{
292+
HAL_RTC_WaitForSynchro(&RtcHandle);
293+
}
294+
#endif // DEVICE_LOWPOWERTIMER
295+
221296
#endif

0 commit comments

Comments
 (0)