3pp-mirror/ahoy
1
0
Fork 0
mirror of https://github.com/lumapu/ahoy.git synced 2025-05-25 14:56:11 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'development03' into nrf_info

Browse source
This commit is contained in:
DanielR92 2022-12-02 09:18:34 +01:00 • committed by GitHub
commit 58fede748d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
24 changed files with 614 additions and 555 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/app.cpp
View file

@ -12,6 +12,12 @@
#include <ArduinoJson.h>
#include "utils/sun.h"
//-----------------------------------------------------------------------------
app::app() : ah::Scheduler() {
mWeb = NULL;
}
//-----------------------------------------------------------------------------
void app::setup(uint32_t timeout) {
Serial.begin(115200);
@ -28,12 +34,12 @@ void app::setup(uint32_t timeout) {
mSettings.getPtr(mConfig);
DPRINTLN(DBG_INFO, F("Settings valid: ") + String((mSettings.getValid()) ? F("true") : F("false")));
mWifi = new ahoywifi(mConfig);
mWifi->setup(timeout, mSettings.getValid());
mSys = new HmSystemType();
mSys->enableDebug();
mSys->setup(mConfig->nrf.amplifierPower, mConfig->nrf.pinIrq, mConfig->nrf.pinCe, mConfig->nrf.pinCs);
mWifi = new ahoywifi(mConfig);
mWifi->setup(timeout, mSettings.getValid());
if(mSys->Radio.isChipConnected())
{
@ -54,6 +60,7 @@ void app::setup(uint32_t timeout) {
addListener(EVERY_SEC, std::bind(&PubMqttType::tickerSecond, &mMqtt));
addListener(EVERY_MIN, std::bind(&PubMqttType::tickerMinute, &mMqtt));
addListener(EVERY_HR, std::bind(&PubMqttType::tickerHour, &mMqtt));
mMqtt.setSubscriptionCb(std::bind(&app::mqttSubRxCb, this, std::placeholders::_1));
}
setupLed();
@ -229,7 +236,8 @@ void app::resetSystem(void) {
mUtcTimestamp = 0;
#endif
mHeapStatCnt = 0;
mSunrise = 0;
mSunset = 0;
mSendTicker = 0xffff;
@ -242,6 +250,12 @@ void app::resetSystem(void) {
memset(&mStat, 0, sizeof(statistics_t));
}
//-----------------------------------------------------------------------------
void app::mqttSubRxCb(JsonObject obj) {
if(NULL != mWeb)
mWeb->apiCtrlRequest(obj);
}
//-----------------------------------------------------------------------------
void app::setupLed(void) {
/** LED connection diagram