Merge branch 'main' into TextAndTextfieldChange

shining-man · Sep 26, 2024 · 0a8f169 · 0a8f169
2 parents c4c91ed + ad7680f
commit 0a8f169
Show file tree

Hide file tree

Showing 8 changed files with 65 additions and 27 deletions.
diff --git a/.github/workflows/IssueToNewProjectItem.yml b/.github/workflows/IssueToNewProjectItem.yml
@@ -0,0 +1,32 @@
+name: Create Project Item on Issue Creation
+
+on:
+  issues:
+    types: [opened]
+
+jobs:
+  create_project_item:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Create Project Item
+        env:
+          GH_TOKEN: ${{ secrets.PROJECT_TOKEN }}
+          PROJECT_ID: "PVT_kwHOBos2JM4AlrcP"  # Projekt-ID
+        run: |
+          ISSUE_NODE_ID=$(gh api graphql -F issue_number=${{ github.event.issue.number }} -F owner="${{ github.repository_owner }}" -F name="${{ github.event.repository.name }}" -f query='
+            query($issue_number: Int!, $owner: String!, $name: String!) {
+              repository(owner: $owner, name: $name) {
+                issue(number: $issue_number) {
+                  id
+                }
+              }
+            }' --jq '.data.repository.issue.id')
+          
+          gh api graphql -F projectId="$PROJECT_ID" -F contentId="$ISSUE_NODE_ID" -f query='
+            mutation($projectId: ID!, $contentId: ID!) {
+              addProjectV2ItemById(input: {projectId: $projectId, contentId: $contentId}) {
+                item {
+                  id
+                }
+              }
+            }'
diff --git a/README.md b/README.md
@@ -19,6 +19,7 @@
   <a href="https://github.com/asdt1803" target=_blank><img src="https://avatars.githubusercontent.com/u/61160231?v=4" height="58"/></a>
   <a href="https://github.com/golfer-fossy" target=_blank><img src="https://avatars.githubusercontent.com/u/175492267?v=4" height="58"/></a>
   <a href="https://github.com/myhacsint" target=_blank><img src="https://avatars.githubusercontent.com/u/111045655?v=4" height="58"/></a>
+  <a href="https://github.com/Dunkhase" target=_blank><img src="https://avatars.githubusercontent.com/u/30649822?v=4" height="58"/></a>
 </p>
 
 <p align="center"><strong>Koffein-Komplize</strong></p><p align="center">
@@ -31,6 +32,8 @@
   <a href="https://github.com/Diedaa" target=_blank><img src="https://avatars.githubusercontent.com/u/175444581?v=4" height="58"/></a>
   <a href="https://github.com/jgatringer" target=_blank><img src="https://avatars.githubusercontent.com/u/14805417?v=4" height="58"/></a>
   <a href="https://github.com/GadingeL" target=_blank><img src="https://avatars.githubusercontent.com/u/46995271?v=4" height="58"/></a>
+  <a href="https://github.com/Vitalic66" target=_blank><img src="https://avatars.githubusercontent.com/u/26961054?v=4" height="58"/></a>
+  <a href="https://github.com/mmoe-milano" target=_blank><img src="https://avatars.githubusercontent.com/u/177930080?v=4" height="58"/></a>
 </p>
 <!-- SPONSORS_ENDE -->
 

diff --git a/include/params.h b/include/params.h
diff --git a/include/params_py.h b/include/params_py.h
@@ -210,7 +210,7 @@ const String paramSystem PROGMEM = "{'page':["
     "'type':"+String(HTML_INPUTNUMBER)+","
     "'default':1883,"
     "'min':1,"
-    "'max':10000,"
+    "'max':49151,"
     "'dt':"+String(PARAM_DT_U16)+""
   "},"
   "{"
@@ -962,7 +962,8 @@ const String paramBmsToInverter PROGMEM = "{'page':["
     "'label':'Send extended data',"
     "'type':"+String(HTML_INPUTCHECKBOX)+","
     "'default':'0',"
-    "'dt':"+String(PARAM_DT_BO)+""
+    "'dt':"+String(PARAM_DT_BO)+","
+    "'help':'Nicht in Verbindung mit einem CerboGX aktivieren!'"
   "},"
   "{"
     "'name':"+String(ID_PARAM_BMS_CAN_DATASOURCE)+","

diff --git a/include/webpages.h b/include/webpages.h
@@ -136,8 +136,8 @@ const char htmlPageSettings[] PROGMEM = "<!DOCTYPE HTML>"
 "</head>"
 "<body>"
   "<div class='topnav'>"
-    "<span class='btnBack' onclick=\"location.href='../'\">&#10094;</span>"
     "<span class='btnBack' onclick=location.href='/'>&#10094;&#10094;</span>"
+    "<span class='btnBack' onclick=\"location.href='../'\">&#10094;</span>"
     "<span class='hl'>Einstellungen</span>"
   "</div>"
   "<div class='content'>"
@@ -166,8 +166,8 @@ const char htmlPageInverter[] PROGMEM = "<!DOCTYPE HTML>"
 "</head>"
 "<body>"
   "<div class='topnav'>"
-    "<span class='btnBack' onclick=\"location.href='../'\">&#10094;</span>"
     "<span class='btnBack' onclick=location.href='/'>&#10094;&#10094;</span>"
+    "<span class='btnBack' onclick=\"location.href='../'\">&#10094;</span>"
     "<span class='hl'>Einstellungen - Inverter</span>"
   "</div>"
   "<div class='content'>"
@@ -190,8 +190,8 @@ const char htmlPageSchnittstellen[] PROGMEM = "<!DOCTYPE HTML>"
 "</head>"
 "<body>"
   "<div class='topnav'>"
-    "<span class='btnBack' onclick=\"location.href='../'\">&#10094;</span>"
     "<span class='btnBack' onclick=location.href='/'>&#10094;&#10094;</span>"
+    "<span class='btnBack' onclick=\"location.href='../'\">&#10094;</span>"
     "<span class='hl'>Einstellungen - Schnittstellen</span>"
   "</div>"
   "<div class='content'>"
@@ -218,8 +218,8 @@ const char htmlPageDevices[] PROGMEM = "<!DOCTYPE HTML>"
 "</head>"
 "<body>"
   "<div class='topnav'>"
-    "<span class='btnBack' onclick=\"location.href='../'\">&#10094;</span>"
     "<span class='btnBack' onclick=location.href='/'>&#10094;&#10094;</span>"
+    "<span class='btnBack' onclick=\"location.href='../'\">&#10094;</span>"
     "<span class='hl'>Einstellungen - Devices</span>"
   "</div>"
   "<div class='content'>"
@@ -242,8 +242,8 @@ const char htmlPageAlarm[] PROGMEM = "<!DOCTYPE HTML>"
 "</head>"
 "<body>"
   "<div class='topnav'>"
-    "<span class='btnBack' onclick=\"location.href='../'\">&#10094;</span>"
     "<span class='btnBack' onclick=location.href='/'>&#10094;&#10094;</span>"
+    "<span class='btnBack' onclick=\"location.href='../'\">&#10094;</span>"
     "<span class='hl'>Einstellungen - Alarmregeln</span>"
   "</div>"
   "<div class='content'>"
@@ -266,8 +266,8 @@ const char htmlPageMenuLivedata[] PROGMEM = "<!DOCTYPE HTML>"
 "</head>"
 "<body>"
   "<div class='topnav'>"
-    "<span class='btnBack' onclick=\"location.href='../'\">&#10094;</span>"
     "<span class='btnBack' onclick=location.href='/'>&#10094;&#10094;</span>"
+    "<span class='btnBack' onclick=\"location.href='../'\">&#10094;</span>"
     "<span class='hl'>Livedaten</span>"
   "</div>"
   "<div class='content'>"
@@ -305,8 +305,8 @@ const char htmlPageBmsSpg[] PROGMEM = "<!doctype html>"
 "</head>"
  "<body>"
   "<div class='topnav'>"
-    "<span class='btnBack' onclick=\"location.href='../'\">&#10094;</span>"
     "<span class='btnBack' onclick=location.href='/'>&#10094;&#10094;</span>"
+    "<span class='btnBack' onclick=\"location.href='../'\">&#10094;</span>"
     "<span class='hl'>Zellspannungen</span>"
   "</div>"
   "<br><br>"
@@ -462,8 +462,8 @@ const char htmlPageOwTempLive[] PROGMEM = "<!doctype html>"
 
 "<body>"
 "<div class='topnav'>"
-  "<span class='btnBack' onclick=\"location.href='../'\">&#10094;</span>"
   "<span class='btnBack' onclick=location.href='/'>&#10094;&#10094;</span>"
+  "<span class='btnBack' onclick=\"location.href='../'\">&#10094;</span>"
   "<span class='hl'>Temperaturen (OW)</span>"
 "</div>"
 
@@ -571,8 +571,8 @@ const char htmlPageBscDataLive[] PROGMEM = "<!doctype html>"
 "<body>"
 
 "<div class='topnav'>"
-  "<span class='btnBack' onclick=\"location.href='../'\">&#10094;</span>"
   "<span class='btnBack' onclick=location.href='/'>&#10094;&#10094;</span>"
+  "<span class='btnBack' onclick=\"location.href='../'\">&#10094;</span>"
   "<span class='hl'>BSC Daten</span>"
 "</div>"
 
@@ -650,8 +650,8 @@ const char htmlPageSupport[] PROGMEM = "<!DOCTYPE HTML>"
 "</head>"
 "<body>"
   "<div class='topnav'>"
-    "<span class='btnBack' onclick=\"location.href='../'\">&#10094;</span>"
     "<span class='btnBack' onclick=location.href='/'>&#10094;&#10094;</span>"
+    "<span class='btnBack' onclick=\"location.href='../'\">&#10094;</span>"
     "<span class='hl'>Unterst&uuml;tzung</span>"
   "</div>"
   "<div class='content' style='max-width:500px'>"
@@ -661,7 +661,6 @@ const char htmlPageSupport[] PROGMEM = "<!DOCTYPE HTML>"
     "<p>Eure großzügige Unterstützung ermöglicht es mir, weiterhin neue Funktionen zu entwickeln und Bugs zu bekämpfen. Nur so kann das Projekt auch in der Zukunft erfolgreich sein.</p>"
     "<p>Vielen Dank im Voraus für eure Großzügigkeit und eure Unterstützung!</p>"
     "<p>Mit elektrischen Grüßen,<br>shiningman</p>"
-    "<p>Paypal: <a href=\"javascript:window.open('https://www.paypal.me/shiningman11');\">https://www.paypal.me/shiningman11</a></p>"
     "<p>GitHub Sponsor: <a href=\"javascript:window.open('https://github.com/sponsors/shining-man');\">https://github.com/sponsors/shining-man</a></p>"
 
     "<p>Mit elektrischen Grüßen,<br>shiningman</p>"

diff --git a/include/webpages_py.h b/include/webpages_py.h
@@ -158,8 +158,8 @@ const char htmlPageSettings[] PROGMEM = "<!DOCTYPE HTML>"
 "</head>"
 "<body>"
   "<div class='topnav'>"
-    "<span class='btnBack' onclick=\"location.href='../'\">&#10094;</span>"
     "<span class='btnBack' onclick=location.href='/'>&#10094;&#10094;</span>"
+    "<span class='btnBack' onclick=\"location.href='../'\">&#10094;</span>"
     "<span class='hl'>Einstellungen</span>"
   "</div>"
   "<div class='content'>"
@@ -188,8 +188,8 @@ const char htmlPageInverter[] PROGMEM = "<!DOCTYPE HTML>"
 "</head>"
 "<body>"
   "<div class='topnav'>"
-    "<span class='btnBack' onclick=\"location.href='../'\">&#10094;</span>"
     "<span class='btnBack' onclick=location.href='/'>&#10094;&#10094;</span>"
+    "<span class='btnBack' onclick=\"location.href='../'\">&#10094;</span>"
     "<span class='hl'>Einstellungen - Inverter</span>"
   "</div>"
   "<div class='content'>"
@@ -212,8 +212,8 @@ const char htmlPageSchnittstellen[] PROGMEM = "<!DOCTYPE HTML>"
 "</head>"
 "<body>"
   "<div class='topnav'>"
-    "<span class='btnBack' onclick=\"location.href='../'\">&#10094;</span>"
     "<span class='btnBack' onclick=location.href='/'>&#10094;&#10094;</span>"
+    "<span class='btnBack' onclick=\"location.href='../'\">&#10094;</span>"
     "<span class='hl'>Einstellungen - Schnittstellen</span>"
   "</div>"
   "<div class='content'>"
@@ -240,8 +240,8 @@ const char htmlPageDevices[] PROGMEM = "<!DOCTYPE HTML>"
 "</head>"
 "<body>"
   "<div class='topnav'>"
-    "<span class='btnBack' onclick=\"location.href='../'\">&#10094;</span>"
     "<span class='btnBack' onclick=location.href='/'>&#10094;&#10094;</span>"
+    "<span class='btnBack' onclick=\"location.href='../'\">&#10094;</span>"
     "<span class='hl'>Einstellungen - Devices</span>"
   "</div>"
   "<div class='content'>"
@@ -264,8 +264,8 @@ const char htmlPageAlarm[] PROGMEM = "<!DOCTYPE HTML>"
 "</head>"
 "<body>"
   "<div class='topnav'>"
-    "<span class='btnBack' onclick=\"location.href='../'\">&#10094;</span>"
     "<span class='btnBack' onclick=location.href='/'>&#10094;&#10094;</span>"
+    "<span class='btnBack' onclick=\"location.href='../'\">&#10094;</span>"
     "<span class='hl'>Einstellungen - Alarmregeln</span>"
   "</div>"
   "<div class='content'>"
@@ -288,8 +288,8 @@ const char htmlPageMenuLivedata[] PROGMEM = "<!DOCTYPE HTML>"
 "</head>"
 "<body>"
   "<div class='topnav'>"
-    "<span class='btnBack' onclick=\"location.href='../'\">&#10094;</span>"
     "<span class='btnBack' onclick=location.href='/'>&#10094;&#10094;</span>"
+    "<span class='btnBack' onclick=\"location.href='../'\">&#10094;</span>"
     "<span class='hl'>Livedaten</span>"
   "</div>"
   "<div class='content'>"
@@ -327,8 +327,8 @@ const char htmlPageBmsSpg[] PROGMEM = "<!doctype html>"
 "</head>"
  "<body>"
   "<div class='topnav'>"
-    "<span class='btnBack' onclick=\"location.href='../'\">&#10094;</span>"
     "<span class='btnBack' onclick=location.href='/'>&#10094;&#10094;</span>"
+    "<span class='btnBack' onclick=\"location.href='../'\">&#10094;</span>"
     "<span class='hl'>Zellspannungen</span>"
   "</div>"
   "<br><br>"
@@ -484,8 +484,8 @@ const char htmlPageOwTempLive[] PROGMEM = "<!doctype html>"
 
 "<body>"
 "<div class='topnav'>"
-  "<span class='btnBack' onclick=\"location.href='../'\">&#10094;</span>"
   "<span class='btnBack' onclick=location.href='/'>&#10094;&#10094;</span>"
+  "<span class='btnBack' onclick=\"location.href='../'\">&#10094;</span>"
   "<span class='hl'>Temperaturen (OW)</span>"
 "</div>"
 
@@ -593,8 +593,8 @@ const char htmlPageBscDataLive[] PROGMEM = "<!doctype html>"
 "<body>"
 
 "<div class='topnav'>"
-  "<span class='btnBack' onclick=\"location.href='../'\">&#10094;</span>"
   "<span class='btnBack' onclick=location.href='/'>&#10094;&#10094;</span>"
+  "<span class='btnBack' onclick=\"location.href='../'\">&#10094;</span>"
   "<span class='hl'>BSC Daten</span>"
 "</div>"
 
@@ -672,8 +672,8 @@ const char htmlPageSupport[] PROGMEM = "<!DOCTYPE HTML>"
 "</head>"
 "<body>"
   "<div class='topnav'>"
-    "<span class='btnBack' onclick=\"location.href='../'\">&#10094;</span>"
     "<span class='btnBack' onclick=location.href='/'>&#10094;&#10094;</span>"
+    "<span class='btnBack' onclick=\"location.href='../'\">&#10094;</span>"
     "<span class='hl'>Unterst&uuml;tzung</span>"
   "</div>"
   "<div class='content' style='max-width:500px'>"

diff --git a/spons b/spons
@@ -19,4 +19,7 @@ Alle, die das Projekt monatlich über <a href="https://github.com/sponsors/shini
   <a href="https://github.com/jgatringer" target=_blank><img src="https://avatars.githubusercontent.com/u/14805417?v=4" height="58"/></a>
   <a href="https://github.com/GadingeL" target=_blank><img src="https://avatars.githubusercontent.com/u/46995271?v=4" height="58"/></a>
   <a href="https://github.com/myhacsint" target=_blank><img src="https://avatars.githubusercontent.com/u/111045655?v=4" height="58"/></a>
+  <a href="https://github.com/Vitalic66" target=_blank><img src="https://avatars.githubusercontent.com/u/26961054?v=4" height="58"/></a>
+  <a href="https://github.com/Dunkhase" target=_blank><img src="https://avatars.githubusercontent.com/u/30649822?v=4" height="58"/></a>
+  <a href="https://github.com/mmoe-milano" target=_blank><img src="https://avatars.githubusercontent.com/u/177930080?v=4" height="58"/></a>
 </p>
diff --git a/src/WebSettings.cpp b/src/WebSettings.cpp
@@ -66,8 +66,8 @@ const char HTML_START_2[] PROGMEM = R"rawliteral(
 </head>
 <body>
 <div class="topnav">
-  <span class='btnBack' onclick=location.href='../'>&#10094;</span>
   <span class='btnBack' onclick=location.href='/'>&#10094;&#10094;</span>
+  <span class='btnBack' onclick=location.href='../'>&#10094;</span>
   <span class='hl'>%s</span>
 </div>
 <div id='lc' class="loading-container"><div class="loading-spinner"></div></div>