3pp-mirror/ahoy
1
0
Fork 0
mirror of https://github.com/lumapu/ahoy.git synced 2025-04-29 02:06:21 +02:00
Code Issues Projects Releases Packages Wiki Activity

refactored directory structure

Browse source 
revert PR #401 (no class, pasted to app.cpp)
This commit is contained in:
lumapu 2022-11-09 22:13:31 +01:00
parent f5b66af793
commit 58bc1f1d8a
25 changed files with 40 additions and 369 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tools/esp8266/CHANGES.md
View file

@ -1,7 +0,0 @@
# Changelog
- v0.5.17
* Bug fix for 1 channel inverters (HM300, HM400) see #246
* Bug fix for read back the active power limit from inverter #243 (before version 0.5.16 the reported limit was just a copy of the user set point, now it is the actual value which the inverter uses)
* Update the [user manual](https://github.com/grindylow/ahoy/blob/main/tools/esp8266/User_Manual.md); added section aobut the published data on mqtt; section about zero export control; added section about code implementation command queue
* Added tx-Id number to packet payload struct. (eg. can be 0x95 or 0xD1) --> less messages fails and faster handling of changing power limit

6
tools/esp8266/main.cpp
View file

@ -3,9 +3,9 @@
// Creative Commons - http://creativecommons.org/licenses/by-nc-sa/3.0/de/
//-----------------------------------------------------------------------------
#include "dbg.h"
#include "app.h"
#include "config.h"
#include "src/utils/dbg.h"
#include "src/app.h"
#include "src/config/config.h"
app myApp;

65
tools/esp8266/platformio.ini
View file

@ -37,13 +37,11 @@ lib_deps =
paulstoffregen/Time
knolleary/PubSubClient
bblanchon/ArduinoJson
;esp8266/DNSServer@1.1.0
;esp8266/EEPROM@^1.0
;esp8266/ESP8266HTTPUpdateServer@^1.0
;esp8266/ESP8266WebServer@^1.0
;esp8266/ESP8266WiFi@^1.0
;esp8266/SPI@1.0
;esp8266/Ticker@^1.0
;esp8266/DNSServer
;esp8266/EEPROM
;esp8266/ESP8266WiFi
;esp8266/SPI
;esp8266/Ticker
[env:esp8266-release]
platform = espressif8266
@ -89,41 +87,6 @@ monitor_filters =
time ; Add timestamp with milliseconds for each new line
log2file ; Log data to a file “platformio-device-monitor-*.log” located in the current working directory
[env:esp8266-nokia5110]
platform = espressif8266
board = esp12e
board_build.f_cpu = 80000000L
build_flags = -D RELEASE -DU8X8_NO_HW_I2C -DENA_NOKIA
monitor_filters =
;default ; Remove typical terminal control codes from input
time ; Add timestamp with milliseconds for each new line
;log2file ; Log data to a file “platformio-device-monitor-*.log” located in the current working directory
lib_deps =
https://github.com/yubox-node-org/ESPAsyncWebServer
nrf24/RF24
paulstoffregen/Time
knolleary/PubSubClient
bblanchon/ArduinoJson
olikraus/U8g2
[env:esp8266-ssd1306]
platform = espressif8266
board = esp12e
board_build.f_cpu = 80000000L
build_flags = -D RELEASE -DENA_SSD1306
monitor_filters =
;default ; Remove typical terminal control codes from input
time ; Add timestamp with milliseconds for each new line
;log2file ; Log data to a file “platformio-device-monitor-*.log” located in the current working directory
lib_deps =
https://github.com/yubox-node-org/ESPAsyncWebServer
nrf24/RF24
paulstoffregen/Time
knolleary/PubSubClient
bblanchon/ArduinoJson
;https://github.com/pasko-zh/brzo_i2c.git
https://github.com/ThingPulse/esp8266-oled-ssd1306.git
[env:esp32-wroom32-release]
platform = espressif32
board = lolin_d32
@ -144,21 +107,3 @@ monitor_filters =
;default ; Remove typical terminal control codes from input
time ; Add timestamp with milliseconds for each new line
log2file ; Log data to a file “platformio-device-monitor-*.log” located in the current working directory
[env:esp32-wroom32-ssd1306]
platform = espressif32
board = lolin_d32
build_flags = -D RELEASE -std=gnu++14 -DENA_SSD1306
build_unflags = -std=gnu++11
monitor_filters =
;default ; Remove typical terminal control codes from input
time ; Add timestamp with milliseconds for each new line
;log2file ; Log data to a file “platformio-device-monitor-*.log” located in the current working directory
lib_deps =
https://github.com/yubox-node-org/ESPAsyncWebServer
nrf24/RF24
paulstoffregen/Time
knolleary/PubSubClient
bblanchon/ArduinoJson
https://github.com/ThingPulse/esp8266-oled-ssd1306.git

269
tools/esp8266/app.cpp → tools/esp8266/src/app.cpp
View file

@ -11,14 +11,6 @@
#include "app.h"
#include <ArduinoJson.h>
#ifdef ENA_NOKIA
#include <U8g2lib.h>
#endif
#ifdef ENA_SSD1306
#include <Wire.h>
#include <SSD1306Wire.h>
#endif
//-----------------------------------------------------------------------------
app::app() {
@ -35,261 +27,10 @@ app::app() {
mShouldReboot = false;
}
#ifdef ENA_SSD1306
/* esp8266 : SCL = 5, SDA = 4 */
/* ewsp32 : SCL = 22, SDA = 21 */
SSD1306Wire display(0x3c, SDA, SCL);
static unsigned char bmp_arrow[] PROGMEM = {
B00000000, B00011100, B00011100, B00001110, B00001110, B11111110, B01111111,
B01110000, B01110000, B00110000, B00111000, B00011000, B01111111, B00111111,
B00011110, B00001110, B00000110, B00000000, B00000000, B00000000, B00000000 } ;
void DataScreen( app* mApp, time_t ts )
{
static int extra = 0;
String timeStr = mApp->getDateTimeStr(ts).substring(2,22);
IPAddress ip = WiFi.localIP();
float totalYield = 0.000, totalYieldToday = 0.000, totalActual = 0.0;
char fmtText[32];
int ucnt=0;
for (uint8_t id = 0; id < mApp->mSys->getNumInverters(); id++)
{
Inverter<> *iv = mApp->mSys->getInverterByPos(id);
if (NULL != iv)
{
record_t<> *rec = iv->getRecordStruct(RealTimeRunData_Debug);
uint8_t pos;
uint8_t list[] = {FLD_PAC, FLD_YT, FLD_YD};
if ( !iv->isProducing(ts,rec) )
continue;
ucnt++;
for (uint8_t fld = 0; fld < 3; fld++)
{
pos = iv->getPosByChFld(CH0, list[fld],rec);
if(fld == 1){
totalYield += iv->getValue(pos,rec);
}
if(fld == 2){
totalYieldToday += iv->getValue(pos,rec);
}
if(fld == 0){
totalActual += iv->getValue(pos,rec);
}
}
}
}
display.clear();
if(ucnt)
{
display.setBrightness(63);
display.drawXbm(10,5,8,17,bmp_arrow);
display.setFont(ArialMT_Plain_24);
sprintf(fmtText,"%3.0f",totalActual);
display.drawString(25,0,String(fmtText)+F(" W"));
display.setFont(ArialMT_Plain_16);
sprintf(fmtText,"%4.0f",totalYieldToday);
display.drawString(5,22,F("today ")+String(fmtText)+F(" Wh"));
sprintf(fmtText,"%.1f",totalYield);
display.drawString(5,35,F("total ")+String(fmtText)+F(" kWh"));
display.drawLine(2,23,123,23);
}
else
{
static int rx=50;
static char up=1;
if(up)
{
rx+=2;
if(rx>=70)
up=0;
}
else
{
rx-=2;
if(rx<=50)
up=1;
}
display.setBrightness(1);
display.setFont(ArialMT_Plain_24);
display.drawString(rx,10,F("off"));
display.setFont(ArialMT_Plain_16);
}
if ( !(extra%20) )
{
display.drawString(5,49,ip.toString());
}
else
{
int w=display.getStringWidth(timeStr.c_str(),timeStr.length(),0);
if ( w>127 )
{
String tt=timeStr.substring(9,17);
w=display.getStringWidth(tt.c_str(),tt.length(),0);
display.drawString(127-w,49,tt);
}
else
display.drawString(0,49,timeStr);
}
display.display();
extra++;
}
#endif
#ifdef ENA_NOKIA
U8G2_PCD8544_84X48_1_4W_HW_SPI u8g2(U8G2_R0,5,4,16);
void ShowInfoText( const char *txt )
{
/* u8g2_font_open_iconic_embedded_2x_t 'D' + 'G' + 'J' */
u8g2.clear();
u8g2.firstPage();
do{
const char *e;
const char *p = txt;
int y=10;
u8g2.setFont(u8g2_font_5x8_tr);
while(1)
{
for(e=p+1; (*e && (*e != '\n')); e++);
size_t len=e-p;
u8g2.setCursor(2,y);
String res=((String)p).substring(0,len);
u8g2.print(res);
if ( !*e )
break;
p=e+1;
y+=12;
}
u8g2.sendBuffer();
} while( u8g2.nextPage() );
}
static unsigned char bmp_arrow[] U8X8_PROGMEM = {
B00000000, B00011100, B00011100, B00001110, B00001110, B11111110, B01111111,
B01110000, B01110000, B00110000, B00111000, B00011000, B01111111, B00111111,
B00011110, B00001110, B00000110, B00000000, B00000000, B00000000, B00000000 } ;
void DataScreen( app* mApp, time_t ts )
{
static int extra = 0;
String timeStr = mApp->getDateTimeStr(ts).substring(2,22);
IPAddress ip = WiFi.localIP();
float totalYield = 0.000, totalYieldToday = 0.000, totalActual = 0.0;
char fmtText[32];
int ucnt=0;
for (uint8_t id = 0; id < mApp->mSys->getNumInverters(); id++)
{
Inverter<> *iv = mApp->mSys->getInverterByPos(id);
if (NULL != iv)
{
record_t<> *rec = iv->getRecordStruct(RealTimeRunData_Debug);
uint8_t pos;
uint8_t list[] = {FLD_PAC, FLD_YT, FLD_YD};
if ( !iv->isProducing(ts,rec) )
continue;
ucnt++;
for (uint8_t fld = 0; fld < 3; fld++)
{
pos = iv->getPosByChFld(CH0, list[fld],rec);
if(fld == 1){
totalYield += iv->getValue(pos,rec);
}
if(fld == 2){
totalYieldToday += iv->getValue(pos,rec);
}
if(fld == 0){
totalActual += iv->getValue(pos,rec);
}
}
}
}
/* u8g2_font_open_iconic_embedded_2x_t 'D' + 'G' + 'J' */
u8g2.clear();
u8g2.firstPage();
do{
if(ucnt)
{
u8g2.drawXBMP(10,0,8,17,bmp_arrow);
u8g2.setFont(u8g2_font_logisoso16_tr);
u8g2.setCursor(25,16);
sprintf(fmtText,"%3.0f",totalActual);
u8g2.print(String(fmtText)+F(" W"));
u8g2.drawHLine(2,20,78);
u8g2.setFont(u8g2_font_5x8_tr);
u8g2.setCursor(5,29);
sprintf(fmtText,"%4.0f",totalYieldToday);
u8g2.print(F("today ")+String(fmtText)+F(" Wh"));
u8g2.setCursor(5,37);
sprintf(fmtText,"%.1f",totalYield);
u8g2.print(F("total ")+String(fmtText)+F(" kWh"));
}
else
{
u8g2.setFont(u8g2_font_logisoso16_tr);
u8g2.setCursor(30,30);
u8g2.print(F("off"));
u8g2.setFont(u8g2_font_5x8_tr);
}
if ( !(extra%20) )
{
u8g2.setCursor(5,57);
u8g2.print(ip);
}
else
{
u8g2.setCursor(0,47);
u8g2.print(timeStr);
}
u8g2.sendBuffer();
} while( u8g2.nextPage() );
extra++;
}
#endif
//-----------------------------------------------------------------------------
void app::setup(uint32_t timeout) {
DPRINTLN(DBG_VERBOSE, F("app::setup"));
#ifdef ENA_NOKIA
u8g2.begin();
ShowInfoText("booting...");
#endif
#ifdef ENA_SSD1306
display.init();
display.flipScreenVertically();
display.setContrast(63);
display.setBrightness(63);
display.clear();
display.setFont(ArialMT_Plain_24);
display.setTextAlignment(TEXT_ALIGN_CENTER_BOTH);
display.drawString(64,22,"Starting...");
display.display();
display.setTextAlignment(TEXT_ALIGN_LEFT);
#endif
mWifiSettingsValid = checkEEpCrc(ADDR_START, ADDR_WIFI_CRC, ADDR_WIFI_CRC);
mSettingsValid = checkEEpCrc(ADDR_START_SETTINGS, ((ADDR_NEXT) - (ADDR_START_SETTINGS)), ADDR_SETTINGS_CRC);
loadEEpconfig();
@ -341,15 +82,7 @@ void app::loop(void) {
mUtcTimestamp = mWifi->getNtpTime();
DPRINTLN(DBG_INFO, F("[NTP]: ") + getDateTimeStr(mUtcTimestamp) + F(" UTC"));
}
#if defined(ENA_NOKIA) || defined(ENA_SSD1306)
static int lcnt=90000;
if ( lcnt == 150000 )
{
DataScreen(this, mUtcTimestamp);
lcnt=0;
}
lcnt++;
#endif
if (mFlagSendDiscoveryConfig) {
mFlagSendDiscoveryConfig = false;
sendMqttDiscoveryConfig();

18
tools/esp8266/app.h → tools/esp8266/src/app.h
View file

@ -6,7 +6,7 @@
#ifndef __APP_H__
#define __APP_H__
#include "dbg.h"
#include "src/utils/dbg.h"
#include "Arduino.h"
@ -15,15 +15,15 @@
#include <RF24_config.h>
#include <ArduinoJson.h>
#include "eep.h"
#include "config/eep.h"
#include "defines.h"
#include "crc.h"
#include "utils/crc.h"
#include "CircularBuffer.h"
#include "hmSystem.h"
#include "mqtt.h"
#include "ahoywifi.h"
#include "web.h"
#include "hm/CircularBuffer.h"
#include "hm/hmSystem.h"
#include "wifi/ahoywifi.h"
#include "web/mqtt.h"
#include "web/web.h"
// convert degrees and radians for sun calculation
#define SIN(x) (sin(radians(x)))
@ -179,7 +179,7 @@ class app {
void setupMqtt(void);
void sendMqttDiscoveryConfig(void);
void sendMqtt(void);
void setupLed(void);
void updateLed(void);

0
tools/esp8266/config.h → tools/esp8266/src/config/config.h
View file

0
tools/esp8266/config_override_example.h → tools/esp8266/src/config/config_override_example.h
View file

0
tools/esp8266/eep.h → tools/esp8266/src/config/eep.h
View file

2
tools/esp8266/defines.h → tools/esp8266/src/defines.h
View file

@ -6,7 +6,7 @@
#ifndef __DEFINES_H__
#define __DEFINES_H__
#include "config.h"
#include "config/config.h"
//-------------------------------------
// VERSION

0
tools/esp8266/CircularBuffer.h → tools/esp8266/src/hm/CircularBuffer.h
View file

2
tools/esp8266/hmDefines.h → tools/esp8266/src/hm/hmDefines.h
View file

@ -6,7 +6,7 @@
#ifndef __HM_DEFINES_H__
#define __HM_DEFINES_H__
#include "dbg.h"
#include "../utils/dbg.h"
#include <cstdint>

0
tools/esp8266/hmInverter.h → tools/esp8266/src/hm/hmInverter.h
View file

4
tools/esp8266/hmRadio.h → tools/esp8266/src/hm/hmRadio.h
View file

@ -6,9 +6,9 @@
#ifndef __RADIO_H__
#define __RADIO_H__
#include "dbg.h"
#include "../utils/dbg.h"
#include <RF24.h>
#include "crc.h"
#include "../utils/crc.h"
#ifndef DISABLE_IRQ
#if defined(ESP8266) || defined(ESP32)
#define DISABLE_IRQ noInterrupts()

0
tools/esp8266/hmSystem.h → tools/esp8266/src/hm/hmSystem.h
View file

0
tools/esp8266/crc.cpp → tools/esp8266/src/utils/crc.cpp
View file

0
tools/esp8266/crc.h → tools/esp8266/src/utils/crc.h
View file

0
tools/esp8266/dbg.cpp → tools/esp8266/src/utils/dbg.cpp
View file

0
tools/esp8266/include/dbg.h → tools/esp8266/src/utils/dbg.h
View file

2
tools/esp8266/mqtt.h → tools/esp8266/src/web/mqtt.h
View file

@ -17,7 +17,7 @@
#define F(sl) (sl)
#endif
#include <PubSubClient.h>
#include "defines.h"
#include "../defines.h"
class mqtt {
public:

20
tools/esp8266/web.cpp → tools/esp8266/src/web/web.cpp
View file

@ -10,16 +10,16 @@
#include "web.h"
#include "html/h/index_html.h"
#include "html/h/login_html.h"
#include "html/h/style_css.h"
#include "html/h/api_js.h"
#include "html/h/favicon_ico_gz.h"
#include "html/h/setup_html.h"
#include "html/h/visualization_html.h"
#include "html/h/update_html.h"
#include "html/h/serial_html.h"
#include "html/h/system_html.h"
#include "../../html/h/index_html.h"
#include "../../html/h/login_html.h"
#include "../../html/h/style_css.h"
#include "../../html/h/api_js.h"
#include "../../html/h/favicon_ico_gz.h"
#include "../../html/h/setup_html.h"
#include "../../html/h/visualization_html.h"
#include "../../html/h/update_html.h"
#include "../../html/h/serial_html.h"
#include "../../html/h/system_html.h"
const char* const pinArgNames[] = {"pinCs", "pinCe", "pinIrq", "pinLed0", "pinLed1"};

4
tools/esp8266/web.h → tools/esp8266/src/web/web.h
View file

@ -6,7 +6,7 @@
#ifndef __WEB_H__
#define __WEB_H__
#include "dbg.h"
#include "../utils/dbg.h"
#ifdef ESP32
#include "AsyncTCP.h"
#include "Update.h"
@ -14,7 +14,7 @@
#include "ESPAsyncTCP.h"
#endif
#include "ESPAsyncWebServer.h"
#include "app.h"
#include "../app.h"
#include "webApi.h"
#define WEB_SERIAL_BUF_SIZE 2048

0
tools/esp8266/webApi.cpp → tools/esp8266/src/web/webApi.cpp
View file

4
tools/esp8266/webApi.h → tools/esp8266/src/web/webApi.h
View file

@ -1,7 +1,7 @@
#ifndef __WEB_API_H__
#define __WEB_API_H__
#include "dbg.h"
#include "../utils/dbg.h"
#ifdef ESP32
#include "AsyncTCP.h"
#else
@ -9,7 +9,7 @@
#endif
#include "ESPAsyncWebServer.h"
#include "AsyncJson.h"
#include "app.h"
#include "../app.h"
class app;

0
tools/esp8266/ahoywifi.cpp → tools/esp8266/src/wifi/ahoywifi.cpp
View file

6
tools/esp8266/ahoywifi.h → tools/esp8266/src/wifi/ahoywifi.h
View file

@ -6,16 +6,16 @@
#ifndef __AHOYWIFI_H__
#define __AHOYWIFI_H__
#include "dbg.h"
#include "../utils/dbg.h"
// NTP
#include <WiFiUdp.h>
#include <TimeLib.h>
#include <DNSServer.h>
#include "defines.h"
#include "../defines.h"
#include "app.h"
#include "../app.h"
class app;