siwat/ESPMegaPRO-v3-SDK
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

pre

Browse source
This commit is contained in:
Siwat Sirichai 2023-09-28 13:57:51 +07:00
parent 63d9bfb524
commit cf35e07c2f
7 changed files with 68 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

41
Template Project/lib/ESPMegaPRO/ESPMegaPRO.cpp
View file

@ -100,7 +100,8 @@ void IRAM_ATTR refreshInputBankB()
inputBufferB = inputBankB.read8();
}
rtctime_t ESPMega_getTime() {
rtctime_t ESPMega_getTime()
{
tmElements_t timeElement;
RTC.read(timeElement);
rtctime_t time;
@ -109,18 +110,19 @@ rtctime_t ESPMega_getTime() {
time.seconds = timeElement.Second;
time.day = timeElement.Day;
time.month = timeElement.Month;
time.year = timeElement.Year+1970;
time.year = timeElement.Year + 1970;
return time;
}
void ESPMega_setTime(int hours,int minutes, int seconds, int day, int month, int year) {
void ESPMega_setTime(int hours, int minutes, int seconds, int day, int month, int year)
{
tmElements_t timeElement;
timeElement.Hour = hours;
timeElement.Minute = minutes;
timeElement.Second = seconds;
timeElement.Day = day;
timeElement.Month = month;
timeElement.Year = year-1970;
timeElement.Year = year - 1970;
RTC.write(timeElement);
}
@ -154,24 +156,23 @@ void ESPMega_dacWrite(int id, int value)
}
}
/* void ESPMega_rtcNTPUpdate()
bool ESPMega_updateTimeFromNTP()
{
ntpTimeClient.update();
if (ntpTimeClient.updated())
struct tm timeinfo;
if (getLocalTime(&timeinfo))
{
int day = ntpTimeClient.getDay();
int month = ntpTimeClient.getMonth();
int year = ntpTimeClient.getYear();
int hours = ntpTimeClient.getHours();
int minutes = ntpTimeClient.getMinutes();
int seconds = ntpTimeClient.getSeconds();
ESPMega_RTC.setYear(year);
ESPMega_RTC.setMonth(month);
ESPMega_RTC.setDay(day);
ESPMega_RTC.setHour(hours);
ESPMega_RTC.setMinute(minutes);
ESPMega_RTC.setSecond(seconds);
rtctime_t rtctime = ESPMega_getTime();
if (rtctime.hours != timeinfo.tm_hour || rtctime.minutes != timeinfo.tm_min ||
rtctime.seconds != timeinfo.tm_sec || rtctime.day != timeinfo.tm_mday ||
rtctime.month != timeinfo.tm_mon + 1 || rtctime.year != timeinfo.tm_year + 1900)
{
ESPMega_setTime(timeinfo.tm_hour, timeinfo.tm_min, timeinfo.tm_sec,
timeinfo.tm_mday, timeinfo.tm_mon + 1, timeinfo.tm_year + 1900);
}
return true;
}
} */
return false;
}
#endif

18
Template Project/lib/ESPMegaPRO/ESPMegaPRO.h
View file

@ -5,12 +5,13 @@
#include <Wire.h>
#include <Adafruit_PWMServoDriver.h>
#include <PCF8574.h>
#ifdef ANALOG_CARD_ENABLE
#include <Adafruit_ADS1X15.h>
#include <MCP4725.h>
#include <I2C_eeprom.h>
#include <TimeLib.h>
#include <DS1307RTC.h>
#include <time.h>
#ifdef ANALOG_CARD_ENABLE
#include <Adafruit_ADS1X15.h>
#include <MCP4725.h>
#endif
#define INPUT_BANK_A_ADDRESS 0x21
@ -23,12 +24,13 @@
#define DAC1_ADDRESS 0x61
#define DAC2_ADDRESS 0x62
#define DAC3_ADDRESS 0x63
#define EEPROM_ADDRESS 0x70
#define EEPROM_ADDRESS 0x5A
//#define USE_INTERRUPT
#define INPUT_BANK_A_INTERRUPT 36
#define INPUT_BANK_B_INTERRUPT 39
extern I2C_eeprom ESPMega_EEPROM;
#define ESPMega_configNTP configTime
struct rtctime_t {
uint8_t hours;
uint8_t minutes;
@ -99,6 +101,14 @@ rtctime_t ESPMega_getTime();
*/
void ESPMega_setTime(int hours,int minutes, int seconds, int day, int month, int year);
/**
* Update the onboard RTC's time
* by using time from the NTP server
* configured with ESPMega_configNTP();
* @return true when updated successfully.
*/
bool ESPMega_updateTimeFromNTP();
#ifdef ANALOG_CARD_ENABLE
/**
* Read one of the ESPMega Analog Card's Analog Input pins (A0-A7)