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);