More verbose ADC logging Change-Id: I89aed52adc449152b2473fb79e42688ff944a43d Reviewed-on: https://pigweed-review.googlesource.com/c/gonk/+/189330 Commit-Queue: Anthony DiGirolamo <tonymd@google.com> Reviewed-by: Eric Holland <hollande@google.com>
diff --git a/applications/fpga_config/main.cc b/applications/fpga_config/main.cc index 41bc091..fcb94b4 100644 --- a/applications/fpga_config/main.cc +++ b/applications/fpga_config/main.cc
@@ -117,24 +117,25 @@ pw::Status update_result = fpga_adc.UpdateContinuousMeasurements(); if (!update_result.ok()) { PW_LOG_ERROR("UpdateContinuousMeasurements() failed"); + } else { + PW_LOG_INFO( + " vbus: %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, ", + fpga_adc.vbus_measurements_[0], fpga_adc.vbus_measurements_[1], + fpga_adc.vbus_measurements_[2], fpga_adc.vbus_measurements_[3], + fpga_adc.vbus_measurements_[4], fpga_adc.vbus_measurements_[5], + fpga_adc.vbus_measurements_[6], fpga_adc.vbus_measurements_[7], + fpga_adc.vbus_measurements_[8], fpga_adc.vbus_measurements_[9], + fpga_adc.vbus_measurements_[10]); + PW_LOG_INFO( + "vshunt: %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, ", + fpga_adc.vshunt_measurements_[0], fpga_adc.vshunt_measurements_[1], + fpga_adc.vshunt_measurements_[2], fpga_adc.vshunt_measurements_[3], + fpga_adc.vshunt_measurements_[4], fpga_adc.vshunt_measurements_[5], + fpga_adc.vshunt_measurements_[6], fpga_adc.vshunt_measurements_[7], + fpga_adc.vshunt_measurements_[8], fpga_adc.vshunt_measurements_[9], + fpga_adc.vshunt_measurements_[10]); } - PW_LOG_INFO(" vbus: %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, ", - fpga_adc.vbus_measurements_[0], fpga_adc.vbus_measurements_[1], - fpga_adc.vbus_measurements_[2], fpga_adc.vbus_measurements_[3], - fpga_adc.vbus_measurements_[4], fpga_adc.vbus_measurements_[5], - fpga_adc.vbus_measurements_[6], fpga_adc.vbus_measurements_[7], - fpga_adc.vbus_measurements_[8], fpga_adc.vbus_measurements_[9], - fpga_adc.vbus_measurements_[10]); - PW_LOG_INFO( - "vshunt: %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, ", - fpga_adc.vshunt_measurements_[0], fpga_adc.vshunt_measurements_[1], - fpga_adc.vshunt_measurements_[2], fpga_adc.vshunt_measurements_[3], - fpga_adc.vshunt_measurements_[4], fpga_adc.vshunt_measurements_[5], - fpga_adc.vshunt_measurements_[6], fpga_adc.vshunt_measurements_[7], - fpga_adc.vshunt_measurements_[8], fpga_adc.vshunt_measurements_[9], - fpga_adc.vshunt_measurements_[10]); - last_update = this_update; update_count = (update_count + 1) % UINT16_MAX; }
diff --git a/lib/adc/adc.cc b/lib/adc/adc.cc index 96d1613..96df067 100644 --- a/lib/adc/adc.cc +++ b/lib/adc/adc.cc
@@ -6,7 +6,7 @@ #include "gonk/adc.h" -#define PW_LOG_LEVEL PW_LOG_LEVEL_INFO +#define PW_LOG_LEVEL PW_LOG_LEVEL_DEBUG #define PW_LOG_MODULE_NAME "Adc" #include "pw_bytes/bit.h" @@ -324,6 +324,9 @@ } int32_t vbus_value = VoltageMeasurement(vbus_read_result.value()); vbus_measurements_[i] = vbus_value; + PW_LOG_INFO("Continuous Read ADC #%02d: VBUS = %02x %02x %02x = %d", i, + vbus_read_result.value()[0], vbus_read_result.value()[1], + vbus_read_result.value()[2], vbus_value); // Read VSHUNT std::array<std::byte, 3> vshunt_read_buffer; @@ -335,6 +338,9 @@ } int32_t vshunt_value = VoltageMeasurement(vshunt_read_result.value()); vshunt_measurements_[i] = vshunt_value; + PW_LOG_INFO("Continuous Read ADC #%02d: VSHUNT = %02x %02x %02x = %d", i, + vshunt_read_result.value()[0], vshunt_read_result.value()[1], + vshunt_read_result.value()[2], vshunt_value); } // All data has been read: clear the pulse signal variable. @@ -396,7 +402,9 @@ } int32_t value = VoltageMeasurement(read_result.value()); - PW_LOG_INFO("ADC #%d: ShuntVoltageMeasurement = %d", adc_number, value); + PW_LOG_INFO("ADC #%02d: VSHUNT = %02x %02x %02x = %d", adc_number, + read_result.value()[0], read_result.value()[1], + read_result.value()[2], value); return value; } @@ -409,7 +417,9 @@ } int32_t value = VoltageMeasurement(read_result.value()); - PW_LOG_INFO("ADC #%d: BusVoltageMeasurement = %d", adc_number, value); + PW_LOG_INFO("ADC #%02d: VBUS = %02x %02x %02x = %d", adc_number, + read_result.value()[0], read_result.value()[1], + read_result.value()[2], value); return value; } @@ -468,7 +478,7 @@ if (adc_config_result.ok()) { uint16_t adc_value = pw::bytes::ReadInOrder<uint16_t>( pw::endian::big, adc_config_result.value().data()); - PW_LOG_INFO("ADC #%d: ADC Config = %x", adc_number, adc_value); + PW_LOG_INFO("ADC #%02d: ADC Config = %x", adc_number, adc_value); } // Read and log the VSHUNT register.