#### v0.2.3

- Add links to IP addresses
- Intelhex moved to lib folder
- Some code cleanup
- MQTT icon update

#### v0.2.2
- Add WireGuard VPN support
- Fix Zigbee version check while starting

#### v0.2.1
- Add Zigbee chip delect (beta)
- Fix typo

Author: xyzroe

.gitignore

@@ -1,4 +1,4 @@
-.DS_Store
+**/.DS_Store
 .pio
 .vscode
 .gcc-flags.json
@@ -9,4 +9,6 @@ gzipped
 webh
 *.code-workspace
 logs
-todo
+todo
+!lib
+!platformio.ini

bin/UZG-01.bin

@@ -1,6 +1,4 @@
 #include "intelhex.h"
-#include "config.h"
-
 /*
  * IntelHex Arduino Library
  *
@@ -25,6 +23,20 @@ TO-DO List
 
 */
 
+
+#ifndef DEBUG_PRINT
+#ifdef DEBUG
+#define DEBUG_PRINT(x) Serial.print(String(x))
+#define DEBUG_PRINTLN(x) Serial.println(String(x))
+#else
+#define DEBUG_PRINT(x)
+#define DEBUG_PRINTLN(x)
+#endif
+#endif
+
+
+
+
 IntelHex::IntelHex(const char *filename) : _filename(filename) {}
 
 IntelHex::~IntelHex()

bin/UZG-01_v0.2.2.full.bin bin/UZG-01_v0.2.3.full.bin

@@ -1,9 +1,9 @@
 
     // AUTO GENERATED FILE, DO NOT EDIT
     #ifndef VERSION
-        #define VERSION "0.2.2"
+        #define VERSION "0.2.3"
     #endif
     #ifndef BUILD_TIMESTAMP
-        #define BUILD_TIMESTAMP "2024-03-15 16:19:42.545675"
+        #define BUILD_TIMESTAMP "2024-03-16 22:23:51.598701"
     #endif
 

lib/.DS_Store

@@ -133,8 +133,8 @@ <h2 data-replace="pageName" class="position-absolute top-50 start-50 translate-m
                         <li class='nav-item'>
                             <a href='/mqtt' class='nav-link align-middle'>
                                 <svg xmlns='http://www.w3.org/2000/svg' width='25' height='25' fill='currentColor'
-                                    class='bi bi-boxes' viewBox='0 0 16 16'>
-                                    <use xlink:href="icons.svg#boxes" />
+                                    class='bi bi-mqtt' viewBox='0 0 16 16'>
+                                    <use xlink:href="icons.svg#mqtt" />
                                 </svg>
                                 <span class='ms-1 d-none d-sm-inline'>MQTT</span>
                             </a>

lib/CC26XX/.DS_Store

@@ -41,14 +41,8 @@
                                 placeholder="60">
                         </div>
 
-                        <!-- <div class='mb-2'>
-                            <label for='gateway'>Gateway</label>
-                            <input data-replace="GWEther" type='text' class='form-control' id='EthGateway' name='ipGW'
-                                placeholder="192.168.x.x">
-                        </div> !-->
-
                         <div class='mb-2 form-check form-switch'>
-                            <label class='form-check-label' for='discovery'>Discovery</label>
+                            <label class='form-check-label' for='discovery'>Home Assistant - Auto Discovery 💡</label>
                             <input data-replace="discoveryMqtt" class='form-check-input' id='MqttDiscovery' 
                                 type='checkbox' role="switch" name='MqttDiscovery'>
                         </div>

lib/WireGuard-ESP32/.DS_Store

@@ -379,8 +379,20 @@ function apiGetPage(page, doneCall) {
 			for (const property in values) {
 				$("[data-replace='" + property + "']").map(function () {
 					const elemType = $(this).prop('nodeName').toLowerCase();
+					let valueToSet = values[property];
+
+					// Проверка на содержание IP-адреса в значении и отсутствие слова "mask" в названии свойства
+					const isIpValue = /^(?:[0-9]{1,3}\.){3}[0-9]{1,3}$/.test(valueToSet);
+					const isMaskInPropertyName = property.toLowerCase().includes('mask');
+
+					if (isIpValue && !isMaskInPropertyName) {
+						valueToSet = '<a href="http://' + valueToSet + '">' + valueToSet + '</a>';
+					}
+
 					switch (elemType) {
-						case "input" || "select" || "textarea":
+						case "input":
+						case "select":
+						case "textarea":
 							const type = $(this).prop('type').toLowerCase();
 							if (elemType == "input" && (type == "checkbox" || type == "radio")) {
 								$(this).prop("checked", values[property]);
@@ -391,9 +403,12 @@ function apiGetPage(page, doneCall) {
 						case "option":
 							$(this).prop("selected", true);
 							break;
-
 						default:
-							$(this).text(values[property]);
+							if (isIpValue && !isMaskInPropertyName) {
+								$(this).html(valueToSet); // Использование .html() для вставки гиперссылки
+							} else {
+								$(this).text(valueToSet); // Использование .text() для обычного текста
+							}
 							break;
 					}
 				});

src/intelhex.cpp lib/intelhex/src/intelhex.cpp

@@ -185,6 +185,7 @@ void zbLedToggle()
     }
 }
 
+/*
 void getZbChip()
 {
     zigbeeEnableBSL();
@@ -220,7 +221,7 @@ void getZbChip()
         }
         zigbeeRestart();
     }
-
+*/
 
 void preParse()
 {

src/intelhex.h lib/intelhex/src/intelhex.h

@@ -1,7 +1,7 @@
 void clearS2Buffer();
 void getZbVer();
 void zbCheck();
-void getZbChip();
+//void getZbChip();
 void zbLedToggle();
 void checkFwHex(const char *tempFile);
 

src/intelhex2.cpp.bak

@@ -0,0 +1,6 @@
+git add -A 
+git commit -F ../commit
+version=$(cat version)
+git tag "v$version"
+git push
+git push origin "v$version"

src/version.h

@@ -1 +1 @@
-0.2.2
+0.2.3