From 8a02c62995cd11e39874972a79aef04bef8f5cfe Mon Sep 17 00:00:00 2001
From: Andreas Schiffler <andreas.schiffler@fhws.de>
Date: Mon, 15 Aug 2022 14:47:31 +0200
Subject: [PATCH] Undo failed merge
- Sorry for the mess
---
tools/esp8266/app.cpp | 40 +----------------------------
tools/esp8266/app.h | 2 +-
tools/esp8266/scripts/getVersion.py | 13 +++-------
3 files changed, 6 insertions(+), 49 deletions(-)
diff --git a/tools/esp8266/app.cpp b/tools/esp8266/app.cpp
index bd402c87..2072635a 100644
--- a/tools/esp8266/app.cpp
+++ b/tools/esp8266/app.cpp
@@ -539,48 +539,10 @@ String app::getStatistics(void) {
return content;
}
-//-----------------------------------------------------------------------------
-void app::webapi(void) { // ToDo
- DPRINTLN(DBG_VERBOSE, F("app::api"));
- DPRINTLN(DBG_DEBUG, mWeb->arg("plain"));
- const size_t capacity = 200; // Use arduinojson.org/assistant to compute the capacity.
- DynamicJsonDocument payload(capacity);
-
- // Parse JSON object
- deserializeJson(payload, mWeb->arg("plain"));
- // ToDo: error handling for payload
- if (payload["tx_request"] == TX_REQ_INFO){
- mSys->InfoCmd = payload["cmd"];
- DPRINTLN(DBG_INFO, F("Will make tx-request 0x15 with subcmd ") + String(mSys->InfoCmd));
- }
- mWeb->send ( 200, "text/json", "{success:true}" );
-}
-
-
-//-----------------------------------------------------------------------------
-void app::showHoymiles(void) {
- DPRINTLN(DBG_VERBOSE, F("app::showHoymiles"));
- String html = FPSTR(hoymiles_html);
- html.replace(F("{DEVICE}"), mDeviceName);
- html.replace(F("{VERSION}"), mVersion);
- html.replace(F("{TS}"), String(mSendInterval) + " ");
- html.replace(F("{JS_TS}"), String(mSendInterval * 1000));
- mWeb->send(200, F("text/html"), html);
-}
-
-
-//-----------------------------------------------------------------------------
-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"));
+String app::getLiveData(void) {
String modHtml;
for(uint8_t id = 0; id < mSys->getNumInverters(); id++) {
Inverter<> *iv = mSys->getInverterByPos(id);
diff --git a/tools/esp8266/app.h b/tools/esp8266/app.h
index c81ba2f1..ef1737e3 100644
--- a/tools/esp8266/app.h
+++ b/tools/esp8266/app.h
@@ -29,7 +29,7 @@
//
// #define __MQTT_TEST__ // MQTT Interval wird auf 10 Sekunden verkürzt ( nur für testzwecke )
#define __MQTT_AFTER_RX__ // versendet die MQTT Daten sobald die WR daten Aufbereitet wurden ( gehört eigentlich ins Setup )
-#define __MQTT_NO_DISCOVERCONFIG__ // das versenden der MQTTDiscoveryConfig abschalten ( gehört eigentlich ins Setup )
+// #define __MQTT_NO_DISCOVERCONFIG__ // das versenden der MQTTDiscoveryConfig abschalten ( gehört eigentlich ins Setup )
typedef CircularBuffer<packet_t, PACKET_BUFFER_SIZE> BufferType;
typedef HmRadio<DEF_RF24_CE_PIN, DEF_RF24_CS_PIN, BufferType> RadioType;
diff --git a/tools/esp8266/scripts/getVersion.py b/tools/esp8266/scripts/getVersion.py
index a2797b56..104e8e4c 100644
--- a/tools/esp8266/scripts/getVersion.py
+++ b/tools/esp8266/scripts/getVersion.py
@@ -1,9 +1,5 @@
import os
from datetime import date
-import subprocess
-def get_git_revision_short_hash() -> str:
- return subprocess.check_output(['git', 'rev-parse', '--short', 'HEAD']).decode('ascii').strip()
-
def readVersion(path, infile):
f = open(path + infile, "r")
@@ -22,15 +18,14 @@ def readVersion(path, infile):
os.mkdir(path + ".pio/build/out/")
- versionout = version[:-1] + "_esp8266_debug_g" + get_git_revision_short_hash() + ".bin"
- src = path + ".pio/build/esp8266-debug/firmware.bin"
+ versionout = version[:-1] + "_esp8266_release.bin"
+ src = path + ".pio/build/esp8266-release/firmware.bin"
dst = path + ".pio/build/out/" + versionout
os.rename(src, dst)
- versionout = version[:-1] + "_esp8266_release_g" + get_git_revision_short_hash() + ".bin"
- src = path + ".pio/build/esp8266-release/firmware.bin"
+ versionout = version[:-1] + "_esp8266_debug.bin"
+ src = path + ".pio/build/esp8266-debug/firmware.bin"
dst = path + ".pio/build/out/" + versionout
os.rename(src, dst)
readVersion("../", "defines.h")
-