Index: ADuCM360_demo_cn0359/.cproject
===================================================================
diff -u -rb39d7f18a4f5f23a76b7fb484c13bffd225ef466 -re5e6c6f79e38c2f82de516ea81069dfe0fc558b5
--- ADuCM360_demo_cn0359/.cproject	(.../.cproject)	(revision b39d7f18a4f5f23a76b7fb484c13bffd225ef466)
+++ ADuCM360_demo_cn0359/.cproject	(.../.cproject)	(revision e5e6c6f79e38c2f82de516ea81069dfe0fc558b5)
@@ -36,9 +36,9 @@
 									<listOptionValue builtIn="false" value="CORE0"/>
 									<listOptionValue builtIn="false" value="ARM_MATH_CM3"/>
 									<listOptionValue builtIn="false" value="_DEBUG"/>
+									<listOptionValue builtIn="false" value="EVAL_BUILD"/>
 									<listOptionValue builtIn="false" value="_RTE_"/>
 									<listOptionValue builtIn="false" value="__ADUCM360__"/>
-									<listOptionValue builtIn="false" value="EVAL_BUILD"/>
 								</option>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="arm.assembler.option.additionaldirectories.369726442" name="Additional include directories (-I):" superClass="arm.assembler.option.additionaldirectories" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src/system/include/cmsis}&quot;"/>
@@ -72,9 +72,9 @@
 									<listOptionValue builtIn="false" value="ARM_MATH_CM3"/>
 									<listOptionValue builtIn="false" value="__START=main"/>
 									<listOptionValue builtIn="false" value="_DEBUG"/>
+									<listOptionValue builtIn="false" value="EVAL_BUILD"/>
 									<listOptionValue builtIn="false" value="_RTE_"/>
 									<listOptionValue builtIn="false" value="__ADUCM360__"/>
-									<listOptionValue builtIn="false" value="EVAL_BUILD"/>
 								</option>
 								<option id="arm.toolchain.cpp.compiler.option.coreid.1452700285" name="Specify the core Id (-DCORE[A|B|0-2])" superClass="arm.toolchain.cpp.compiler.option.coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="arm.base.compiler.option.include.paths.584680977" name="Additional include directories (-I):" superClass="arm.base.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
@@ -123,9 +123,9 @@
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="arm.base.compiler.option.preprocessdefs.1940559705" name="Preprocessor definitions (-D):" superClass="arm.base.compiler.option.preprocessdefs" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="CORE0"/>
 									<listOptionValue builtIn="false" value="ARM_MATH_CM3"/>
+									<listOptionValue builtIn="false" value="EVAL_BUILD"/>
 									<listOptionValue builtIn="false" value="_RTE_"/>
 									<listOptionValue builtIn="false" value="__ADUCM360__"/>
-									<listOptionValue builtIn="false" value="EVAL_BUILD"/>
 								</option>
 								<option id="arm.toolchain.cpp.compiler.option.coreid.1701731372" name="Specify the core Id (-DCORE[A|B|0-2])" superClass="arm.toolchain.cpp.compiler.option.coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="arm.base.compiler.option.include.paths.265475614" name="Additional include directories (-I):" superClass="arm.base.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
@@ -144,9 +144,9 @@
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="arm.linker.option.preprocessdefs.1176826819" name="Preprocessor definitions (-D):" superClass="arm.linker.option.preprocessdefs" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="CORE0"/>
 									<listOptionValue builtIn="false" value="ARM_MATH_CM3"/>
+									<listOptionValue builtIn="false" value="EVAL_BUILD"/>
 									<listOptionValue builtIn="false" value="_RTE_"/>
 									<listOptionValue builtIn="false" value="__ADUCM360__"/>
-									<listOptionValue builtIn="false" value="EVAL_BUILD"/>
 								</option>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="arm.linker.option.include.paths.677965306" name="Additional include directories (-I):" superClass="arm.linker.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src/system/include/cmsis}&quot;"/>
@@ -227,9 +227,9 @@
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="arm.assembler.option.preprocessdefs.1682827382" name="Preprocessor definitions (-D):" superClass="arm.assembler.option.preprocessdefs" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="CORE0"/>
 									<listOptionValue builtIn="false" value="NDEBUG"/>
+									<listOptionValue builtIn="false" value="EVAL_BUILD"/>
 									<listOptionValue builtIn="false" value="_RTE_"/>
 									<listOptionValue builtIn="false" value="__ADUCM360__"/>
-									<listOptionValue builtIn="false" value="EVAL_BUILD"/>
 								</option>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="arm.assembler.option.additionaldirectories.352214691" name="Additional include directories (-I):" superClass="arm.assembler.option.additionaldirectories" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src/system/include/cmsis}&quot;"/>
