diff --git a/src/espmega_iot_core.cpp b/src/espmega_iot_core.cpp index f162c9b..3dcaaf3 100644 --- a/src/espmega_iot_core.cpp +++ b/src/espmega_iot_core.cpp @@ -336,7 +336,7 @@ void thread_initialization() eeprom_pwm_updater.onRun(eeprom_pwm_update); eeprom_pwm_updater.setInterval(1000); user_timer_tick.onRun(timer_tick_callback); - user_timer_tick.setInterval(15000); + user_timer_tick.setInterval(5000); } void pwm_state_callback(String topic, String message) diff --git a/src/espmega_iot_timer.cpp b/src/espmega_iot_timer.cpp deleted file mode 100644 index eb25edd..0000000 --- a/src/espmega_iot_timer.cpp +++ /dev/null @@ -1,43 +0,0 @@ -#include "espmega_iot_timer.hpp" - -void ESPMega_Timer::loop() { - rtctime_t curtime = ESPMega_getTime(); - if(today!=curtime.day) { - today=curtime.day; - timer_ran_today = false; - ESPMega_FRAM.write8(fram_address,timer_ran_today); - } - if (!timer_ran_today && (hr < curtime.hours || (hr == curtime.hours && min <= curtime.minutes))) { - timer_ran_today = true; - ESPMega_FRAM.write8(fram_address,timer_ran_today); - timer_callback(); - } -} - -ESPMega_Timer::ESPMega_Timer(uint8_t hour,uint8_t minute,void(*timer_callback)(), uint32_t fram_address) { - this->hr = hour; - this->min = minute; - this->timer_callback = timer_callback; - this->fram_address = fram_address; -} - -void ESPMega_Timer::begin() { - rtctime_t curtime = ESPMega_getTime(); - this-> today = curtime.day; - this-> timer_ran_today = ESPMega_FRAM.read8(fram_address); - loop(); -} - -void ESPMega_Timer::set(uint8_t hour,uint8_t minute) { - rtctime_t curtime = ESPMega_getTime(); - if ((hr < curtime.hours || (hr == curtime.hours && min <= curtime.minutes))) { - this->timer_ran_today = true; - ESPMega_FRAM.write8(fram_address,timer_ran_today); - - } else { - this->timer_ran_today = false; - ESPMega_FRAM.write8(fram_address,timer_ran_today); - } - hr = hour; - min = minute; -} \ No newline at end of file diff --git a/src/espmega_iot_timer.hpp b/src/espmega_iot_timer.hpp deleted file mode 100644 index 395c6e8..0000000 --- a/src/espmega_iot_timer.hpp +++ /dev/null @@ -1,17 +0,0 @@ -#pragma once -#include - -class ESPMega_Timer { - public: - void loop(); - ESPMega_Timer(uint8_t hour,uint8_t minute,void(*timer_callback)(), uint32_t fram_address); - void set(uint8_t hour,uint8_t minute); - void begin(); - private: - uint8_t today; - uint8_t timer_ran_today; - uint8_t hr; - uint8_t min; - uint32_t fram_address; - void (*timer_callback)(); -}; \ No newline at end of file diff --git a/src/user_code.cpp b/src/user_code.cpp index 4c93cf9..0e841ee 100644 --- a/src/user_code.cpp +++ b/src/user_code.cpp @@ -1,51 +1,37 @@ #include -void timer1_callback(){ - for(int i=0;i<16;i++){ - pwm_set_state(i,1); - } -} - -ESPMega_Timer timer1(0,50,timer1_callback,15001); - /* This Code will run right after ESPMega PRO's Peripheral Initialization Routine */ - -void user_pre_init() -{ - +void user_pre_init() { + } /* This code will run after every component is initialized */ -void user_init() -{ - timer1.begin(); +void user_init() { + } /* This code will run once every event loop */ -void user_loop() -{ +void user_loop() { + } /* This code will run when an input pin changed state */ -void virtual_interrupt_user_callback(int pin, int state) -{ +void virtual_interrupt_user_callback(int pin, int state) { + } /* -This code will run every 15 seconds +This code will run every 5 seconds */ -void timer_tick_callback() -{ - if(standalone){ - timer1.loop(); - } +void timer_tick_callback() { + } diff --git a/src/user_code.hpp b/src/user_code.hpp index 4c81694..ff77f21 100644 --- a/src/user_code.hpp +++ b/src/user_code.hpp @@ -1,7 +1,9 @@ #pragma once #include #include -#include "espmega_iot_timer.hpp" + + + // External LCD Configuration #define ENABLE_EXTERNAL_LCD @@ -35,5 +37,4 @@ extern bool input_get_state(int id); extern void ac_set_state(int mode, int temperature, int fan_speed); extern uint8_t ac_get_temperature(); extern uint8_t ac_get_mode(); -extern uint8_t ac_get_fan_speed(); -extern bool standalone; \ No newline at end of file +extern uint8_t ac_get_fan_speed(); \ No newline at end of file