update

- New mdns
- Disable TCP server when AUTOPID is selected
- MQTT can be disabled when AUTOPID is selected, poll data using http

Author: meatpiHQ

CMakeLists.txt

@@ -4,11 +4,11 @@ cmake_minimum_required(VERSION 3.5)
 
 
 set(PROJECT_PREF "wican-fw")
-set(PROJECT_VER "v343_hv300")
+set(PROJECT_VER "v344_hv300")
 #set(PROJECT_VER "v155_hv210")
 
 # set(PROJECT_PREF "wican-fw-usb")
-# set(PROJECT_VER "v343_hv150")
+# set(PROJECT_VER "v344_hv150")
 
 set(PROJECT_VERU ${PROJECT_VER})
 set(PROJECT_BIN "${PROJECT_PREF}_${PROJECT_VERU}")

main/main.c

@@ -53,6 +53,7 @@
 #include "esp_mac.h"
 #include "ftp.h"
 #include "autopid.h"
+#include "mdns.h"
 
 #define TAG 		__func__
 #define TX_GPIO_NUM             	0
@@ -76,7 +77,7 @@ int FTP_TASK_FINISH_BIT = BIT2;
 EventGroupHandle_t xEventTask;
 static uint8_t mqtt_elm327_log_en = 0;
 static uint8_t derived_mac_addr[6] = {0};
-static uint8_t uid[33];
+static uint8_t uid[16];
 static uint8_t ble_uid[33];
 
 static void log_can_to_mqtt(twai_message_t *frame, uint8_t type)
@@ -273,7 +274,7 @@ static void can_rx_task(void *pvParameters)
 				}
         	}
         	//TODO: optimize, useless ifs
-			if(tcp_port_open() || ble_connected() || project_hardware_rev == WICAN_USB_V100 || mqtt_connected())
+			if(tcp_port_open() || ble_connected() || project_hardware_rev == WICAN_USB_V100 || mqtt_connected() || protocol == AUTO_PID )
 			{
 				memset(ucTCP_TX_Buffer.ucElement, 0, sizeof(ucTCP_TX_Buffer.ucElement));
 				ucTCP_TX_Buffer.usLen = 0;
@@ -346,6 +347,26 @@ static void can_rx_task(void *pvParameters)
 	}
 }
 
+static void initialise_mdns(char *id)
+{
+	static char mdns_host_name[24] = {0}; 
+
+	sprintf(mdns_host_name, "wican_%s", id);
+
+    mdns_init();
+    mdns_hostname_set(mdns_host_name);
+    mdns_instance_name_set("wican web server");
+
+    mdns_txt_item_t serviceTxtData[] = {
+		{"fimrware", "3.44"},
+		{"hardware", "wican"},
+        {"path", "/"}
+    };
+
+    ESP_ERROR_CHECK(mdns_service_add("WiCAN-WebServer", "_http", "_tcp", 80, serviceTxtData,
+                                     sizeof(serviceTxtData) / sizeof(serviceTxtData[0])));
+}
+
 void app_main(void)
 {
     ESP_ERROR_CHECK(nvs_flash_init());
@@ -409,6 +430,7 @@ void app_main(void)
 		can_set_silent(1);
 	}
 
+	initialise_mdns((char*)uid);
 	protocol = config_server_protocol();
 //	protocol = OBD_ELM327;
 
@@ -483,15 +505,19 @@ void app_main(void)
 	{
 		port = 3333;
 	}
-	if(config_server_get_port_type() == UDP_PORT)
-	{
-		tcp_server_init(port, &xMsg_Tx_Queue, &xMsg_Rx_Queue, CONNECTED_LED_GPIO_NUM, 1);
-	}
-	else
+
+	if(protocol != AUTO_PID)
 	{
-		tcp_server_init(port, &xMsg_Tx_Queue, &xMsg_Rx_Queue, CONNECTED_LED_GPIO_NUM, 0);
+		if(config_server_get_port_type() == UDP_PORT)
+		{
+			tcp_server_init(port, &xMsg_Tx_Queue, &xMsg_Rx_Queue, CONNECTED_LED_GPIO_NUM, 1);
+		}
+		else
+		{
+			tcp_server_init(port, &xMsg_Tx_Queue, &xMsg_Rx_Queue, CONNECTED_LED_GPIO_NUM, 0);
+		}
 	}