@@ -261,9 +261,9 @@
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="arm.base.compiler.option.preprocessdefs.402860969" name="Preprocessor definitions (-D):" superClass="arm.base.compiler.option.preprocessdefs" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="CORE0"/>
 									<listOptionValue builtIn="false" value="NDEBUG"/>
+									<listOptionValue builtIn="false" value="EVAL_BUILD"/>
 									<listOptionValue builtIn="false" value="_RTE_"/>
 									<listOptionValue builtIn="false" value="__ADUCM360__"/>
-									<listOptionValue builtIn="false" value="EVAL_BUILD"/>
 								</option>
 								<option id="arm.toolchain.cpp.compiler.option.coreid.1726643401" name="Specify the core Id (-DCORE[A|B|0-2])" superClass="arm.toolchain.cpp.compiler.option.coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="arm.base.compiler.option.include.paths.1707426043" name="Additional include directories (-I):" superClass="arm.base.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
@@ -312,9 +312,9 @@
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="arm.base.compiler.option.preprocessdefs.157881195" name="Preprocessor definitions (-D):" superClass="arm.base.compiler.option.preprocessdefs" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="CORE0"/>
 									<listOptionValue builtIn="false" value="NDEBUG"/>
+									<listOptionValue builtIn="false" value="EVAL_BUILD"/>
 									<listOptionValue builtIn="false" value="_RTE_"/>
 									<listOptionValue builtIn="false" value="__ADUCM360__"/>
-									<listOptionValue builtIn="false" value="EVAL_BUILD"/>
 								</option>
 								<option id="arm.toolchain.cpp.compiler.option.coreid.1605053625" name="Specify the core Id (-DCORE[A|B|0-2])" superClass="arm.toolchain.cpp.compiler.option.coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="arm.base.compiler.option.include.paths.47406610" name="Additional include directories (-I):" superClass="arm.base.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
@@ -332,9 +332,9 @@
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="arm.linker.option.preprocessdefs.1099328288" name="Preprocessor definitions (-D):" superClass="arm.linker.option.preprocessdefs" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="CORE0"/>
 									<listOptionValue builtIn="false" value="NDEBUG"/>
+									<listOptionValue builtIn="false" value="EVAL_BUILD"/>
 									<listOptionValue builtIn="false" value="_RTE_"/>
 									<listOptionValue builtIn="false" value="__ADUCM360__"/>
-									<listOptionValue builtIn="false" value="EVAL_BUILD"/>
 								</option>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="arm.linker.option.include.paths.760595365" name="Additional include directories (-I):" superClass="arm.linker.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/include}&quot;"/>
Index: ADuCM360_demo_cn0359/include/hal/drivers/adc.h
===================================================================
diff -u -r8d80f35bf88694bd50d769b9bab31db8364a9004 -re5e6c6f79e38c2f82de516ea81069dfe0fc558b5
--- ADuCM360_demo_cn0359/include/hal/drivers/adc.h	(.../adc.h)	(revision 8d80f35bf88694bd50d769b9bab31db8364a9004)
+++ ADuCM360_demo_cn0359/include/hal/drivers/adc.h	(.../adc.h)	(revision e5e6c6f79e38c2f82de516ea81069dfe0fc558b5)
@@ -68,4 +68,6 @@
 	unsigned long adc1_hit;
 };
 
+float get_raw_temperature_resistance(void);
+
 #endif
Index: ADuCM360_demo_cn0359/include/hal/drivers/calibration.h
===================================================================
diff -u -re68895e85fe32aca137ce08ac5d6accd67fec591 -re5e6c6f79e38c2f82de516ea81069dfe0fc558b5
--- ADuCM360_demo_cn0359/include/hal/drivers/calibration.h	(.../calibration.h)	(revision e68895e85fe32aca137ce08ac5d6accd67fec591)
+++ ADuCM360_demo_cn0359/include/hal/drivers/calibration.h	(.../calibration.h)	(revision e5e6c6f79e38c2f82de516ea81069dfe0fc558b5)
@@ -18,7 +18,7 @@
 #define FIRMWARE_VERSION    "v0.1.0"      // Major.Minor.Build
 
 #define MIN_VERSION_LENGTH  1             // Minimum version string length
-#define MAX_VERSION_LENGTH  13            // Maximum version string length
+#define MAX_VERSION_LENGTH  12            // Maximum version string length : 11 characters + 1 null terminator
 
 #define DEFAULT_COEFF       0.0F          // Default calibration coefficient
 
