mirror of
https://github.com/lumapu/ahoy.git
synced 2025-05-10 07:26:38 +02:00
* main in app integriert, Zwischenstand
This commit is contained in:
lumapu
parent
c6e3cd39ba
commit
ccb9fb537d
7 changed files with 759 additions and 603 deletions
|
|
@ -5,16 +5,49 @@
|
|||
|
||||
#include "app.h"
|
||||
|
||||
#include "favicon.h"
|
||||
#include "html/h/setup_html.h"
|
||||
#include "html/h/hoymiles_html.h"
|
||||
#include <ArduinoJson.h>
|
||||
|
||||
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
app::app() : Main() {
|
||||
DPRINTLN(DBG_VERBOSE, F("app::app():Main"));
|
||||
app::app() {
|
||||
DPRINTLN(DBG_VERBOSE, F("app::app"));
|
||||
mDns = new DNSServer();
|
||||
mWeb = new ESP8266WebServer(80);
|
||||
mUdp = new WiFiUDP();
|
||||
|
||||
memset(&config, 0, sizeof(config_t));
|
||||
|
||||
config.apActive = true;
|
||||
mWifiSettingsValid = false;
|
||||
mSettingsValid = false;
|
||||
|
||||
mLimit = 10;
|
||||
mNextTryTs = 0;
|
||||
mApLastTick = 0;
|
||||
|
||||
// default config
|
||||
snprintf(config.version, 12, "%d.%d.%d", VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH);
|
||||
config.apActive = false;
|
||||
config.sendInterval = SEND_INTERVAL;
|
||||
|
||||
|
||||
mEep = new eep();
|
||||
Serial.begin(115200);
|
||||
DPRINTLN(DBG_VERBOSE, F("Main::Main"));
|
||||
|
||||
mUptimeSecs = 0;
|
||||
mUptimeTicker = 0xffffffff;
|
||||
mUptimeInterval = 1000;
|
||||
|
||||
#ifdef AP_ONLY
|
||||
mTimestamp = 1;
|
||||
#else
|
||||
mTimestamp = 0;
|
||||
#endif
|
||||
|
||||
mHeapStatCnt = 0;
|
||||
|
||||
mSendTicker = 0xffff;
|
||||
mMqttTicker = 0xffff;
|
||||
mMqttInterval = MQTT_INTERVAL;
|
||||
|
|
@ -51,9 +84,8 @@ app::~app(void) {
|
|||
//-----------------------------------------------------------------------------
|
||||
void app::setup(uint32_t timeout) {
|
||||
DPRINTLN(DBG_VERBOSE, F("app::setup"));
|
||||
Main::setup(timeout);
|
||||
Mainsetup(timeout);
|
||||
|
||||
mWeb->on("/favicon.ico", std::bind(&app::showFavicon, this));
|
||||
//mWeb->on("/setup", std::bind(&app::showSetup, this));
|
||||
//mWeb->on("/save", std::bind(&app::showSave, this));
|
||||
mWeb->on("/cmdstat", std::bind(&app::showStatistics, this));
|
||||
|
|
@ -97,9 +129,9 @@ void app::setup(uint32_t timeout) {
|
|||
}
|
||||
}
|
||||
|
||||
mEep->read(ADDR_INV_MAX_RTRY, &mMaxRetransPerPyld);
|
||||
if(0 == mMaxRetransPerPyld)
|
||||
mMaxRetransPerPyld = DEF_MAX_RETRANS_PER_PYLD;
|
||||
mEep->read(ADDR_INV_MAX_RTRY, &config.maxRetransPerPyld);
|
||||
if(0 == config.maxRetransPerPyld)
|
||||
config.maxRetransPerPyld = DEF_MAX_RETRANS_PER_PYLD;
|
||||
|
||||
// pinout
|
||||
mEep->read(ADDR_PINOUT, &mSys->Radio.pinCs);
|
||||
|
|
@ -219,7 +251,7 @@ void app::setup(uint32_t timeout) {
|
|||
//-----------------------------------------------------------------------------
|
||||
void app::loop(void) {
|
||||
DPRINTLN(DBG_VERBOSE, F("app::loop"));
|
||||
Main::loop();
|
||||
MainLoop();
|
||||
|
||||
mSys->Radio.loop();
|
||||
|
||||
|
|
@ -510,7 +542,7 @@ void app::processPayload(bool retransmit) {
|
|||
if(!buildPayload(iv->id)) {
|
||||
if(mPayload[iv->id].requested) {
|
||||
if(retransmit) {
|
||||
if(mPayload[iv->id].retransmits < mMaxRetransPerPyld) {
|
||||
if(mPayload[iv->id].retransmits < config.maxRetransPerPyld) {
|
||||
mPayload[iv->id].retransmits++;
|
||||
if(mPayload[iv->id].maxPackId != 0) {
|
||||
for(uint8_t i = 0; i < (mPayload[iv->id].maxPackId-1); i ++) {
|
||||
|
|
@ -684,7 +716,7 @@ void app::processPayload(bool retransmit) {
|
|||
|
||||
if(mSettingsValid) {
|
||||
html.replace(F("{INV_INTVL}"), String(mSendInterval));
|
||||
html.replace(F("{INV_RETRIES}"), String(mMaxRetransPerPyld));
|
||||
html.replace(F("{INV_RETRIES}"), String(maxRetransPerPyld));
|
||||
|
||||
uint8_t tmp;
|
||||
mEep->read(ADDR_SER_ENABLE, &tmp);
|
||||
|
|
@ -877,15 +909,6 @@ void app::showHoymiles(void) {
|
|||
}
|
||||
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
void app::showFavicon(void) {
|
||||
DPRINTLN(DBG_VERBOSE, F("app::showFavicon"));
|
||||
static const char favicon_type[] PROGMEM = "image/x-icon";
|
||||
static const char favicon_content[] PROGMEM = FAVICON_PANEL_16;
|
||||
mWeb->send_P(200, favicon_type, favicon_content, sizeof(favicon_content));
|
||||
}
|
||||
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
void app::showLiveData(void) {
|
||||
DPRINTLN(DBG_VERBOSE, F("app::showLiveData"));
|
||||
|
|
@ -998,42 +1021,7 @@ void app::showJSON(void) {
|
|||
char buf[20] = {0};
|
||||
uint8_t i = 0;
|
||||
uint16_t interval;
|
||||
uint16_t activepowerlimit=-1;
|
||||
|
||||
// inverter
|
||||
serial_u addr;
|
||||
for(uint8_t i = 0; i < MAX_NUM_INVERTERS; i ++) {
|
||||
// address
|
||||
mWeb->arg("inv" + String(i) + "Addr").toCharArray(buf, 20);
|
||||
if(strlen(buf) == 0)
|
||||
memset(buf, 0, 20);
|
||||
addr.u64 = Serial2u64(buf);
|
||||
mEep->write(ADDR_INV_ADDR + (i * 8), addr.u64);
|
||||
|
||||
// active power limit
|
||||
activepowerlimit = mWeb->arg("inv" + String(i) + "ActivePowerLimit").toInt();
|
||||
if (activepowerlimit != 0xffff && activepowerlimit > 0) {
|
||||
mEep->write(ADDR_INV_PWR_LIM + i * 2,activepowerlimit);
|
||||
}
|
||||
|
||||
// name
|
||||
mWeb->arg("inv" + String(i) + "Name").toCharArray(buf, 20);
|
||||
mEep->write(ADDR_INV_NAME + (i * MAX_NAME_LENGTH), buf, MAX_NAME_LENGTH);
|
||||
|
||||
// max channel power / name
|
||||
for(uint8_t j = 0; j < 4; j++) {
|
||||
uint16_t pwr = mWeb->arg("inv" + String(i) + "ModPwr" + String(j)).toInt();
|
||||
mEep->write(ADDR_INV_CH_PWR + (i * 2 * 4) + (j*2), pwr);
|
||||
memset(buf, 0, 20);
|
||||
mWeb->arg("inv" + String(i) + "ModName" + String(j)).toCharArray(buf, 20);
|
||||
mEep->write(ADDR_INV_CH_NAME + (i * 4 * MAX_NAME_LENGTH) + j * MAX_NAME_LENGTH, buf, MAX_NAME_LENGTH);
|
||||
}
|
||||
}
|
||||
|
||||
interval = mWeb->arg("invInterval").toInt();
|
||||
mEep->write(ADDR_INV_INTERVAL, interval);
|
||||
i = mWeb->arg("invRetry").toInt();
|
||||
mEep->write(ADDR_INV_MAX_RTRY, i);
|
||||
|
||||
|
||||
// pinout
|
||||
|
|
@ -1106,16 +1094,6 @@ void app::showJSON(void) {
|
|||
}*/
|
||||
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
/*void app::updateCrc(void) {
|
||||
DPRINTLN(DBG_VERBOSE, F("app::updateCrc"));
|
||||
Main::updateCrc();
|
||||
|
||||
uint16_t crc;
|
||||
crc = buildEEpCrc(ADDR_START_SETTINGS, ((ADDR_NEXT) - (ADDR_START_SETTINGS)));
|
||||
DPRINTLN(DBG_DEBUG, F("new CRC: ") + String(crc, HEX));
|
||||
mEep->write(ADDR_SETTINGS_CRC, crc);
|
||||
}*/
|
||||
|
||||
void app::sendMqttDiscoveryConfig(void) {
|
||||
DPRINTLN(DBG_VERBOSE, F("app::sendMqttDiscoveryConfig"));
|
||||
|
|
@ -1187,3 +1165,297 @@ const char* app::getFieldStateClass(uint8_t fieldId) {
|
|||
}
|
||||
return (pos >= DEVICE_CLS_ASSIGN_LIST_LEN) ? NULL : stateClasses[deviceFieldAssignment[pos].stateClsId];
|
||||
}
|
||||
|
||||
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
void app::Mainsetup(uint32_t timeout) {
|
||||
DPRINTLN(DBG_VERBOSE, F("Main::setup"));
|
||||
bool startAp = config.apActive;
|
||||
mLimit = timeout;
|
||||
|
||||
|
||||
startAp = getConfig();
|
||||
|
||||
#ifndef AP_ONLY
|
||||
if(false == startAp)
|
||||
startAp = setupStation(timeout);
|
||||
#endif
|
||||
|
||||
config.apActive = startAp;
|
||||
mStActive = !startAp;
|
||||
}
|
||||
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
void app::MainLoop(void) {
|
||||
//DPRINTLN(DBG_VERBOSE, F("M"));
|
||||
if(config.apActive) {
|
||||
mDns->processNextRequest();
|
||||
#ifndef AP_ONLY
|
||||
if(checkTicker(&mNextTryTs, (WIFI_AP_ACTIVE_TIME * 1000))) {
|
||||
config.apActive = setupStation(mLimit);
|
||||
if(config.apActive) {
|
||||
if(strlen(WIFI_AP_PWD) < 8)
|
||||
DPRINTLN(DBG_ERROR, F("password must be at least 8 characters long"));
|
||||
mApLastTick = millis();
|
||||
mNextTryTs = (millis() + (WIFI_AP_ACTIVE_TIME * 1000));
|
||||
setupAp(WIFI_AP_SSID, WIFI_AP_PWD);
|
||||
}
|
||||
}
|
||||
else {
|
||||
if(millis() - mApLastTick > 10000) {
|
||||
uint8_t cnt = WiFi.softAPgetStationNum();
|
||||
if(cnt > 0) {
|
||||
DPRINTLN(DBG_INFO, String(cnt) + F(" clients connected, resetting AP timeout"));
|
||||
mNextTryTs = (millis() + (WIFI_AP_ACTIVE_TIME * 1000));
|
||||
}
|
||||
mApLastTick = millis();
|
||||
DPRINTLN(DBG_INFO, F("AP will be closed in ") + String((mNextTryTs - mApLastTick) / 1000) + F(" seconds"));
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
mWeb->handleClient();
|
||||
|
||||
if(checkTicker(&mUptimeTicker, mUptimeInterval)) {
|
||||
mUptimeSecs++;
|
||||
if(0 != mTimestamp)
|
||||
mTimestamp++;
|
||||
else {
|
||||
if(!config.apActive) {
|
||||
mTimestamp = getNtpTime();
|
||||
DPRINTLN(DBG_INFO, "[NTP]: " + getDateTimeStr(mTimestamp));
|
||||
}
|
||||
}
|
||||
|
||||
/*if(++mHeapStatCnt >= 10) {
|
||||
mHeapStatCnt = 0;
|
||||
stats();
|
||||
}*/
|
||||
}
|
||||
if (WiFi.status() != WL_CONNECTED) {
|
||||
DPRINTLN(DBG_INFO, "[WiFi]: Connection Lost");
|
||||
mStActive = false;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
bool app::getConfig(void) {
|
||||
DPRINTLN(DBG_VERBOSE, F("app::getConfig"));
|
||||
config.apActive = false;
|
||||
|
||||
mWifiSettingsValid = checkEEpCrc(ADDR_START, ADDR_WIFI_CRC, ADDR_WIFI_CRC);
|
||||
mSettingsValid = checkEEpCrc(ADDR_START_SETTINGS, ((ADDR_NEXT)-(ADDR_START_SETTINGS)), ADDR_SETTINGS_CRC);
|
||||
|
||||
if(mWifiSettingsValid) {
|
||||
mEep->read(ADDR_SSID, config.stationSsid, SSID_LEN);
|
||||
mEep->read(ADDR_PWD, config.stationPwd, PWD_LEN);
|
||||
mEep->read(ADDR_DEVNAME, config.deviceName, DEVNAME_LEN);
|
||||
}
|
||||
|
||||
if((!mWifiSettingsValid) || (config.stationSsid[0] == 0xff)) {
|
||||
snprintf(config.stationSsid, SSID_LEN, "%s", FB_WIFI_SSID);
|
||||
snprintf(config.stationPwd, PWD_LEN, "%s", FB_WIFI_PWD);
|
||||
snprintf(config.deviceName, DEVNAME_LEN, "%s", DEF_DEVICE_NAME);
|
||||
}
|
||||
|
||||
return config.apActive;
|
||||
}
|
||||
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
void app::setupAp(const char *ssid, const char *pwd) {
|
||||
DPRINTLN(DBG_VERBOSE, F("app::setupAp"));
|
||||
IPAddress apIp(192, 168, 1, 1);
|
||||
|
||||
DPRINTLN(DBG_INFO, F("\n---------\nAP MODE\nSSID: ")
|
||||
+ String(ssid) + F("\nPWD: ")
|
||||
+ String(pwd) + F("\nActive for: ")
|
||||
+ String(WIFI_AP_ACTIVE_TIME) + F(" seconds")
|
||||
+ F("\n---------\n"));
|
||||
DPRINTLN(DBG_DEBUG, String(mNextTryTs));
|
||||
|
||||
WiFi.mode(WIFI_AP);
|
||||
WiFi.softAPConfig(apIp, apIp, IPAddress(255, 255, 255, 0));
|
||||
WiFi.softAP(ssid, pwd);
|
||||
|
||||
mDns->start(mDnsPort, "*", apIp);
|
||||
|
||||
/*mWeb->onNotFound([&]() {
|
||||
showSetup();
|
||||
});
|
||||
mWeb->on("/", std::bind(&app::showSetup, this));
|
||||
|
||||
mWeb->begin();*/
|
||||
}
|
||||
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
bool app::setupStation(uint32_t timeout) {
|
||||
DPRINTLN(DBG_VERBOSE, F("app::setupStation"));
|
||||
int32_t cnt;
|
||||
bool startAp = false;
|
||||
|
||||
if(timeout >= 3)
|
||||
cnt = (timeout - 3) / 2 * 10;
|
||||
else {
|
||||
timeout = 1;
|
||||
cnt = 1;
|
||||
}
|
||||
|
||||
WiFi.mode(WIFI_STA);
|
||||
WiFi.begin(config.stationSsid, config.stationPwd);
|
||||
if(String(config.deviceName) != "")
|
||||
WiFi.hostname(config.deviceName);
|
||||
|
||||
delay(2000);
|
||||
DPRINTLN(DBG_INFO, F("connect to network '") + String(config.stationSsid) + F("' ..."));
|
||||
while (WiFi.status() != WL_CONNECTED) {
|
||||
delay(100);
|
||||
if(cnt % 100 == 0)
|
||||
Serial.println(".");
|
||||
else
|
||||
Serial.print(".");
|
||||
|
||||
if(timeout > 0) { // limit == 0 -> no limit
|
||||
if(--cnt <= 0) {
|
||||
if(WiFi.status() != WL_CONNECTED) {
|
||||
startAp = true;
|
||||
WiFi.disconnect();
|
||||
}
|
||||
delay(100);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
Serial.println(".");
|
||||
|
||||
if(false == startAp) {
|
||||
mWeb->begin();
|
||||
}
|
||||
|
||||
delay(1000);
|
||||
|
||||
return startAp;
|
||||
}
|
||||
|
||||
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
void app::saveValues(uint32_t saveMask = 0) {
|
||||
DPRINTLN(DBG_VERBOSE, F("app::saveValues"));
|
||||
|
||||
if(CHK_MSK(saveMask, SAVE_SSID))
|
||||
mEep->write(ADDR_SSID, config.stationSsid, SSID_LEN);
|
||||
if(CHK_MSK(saveMask, SAVE_PWD))
|
||||
mEep->write(ADDR_PWD, config.stationPwd, SSID_LEN);
|
||||
if(CHK_MSK(saveMask, SAVE_DEVICE_NAME))
|
||||
mEep->write(ADDR_DEVNAME, config.deviceName, DEVNAME_LEN);
|
||||
|
||||
Inverter<> *iv;
|
||||
if(CHK_MSK(saveMask, SAVE_INVERTERS)) {
|
||||
for(uint8_t i = 0; i < MAX_NUM_INVERTERS; i ++) {
|
||||
iv = mSys->getInverterByPos(i);
|
||||
if(NULL != iv) {
|
||||
mEep->write(ADDR_INV_ADDR + (i * 8), iv->serial.u64);
|
||||
mEep->write(ADDR_INV_PWR_LIM + i * 2, iv->powerLimit[0]);
|
||||
mEep->write(ADDR_INV_NAME + (i * MAX_NAME_LENGTH), iv->name, MAX_NAME_LENGTH);
|
||||
// max channel power / name
|
||||
for(uint8_t j = 0; j < 4; j++) {
|
||||
mEep->write(ADDR_INV_CH_PWR + (i * 2 * 4) + (j*2), iv->chMaxPwr[j]);
|
||||
mEep->write(ADDR_INV_CH_NAME + (i * 4 * MAX_NAME_LENGTH) + j * MAX_NAME_LENGTH, iv->chName[j], MAX_NAME_LENGTH);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if(CHK_MSK(saveMask, SAVE_INV_SEND_INTERVAL))
|
||||
mEep->write(ADDR_INV_INTERVAL, config.sendInterval);
|
||||
if(CHK_MSK(saveMask, SAVE_INV_RETRY))
|
||||
mEep->write(ADDR_INV_MAX_RTRY, config.maxRetransPerPyld);
|
||||
|
||||
if(saveMask > 0) {
|
||||
updateCrc();
|
||||
mEep->commit();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
time_t app::getNtpTime(void) {
|
||||
//DPRINTLN(DBG_VERBOSE, F("app::getNtpTime"));
|
||||
time_t date = 0;
|
||||
IPAddress timeServer;
|
||||
uint8_t buf[NTP_PACKET_SIZE];
|
||||
uint8_t retry = 0;
|
||||
|
||||
WiFi.hostByName(NTP_SERVER_NAME, timeServer);
|
||||
mUdp->begin(NTP_LOCAL_PORT);
|
||||
|
||||
|
||||
sendNTPpacket(timeServer);
|
||||
|
||||
while(retry++ < 5) {
|
||||
int wait = 150;
|
||||
while(--wait) {
|
||||
if(NTP_PACKET_SIZE <= mUdp->parsePacket()) {
|
||||
uint64_t secsSince1900;
|
||||
mUdp->read(buf, NTP_PACKET_SIZE);
|
||||
secsSince1900 = (buf[40] << 24);
|
||||
secsSince1900 |= (buf[41] << 16);
|
||||
secsSince1900 |= (buf[42] << 8);
|
||||
secsSince1900 |= (buf[43] );
|
||||
|
||||
date = secsSince1900 - 2208988800UL; // UTC time
|
||||
date += (TIMEZONE + offsetDayLightSaving(date)) * 3600;
|
||||
break;
|
||||
}
|
||||
else
|
||||
delay(10);
|
||||
}
|
||||
}
|
||||
|
||||
return date;
|
||||
}
|
||||
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
void app::sendNTPpacket(IPAddress& address) {
|
||||
//DPRINTLN(DBG_VERBOSE, F("app::sendNTPpacket"));
|
||||
uint8_t buf[NTP_PACKET_SIZE] = {0};
|
||||
|
||||
buf[0] = B11100011; // LI, Version, Mode
|
||||
buf[1] = 0; // Stratum
|
||||
buf[2] = 6; // Max Interval between messages in seconds
|
||||
buf[3] = 0xEC; // Clock Precision
|
||||
// bytes 4 - 11 are for Root Delay and Dispersion and were set to 0 by memset
|
||||
buf[12] = 49; // four-byte reference ID identifying
|
||||
buf[13] = 0x4E;
|
||||
buf[14] = 49;
|
||||
buf[15] = 52;
|
||||
|
||||
mUdp->beginPacket(address, 123); // NTP request, port 123
|
||||
mUdp->write(buf, NTP_PACKET_SIZE);
|
||||
mUdp->endPacket();
|
||||
}
|
||||
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// calculates the daylight saving time for middle Europe. Input: Unixtime in UTC
|
||||
// from: https://forum.arduino.cc/index.php?topic=172044.msg1278536#msg1278536
|
||||
time_t app::offsetDayLightSaving (uint32_t local_t) {
|
||||
//DPRINTLN(DBG_VERBOSE, F("app::offsetDayLightSaving"));
|
||||
int m = month (local_t);
|
||||
if(m < 3 || m > 10) return 0; // no DSL in Jan, Feb, Nov, Dez
|
||||
if(m > 3 && m < 10) return 1; // DSL in Apr, May, Jun, Jul, Aug, Sep
|
||||
int y = year (local_t);
|
||||
int h = hour (local_t);
|
||||
int hToday = (h + 24 * day(local_t));
|
||||
if((m == 3 && hToday >= (1 + TIMEZONE + 24 * (31 - (5 * y /4 + 4) % 7)))
|
||||
|| (m == 10 && hToday < (1 + TIMEZONE + 24 * (31 - (5 * y /4 + 1) % 7))) )
|
||||
return 1;
|
||||
else
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue