Sync Release 3.8 to develop

Foroxon · Mar 18, 2024 · acb6035 · acb6035
2 parents 0427dee + af2f13b
commit acb6035
Show file tree

Hide file tree

Showing 12 changed files with 7 additions and 7 deletions.
diff --git a/bin/3.6.bin b/bin/3.6.bin
diff --git a/bin_beta/3.8-b37.bin → bin/3.8.bin b/bin_beta/3.8-b37.bin → bin/3.8.bin
diff --git a/bin/latest.bin b/bin/latest.bin
diff --git a/bin_beta/3.8.bin b/bin_beta/3.8.bin
diff --git a/bin_beta/latest_beta.bin b/bin_beta/latest_beta.bin
diff --git a/deploy/web_server/web_server.py b/deploy/web_server/web_server.py
@@ -162,7 +162,7 @@ async def main(request):
                     <ul>
                         <li>Тривоги: [<a href="/alerts_statuses_v1.json">класична схема</a>], [<a href="/alerts_statuses_v2.json">v2</a>], [<a href="/alerts_statuses_v3.json">v3</a>]</li>
                         <li>Погода: [<a href="/weather_statuses_v1.json">v1</a>]</li>
-                        <li>Вибухи: (інформація з СМІ) [<a href="/explosives_statuses_v1.json">v1</a>], [<a href="/explosives_statuses_v2.json">v2</a>]</li>
+                        <li>Вибухи: (інформація з ЗМІ) [<a href="/explosives_statuses_v1.json">v1</a>], [<a href="/explosives_statuses_v2.json">v2</a>]</li>
                         <li>Дані TCP: [<a href="/tcp_statuses_v1.json">v1</a>]</li>
                         <li><a href="/api_status.json">API healthcheck</a></li>
                     </ul>
@@ -171,7 +171,7 @@ async def main(request):
                 <div class='col-md-6 offset-md-3'>
                     <p>Джерела даних:</p>
                     <ul>
-                        <li><a href="https://app.etryvoga.com/">app.etryvoga.com (дані по вибухам з СМІ)</a></li>
+                        <li><a href="https://app.etryvoga.com/">app.etryvoga.com (дані по вибухам з ЗМІ)</a></li>
                         <li><a href="https://www.ukrainealarm.com/">ukrainealarm.com (офіційне API тривог)</a></li>
                         <li><a href="https://openweathermap.org/api">openweathermap.org (погода)</a></li>                         
                     </ul>

diff --git a/pages/bins/jaam.bin b/pages/bins/jaam.bin
diff --git a/pages/bins/jaam_lite.bin b/pages/bins/jaam_lite.bin
diff --git a/pages/index.html b/pages/index.html
@@ -66,7 +66,7 @@ <h2 class='text-center'>JAAM Flasher</h2>
         <div class='row'>
             <div class='by col-md-12 mt-2' align='center'>
                 <esp-web-install-button manifest="manifest.json">
-                    <button class='btn btn-primary' type='button' aria-expanded='false' slot="activate">Встановити JAAM 3.7</button>
+                    <button class='btn btn-primary' type='button' aria-expanded='false' slot="activate">Встановити JAAM 3.8</button>
                     <span slot="unsupported">Браузер не підтримується!</span>
                     <span slot="not-allowed">Заборенено використання HTTP!</span>
                 </esp-web-install-button>
@@ -76,7 +76,7 @@ <h2 class='text-center'>JAAM Flasher</h2>
                     <span slot="not-allowed">Заборенено використання HTTP!</span>
                 </esp-web-install-button>
                 <esp-web-install-button manifest="manifest-lite.json">
-                    <button class='btn btn-success' type='button' aria-expanded='false' slot="activate">Встановити JAAM 3.7 Lite</button>
+                    <button class='btn btn-success' type='button' aria-expanded='false' slot="activate">Встановити JAAM 3.8 Lite</button>
                     <span slot="unsupported">Браузер не підтримується!</span>
                     <span slot="not-allowed">Заборенено використання HTTP!</span>
                 </esp-web-install-button>

diff --git a/pages/manifest-lite.json b/pages/manifest-lite.json
@@ -1,6 +1,6 @@
 {
     "name": "JAAM Lite",
-    "version": "3.7",
+    "version": "3.8",
     "funding_url": "https://send.monobank.ua/jar/7GzS1PhPa2",
     "new_install_improv_wait_time": 0,
     "new_install_prompt_erase": true,

diff --git a/pages/manifest.json b/pages/manifest.json
@@ -1,6 +1,6 @@
 {
     "name": "JAAM",
-    "version": "3.7",
+    "version": "3.8",
     "funding_url": "https://send.monobank.ua/jar/7GzS1PhPa2",
     "new_install_improv_wait_time": 0,
     "new_install_prompt_erase": true,

diff --git a/src/firmware/firmware.ino b/src/firmware/firmware.ino
@@ -58,7 +58,7 @@
 #include <melody_factory.h>
 #endif
 
-const PROGMEM char* VERSION = "3.7";
+const PROGMEM char* VERSION = "3.8";
 
 struct Settings {
   const char*   apssid                 = "JAAM";