Index: ADuCM360_demo_cn0359/src/applications/DDdefs.cpp
===================================================================
diff -u -rcf2d4ebc110a148e31ce7a7ee049691b101abe21 -re5e6c6f79e38c2f82de516ea81069dfe0fc558b5
--- ADuCM360_demo_cn0359/src/applications/DDdefs.cpp	(.../DDdefs.cpp)	(revision cf2d4ebc110a148e31ce7a7ee049691b101abe21)
+++ ADuCM360_demo_cn0359/src/applications/DDdefs.cpp	(.../DDdefs.cpp)	(revision e5e6c6f79e38c2f82de516ea81069dfe0fc558b5)
@@ -116,7 +116,7 @@
 		auto_poll_data.cond_data.read_count = (uint8_t)(adc.adc0_hit & 0xFF);
 		auto_poll_data.cond_data.error = get_error_flag();
 
-		auto_poll_data.temp_data.raw_temp = adc.temp;
+		auto_poll_data.temp_data.raw_temp = get_raw_temperature_resistance();
 		auto_poll_data.temp_data.read_count = (uint8_t)(adc.adc1_hit & 0xFF);
 		auto_poll_data.temp_data.error = get_error_flag();
 
@@ -208,16 +208,17 @@
 			printf("+Vp-p: %eV\n", adc.p_volt);
 			printf("-Vp-p: %eV\n", adc.n_volt);
 			printf("TEMP: %f'C\n", adc.temp);
+			printf("Raw Temperature Resistance - : %eOhms\n", get_raw_temperature_resistance());
 
 			raw_conductivity = ((adc.p_curt - adc.n_curt) /
 					      	  	(adc.p_volt - adc.n_volt));
 
-			printf("Raw conductivity - (Current/Voltage) : %eS/cm\n", raw_conductivity);
+			printf("Raw Conductivity - (Current/Voltage) : %eS/cm\n", raw_conductivity);
 
 			raw_resistance = ((adc.p_volt - adc.n_volt) /
 							  (adc.p_curt - adc.n_curt));
 
-			printf("Raw Resistance - (Voltage/Current): %eOhms\n\n", raw_resistance);
+			printf("Raw Conductivity Resistance - (Voltage/Current): %eOhms\n\n", raw_resistance);
 		}
 
 		fflush(stdout);
Index: ADuCM360_demo_cn0359/src/hal/drivers/adc.cpp
===================================================================
diff -u -rb39d7f18a4f5f23a76b7fb484c13bffd225ef466 -re5e6c6f79e38c2f82de516ea81069dfe0fc558b5
--- ADuCM360_demo_cn0359/src/hal/drivers/adc.cpp	(.../adc.cpp)	(revision b39d7f18a4f5f23a76b7fb484c13bffd225ef466)
+++ ADuCM360_demo_cn0359/src/hal/drivers/adc.cpp	(.../adc.cpp)	(revision e5e6c6f79e38c2f82de516ea81069dfe0fc558b5)
@@ -74,6 +74,8 @@
 
 static int position = 0;
 
