Merge branch 'master' of https://github.com/me21/Arduino_STM32 into me21-master
This commit is contained in:
commit
8fbd6f0f4e
|
@ -39,7 +39,7 @@
|
||||||
|
|
||||||
}//end RTC
|
}//end RTC
|
||||||
|
|
||||||
RTClock::RTClock(rtc_clk_src src, uint16 prescaler ) {
|
RTClock::RTClock(rtc_clk_src src, uint32 prescaler ) {
|
||||||
switch (src) {
|
switch (src) {
|
||||||
|
|
||||||
case RTCSEL_LSE : {
|
case RTCSEL_LSE : {
|
||||||
|
|
|
@ -41,7 +41,7 @@ class RTClock {
|
||||||
public:
|
public:
|
||||||
RTClock();
|
RTClock();
|
||||||
RTClock(rtc_clk_src src );
|
RTClock(rtc_clk_src src );
|
||||||
RTClock(rtc_clk_src src, uint16 prescaler );
|
RTClock(rtc_clk_src src, uint32 prescaler );
|
||||||
//~RTClock(); //to implement
|
//~RTClock(); //to implement
|
||||||
|
|
||||||
void breakTime(time_t epoch_time, tm_t & tmm);
|
void breakTime(time_t epoch_time, tm_t & tmm);
|
||||||
|
|
Loading…
Reference in New Issue