update firmware/hardware version settings

meatpiHQ · meatpiHQ · commit 8235f4e4c001 · 2024-09-30T00:23:11.000+10:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,15 +2,73 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
+include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+
+set(WICAN_V210 1)
+set(WICAN_V300 2)
+set(WICAN_USB_V100 3)
+set(WICAN_PRO 4)
+
+set(WICAN_V210_STR "OBD")
+set(WICAN_V300_STR "OBD")
+set(WICAN_USB_V100_STR "USB")
+set(WICAN_PRO_STR "OBD-PRO")
+
+# Set these without quotes, as they're string literals
+set(WICAN_V210_PREF "obd")
+set(WICAN_V300_PREF "obd")
+set(WICAN_USB_V100_PREF "usb")
+set(WICAN_PRO_PREF "obd_pro")
+
+add_definitions(-DWICAN_V210=${WICAN_V210})
+add_definitions(-DWICAN_V300=${WICAN_V300})
+add_definitions(-DWICAN_USB_V100=${WICAN_USB_V100})
+add_definitions(-DWICAN_PRO=${WICAN_PRO})
+
+add_definitions(-DWICAN_V210_STR="${WICAN_V210_STR}")
+add_definitions(-DWICAN_V300_STR="${WICAN_V300_STR}")
+add_definitions(-DWICAN_USB_V100_STR="${WICAN_USB_V100_STR}")
+add_definitions(-DWICAN_PRO_STR="${WICAN_PRO_STR}")
+
+execute_process(
+    COMMAND git describe --tags --always --dirty
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    OUTPUT_VARIABLE GIT_SHA
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+
+set(GIT_SHA1 "${GIT_SHA}")
+string(REPLACE "." "" GIT_SHA "${GIT_SHA}")
+
+add_definitions(-DGIT_SHA="${GIT_SHA1}")
+
+# Uncomment and use one of the following as needed
+# set(HARDWARE_VER ${WICAN_V210})
+set(HARDWARE_VER ${WICAN_V300})
+# set(HARDWARE_VER ${WICAN_USB_V100})
+# set(HARDWARE_VER ${WICAN_PRO})
+
+add_definitions(-DHARDWARE_VER=${HARDWARE_VER})
 
 set(PROJECT_PREF "wican-fw")
-set(PROJECT_VER "v344_hv300")
-#set(PROJECT_VER "v155_hv210")
 
-# set(PROJECT_PREF "wican-fw-usb")
-# set(PROJECT_VER "v344_hv150")
+# Set HW_PREF based on HARDWARE_VER
+if (HARDWARE_VER EQUAL ${WICAN_PRO})
+    set(HW_PREF "${WICAN_PRO_PREF}")
+    set(HW_VER "${WICAN_PRO_STR}")
+elseif (HARDWARE_VER EQUAL ${WICAN_USB_V100})
+    set(HW_PREF "${WICAN_USB_V100_PREF}")
+    set(HW_VER "${WICAN_USB_V100_STR}")
+elseif (HARDWARE_VER EQUAL ${WICAN_V210})
+    set(HW_PREF "${WICAN_V210_PREF}")
+    set(HW_VER "${WICAN_V210_STR}")
+else()
+    set(HW_PREF "${WICAN_V300_PREF}")
+    set(HW_VER "${WICAN_V300_STR}")
+endif()
 
-set(PROJECT_VERU ${PROJECT_VER})
-set(PROJECT_BIN "${PROJECT_PREF}_${PROJECT_VERU}")
-include($ENV{IDF_PATH}/tools/cmake/project.cmake)
-project("${PROJECT_BIN}")
+add_definitions(-DHARDWARE_VERSION="${HW_VER}")
+
+# Form the project binary name
+set(PRJ_BIN "${PROJECT_PREF}_${HW_PREF}_${GIT_SHA}")
+project("${PRJ_BIN}")
diff --git a/main/config_server.c b/main/config_server.c
@@ -772,6 +772,8 @@ static esp_err_t check_status_handler(httpd_req_t *req)
 	static char hver[32];
     const esp_partition_t *running = esp_ota_get_running_partition();
     static esp_app_desc_t running_app_info;
+	uint32_t firmware_ver_minor = 0, firmware_ver_major = 0;
+
     if (esp_ota_get_partition_description(running, &running_app_info) != ESP_OK)
     {
     	running_app_info.version[0] = '1';
@@ -780,26 +782,13 @@ static esp_err_t check_status_handler(httpd_req_t *req)
     }
 
 
+	if (sscanf(running_app_info.version, "v%ld.%ld", &firmware_ver_major, &firmware_ver_minor) == 2) 
+	{
+		ESP_LOGI(TAG, "Firmware version: %ld.%ld", firmware_ver_major, firmware_ver_minor);
+	} 
 
-    sprintf(fver, "%c%c.%c%c", running_app_info.version[0]\
-							, running_app_info.version[1]\
-							, running_app_info.version[2]\
-							, running_app_info.version[3]);
-
-    if(strstr(running_app_info.project_name, "usb") != 0)
-    {
-        sprintf(hver, "%c%c.%c%c_usb", running_app_info.version[6]\
-    							, running_app_info.version[7]\
-    							, running_app_info.version[8]\
-    							, running_app_info.version[9]);
-    }
-    else
-    {
-        sprintf(hver, "%c%c.%c%c_obd", running_app_info.version[6]\
-    							, running_app_info.version[7]\
-    							, running_app_info.version[8]\
-    							, running_app_info.version[9]);
-    }
+    sprintf(fver, "%ld.%ld", firmware_ver_major, firmware_ver_minor);
+    sprintf(hver, "WiCAN-%s", HARDWARE_VERSION);
 
 	cJSON_AddStringToObject(root, "wifi_mode", device_config.wifi_mode);
 	cJSON_AddStringToObject(root, "ap_ch", device_config.ap_ch);
@@ -813,6 +802,7 @@ static esp_err_t check_status_handler(httpd_req_t *req)
 	cJSON_AddStringToObject(root, "port", device_config.port);
 	cJSON_AddStringToObject(root, "fw_version", fver);
 	cJSON_AddStringToObject(root, "hw_version", hver);
+	cJSON_AddStringToObject(root, "git_version", GIT_SHA);
 	cJSON_AddStringToObject(root, "protocol", device_config.protocol);
 	cJSON_AddStringToObject(root, "sleep_status", device_config.sleep_status);
 	cJSON_AddStringToObject(root, "sleep_volt", device_config.sleep_volt);
diff --git a/main/homepage.html b/main/homepage.html
@@ -738,7 +738,7 @@ <h2>Custom PIDs:</h2>
 				<tr>
 					<td><b>Firmware ver:</b></td>
 					<td>
-						<div id="fw_version">v1.00</div>
+						<div id="fw_version">1.00</div>
 					</td>
 				</tr>
 				<tr>
@@ -747,6 +747,12 @@ <h2>Custom PIDs:</h2>
 						<div id="hw_version">v2.10</div>
 					</td>
 				</tr>
+				<tr>
+					<td><b>Git ver:</b></td>
+					<td>
+						<div id="git_version">v2.10</div>
+					</td>
+				</tr>
 				<tr>
 					<td><b>Designed By:</b></td>
 					<td>
@@ -1418,6 +1424,7 @@ <h2>Custom PIDs:</h2>
 			document.getElementById("port_status").innerHTML = obj.port;
 			document.getElementById("fw_version").innerHTML = obj.fw_version;
 			document.getElementById("hw_version").innerHTML = obj.hw_version;
+			document.getElementById("git_version").innerHTML = obj.git_version;
 			document.getElementById("protocol").value = obj.protocol;
 			document.getElementById("batt_voltage").innerHTML = obj.batt_voltage;
 			document.getElementById("ret_msg").innerHTML = " ";
diff --git a/main/main.c b/main/main.c
@@ -529,11 +529,23 @@ void app_main(void)
 
     const esp_partition_t *running = esp_ota_get_running_partition();
     esp_app_desc_t running_app_info;
+	uint32_t firmware_ver_minor, firmware_ver_major;
+
     if (esp_ota_get_partition_description(running, &running_app_info) == ESP_OK)
     {
         ESP_LOGI(TAG, "Running firmware version: %s", running_app_info.version);
         ESP_LOGI(TAG, "Project Name: %s", running_app_info.project_name);
 
+		if (sscanf(running_app_info.version, "v%ld.%ld", &firmware_ver_major, &firmware_ver_minor) == 2) 
+		{
+			ESP_LOGI(TAG, "Firmware version: %ld.%ld", firmware_ver_major, firmware_ver_minor);
+		} 
+		else 
+		{
+			ESP_LOGI(TAG, "Failed to extract firmware version");
+		}
+		ESP_LOGI(TAG, "Hardware version: %s", HARDWARE_VERSION);
+
         if(strstr(running_app_info.project_name, "usb") != 0)
         {
         	project_hardware_rev = WICAN_USB_V100;
diff --git a/main/ver.h b/main/ver.h
@@ -23,9 +23,9 @@
 #define __VER_H__
 
 #define RESERVED_VER			0
-#define WICAN_V210				1
-#define WICAN_V300				2
-#define WICAN_USB_V100			3
+// #define WICAN_V210				1
+// #define WICAN_V300				2
+// #define WICAN_USB_V100			3
 
 extern uint8_t project_hardware_rev;
 
