DigitalInfinity/ESP32-PaxCounter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #984 from cyberman54/development

Browse Source 
Development
This commit is contained in:
Verkehrsrot 2023-07-02 21:30:32 +02:00 committed by GitHub
commit 8c7b8730a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/globals.h
View File

@ -6,8 +6,7 @@
// Time functions // Time functions
#ifdef HAS_RTC #ifdef HAS_RTC
#include <RtcUtility.h> #include <RtcDS3231.h>
#include <RtcDateTime.h>
#endif #endif
#include <Ticker.h> #include <Ticker.h>
@ -114,4 +113,4 @@ typedef struct {
extern char clientId[20]; // unique clientID extern char clientId[20]; // unique clientID
#endif #endif

3
include/rtctime.h
View File

@ -4,7 +4,6 @@
#ifdef HAS_RTC #ifdef HAS_RTC
#include <Wire.h> // must be included here so that Arduino library object file references work #include <Wire.h> // must be included here so that Arduino library object file references work
#include <RtcDS3231.h>
#include "globals.h" #include "globals.h"
#include "timekeeper.h" #include "timekeeper.h"
@ -19,4 +18,4 @@ float get_rtctemp(void);
#endif #endif
#endif // _RTCTIME_H #endif // _RTCTIME_H

1
src/rtctime.cpp
View File

@ -2,7 +2,6 @@
#include "rtctime.h" #include "rtctime.h"
RtcDS3231<TwoWire> Rtc(Wire); // RTC hardware i2c interface RtcDS3231<TwoWire> Rtc(Wire); // RTC hardware i2c interface
// initialize RTC // initialize RTC