+static float raw_temp_res; 						// Raw Temperature Resistance
+
 ssize_t adc_read(void *buf, size_t count)
 {
 	if ((position + count) > sizeof(adc_file)) {
@@ -512,10 +514,14 @@
 			if (adc1_result >= 0x09d54f53) { //PT1000
 				result.temp = res2temp(6.e3f * adc1_result / (1074547130368ll -
 						       (3ll * adc1_result))); //normalized to 1 at 0°C
+				raw_temp_res = (6.e3f * adc1_result / (1074547130368ll -
+						       (3ll * adc1_result)));
 				result.rtd_type = 1000;
 			} else { //PT100
 				result.temp = res2temp(6.e4f * adc1_result / (1074547130368ll -
 						       (3ll * adc1_result))); //normalized to 1 at 0°C
+				raw_temp_res = (6.e4f * adc1_result / (1074547130368ll -
+						       (3ll * adc1_result)));
 				result.rtd_type = 100;
 			}
 
@@ -545,6 +551,11 @@
 	return 0;
 }
 
+float get_raw_temperature_resistance(void)
+{
+	return raw_temp_res;
+}
+
 #ifdef __cplusplus
 extern "C"
 {
Index: CN0_Python_Scripts/commands_rev_b.py
===================================================================
diff -u -rcf2d4ebc110a148e31ce7a7ee049691b101abe21 -re5e6c6f79e38c2f82de516ea81069dfe0fc558b5
--- CN0_Python_Scripts/commands_rev_b.py	(.../commands_rev_b.py)	(revision cf2d4ebc110a148e31ce7a7ee049691b101abe21)
+++ CN0_Python_Scripts/commands_rev_b.py	(.../commands_rev_b.py)	(revision e5e6c6f79e38c2f82de516ea81069dfe0fc558b5)
@@ -124,7 +124,7 @@
 
     i = 0
     poll = ""
-    while i <= 7:  # decode by number of lines of data messages
+    while i <= 8:  # decode by number of lines of data messages
         current_line_text = str(cond1.ser.readline().decode())
         poll = poll + current_line_text
         i += 1
Index: CN0_Python_Scripts/data_analysis.py
===================================================================
diff -u -rcf2d4ebc110a148e31ce7a7ee049691b101abe21 -re5e6c6f79e38c2f82de516ea81069dfe0fc558b5
--- CN0_Python_Scripts/data_analysis.py	(.../data_analysis.py)	(revision cf2d4ebc110a148e31ce7a7ee049691b101abe21)
+++ CN0_Python_Scripts/data_analysis.py	(.../data_analysis.py)	(revision e5e6c6f79e38c2f82de516ea81069dfe0fc558b5)
@@ -3,8 +3,14 @@
 from datetime import datetime
 import atexit
 from openpyxl import Workbook, load_workbook
+import os
 
-EXCEL_PATH = "autopoll_log.xlsx"
+# === 1) Create a run-specific timestamp and filename ===
+RUN_TS = datetime.now().strftime("%Y%m%d-%H%M%S")  # e.g., 20260224-112905
+# Optional: choose an output directory (create it if needed)
+EXCEL_DIR = "."  # change to e.g., "logs" if desired
+os.makedirs(EXCEL_DIR, exist_ok=True)
+EXCEL_PATH = os.path.join(EXCEL_DIR, f"autopoll_log_{RUN_TS}.xlsx")
 
 # Keep workbook open for performance
 _wb = None
@@ -13,8 +19,8 @@
 
 # Per-sheet headers (include units in the Value column)
 HEADER_MAP = {
-    "Resistance": ["Number", "Date", "Time", "Value (Ohms)", "Read Count", "Error"],
-    "Temperature":  ["Number", "Date", "Time", "Value (°C)", "Read Count", "Error"],
+    "Conductivity": ["Number", "Date", "Time", "Resistance (Ohms)", "Read Count", "Error"],
+    "Temperature":  ["Number", "Date", "Time", "Resistance (Ohms)", "Read Count", "Error"],
 }
 
 ########################################################################################################################
@@ -62,7 +68,7 @@
         return ws
 
     # Ensure both sheets with their respective headers
-    _ws_map["Resistance"] = ensure_sheet("Resistance", HEADER_MAP["Resistance"])
+    _ws_map["Conductivity"] = ensure_sheet("Conductivity", HEADER_MAP["Conductivity"])
     _ws_map["Temperature"]  = ensure_sheet("Temperature",  HEADER_MAP["Temperature"])
 
     # Remove default "Sheet" if unused and not one of our targets
@@ -92,10 +98,13 @@
 
 
 def log_to_excel(kind: str, ts: datetime, value: float, read_count: int, error: int, path: str = EXCEL_PATH):
+
+    path = EXCEL_PATH
+
     """
     Append a row to the Excel workbook.
 
-    kind: "Resistance" or "Temperature"
+    kind: "Conductivity" or "Temperature"
     ts: datetime timestamp
     value: float
     read_count: int
Index: CN0_Python_Scripts/parser.py
===================================================================
diff -u -rcf2d4ebc110a148e31ce7a7ee049691b101abe21 -re5e6c6f79e38c2f82de516ea81069dfe0fc558b5
--- CN0_Python_Scripts/parser.py	(.../parser.py)	(revision cf2d4ebc110a148e31ce7a7ee049691b101abe21)
+++ CN0_Python_Scripts/parser.py	(.../parser.py)	(revision e5e6c6f79e38c2f82de516ea81069dfe0fc558b5)
@@ -29,16 +29,16 @@
         ts = datetime.now()
 
         if _id == b'r':
-            # print(f"{datetime.now()} Resistance: {value} Ohms | count={read_count} | err={error}")
-            data_analysis.log_to_excel("Resistance", ts, value, read_count, error)
+            # print(f"{datetime.now()} Conductivity: {value} Ohms | count={read_count} | err={error}")
+            data_analysis.log_to_excel("Conductivity", ts, value, read_count, error)
         else:
             # print(f"{datetime.now()} Temperature: {value} °C | count={read_count} | err={error}")
             data_analysis.log_to_excel("Temperature", ts, value, read_count, error)
 
 ########################################################################################################################
 # This function parses and prints the received packet of calibration data and version information
-MAX_VERSION_LENGTH = 13
-DATA_BYTES_PER_VER = 12
+MAX_VERSION_LENGTH = 12
+DATA_BYTES_PER_VER = 11
 
 def parse_coeff_and_version(packet: bytes):
     i = 0