-
+	
     if(config_server_get_ble_config())
     {
     	int pass = config_server_ble_pass();

sdkconfig

@@ -283,7 +283,7 @@ CONFIG_IDF_TOOLCHAIN="gcc"
 CONFIG_IDF_TARGET_ARCH_RISCV=y
 CONFIG_IDF_TARGET_ARCH="riscv"
 CONFIG_IDF_TARGET="esp32c3"
-CONFIG_IDF_INIT_VERSION="5.3.0"
+CONFIG_IDF_INIT_VERSION="5.3.1"
 CONFIG_IDF_TARGET_ESP32C3=y
 CONFIG_IDF_FIRMWARE_CHIP_ID=0x0005
 
@@ -1912,6 +1912,35 @@ CONFIG_WIFI_PROV_AUTOSTOP_TIMEOUT=30
 CONFIG_WIFI_PROV_STA_ALL_CHANNEL_SCAN=y
 # CONFIG_WIFI_PROV_STA_FAST_SCAN is not set
 # end of Wi-Fi Provisioning Manager
+
+#
+# mDNS
+#
+CONFIG_MDNS_MAX_INTERFACES=3
+CONFIG_MDNS_MAX_SERVICES=10
+CONFIG_MDNS_TASK_PRIORITY=1
+CONFIG_MDNS_ACTION_QUEUE_LEN=16
+CONFIG_MDNS_TASK_STACK_SIZE=4096
+# CONFIG_MDNS_TASK_AFFINITY_NO_AFFINITY is not set
+CONFIG_MDNS_TASK_AFFINITY_CPU0=y
+CONFIG_MDNS_TASK_AFFINITY=0x0
+CONFIG_MDNS_SERVICE_ADD_TIMEOUT_MS=2000
+CONFIG_MDNS_TIMER_PERIOD_MS=100
+# CONFIG_MDNS_NETWORKING_SOCKET is not set
+# CONFIG_MDNS_SKIP_SUPPRESSING_OWN_QUERIES is not set
+# CONFIG_MDNS_ENABLE_DEBUG_PRINTS is not set
+CONFIG_MDNS_ENABLE_CONSOLE_CLI=y
+# CONFIG_MDNS_RESPOND_REVERSE_QUERIES is not set
+CONFIG_MDNS_MULTIPLE_INSTANCE=y
+
+#
+# MDNS Predefined interfaces
+#
+CONFIG_MDNS_PREDEF_NETIF_STA=y
+CONFIG_MDNS_PREDEF_NETIF_AP=y
+CONFIG_MDNS_PREDEF_NETIF_ETH=y
+# end of MDNS Predefined interfaces
+# end of mDNS
 # end of Component config
 
 # CONFIG_IDF_EXPERIMENTAL_FEATURES is not set

sdkconfig.old

@@ -1,6 +1,6 @@
 #
 # Automatically generated file. DO NOT EDIT.
-# Espressif IoT Development Framework (ESP-IDF) 5.3.0 Project Configuration
+# Espressif IoT Development Framework (ESP-IDF) 5.3.1 Project Configuration
 #
 CONFIG_SOC_ADC_SUPPORTED=y
 CONFIG_SOC_DEDICATED_GPIO_SUPPORTED=y
@@ -283,7 +283,7 @@ CONFIG_IDF_TOOLCHAIN="gcc"
 CONFIG_IDF_TARGET_ARCH_RISCV=y
 CONFIG_IDF_TARGET_ARCH="riscv"
 CONFIG_IDF_TARGET="esp32c3"
-CONFIG_IDF_INIT_VERSION="5.3.0"
+CONFIG_IDF_INIT_VERSION="5.3.1"
 CONFIG_IDF_TARGET_ESP32C3=y
 CONFIG_IDF_FIRMWARE_CHIP_ID=0x0005
 
@@ -539,6 +539,7 @@ CONFIG_BT_GATTC_NOTIF_REG_MAX=5
 CONFIG_BT_GATTC_CONNECT_RETRY_COUNT=3
 CONFIG_BT_BLE_SMP_ENABLE=y
 # CONFIG_BT_SMP_SLAVE_CON_PARAMS_UPD_ENABLE is not set
+# CONFIG_BT_BLE_SMP_ID_RESET_ENABLE is not set
 CONFIG_BT_STACK_NO_LOG=y
 CONFIG_BT_ACL_CONNECTIONS=4
 CONFIG_BT_MULTI_CONNECTION_ENBALE=y
@@ -1322,32 +1323,32 @@ CONFIG_HAL_SPI_SLAVE_FUNC_IN_IRAM=y
 CONFIG_HEAP_POISONING_DISABLED=y
 # CONFIG_HEAP_POISONING_LIGHT is not set
 # CONFIG_HEAP_POISONING_COMPREHENSIVE is not set
-CONFIG_HEAP_TRACING_OFF=y
-# CONFIG_HEAP_TRACING_STANDALONE is not set
+# CONFIG_HEAP_TRACING_OFF is not set
+CONFIG_HEAP_TRACING_STANDALONE=y
 # CONFIG_HEAP_TRACING_TOHOST is not set
+CONFIG_HEAP_TRACING=y
+CONFIG_HEAP_TRACING_STACK_DEPTH=0
 # CONFIG_HEAP_USE_HOOKS is not set
 # CONFIG_HEAP_TASK_TRACKING is not set
+# CONFIG_HEAP_TRACE_HASH_MAP is not set
 # CONFIG_HEAP_ABORT_WHEN_ALLOCATION_FAILS is not set
 # CONFIG_HEAP_PLACE_FUNCTION_INTO_FLASH is not set
 # end of Heap memory debugging
 
 #
 # Log output
 #
-CONFIG_LOG_DEFAULT_LEVEL_NONE=y
+# CONFIG_LOG_DEFAULT_LEVEL_NONE is not set
 # CONFIG_LOG_DEFAULT_LEVEL_ERROR is not set
 # CONFIG_LOG_DEFAULT_LEVEL_WARN is not set
-# CONFIG_LOG_DEFAULT_LEVEL_INFO is not set
+CONFIG_LOG_DEFAULT_LEVEL_INFO=y
 # CONFIG_LOG_DEFAULT_LEVEL_DEBUG is not set
 # CONFIG_LOG_DEFAULT_LEVEL_VERBOSE is not set
-CONFIG_LOG_DEFAULT_LEVEL=0
+CONFIG_LOG_DEFAULT_LEVEL=3
 CONFIG_LOG_MAXIMUM_EQUALS_DEFAULT=y
-# CONFIG_LOG_MAXIMUM_LEVEL_ERROR is not set
-# CONFIG_LOG_MAXIMUM_LEVEL_WARN is not set
-# CONFIG_LOG_MAXIMUM_LEVEL_INFO is not set
 # CONFIG_LOG_MAXIMUM_LEVEL_DEBUG is not set
 # CONFIG_LOG_MAXIMUM_LEVEL_VERBOSE is not set
-CONFIG_LOG_MAXIMUM_LEVEL=0
+CONFIG_LOG_MAXIMUM_LEVEL=3
 # CONFIG_LOG_MASTER_LEVEL is not set
 CONFIG_LOG_COLORS=y
 CONFIG_LOG_TIMESTAMP_SOURCE_RTOS=y
@@ -1914,6 +1915,35 @@ CONFIG_WIFI_PROV_AUTOSTOP_TIMEOUT=30
 CONFIG_WIFI_PROV_STA_ALL_CHANNEL_SCAN=y
 # CONFIG_WIFI_PROV_STA_FAST_SCAN is not set
 # end of Wi-Fi Provisioning Manager
+
+#
+# mDNS
+#
+CONFIG_MDNS_MAX_INTERFACES=3
+CONFIG_MDNS_MAX_SERVICES=10
+CONFIG_MDNS_TASK_PRIORITY=1
+CONFIG_MDNS_ACTION_QUEUE_LEN=16
+CONFIG_MDNS_TASK_STACK_SIZE=4096
+# CONFIG_MDNS_TASK_AFFINITY_NO_AFFINITY is not set
+CONFIG_MDNS_TASK_AFFINITY_CPU0=y
+CONFIG_MDNS_TASK_AFFINITY=0x0
+CONFIG_MDNS_SERVICE_ADD_TIMEOUT_MS=2000
+CONFIG_MDNS_TIMER_PERIOD_MS=100
+# CONFIG_MDNS_NETWORKING_SOCKET is not set
+# CONFIG_MDNS_SKIP_SUPPRESSING_OWN_QUERIES is not set
+# CONFIG_MDNS_ENABLE_DEBUG_PRINTS is not set
+CONFIG_MDNS_ENABLE_CONSOLE_CLI=y
+# CONFIG_MDNS_RESPOND_REVERSE_QUERIES is not set
+CONFIG_MDNS_MULTIPLE_INSTANCE=y
+
+#
+# MDNS Predefined interfaces
+#
+CONFIG_MDNS_PREDEF_NETIF_STA=y
+CONFIG_MDNS_PREDEF_NETIF_AP=y
+CONFIG_MDNS_PREDEF_NETIF_ETH=y
+# end of MDNS Predefined interfaces
+# end of mDNS
 # end of Component config
 
 # CONFIG_IDF_EXPERIMENTAL_FEATURES is not set