forked from PaulStoffregen/Time
Updated ArduinoTime and EspOcpp to fix compilation under windows again
This commit is contained in:
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
time.c - low level time and date functions
|
ArduinoTime.cpp - low level time and date functions
|
||||||
Copyright (c) Michael Margolis 2009-2014
|
Copyright (c) Michael Margolis 2009-2014
|
||||||
|
|
||||||
This library is free software; you can redistribute it and/or
|
This library is free software; you can redistribute it and/or
|
||||||
@ -33,7 +33,7 @@
|
|||||||
//#include <WProgram.h>
|
//#include <WProgram.h>
|
||||||
//#endif
|
//#endif
|
||||||
|
|
||||||
#include "TimeLib.h"
|
#include "ArduinoTimeLib.h"
|
||||||
|
|
||||||
#include <esp_timer.h>
|
#include <esp_timer.h>
|
||||||
|
|
2
ArduinoTime.h
Normal file
2
ArduinoTime.h
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
#warning "Please include ArduinoTimeLib.h, not ArduinoTime.h. Future versions will remove ArduinoTime.h"
|
||||||
|
#include "ArduinoTimeLib.h"
|
@ -1,15 +1,14 @@
|
|||||||
/*
|
/*
|
||||||
time.h - low level time and date functions
|
ArduinoTimeLib.h - low level time and date functions
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
/*
|
||||||
July 3 2011 - fixed elapsedSecsThisWeek macro (thanks Vincent Valdy for this)
|
July 3 2011 - fixed elapsedSecsThisWeek macro (thanks Vincent Valdy for this)
|
||||||
- fixed daysToTime_t macro (thanks maniacbug)
|
- fixed daysToTime_t macro (thanks maniacbug)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef _Time_h
|
#pragma once
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
#define _Time_h
|
|
||||||
|
|
||||||
#include <inttypes.h>
|
#include <inttypes.h>
|
||||||
#ifndef __AVR__
|
#ifndef __AVR__
|
||||||
@ -140,5 +139,4 @@ time_t makeTime(const tmElements_t &tm); // convert time elements into time_t
|
|||||||
|
|
||||||
} // extern "C++"
|
} // extern "C++"
|
||||||
#endif // __cplusplus
|
#endif // __cplusplus
|
||||||
#endif /* _Time_h */
|
|
||||||
|
|
@ -1,11 +1,11 @@
|
|||||||
set(headers
|
set(headers
|
||||||
Time.h
|
ArduinoTime.h
|
||||||
TimeLib.h
|
ArduinoTimeLib.h
|
||||||
)
|
)
|
||||||
|
|
||||||
set(sources
|
set(sources
|
||||||
|
ArduinoTime.cpp
|
||||||
DateStrings.cpp
|
DateStrings.cpp
|
||||||
Time.cpp
|
|
||||||
)
|
)
|
||||||
|
|
||||||
set(dependencies
|
set(dependencies
|
||||||
@ -23,8 +23,6 @@ idf_component_register(
|
|||||||
)
|
)
|
||||||
|
|
||||||
target_compile_options(${COMPONENT_TARGET}
|
target_compile_options(${COMPONENT_TARGET}
|
||||||
PUBLIC
|
|
||||||
-DUSE_FACADE=true
|
|
||||||
PRIVATE
|
PRIVATE
|
||||||
-fstack-reuse=all
|
-fstack-reuse=all
|
||||||
-fstack-protector-all
|
-fstack-protector-all
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
|
|
||||||
//#include <Arduino.h>
|
//#include <Arduino.h>
|
||||||
|
|
||||||
#include "TimeLib.h"
|
#include "ArduinoTimeLib.h"
|
||||||
|
|
||||||
|
|
||||||
// the short strings for each day or month must be exactly dt_SHORT_STR_LEN
|
// the short strings for each day or month must be exactly dt_SHORT_STR_LEN
|
||||||
|
Reference in New Issue
Block a user