From 9aed13fc53d45593456921c73d0a3ef5569b95da Mon Sep 17 00:00:00 2001
From: "RZ_MINIX\\rober" <robert@zmrinc.com>
Date: Tue, 24 Jun 2025 12:25:15 -0700
Subject: [PATCH] Added reporting of well_id and group_id on bootup

---
 main/App.cpp | 47 ++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 42 insertions(+), 5 deletions(-)

diff --git a/main/App.cpp b/main/App.cpp
index bdb8ee7..f38d63f 100644
--- a/main/App.cpp
+++ b/main/App.cpp
@@ -40,8 +40,9 @@ void App::init()
 	ESP_LOGW(TAG, "Starting the app...");
 	uint8_t mac[8];
 	esp_read_mac(mac, ESP_MAC_WIFI_STA);
-	ESP_LOGI(TAG, "mqtt_id: %s, wifi mac: %02x:%02x:%02x:%02x:%02x:%02x ...", SETTINGS.mqtt.device_id, 
-		mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
+	//Lets report all programmed parameters
+	ESP_LOGI(TAG, "mqtt_id: %s, wifi mac: %02x:%02x:%02x:%02x:%02x:%02x well_id: %u, group_id: %u", SETTINGS.mqtt.device_id, 
+		mac[0], mac[1], mac[2], mac[3], mac[4], mac[5], SETTINGS.device.tata_id, SETTINGS.device.group_id);
 
 	m_led = new Led(LED_PIN);
 	m_wifi = new Wifi();
@@ -94,9 +95,45 @@ void App::init()
 			needs_provision = false;
 		}
 		else
-			m_wifi->pause(true);
+		{
+			ESP_LOGI(TAG, "Provisioned networks failed, trying fallback...");
+			// Don't pause yet - let it try the fallback
+			// The modified startConnecting() will attempt CBX_IoT fallback
+			// Wait a bit more for the fallback attempt
+			delay(5000);
+			wifi_status = m_wifi->status();
+			
+			if(wifi_status == Wifi::WIFI_STATUS::CONNECTED)
+			{
+				ESP_LOGI(TAG, "Connected via fallback network");
+				needs_provision = false;
+			}
+			else
+			{
+				ESP_LOGI(TAG, "Fallback also failed, entering provisioning mode");
+				m_wifi->pause(true);
+			}
+		}
 	}
-	
+	else
+	{
+		// No provisioned networks - try fallback directly
+		ESP_LOGI(TAG, "No provisioned networks, trying fallback...");
+		m_led->setColor(0, 255, 0);
+		m_wifi->start();
+		Wifi::WIFI_STATUS wifi_status = m_wifi->waitForConnection();
+		
+		if(wifi_status == Wifi::WIFI_STATUS::CONNECTED)
+		{
+			ESP_LOGI(TAG, "Connected to fallback network");
+			needs_provision = false;
+		}
+		else
+		{
+			ESP_LOGI(TAG, "Fallback failed, entering provisioning mode");
+			m_wifi->pause(true);
+		}
+	}	
 	if(needs_provision)
 	{
 		m_led->setPulse(0, 0, 255);
@@ -104,7 +141,7 @@ void App::init()
 		provision.start();
 	}
 
-	otaCheck();
+	//otaCheck();
 	
 	// m_led->setPulse(255, 0, 255);
 	m_led->setColor(0, 0, 0);