noisymime
/
Arduino_STM32
mirror of https://github.com/noisymime/Arduino_STM32.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/me21/Arduino_STM32 into me21-master

This commit is contained in:
Roger Clark 2018-05-27 15:01:51 +10:00
parent cd3cab3a79 84c5a86109
commit 8fbd6f0f4e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
STM32F1/libraries/RTClock/src/RTClock.cpp
View File

@ -39,7 +39,7 @@
}//end RTC
RTClock::RTClock(rtc_clk_src src, uint16 prescaler ) {
RTClock::RTClock(rtc_clk_src src, uint32 prescaler ) {
switch (src) {
case RTCSEL_LSE : {

2
STM32F1/libraries/RTClock/src/RTClock.h
View File

@ -41,7 +41,7 @@ class RTClock {
public:
RTClock();
RTClock(rtc_clk_src src );
RTClock(rtc_clk_src src, uint16 prescaler );
RTClock(rtc_clk_src src, uint32 prescaler );
//~RTClock(); //to implement
void breakTime(time_t epoch_time, tm_t & tmm);