|
@ -45,7 +45,6 @@ typedef PubSerial<HmSystemType> PubSerialType; |
|
|
// PLUGINS
|
|
|
// PLUGINS
|
|
|
#include "plugins/Display/Display.h" |
|
|
#include "plugins/Display/Display.h" |
|
|
typedef Display<HmSystemType> DisplayType; |
|
|
typedef Display<HmSystemType> DisplayType; |
|
|
// #include <SoftwareSerial.h>
|
|
|
|
|
|
|
|
|
|
|
|
class app : public IApp, public ah::Scheduler { |
|
|
class app : public IApp, public ah::Scheduler { |
|
|
public: |
|
|
public: |
|
@ -57,7 +56,6 @@ class app : public IApp, public ah::Scheduler { |
|
|
void loopStandard(void); |
|
|
void loopStandard(void); |
|
|
void loopWifi(void); |
|
|
void loopWifi(void); |
|
|
void onWifi(bool gotIp); |
|
|
void onWifi(bool gotIp); |
|
|
void cleanup_history(void); |
|
|
|
|
|
void regularTickers(void); |
|
|
void regularTickers(void); |
|
|
|
|
|
|
|
|
void handleIntr(void) { |
|
|
void handleIntr(void) { |
|
@ -209,7 +207,6 @@ class app : public IApp, public ah::Scheduler { |
|
|
|
|
|
|
|
|
HmSystemType mSys; |
|
|
HmSystemType mSys; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private: |
|
|
private: |
|
|
typedef std::function<void()> innerLoopCb; |
|
|
typedef std::function<void()> innerLoopCb; |
|
|
|
|
|
|
|
@ -257,10 +254,6 @@ class app : public IApp, public ah::Scheduler { |
|
|
void tickMinute(void); |
|
|
void tickMinute(void); |
|
|
void tickZeroValues(void); |
|
|
void tickZeroValues(void); |
|
|
void tickMidnight(void); |
|
|
void tickMidnight(void); |
|
|
void check_hist_file (File file); |
|
|
|
|
|
void show_history (String path); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* void tickSerial(void) {
|
|
|
/* void tickSerial(void) {
|
|
|
if(Serial.available() == 0) |
|
|
if(Serial.available() == 0) |
|
|
return; |
|
|
return; |
|
@ -275,6 +268,7 @@ class app : public IApp, public ah::Scheduler { |
|
|
} |
|
|
} |
|
|
DBGPRINTLN(""); |
|
|
DBGPRINTLN(""); |
|
|
}*/ |
|
|
}*/ |
|
|
|
|
|
void show_history (String path); |
|
|
|
|
|
|
|
|
innerLoopCb mInnerLoopCb; |
|
|
innerLoopCb mInnerLoopCb; |
|
|
|
|
|
|
|
@ -293,7 +287,6 @@ class app : public IApp, public ah::Scheduler { |
|
|
settings_t *mConfig; |
|
|
settings_t *mConfig; |
|
|
bool mSavePending; |
|
|
bool mSavePending; |
|
|
bool mSaveReboot; |
|
|
bool mSaveReboot; |
|
|
bool mCritical; |
|
|
|
|
|
|
|
|
|
|
|
uint8_t mSendLastIvId; |
|
|
uint8_t mSendLastIvId; |
|
|
bool mSendFirst; |
|
|
bool mSendFirst; |
|
|