3pp-mirror/ahoy
1
0
Fork 0
mirror of https://github.com/lumapu/ahoy.git synced 2025-05-10 07:26:38 +02:00
Code Issues Projects Releases Packages Wiki Activity

* added config.h for general configuration

Browse source 
* added option to compile WiFi SSID + PWD to firmware
* added option to configure WiFi access point name and password
* added feature to retry connect to station WiFi (configurable timeouts)
* updated index.html
* added option for factory reset
* added info about project on index.html
* moved "update" and "home" to footer
* fixed #23 HM1200 yield day unit
* fixed DNS name of ESP after setup (some commits before)
This commit is contained in:
lumapu 2022-05-03 21:03:03 +02:00
parent c4b731708a
commit 539d4f73c1
16 changed files with 166 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

24
tools/esp8266/app.cpp
View file

@ -39,7 +39,6 @@ void app::setup(const char *ssid, const char *pwd, uint32_t timeout) {
mWeb->on("/cmdstat", std::bind(&app::showStatistics, this));
mWeb->on("/hoymiles", std::bind(&app::showHoymiles, this));
mWeb->on("/livedata", std::bind(&app::showLiveData, this));
mWeb->on("/mqttstate", std::bind(&app::showMqtt, this));
if(mSettingsValid) {
uint64_t invSerial;
@ -154,7 +153,7 @@ void app::loop(void) {
mSys->BufCtrl.popBack();
}
if(checkTicker(&mSendTicker, &mSendInterval)) {
if(checkTicker(&mSendTicker, mSendInterval)) {
Inverter<> *inv;
for(uint8_t i = 0; i < MAX_NUM_INVERTERS; i ++) {
inv = mSys->getInverterByPos(i);
@ -168,7 +167,7 @@ void app::loop(void) {
// mqtt
mMqtt.loop();
if(checkTicker(&mMqttTicker, &mMqttInterval)) {
if(checkTicker(&mMqttTicker, mMqttInterval)) {
mMqtt.isConnected(true);
char topic[30], val[10];
for(uint8_t id = 0; id < mSys->getNumInverters(); id++) {
@ -360,11 +359,19 @@ void app::showStatistics(void) {
content += String("75: ") + String(mChannelStat[3]) + String("\n");*/
if(!mSys->Radio.isChipConnected())
content += "WARNING! your NRF24 module can't be reached, check the wiring\n";
content += "WARNING! your NRF24 module can't be reached, check the wiring and pinout (<a href=\"/setup\">setup</a>)\n";
if(mShowRebootRequest)
content += "INFO: reboot your ESP to apply all your configuration changes!\n";
if(!mSettingsValid)
content += "INFO: your settings are invalid, please switch to <a href=\"/setup\">setup</a> to correct this.\n";
content += "MQTT: ";
if(!mMqtt.isConnected())
content += "not ";
content += "connected\n";
mWeb->send(200, "text/plain", content);
}
@ -448,15 +455,6 @@ void app::showLiveData(void) {
}
//-----------------------------------------------------------------------------
void app::showMqtt(void) {
String txt = "connected";
if(!mMqtt.isConnected())
txt = "not " + txt;
mWeb->send(200, "text/plain", txt);
}
//-----------------------------------------------------------------------------
void app::saveValues(bool webSend = true) {
Main::saveValues(false); // general configuration