Merge branch 'mqtt-max-char' of https://github.com/DanielR92/ahoy into DanielR92-mqtt-max-char

.github/workflows/compile_esp8266.yml → .github/workflows/compile_release.yml

@@ -4,10 +4,11 @@ on:
   push:
     branches: main
     paths:
-    - 'tools/esp8266/**' # build only when changes occur here
-    - '!tools/esp8266/README.md'
-    - '!tools/esp8266/CHANGES.md'
-    - '!tools/esp8266/User_Manual.md'
+    - 'src/**' # build only when changes occur here
+    - '.github/workflows/compile_release.yml'
+    - '!README.md'
+    - '!CHANGES.md'
+    - '!User_Manual.md'
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -48,6 +49,7 @@ jobs:
     - name: Convert HTML files
       working-directory: src/web/html
       run: python convert.py
+
     - name: Run PlatformIO
       run: pio run -d tools/esp8266 --environment esp8266-release --environment esp8285-release --environment esp8266-nokia5110 --environment esp8266-ssd1306 --environment esp32-wroom32-release --environment esp32-wroom32-nokia5110 --environment esp32-wroom32-ssd1306
 
@@ -64,17 +66,19 @@ jobs:
         prerelease: false
         release_name: ${{ steps.rename-binary-files.outputs.name }}
         tag_name: ${{ steps.rename-binary-files.outputs.name }}
-        body_path: tools/esp8266/CHANGES.md
+        body_path: src/CHANGES.md
       env:
         GITHUB_TOKEN: ${{ github.token }}
-    - name: set-version
+
+    - name: Set Version
       uses: cschleiden/replace-tokens@v1
       with:
-        files: tools/esp8266/User_Manual.md
+        files: User_Manual.md
       env:
           VERSION: ${{ steps.rename-binary-files.outputs.name }}
-    - name: create-artifact
-      run: zip  --junk-paths ${{ steps.rename-binary-files.outputs.name }}.zip tools/esp8266/.pio/build/out/* tools/esp8266/User_Manual.md
+
+    - name: Create Artifact
+      run: zip  --junk-paths ${{ steps.rename-binary-files.outputs.name }}.zip src/firmware/* User_Manual.md
 
     - name: Upload Release
       id: upload-release

Getting_Started.md

@@ -55,6 +55,7 @@ TSun Inverters:
 
 - TSOL-350
 - TSOL-400
+- [TSOL-M800](http://de.tsun-ess.com/products/TSOL-M/User-Manual-TSOL-M350&M400&M800&M1600-EN-V1.0.pdf)
 - others may work as well (need to be verified).
 
 ## Things needed

README.md

@@ -14,13 +14,14 @@ List of approaches
 
 ## Quick Start with ESP8266
 - [Go here ✨](Getting_Started.md#things-needed)
+- [Our Website](https://ahoydtu.de)
 
 
 ## Success Stories
 - [Getting the data into influxDB and visualize them in a Grafana Dashboard](https://grafana.com/grafana/dashboards/16850-pv-power-ahoy/) (thx @Carl)
 
 ## Support, Feedback, Information and Discussion
-- [Discord Server (~ 300 Users)](https://discord.gg/WzhxEY62mB)
+- [Discord Server (~ 1200 Users)](https://discord.gg/WzhxEY62mB)
 - [The root of development](https://www.mikrocontroller.net/topic/525778)
 
 ### Development

src/app.cpp

@@ -263,7 +263,6 @@ void app::resetSystem(void) {
     mRxTicker = 0;
 
     mSendLastIvId = 0;
-
     mShowRebootRequest = false;
 
     memset(&mStat, 0, sizeof(statistics_t));

src/defines.h

@@ -85,9 +85,9 @@ union serial_u {
 #define DEVNAME_LEN             16
 #define NTP_ADDR_LEN            32 // DNS Name
 
-#define MQTT_ADDR_LEN           32 // DNS Name
-#define MQTT_USER_LEN           16
-#define MQTT_PWD_LEN            32
+#define MQTT_ADDR_LEN           64 // DNS Name
+#define MQTT_USER_LEN           64
+#define MQTT_PWD_LEN            64
 #define MQTT_TOPIC_LEN          64
 
 #define MQTT_MAX_PACKET_SIZE    384

src/web/html/setup.html

@@ -127,7 +127,7 @@
                     <fieldset>
                     <legend class="des">MQTT</legend>
                         <label for="mqttAddr">Broker / Server IP</label>
-                        <input type="text" class="text" name="mqttAddr" maxlength="32" />
+                        <input type="text" class="text" name="mqttAddr"/>
                         <label for="mqttPort">Port</label>
                         <input type="text" class="text" name="mqttPort"/>
                         <label for="mqttUser">Username (optional)</label>