Updated ArduinoTime and EspOcpp to fix compilation under windows again

This commit is contained in:
2021-06-07 17:52:40 +02:00
parent a2b883c276
commit a33acfdc74
6 changed files with 11 additions and 15 deletions

View File

@ -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
This library is free software; you can redistribute it and/or
@ -33,7 +33,7 @@
//#include <WProgram.h>
//#endif
#include "TimeLib.h"
#include "ArduinoTimeLib.h"
#include <esp_timer.h>

2
ArduinoTime.h Normal file
View File

@ -0,0 +1,2 @@
#warning "Please include ArduinoTimeLib.h, not ArduinoTime.h. Future versions will remove ArduinoTime.h"
#include "ArduinoTimeLib.h"

View File

@ -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)
- fixed daysToTime_t macro (thanks maniacbug)
*/
*/
#ifndef _Time_h
#pragma once
#ifdef __cplusplus
#define _Time_h
#include <inttypes.h>
#ifndef __AVR__
@ -140,5 +139,4 @@ time_t makeTime(const tmElements_t &tm); // convert time elements into time_t
} // extern "C++"
#endif // __cplusplus
#endif /* _Time_h */

View File

@ -1,11 +1,11 @@
set(headers
Time.h
TimeLib.h
ArduinoTime.h
ArduinoTimeLib.h
)
set(sources
ArduinoTime.cpp
DateStrings.cpp
Time.cpp
)
set(dependencies
@ -23,8 +23,6 @@ idf_component_register(
)
target_compile_options(${COMPONENT_TARGET}
PUBLIC
-DUSE_FACADE=true
PRIVATE
-fstack-reuse=all
-fstack-protector-all

View File

@ -11,7 +11,7 @@
//#include <Arduino.h>
#include "TimeLib.h"
#include "ArduinoTimeLib.h"
// the short strings for each day or month must be exactly dt_SHORT_STR_LEN

2
Time.h
View File

@ -1,2 +0,0 @@
#warning "Please include TimeLib.h, not Time.h. Future versions will remove Time.h"
#include "TimeLib.h"