Updated logging to short mode

Author: graham22

PCB/DaughterBoard.dch

@@ -18,13 +18,13 @@ void inline printHexString(char* ptr, int len)
 #endif
 
 #if APP_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_DEBUG
-#define logd(format, ...) log_printf(ARDUHAL_LOG_FORMAT(D, format), ##__VA_ARGS__)
+#define logd(format, ...) log_printf(ARDUHAL_SHORT_LOG_FORMAT(D, format), ##__VA_ARGS__)
 #else
 #define logd(format, ...)
 #endif
 
 #if APP_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_INFO
-#define logi(format, ...) log_printf(ARDUHAL_LOG_FORMAT(I, format), ##__VA_ARGS__)
+#define logi(format, ...) log_printf(ARDUHAL_SHORT_LOG_FORMAT(I, format), ##__VA_ARGS__)
 #else
 #define logi(format, ...)
 #endif

PCB/DaughterBoard.dip

@@ -28,8 +28,8 @@ build_flags =
     -D 'CONFIG_VERSION="V1.0.1"' ; major.minor.build (major or minor will invalidate the configuration)
     -D 'NTP_SERVER="pool.ntp.org"'
     -D 'HOME_ASSISTANT_PREFIX="homeassistant"' ; Home Assistant Auto discovery root topic
-    -D WIFI_STATUS_PIN=2 ;LED Pin on the Dev board
-    ; -D WIFI_STATUS_PIN=23 ;LED Pin on the ESP32 X4 Relay board
+    ; -D WIFI_STATUS_PIN=2 ;LED Pin on the Dev board
+    -D WIFI_STATUS_PIN=23 ;LED Pin on the ESP32 X4 Relay board
     -D FACTORY_RESET_PIN=4 ; Clear NVRAM
 
     ; 4-20 Sensor using 2 X 270Ω resistors in parallel to get 135Ω

Pictures/$-Relay board Pinout.pdf

@@ -44,9 +44,9 @@ namespace HydroFloat
             strcpy(buffer, "Overflow");
         _oled.setCursor(xOffset(2, strlen(buffer)), STATUS_Y);
         _oled.print(buffer);
-        logd("State: %s", buffer);
+        // logd("State: %s", buffer);
         sprintf(buffer, "%d%%", level);
-        logd("Level: %s", buffer);
+        // logd("Level: %s", buffer);
         _oled.setCursor(xOffset(5, strlen(buffer)), LEVEL_Y); 
         _oled.setTextSize(LEVEL_FONT);         
         _oled.setTextColor(SSD1306_WHITE);
@@ -57,7 +57,7 @@ namespace HydroFloat
     uint8_t Oled::xOffset(uint8_t textSize, uint8_t numberOfCharaters) {
         uint8_t textPixels = textSize * 6;
         uint8_t rVal =  (SCREEN_WIDTH - (numberOfCharaters * textPixels)) / 2;
-        logd("Offset: %d", rVal);
+        // logd("Offset: %d", rVal);
         return rVal;
 
     }

code/ESP32/include/Log.h

@@ -20,6 +20,7 @@ namespace HydroFloat {
 		pinMode(FACTORY_RESET_PIN, INPUT_PULLUP);
 		pinMode(WIFI_STATUS_PIN, OUTPUT);
 		_oled.begin();
+		_oled.update(0, off);
 		EEPROM.begin(EEPROM_SIZE);
 		if (digitalRead(FACTORY_RESET_PIN) == LOW)
 		{
@@ -82,11 +83,11 @@ namespace HydroFloat {
 		_webSocket.onEvent([this](uint8_t num, WStype_t type, uint8_t *payload, size_t length)
 		{ 
 			if (type == WStype_DISCONNECTED) {
-				logi("[%u] Home Page Disconnected!\n", num);
+				logi("[%u] Home Page Disconnected!", num);
 				_networkStatus = APMode;
 			}
 			else if (type == WStype_CONNECTED) {
-				logi("[%u] Home Page Connected!\n", num);
+				logi("[%u] Home Page Connected!", num);
 				_lastWaterLevel = -1; //force a broadcast
 				_networkStatus = WSMode;
 			} 
@@ -102,12 +103,14 @@ namespace HydroFloat {
 		});
 
 		_asyncServer.onNotFound([this](AsyncWebServerRequest *request) {
-			logd("Not found: %s", request->url().c_str());
-			String page = redirect_html;
-			page.replace("{n}", _SSID);
-			IPAddress IP = WiFi.softAPIP();
-			page.replace("{ip}", IP.toString().c_str());
-			request->send(200, "text/html", page);
+			if (APMode == _networkStatus) {
+				logd("Redirecting from: %s", request->url().c_str());
+				String page = redirect_html;
+				page.replace("{n}", _SSID);
+				IPAddress IP = WiFi.softAPIP();
+				page.replace("{ip}", IP.toString().c_str());
+				request->send(200, "text/html", page);
+			}
 		});
 
 		_asyncServer.on("/settings", HTTP_GET, [this](AsyncWebServerRequest *request) {
@@ -215,7 +218,7 @@ namespace HydroFloat {
 			serializeJson(doc, s);
 			_webSocket.broadcastTXT(s);
 			_oled.update(waterLevel, s4 ? overflow : s3 ? slag : s2 ? slead : s1 ? stop : off);
-			logd("Water Level: %f JSON: %s", waterLevel, s.c_str());
+			logd("broadcast JSON: %s", s.c_str());
 		}
 		_webSocket.loop();
 		_dnsServer.processNextRequest();

code/ESP32/platformio.ini

@@ -25,7 +25,10 @@ void setup() {
   _tank->setup();
   if (timer == NULL)  {
     timer = timerBegin(0, 80, true); // timer 0, div 80
-    timerAttachInterrupt(timer, []() { esp_restart(); }, true); // attach callback
+    timerAttachInterrupt(timer, []() { 
+      ets_printf("watchdog timer expired - rebooting\n");
+      esp_restart(); 
+    }, true); // attach callback
     timerAlarmWrite(timer, WATCHDOG_TIMER * 1000, false); // set time in us
     timerAlarmEnable(timer); // enable interrupt
   }