Fix About page blank #29

Continue code cleanup

Author: xyzroe

README.md

@@ -66,7 +66,7 @@ Special thanks goes also to all authors of 3rd party libraries which are used in
 - [plerup / EspSoftwareSerial](https://github.com/plerup/espsoftwareserial),
 - [marian-craciunescu / ESP32Ping](https://github.com/marian-craciunescu/ESP32Ping),
 - [sstaub / Ticker](https://github.com/sstaub/Ticker),
-- [knolleary / PubSubClient](https://github.com/knolleary/pubsubclient);
+- [knolleary / PubSubClient](https://github.com/knolleary/pubsubclient),
 - [ESP Async WebServer](https://github.com/me-no-dev/ESPAsyncWebServer),
 - [Martin-Laclaustra / CronAlarms](https://github.com/Martin-Laclaustra/CronAlarms)
 

bin/UZG-01.bin

@@ -4,5 +4,7 @@ author=xyzroe
 maintainer=xyzroe
 sentence="Work with TI CC(2538/1352/2652) series chips: read, write, verify firmware, get chip ID, etc."
 paragraph=
+category=Communication
+url="https://github.com/xyzroe/CCTools"
 includes=CCTools.h
 architectures=esp32

bin/UZG-01_v0.2.5.full.bin

@@ -1,8 +1,17 @@
 #include <Arduino.h>
 #include "CCTools.h"
 
-CommandInterface::CommandInterface(Stream &serial) : _stream(serial) {}
+#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
 
+CommandInterface::CommandInterface(Stream &serial) : _stream(serial) {}
 
 bool CommandInterface::_sendSynch()
 {
@@ -54,7 +63,7 @@ uint32_t CommandInterface::_cmdGetChipId()
         // Serial.println("size " + String(sizeof(version)));
         if (_checkLastCmd())
         {
-           
+
             uint32_t value = 0;
             value |= uint32_t(version[3]) << 0; // Least significant byte
             value |= uint32_t(version[2]) << 8;
@@ -146,13 +155,15 @@ void CommandInterface::_sendNAck()
     _stream.write(cmd2);
 }
 
-void CommandInterface::_eraseFlash() {
-    const u_int32_t cmd1 = 0x2C; 
+void CommandInterface::_eraseFlash()
+{
+    const u_int32_t cmd1 = 0x2C;
     _stream.write(cmd1);
 }
 
-bool CommandInterface::_ping() {
-    const u_int32_t cmd1 = 0x20; 
+bool CommandInterface::_ping()
+{
+    const u_int32_t cmd1 = 0x20;
     _stream.write(cmd1);
     return _wait_for_ack(1);
 }
@@ -268,46 +279,67 @@ byte CommandInterface::_calcChecks(byte cmd, unsigned long addr, unsigned long s
     return (byte)(sum & 0xFF);
 }
 
-CCTools_detect::CCTools_detect(Stream &serial) : CommandInterface(serial) {}
-
-bool CCTools_detect::begin(int CC_RST_PIN, int CC_BSL_PIN, int BSL_MODE)
+CCTools::CCTools(Stream &serial, int CC_RST_PIN, int CC_BSL_PIN, int BSL_MODE)
+    : CommandInterface(serial), _CC_RST_PIN(CC_RST_PIN), _CC_BSL_PIN(CC_BSL_PIN), _BSL_MODE(BSL_MODE)
 {
-    _CC_RST_PIN = CC_RST_PIN;
-    _CC_BSL_PIN = CC_BSL_PIN;
-    _BSL_MODE = BSL_MODE;
+}
 
+bool CCTools::begin()
+{
     pinMode(_CC_RST_PIN, OUTPUT);
+    digitalWrite(_CC_RST_PIN, HIGH);
     pinMode(_CC_BSL_PIN, OUTPUT);
+    digitalWrite(_CC_BSL_PIN, HIGH);
+
+    enterBSL();
 
-    _enterBSLMode();
     if (!_sendSynch())
     {
-        // Serial.print("begin NOT ok");
         return false;
     }
 
-    
     return true;
 }
 
-void CCTools_detect::_enterBSLMode()
+void CCTools::enterBSL()
 {
     if (_BSL_MODE == 0)
     {
         digitalWrite(_CC_RST_PIN, LOW);
         digitalWrite(_CC_BSL_PIN, LOW);
+        DEBUG_PRINTLN(F("Zigbee RST pin ON"));
+        DEBUG_PRINTLN(F("Zigbee BSL pin ON"));
         delay(250);
         digitalWrite(_CC_RST_PIN, HIGH);
-        delay(2000);
+        DEBUG_PRINTLN(F("Zigbee RST pin OFF"));
+        delay(1000);
         digitalWrite(_CC_BSL_PIN, HIGH);
+        DEBUG_PRINTLN(F("Zigbee BSL pin OFF"));
         delay(1000);
-        //Serial.println("enter bsl mode...");
     }
+    // Other modes BSL_MODE can be added later
+}
 
-    // Другие режимы BSL_MODE могут быть добавлены здесь в будущем
+void CCTools::restart()
+{
+    digitalWrite(_CC_RST_PIN, LOW);
+    DEBUG_PRINTLN(F("Zigbee RST pin ON"));
+    delay(250);
+    digitalWrite(_CC_RST_PIN, HIGH);
+    DEBUG_PRINTLN(F("Zigbee RST pin OFF"));
+    delay(1000);
 }
 
-String CCTools_detect::detectChipInfo()
+void CCTools::routerRejoin()
+{
+    digitalWrite(_CC_BSL_PIN, LOW);
+    DEBUG_PRINTLN(F("ZB BSL pin ON"));
+    delay(250);
+    digitalWrite(_CC_BSL_PIN, HIGH);
+    DEBUG_PRINTLN(F("ZB BSL pin OFF"));
+    delay(500);
+}
+String CCTools::detectChipInfo()
 {
     uint32_t chip_id = _cmdGetChipId();
 
@@ -366,11 +398,10 @@ String CCTools_detect::detectChipInfo()
     return chip_str;
 }
 
-
-bool CCTools_detect::eraseFlash()
+bool CCTools::eraseFlash()
 {
     _ping();
     _eraseFlash();
-    
+
     return true;
 }

lib/CCTools/library.properties

@@ -102,19 +102,23 @@ class CommandInterface
     byte *_cmdMemRead(uint32_t address);
 };
 
-class CCTools_detect : public CommandInterface
+class CCTools : public CommandInterface
 {
 private:
     int _CC_RST_PIN, _CC_BSL_PIN, _BSL_MODE;
-
-    void _enterBSLMode();
+    
 
 public:
-    CCTools_detect(Stream &serial);
-    bool begin(int CC_RST_PIN, int CC_BSL_PIN, int BSL_MODE = 0);
+    // Adjusted constructor declaration
+    CCTools(Stream &serial, int CC_RST_PIN, int CC_BSL_PIN, int BSL_MODE = 0);
+
+    bool begin();
     bool eraseFlash();
     bool ping();
     String detectChipInfo();
+    void enterBSL();
+    void restart();
+    void routerRejoin();
 };
 
 #endif // CCTools_DETECT_H

lib/CCTools/src/CCTools.cpp

@@ -4,5 +4,7 @@ author="OpenAI's ChatGPT with contributions from xyzroe"
 maintainer=xyzroe
 sentence="Read and parse Intel Hex format files from the LittleFS file system."
 paragraph=
+category=Communication
+url="https://github.com/xyzroe/IntelHex"
 includes=IntelHex.h
 architectures=esp32

lib/CCTools/src/CCTools.h

@@ -16,7 +16,7 @@
 #define ETH_MDIO_PIN_1 18
 // ESP32 PINS TO CONTROL CC2652P
 #define CC2652P_RST 16
-#define CC2652P_FLSH 32
+#define CC2652P_FLASH 32
 #define CC2652P_RXD 36
 #define CC2652P_TXD 4
 #define BTN 35
@@ -27,8 +27,8 @@
 #define FORMAT_LITTLEFS_IF_FAILED true
 
 // CC2652 settings (FOR BSL VALIDATION!)
-#define BSL_PIN 15  // CC2652 pin number (FOR BSL VALIDATION!)
-#define BSL_LEVEL 0 // 0-LOW 1-HIGH
+#define NEED_BSL_PIN 15  // CC2652 pin number (FOR BSL VALIDATION!)
+#define NEED_BSL_LEVEL 0 // 0-LOW 1-HIGH
 
 const int16_t overseerInterval = 5 * 1000; // check lan or wifi connection every 5sec
 const uint8_t overseerMaxRetry = 3;        // 5x12 = 60sec delay for AP start
@@ -55,13 +55,6 @@ extern const char *configFileMqtt;
 extern const char *configFileWg;
 extern const char *deviceModel;
 
-// struct JsonConsts_t{
-//   char* str;
-// };
-// JsonConsts_t JsonConsts {
-//   "sadasd"
-// };
-
 struct ConfigSettingsStruct
 {
   char ssid[50];

lib/IntelHex/library.properties

@@ -4,6 +4,7 @@
 #include <FS.h>
 #include <LittleFS.h>
 #include <ETH.h>
+#include <CCTools.h>
 
 #include "config.h"
 #include "web.h"
@@ -13,6 +14,8 @@
 
 extern struct ConfigSettingsStruct ConfigSettings;
 
+extern CCTools CCTool;
+
 const char *coordMode = "coordMode";         // coordMode node name
 const char *prevCoordMode = "prevCoordMode"; // prevCoordMode node name
 const char *configFileSystem = "/config/system.json";
@@ -96,57 +99,29 @@ float getCPUtemp(bool clear)
 
 void zigbeeRouterRejoin()
 {
-  printLogMsg("Zigbee RST pin ON");
-  DEBUG_PRINTLN(F("Zigbee RST pin ON"));
-  digitalWrite(CC2652P_FLSH, 0);
-  delay(250);
-
-  printLogMsg("Zigbee RST pin OFF");
-  DEBUG_PRINTLN(F("Zigbee RST pin OFF"));
-  digitalWrite(CC2652P_FLSH, 1);
-  delay(500);
-
-  printLogMsg("Router reconnect");
-  DEBUG_PRINTLN(F("Router Reconnect"));
+  printLogMsg("Router rejoin begin");
+  DEBUG_PRINTLN(F("Router rejoin begin"));
+  CCTool.routerRejoin();
+  printLogMsg("Router in join mode!");
+  DEBUG_PRINTLN(F("Router in join mode!"));
 }
 
 void zigbeeEnableBSL()
 {
-  printLogMsg("Zigbee BSL pin ON");
-  DEBUG_PRINTLN(F("Zigbee BSL pin ON"));
-  digitalWrite(CC2652P_FLSH, 0);
-  delay(100);
-
-  printLogMsg("Zigbee RST pin ON");
-  DEBUG_PRINTLN(F("Zigbee RST pin ON"));
-  digitalWrite(CC2652P_RST, 0);
-  delay(250);
-
-  printLogMsg("Zigbee RST pin OFF");
-  DEBUG_PRINTLN(F("Zigbee RST pin OFF"));
-  digitalWrite(CC2652P_RST, 1);
-  delay(2000);
-
-  printLogMsg("Zigbee BSL pin OFF");
-  DEBUG_PRINTLN(F("Zigbee BSL pin OFF"));
-  digitalWrite(CC2652P_FLSH, 1);
-  delay(4000);
+  printLogMsg("ZB enable BSL");
+  DEBUG_PRINTLN(F("ZB enable BSL"));
+  CCTool.enterBSL();
   printLogMsg("Now you can flash CC2652!");
   DEBUG_PRINTLN(F("Now you can flash CC2652!"));
 }
 
 void zigbeeRestart()
 {
-  printLogMsg("Zigbee RST pin ON");
-  DEBUG_PRINTLN(F("Zigbee RST pin ON"));
-  digitalWrite(CC2652P_RST, 0);
-  delay(250);
-  printLogMsg("Zigbee RST pin OFF");
-  DEBUG_PRINTLN(F("Zigbee RST pin OFF"));
-  digitalWrite(CC2652P_RST, 1);
-  delay(2000);
-  printLogMsg("Zigbee restart was done");
-  DEBUG_PRINTLN(F("Zigbee restart was done"));
+  printLogMsg("ZB RST begin");
+  DEBUG_PRINTLN(F("ZB RST begin"));
+  CCTool.restart();
+  printLogMsg("ZB restart was done");
+  DEBUG_PRINTLN(F("ZB restart was done"));
 }
 
 void adapterModeUSB()
@@ -319,9 +294,12 @@ void setClock()
   configTime(0, 0, "pool.ntp.org", "time.google.com");
 
   DEBUG_PRINT(F("Waiting for NTP time sync: "));
-  int startTryingTime = millis()/1000;
+  int startTryingTime = millis();
+  DEBUG_PRINTLN(startTryingTime);
+  startTryingTime = startTryingTime / 1000;
   time_t nowSecs = time(nullptr);
-  while ((nowSecs-startTryingTime) < 60)
+  DEBUG_PRINTLN(nowSecs);
+  while ((nowSecs - startTryingTime) < 60)
   {
     delay(500);
     DEBUG_PRINT(F("."));
@@ -346,18 +324,18 @@ void setClock()
 
   if (gmtOffset != nullptr)
   {
-    DEBUG_PRINT("GMT Offset for ");
+    DEBUG_PRINT(F("GMT Offset for "));
     DEBUG_PRINT(zoneToFind);
-    DEBUG_PRINT(" is ");
+    DEBUG_PRINT(F(" is "));
     DEBUG_PRINTLN(gmtOffset);
     timezone = gmtOffset;
     setTimezone(timezone);
   }
   else
   {
-    DEBUG_PRINT("GMT Offset for ");
+    DEBUG_PRINT(F("GMT Offset for "));
     DEBUG_PRINT(zoneToFind);
-    DEBUG_PRINTLN(" not found.");
+    DEBUG_PRINTLN(F(" not found."));
   }
 }
 
@@ -369,8 +347,12 @@ void setTimezone(String timezone)
   time_t nowSecs = time(nullptr);
   struct tm timeinfo;
   localtime_r(&nowSecs, &timeinfo);
+
+  String timeNow = asctime(&timeinfo);
+  timeNow.remove(timeNow.length() - 1);
   DEBUG_PRINT(F("Local time: "));
-  DEBUG_PRINTLN(asctime(&timeinfo));
+  DEBUG_PRINTLN(timeNow);
+  printLogMsg("Local time: " + timeNow);
 }
 
 const char *getGmtOffsetForZone(const char *zone)
@@ -389,5 +371,5 @@ const char *getGmtOffsetForZone(const char *zone)
 
 void ledsScheduler()
 {
-  DEBUG_PRINTLN("LEDS Scheduler");
+  DEBUG_PRINTLN(F("LEDS Scheduler"));
 }