Index: ADuCM360_demo_cn0359/include/applications/DDdefs.h =================================================================== diff -u -re68895e85fe32aca137ce08ac5d6accd67fec591 -rcf2d4ebc110a148e31ce7a7ee049691b101abe21 --- ADuCM360_demo_cn0359/include/applications/DDdefs.h (.../DDdefs.h) (revision e68895e85fe32aca137ce08ac5d6accd67fec591) +++ ADuCM360_demo_cn0359/include/applications/DDdefs.h (.../DDdefs.h) (revision cf2d4ebc110a148e31ce7a7ee049691b101abe21) @@ -28,7 +28,7 @@ struct __attribute__((packed)) condStruct { const char id = 'r'; - float raw_cond = 0.0; + float raw_resistance = 0.0; uint8_t read_count = 0; uint8_t error = 0; }; Index: ADuCM360_demo_cn0359/src/applications/DDdefs.cpp =================================================================== diff -u -rb39d7f18a4f5f23a76b7fb484c13bffd225ef466 -rcf2d4ebc110a148e31ce7a7ee049691b101abe21 --- ADuCM360_demo_cn0359/src/applications/DDdefs.cpp (.../DDdefs.cpp) (revision b39d7f18a4f5f23a76b7fb484c13bffd225ef466) +++ ADuCM360_demo_cn0359/src/applications/DDdefs.cpp (.../DDdefs.cpp) (revision cf2d4ebc110a148e31ce7a7ee049691b101abe21) @@ -87,7 +87,7 @@ /** - * @brief Publishes ADC data when auto-publish is enabled. + * @brief Publishes raw resistance and temperature when auto-publish is enabled. * * @param[in] argc Argument count (unused). * @param[in] argv Argument vector (unused). @@ -99,6 +99,7 @@ if(true == auto_publish_flag) { AutoPollStruct auto_poll_data; + float raw_resistance = 0; float raw_cond = 0; adc_file adc; @@ -108,7 +109,10 @@ raw_cond = ((adc.p_curt - adc.n_curt) / (adc.p_volt - adc.n_volt)); - auto_poll_data.cond_data.raw_cond = raw_cond; + raw_resistance = ((adc.p_volt - adc.n_volt) / + (adc.p_curt - adc.n_curt)); + + auto_poll_data.cond_data.raw_resistance = raw_resistance; auto_poll_data.cond_data.read_count = (uint8_t)(adc.adc0_hit & 0xFF); auto_poll_data.cond_data.error = get_error_flag(); @@ -193,6 +197,8 @@ } else { adc_file adc; + float raw_conductivity = 0.0; + float raw_resistance = 0.0; rewind(p_adc); fread(&adc, sizeof(adc_file), 1, p_adc); @@ -203,10 +209,15 @@ printf("-Vp-p: %eV\n", adc.n_volt); printf("TEMP: %f'C\n", adc.temp); - float raw_conductivity = ((adc.p_curt - adc.n_curt) / - (adc.p_volt - adc.n_volt)); + raw_conductivity = ((adc.p_curt - adc.n_curt) / + (adc.p_volt - adc.n_volt)); - printf("Raw conductivity: %eS/cm\n\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); } fflush(stdout); Index: CN0_Python_Scripts/commands_rev_b.py =================================================================== diff -u -rb39d7f18a4f5f23a76b7fb484c13bffd225ef466 -rcf2d4ebc110a148e31ce7a7ee049691b101abe21 --- CN0_Python_Scripts/commands_rev_b.py (.../commands_rev_b.py) (revision b39d7f18a4f5f23a76b7fb484c13bffd225ef466) +++ CN0_Python_Scripts/commands_rev_b.py (.../commands_rev_b.py) (revision cf2d4ebc110a148e31ce7a7ee049691b101abe21) @@ -124,7 +124,7 @@ i = 0 poll = "" - while i <= 6: # decode by number of lines of data messages + while i <= 7: # decode by number of lines of data messages current_line_text = str(cond1.ser.readline().decode()) poll = poll + current_line_text i += 1 @@ -140,7 +140,7 @@ while time.time() < end_time: data = cond1.ser.read(7) data_count = data_count + 1 - # print(data) + print(data) parser.parse_autopoll(data) print(data_count) Index: CN0_Python_Scripts/data_analysis.py =================================================================== diff -u -r855524c483c89b2cabf1b0fdb91227d5614b1639 -rcf2d4ebc110a148e31ce7a7ee049691b101abe21 --- CN0_Python_Scripts/data_analysis.py (.../data_analysis.py) (revision 855524c483c89b2cabf1b0fdb91227d5614b1639) +++ CN0_Python_Scripts/data_analysis.py (.../data_analysis.py) (revision cf2d4ebc110a148e31ce7a7ee049691b101abe21) @@ -13,7 +13,7 @@ # Per-sheet headers (include units in the Value column) HEADER_MAP = { - "Conductivity": ["Number", "Date", "Time", "Value (S/cm)", "Read Count", "Error"], + "Resistance": ["Number", "Date", "Time", "Value (Ohms)", "Read Count", "Error"], "Temperature": ["Number", "Date", "Time", "Value (°C)", "Read Count", "Error"], } @@ -62,7 +62,7 @@ return ws # Ensure both sheets with their respective headers - _ws_map["Conductivity"] = ensure_sheet("Conductivity", HEADER_MAP["Conductivity"]) + _ws_map["Resistance"] = ensure_sheet("Resistance", HEADER_MAP["Resistance"]) _ws_map["Temperature"] = ensure_sheet("Temperature", HEADER_MAP["Temperature"]) # Remove default "Sheet" if unused and not one of our targets @@ -95,7 +95,7 @@ """ Append a row to the Excel workbook. - kind: "Conductivity" or "Temperature" + kind: "Resistance" or "Temperature" ts: datetime timestamp value: float read_count: int Index: CN0_Python_Scripts/parser.py =================================================================== diff -u -r855524c483c89b2cabf1b0fdb91227d5614b1639 -rcf2d4ebc110a148e31ce7a7ee049691b101abe21 --- CN0_Python_Scripts/parser.py (.../parser.py) (revision 855524c483c89b2cabf1b0fdb91227d5614b1639) +++ CN0_Python_Scripts/parser.py (.../parser.py) (revision cf2d4ebc110a148e31ce7a7ee049691b101abe21) @@ -29,8 +29,8 @@ ts = datetime.now() if _id == b'r': - # print(f"{datetime.now()} Conductivity: {value} S/cm | count={read_count} | err={error}") - data_analysis.log_to_excel("Conductivity", ts, value, read_count, error) + # print(f"{datetime.now()} Resistance: {value} Ohms | count={read_count} | err={error}") + data_analysis.log_to_excel("Resistance", 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)