Vybhav Kadaba
/
EV-PRO-MW1001_Development_code_cleaup
Removed unwanted enums and unused functions
Diff: common/utils.c
- Revision:
- 5:0728bde67bdb
- Parent:
- 2:e391aa125721
- Child:
- 6:9d393a9677f4
diff -r 2ca06eee5735 -r 0728bde67bdb common/utils.c --- a/common/utils.c Tue Jun 04 10:09:11 2019 +0000 +++ b/common/utils.c Wed Jun 05 05:39:15 2019 +0000 @@ -1,111 +1,111 @@ #include <stdlib.h> #include "utils.h" -#include "adi_sense_log.h" +#include "admw_log.h" void utils_printStatus( - ADI_SENSE_STATUS *pStatus) + ADMW_STATUS *pStatus) { - ADI_SENSE_LOG_INFO("Status Summary:"); + ADMW_LOG_INFO("Status Summary:"); if (pStatus->deviceStatus == 0) { - ADI_SENSE_LOG_INFO("\tNo errors detected"); + ADMW_LOG_INFO("\tNo errors detected"); } else { - if (pStatus->deviceStatus & ADI_SENSE_DEVICE_STATUS_BUSY) - ADI_SENSE_LOG_INFO("\tCommand running"); - if (pStatus->deviceStatus & ADI_SENSE_DEVICE_STATUS_DATAREADY) - ADI_SENSE_LOG_INFO("\tData ready"); - if (pStatus->deviceStatus & ADI_SENSE_DEVICE_STATUS_ERROR) - ADI_SENSE_LOG_INFO("\tActive Errors - RESET REQUIRED"); - if (pStatus->deviceStatus & ADI_SENSE_DEVICE_STATUS_FIFO_ERROR) - ADI_SENSE_LOG_INFO("\tActive FIFO Errors - ATTENTION REQUIRED"); - if (pStatus->deviceStatus & ADI_SENSE_DEVICE_STATUS_CONFIG_ERROR) - ADI_SENSE_LOG_INFO("\tActive Configuration Errors - ATTENTION REQUIRED"); - if (pStatus->deviceStatus & ADI_SENSE_DEVICE_STATUS_LUT_ERROR) - ADI_SENSE_LOG_INFO("\tActive Look-Up Table Errors - ATTENTION REQUIRED"); - if (pStatus->deviceStatus & ADI_SENSE_DEVICE_STATUS_EXT_FLASH_ERROR) - ADI_SENSE_LOG_INFO("\tActive External Flash Errors - ATTENTION REQUIRED"); + if (pStatus->deviceStatus & ADMW_DEVICE_STATUS_BUSY) + ADMW_LOG_INFO("\tCommand running"); + if (pStatus->deviceStatus & ADMW_DEVICE_STATUS_DATAREADY) + ADMW_LOG_INFO("\tData ready"); + if (pStatus->deviceStatus & ADMW_DEVICE_STATUS_ERROR) + ADMW_LOG_INFO("\tActive Errors - RESET REQUIRED"); + if (pStatus->deviceStatus & ADMW_DEVICE_STATUS_FIFO_ERROR) + ADMW_LOG_INFO("\tActive FIFO Errors - ATTENTION REQUIRED"); + if (pStatus->deviceStatus & ADMW_DEVICE_STATUS_CONFIG_ERROR) + ADMW_LOG_INFO("\tActive Configuration Errors - ATTENTION REQUIRED"); + if (pStatus->deviceStatus & ADMW_DEVICE_STATUS_LUT_ERROR) + ADMW_LOG_INFO("\tActive Look-Up Table Errors - ATTENTION REQUIRED"); + if (pStatus->deviceStatus & ADMW_DEVICE_STATUS_EXT_FLASH_ERROR) + ADMW_LOG_INFO("\tActive External Flash Errors - ATTENTION REQUIRED"); - if (pStatus->deviceStatus & ADI_SENSE_DEVICE_STATUS_ERROR) + if (pStatus->deviceStatus & ADMW_DEVICE_STATUS_ERROR) { - ADI_SENSE_LOG_INFO("\tActive Errors - ATTENTION REQUIRED"); - ADI_SENSE_LOG_INFO("\t\tLast Error Code: %u (0x%X)", + ADMW_LOG_INFO("\tActive Errors - ATTENTION REQUIRED"); + ADMW_LOG_INFO("\t\tLast Error Code: %u (0x%X)", pStatus->errorCode, pStatus->errorCode); if (pStatus->diagnosticsStatus == 0) { - ADI_SENSE_LOG_INFO("\t\tNo diagnostics faults detected"); + ADMW_LOG_INFO("\t\tNo diagnostics faults detected"); } else { - ADI_SENSE_LOG_INFO("\t\tActive diagnostics faults:"); + ADMW_LOG_INFO("\t\tActive diagnostics faults:"); - if (pStatus->diagnosticsStatus & ADI_SENSE_DIAGNOSTICS_STATUS_CHECKSUM_ERROR) - ADI_SENSE_LOG_INFO("\t\t\tInternal Checksum fault detected"); - if (pStatus->diagnosticsStatus & ADI_SENSE_DIAGNOSTICS_STATUS_COMMS_ERROR) - ADI_SENSE_LOG_INFO("\t\t\tInternal Communications fault detected"); - if (pStatus->diagnosticsStatus & ADI_SENSE_DIAGNOSTICS_STATUS_SUPPLY_MONITOR_ERROR) - ADI_SENSE_LOG_INFO("\t\t\tSupply Monitor fault detected"); - if (pStatus->diagnosticsStatus & ADI_SENSE_DIAGNOSTICS_STATUS_SUPPLY_CAP_ERROR) - ADI_SENSE_LOG_INFO("\t\t\tSupply Regulator Capacitor fault detected"); - if (pStatus->diagnosticsStatus & ADI_SENSE_DIAGNOSTICS_STATUS_CONVERSION_ERROR) - ADI_SENSE_LOG_INFO("\t\t\tInternal ADC Conversions fault detected"); - if (pStatus->diagnosticsStatus & ADI_SENSE_DIAGNOSTICS_STATUS_CALIBRATION_ERROR) - ADI_SENSE_LOG_INFO("\t\t\tInternal Device Calibrations fault detected"); + if (pStatus->diagnosticsStatus & ADMW_DIAGNOSTICS_STATUS_CHECKSUM_ERROR) + ADMW_LOG_INFO("\t\t\tInternal Checksum fault detected"); + if (pStatus->diagnosticsStatus & ADMW_DIAGNOSTICS_STATUS_COMMS_ERROR) + ADMW_LOG_INFO("\t\t\tInternal Communications fault detected"); + if (pStatus->diagnosticsStatus & ADMW_DIAGNOSTICS_STATUS_SUPPLY_MONITOR_ERROR) + ADMW_LOG_INFO("\t\t\tSupply Monitor fault detected"); + if (pStatus->diagnosticsStatus & ADMW_DIAGNOSTICS_STATUS_SUPPLY_CAP_ERROR) + ADMW_LOG_INFO("\t\t\tSupply Regulator Capacitor fault detected"); + if (pStatus->diagnosticsStatus & ADMW_DIAGNOSTICS_STATUS_CONVERSION_ERROR) + ADMW_LOG_INFO("\t\t\tInternal ADC Conversions fault detected"); + if (pStatus->diagnosticsStatus & ADMW_DIAGNOSTICS_STATUS_CALIBRATION_ERROR) + ADMW_LOG_INFO("\t\t\tInternal Device Calibrations fault detected"); } } - if (pStatus->deviceStatus & ADI_SENSE_DEVICE_STATUS_ALERT) + if (pStatus->deviceStatus & ADMW_DEVICE_STATUS_ALERT) { - ADI_SENSE_LOG_INFO("\tActive Alerts - ATTENTION REQUIRED:"); - ADI_SENSE_LOG_INFO("\t\tLast Alert Code: %u (0x%X)", + ADMW_LOG_INFO("\tActive Alerts - ATTENTION REQUIRED:"); + ADMW_LOG_INFO("\t\tLast Alert Code: %u (0x%X)", pStatus->alertCode, pStatus->alertCode); - for (unsigned i = 0; i < ADI_SENSE_1000_MAX_CHANNELS; i++) + for (unsigned i = 0; i < ADMW1001_MAX_CHANNELS; i++) { if (pStatus->channelAlerts[i] == 0) continue; - ADI_SENSE_LOG_INFO("\t\tChannel #%u:", i); - ADI_SENSE_LOG_INFO("\t\t\tLast Alert Code: %u (0x%X)", + ADMW_LOG_INFO("\t\tChannel #%u:", i); + ADMW_LOG_INFO("\t\t\tLast Alert Code: %u (0x%X)", pStatus->channelAlertCodes[i], pStatus->channelAlertCodes[i]); - if (pStatus->channelAlerts[i] & ADI_SENSE_CHANNEL_ALERT_TIMEOUT) - ADI_SENSE_LOG_INFO("\t\t\tTimeout alert detected"); - if (pStatus->channelAlerts[i] & ADI_SENSE_CHANNEL_ALERT_UNDER_RANGE) - ADI_SENSE_LOG_INFO("\t\t\tUnder Range alert detected"); - if (pStatus->channelAlerts[i] & ADI_SENSE_CHANNEL_ALERT_OVER_RANGE) - ADI_SENSE_LOG_INFO("\t\t\tOver Range alert detected"); - if (pStatus->channelAlerts[i] & ADI_SENSE_CHANNEL_ALERT_LOW_LIMIT) - ADI_SENSE_LOG_INFO("\t\t\tLow limit alert detected"); - if (pStatus->channelAlerts[i] & ADI_SENSE_CHANNEL_ALERT_HIGH_LIMIT) - ADI_SENSE_LOG_INFO("\t\t\tHigh Limit alert detected"); - if (pStatus->channelAlerts[i] & ADI_SENSE_CHANNEL_ALERT_SENSOR_OPEN) - ADI_SENSE_LOG_INFO("\t\t\tSensor Fault alert detected"); - if (pStatus->channelAlerts[i] & ADI_SENSE_CHANNEL_ALERT_REF_DETECT) - ADI_SENSE_LOG_INFO("\t\t\tReference Detection alert detected"); - if (pStatus->channelAlerts[i] & ADI_SENSE_CHANNEL_ALERT_CONFIG_ERR) - ADI_SENSE_LOG_INFO("\t\t\tConfiguration Error alert detected"); - if (pStatus->channelAlerts[i] & ADI_SENSE_CHANNEL_ALERT_LUT_ERR) - ADI_SENSE_LOG_INFO("\t\t\tLook-Up Table Error alert detected"); - if (pStatus->channelAlerts[i] & ADI_SENSE_CHANNEL_ALERT_SENSOR_NOT_READY) - ADI_SENSE_LOG_INFO("\t\t\tSensor Not Ready alert detected"); - if (pStatus->channelAlerts[i] & ADI_SENSE_CHANNEL_ALERT_COMP_NOT_READY) - ADI_SENSE_LOG_INFO("\t\t\tCompensation Channel Not Ready alert detected"); - if (pStatus->channelAlerts[i] & ADI_SENSE_CHANNEL_ALERT_LUT_UNDER_RANGE) - ADI_SENSE_LOG_INFO("\t\t\tUnder Look-Up Table Range alert detected"); - if (pStatus->channelAlerts[i] & ADI_SENSE_CHANNEL_ALERT_LUT_OVER_RANGE) - ADI_SENSE_LOG_INFO("\t\t\tOver Look-Up Table Range alert detected"); + if (pStatus->channelAlerts[i] & ADMW_CHANNEL_ALERT_TIMEOUT) + ADMW_LOG_INFO("\t\t\tTimeout alert detected"); + if (pStatus->channelAlerts[i] & ADMW_CHANNEL_ALERT_UNDER_RANGE) + ADMW_LOG_INFO("\t\t\tUnder Range alert detected"); + if (pStatus->channelAlerts[i] & ADMW_CHANNEL_ALERT_OVER_RANGE) + ADMW_LOG_INFO("\t\t\tOver Range alert detected"); + if (pStatus->channelAlerts[i] & ADMW_CHANNEL_ALERT_LOW_LIMIT) + ADMW_LOG_INFO("\t\t\tLow limit alert detected"); + if (pStatus->channelAlerts[i] & ADMW_CHANNEL_ALERT_HIGH_LIMIT) + ADMW_LOG_INFO("\t\t\tHigh Limit alert detected"); + if (pStatus->channelAlerts[i] & ADMW_CHANNEL_ALERT_SENSOR_OPEN) + ADMW_LOG_INFO("\t\t\tSensor Fault alert detected"); + if (pStatus->channelAlerts[i] & ADMW_CHANNEL_ALERT_REF_DETECT) + ADMW_LOG_INFO("\t\t\tReference Detection alert detected"); + if (pStatus->channelAlerts[i] & ADMW_CHANNEL_ALERT_CONFIG_ERR) + ADMW_LOG_INFO("\t\t\tConfiguration Error alert detected"); + if (pStatus->channelAlerts[i] & ADMW_CHANNEL_ALERT_LUT_ERR) + ADMW_LOG_INFO("\t\t\tLook-Up Table Error alert detected"); + if (pStatus->channelAlerts[i] & ADMW_CHANNEL_ALERT_SENSOR_NOT_READY) + ADMW_LOG_INFO("\t\t\tSensor Not Ready alert detected"); + if (pStatus->channelAlerts[i] & ADMW_CHANNEL_ALERT_COMP_NOT_READY) + ADMW_LOG_INFO("\t\t\tCompensation Channel Not Ready alert detected"); + if (pStatus->channelAlerts[i] & ADMW_CHANNEL_ALERT_LUT_UNDER_RANGE) + ADMW_LOG_INFO("\t\t\tUnder Look-Up Table Range alert detected"); + if (pStatus->channelAlerts[i] & ADMW_CHANNEL_ALERT_LUT_OVER_RANGE) + ADMW_LOG_INFO("\t\t\tOver Look-Up Table Range alert detected"); } } - if ((pStatus->deviceStatus & ADI_SENSE_DEVICE_STATUS_ERROR) || - (pStatus->deviceStatus & ADI_SENSE_DEVICE_STATUS_ALERT)) + if ((pStatus->deviceStatus & ADMW_DEVICE_STATUS_ERROR) || + (pStatus->deviceStatus & ADMW_DEVICE_STATUS_ALERT)) { - ADI_SENSE_LOG_INFO("\t\tLast Debug Code: %u-%u", + ADMW_LOG_INFO("\t\tLast Debug Code: %u-%u", (pStatus->debugCode >> 16) & 0xFFFF, (pStatus->debugCode >> 0) & 0xFFFF); } @@ -113,185 +113,185 @@ } void utils_printSamples( - ADI_SENSE_DATA_SAMPLE *pSampleBuffer, + ADMW_DATA_SAMPLE *pSampleBuffer, uint32_t nNumSamples, - ADI_SENSE_MEASUREMENT_MODE eMeasurementMode) + ADMW_MEASUREMENT_MODE eMeasurementMode) { - bool fftMode = (eMeasurementMode == ADI_SENSE_MEASUREMENT_MODE_FFT); + bool fftMode = (eMeasurementMode == ADMW_MEASUREMENT_MODE_FFT); for (uint32_t i = 0; i < nNumSamples; i++) { if (fftMode) { - ADI_SENSE_LOG_INFO("Sample # %2d Channel # %2d :: Bin/Raw %8d :: Magnitude %e :: flags:%s%s", + ADMW_LOG_INFO("Sample # %2d Channel # %2d :: Bin/Raw %8d :: Magnitude %e :: flags:%s%s", i+1, pSampleBuffer[i].channelId, pSampleBuffer[i].rawValue, pSampleBuffer[i].processedValue, - pSampleBuffer[i].status & ADI_SENSE_DEVICE_STATUS_ERROR ? " ERROR" : "", - pSampleBuffer[i].status & ADI_SENSE_DEVICE_STATUS_ALERT ? " ALERT" : ""); + pSampleBuffer[i].status & ADMW_DEVICE_STATUS_ERROR ? " ERROR" : "", + pSampleBuffer[i].status & ADMW_DEVICE_STATUS_ALERT ? " ALERT" : ""); } else { - ADI_SENSE_LOG_INFO("Sample # %2d Channel # %2d :: Raw %0X %f :: Processed %f :: flags:%s%s", + ADMW_LOG_INFO("Sample # %2d Channel # %2d :: Raw %0X %f :: Processed %f :: flags:%s%s", i+1, pSampleBuffer[i].channelId, pSampleBuffer[i].rawValue, (pSampleBuffer[i].rawValue/1024.0), pSampleBuffer[i].processedValue, - pSampleBuffer[i].status & ADI_SENSE_DEVICE_STATUS_ERROR ? " ERROR" : "", - pSampleBuffer[i].status & ADI_SENSE_DEVICE_STATUS_ALERT ? " ALERT" : ""); + pSampleBuffer[i].status & ADMW_DEVICE_STATUS_ERROR ? " ERROR" : "", + pSampleBuffer[i].status & ADMW_DEVICE_STATUS_ALERT ? " ALERT" : ""); } } } -static void gpioCallbackFn(ADI_SENSE_GPIO_PIN ePinId, void * pArg) +static void gpioCallbackFn(ADMW_GPIO_PIN ePinId, void * pArg) { volatile bool *pbFlag = (volatile bool *)pArg; *pbFlag = true; } -ADI_SENSE_RESULT utils_registerCallbacks( - ADI_SENSE_DEVICE_HANDLE hDevice, +ADMW_RESULT utils_registerCallbacks( + ADMW_DEVICE_HANDLE hDevice, volatile bool *pbDataReady, volatile bool *pbError, volatile bool *pbAlert) { - ADI_SENSE_RESULT res; + ADMW_RESULT res; bool state; - res = adi_sense_RegisterGpioCallback(hDevice, ADI_SENSE_GPIO_PIN_DATAREADY, + res = admw_RegisterGpioCallback(hDevice, ADMW_GPIO_PIN_DATAREADY, gpioCallbackFn, (void *)pbDataReady); - if (res != ADI_SENSE_SUCCESS) + if (res != ADMW_SUCCESS) { - ADI_SENSE_LOG_ERROR("Failed to register DATAREADY callback"); + ADMW_LOG_ERROR("Failed to register DATAREADY callback"); return res; } - res = adi_sense_GetGpioState(hDevice, ADI_SENSE_GPIO_PIN_ERROR, &state); - if (res != ADI_SENSE_SUCCESS) + res = admw_GetGpioState(hDevice, ADMW_GPIO_PIN_ALERT_ERROR, &state); + if (res != ADMW_SUCCESS) { - ADI_SENSE_LOG_ERROR("Failed to get current ERROR state"); + ADMW_LOG_ERROR("Failed to get current ERROR state"); return res; } if (state) { - ADI_SENSE_LOG_ERROR("ERROR signal already asserted"); - return ADI_SENSE_FAILURE; + ADMW_LOG_ERROR("ERROR signal already asserted"); + return ADMW_FAILURE; } - res = adi_sense_RegisterGpioCallback(hDevice, ADI_SENSE_GPIO_PIN_ERROR, + res = admw_RegisterGpioCallback(hDevice, ADMW_GPIO_PIN_ALERT_ERROR, gpioCallbackFn, (void *)pbError); - if (res != ADI_SENSE_SUCCESS) + if (res != ADMW_SUCCESS) { - ADI_SENSE_LOG_ERROR("Failed to register ERROR callback"); + ADMW_LOG_ERROR("Failed to register ERROR callback"); return res; } - /*res = adi_sense_GetGpioState(hDevice, ADI_SENSE_GPIO_PIN_ALERT, &state); - if (res != ADI_SENSE_SUCCESS) + /*res = admw_GetGpioState(hDevice, ADMW_GPIO_PIN_ALERT, &state); + if (res != ADMW_SUCCESS) { - ADI_SENSE_LOG_ERROR("Failed to get current ALERT state"); + ADMW_LOG_ERROR("Failed to get current ALERT state"); return res; } if (state) { - ADI_SENSE_LOG_ERROR("ALERT signal already asserted"); - return ADI_SENSE_FAILURE; + ADMW_LOG_ERROR("ALERT signal already asserted"); + return ADMW_FAILURE; }*/ - res = adi_sense_RegisterGpioCallback(hDevice, ADI_SENSE_GPIO_PIN_ALERT, + res = admw_RegisterGpioCallback(hDevice, ADMW_GPIO_PIN_ALERT_ERROR, gpioCallbackFn, (void *)pbAlert); - if (res != ADI_SENSE_SUCCESS) + if (res != ADMW_SUCCESS) { - ADI_SENSE_LOG_ERROR("Failed to register ALERT callback"); + ADMW_LOG_ERROR("Failed to register ALERT callback"); return res; } - return ADI_SENSE_SUCCESS; + return ADMW_SUCCESS; } -ADI_SENSE_RESULT utils_deregisterCallbacks( - ADI_SENSE_DEVICE_HANDLE hDevice) +ADMW_RESULT utils_deregisterCallbacks( + ADMW_DEVICE_HANDLE hDevice) { - ADI_SENSE_RESULT res; + ADMW_RESULT res; - res = adi_sense_RegisterGpioCallback(hDevice, ADI_SENSE_GPIO_PIN_DATAREADY, + res = admw_RegisterGpioCallback(hDevice, ADMW_GPIO_PIN_DATAREADY, NULL, NULL); - if (res != ADI_SENSE_SUCCESS) + if (res != ADMW_SUCCESS) { - ADI_SENSE_LOG_ERROR("Failed to deregister DATAREADY callback"); + ADMW_LOG_ERROR("Failed to deregister DATAREADY callback"); return res; } - res = adi_sense_RegisterGpioCallback(hDevice, ADI_SENSE_GPIO_PIN_ERROR, + res = admw_RegisterGpioCallback(hDevice, ADMW_GPIO_PIN_ALERT_ERROR, NULL, NULL); - if (res != ADI_SENSE_SUCCESS) + if (res != ADMW_SUCCESS) { - ADI_SENSE_LOG_ERROR("Failed to deregister ERROR callback"); + ADMW_LOG_ERROR("Failed to deregister ERROR callback"); return res; } - res = adi_sense_RegisterGpioCallback(hDevice, ADI_SENSE_GPIO_PIN_ALERT, + res = admw_RegisterGpioCallback(hDevice, ADMW_GPIO_PIN_ALERT_ERROR, NULL, NULL); - if (res != ADI_SENSE_SUCCESS) + if (res != ADMW_SUCCESS) { - ADI_SENSE_LOG_INFO("Failed to deregister ALERT callback"); + ADMW_LOG_INFO("Failed to deregister ALERT callback"); return res; } - return ADI_SENSE_SUCCESS; + return ADMW_SUCCESS; } -ADI_SENSE_RESULT utils_runMeasurement( - ADI_SENSE_DEVICE_HANDLE hDevice, - ADI_SENSE_MEASUREMENT_MODE eMeasurementMode) +ADMW_RESULT utils_runMeasurement( + ADMW_DEVICE_HANDLE hDevice, + ADMW_MEASUREMENT_MODE eMeasurementMode) { - ADI_SENSE_RESULT res; + ADMW_RESULT res; volatile bool bDataReady = false; volatile bool bError = false; volatile bool bAlert = false; res = utils_registerCallbacks(hDevice, &bDataReady, &bError, &bAlert); - if (res != ADI_SENSE_SUCCESS) + if (res != ADMW_SUCCESS) return res; /* * Retrieve the number of samples per cycle, per DATAREADY pulse, etc. for * this configuration. */ - ADI_SENSE_1000_OPERATING_MODE eOperatingMode; - ADI_SENSE_1000_DATAREADY_MODE eDataReadyMode; + ADMW1001_OPERATING_MODE eOperatingMode; + ADMW1001_DATAREADY_MODE eDataReadyMode; uint32_t nSamplesPerDataready; uint32_t nSamplesPerCycle; uint8_t nBytesPerSample; - res = adi_sense_1000_GetDataReadyModeInfo(hDevice, + res = admw1001_GetDataReadyModeInfo(hDevice, eMeasurementMode, &eOperatingMode, &eDataReadyMode, &nSamplesPerDataready, &nSamplesPerCycle, &nBytesPerSample); - if (res != ADI_SENSE_SUCCESS) + if (res != ADMW_SUCCESS) return res; /* * Allocate a buffer to store the samples retrieved on each DATAREADY pulse */ - ADI_SENSE_DATA_SAMPLE *pSampleBuffer; - pSampleBuffer = malloc(sizeof(ADI_SENSE_DATA_SAMPLE) * + ADMW_DATA_SAMPLE *pSampleBuffer; + pSampleBuffer = malloc(sizeof(ADMW_DATA_SAMPLE) * nSamplesPerDataready); if (pSampleBuffer == NULL) { - ADI_SENSE_LOG_ERROR("Failed to allocate sample buffer"); - return ADI_SENSE_NO_MEM; + ADMW_LOG_ERROR("Failed to allocate sample buffer"); + return ADMW_NO_MEM; } /* * Kick off the measurement cycle(s) here */ - ADI_SENSE_LOG_INFO("Starting measurement"); - res = adi_sense_StartMeasurement(hDevice, eMeasurementMode); - if (res != ADI_SENSE_SUCCESS) + ADMW_LOG_INFO("Starting measurement"); + res = admw_StartMeasurement(hDevice, eMeasurementMode); + if (res != ADMW_SUCCESS) { - ADI_SENSE_LOG_ERROR("Failed to start measurement"); + ADMW_LOG_ERROR("Failed to start measurement"); return res; } @@ -302,7 +302,7 @@ uint32_t nReturned; while (true) { - ADI_SENSE_STATUS status; + ADMW_STATUS status; /* * Wait until the next batch of 1 or more samples is ready, continuously @@ -317,24 +317,24 @@ * Get data samples from the measurement cycle, if no error has occurred */ bDataReady = false; - res = adi_sense_GetData(hDevice, eMeasurementMode, pSampleBuffer, + res = admw_GetData(hDevice, eMeasurementMode, pSampleBuffer, nBytesPerSample, nSamplesPerDataready, &nReturned); - if (res != ADI_SENSE_SUCCESS) + if (res != ADMW_SUCCESS) { - if (res == ADI_SENSE_INCOMPLETE) + if (res == ADMW_INCOMPLETE) { /* * This is expected in cases where cycleSkipCount may * be non-zero for some channels, resulting in * variable-length sequences */ - ADI_SENSE_LOG_DEBUG("Retrieved %u of %u requested data samples", + ADMW_LOG_DEBUG("Retrieved %u of %u requested data samples", nReturned, nSamplesPerDataready); } else { - ADI_SENSE_LOG_WARN("Failed to get data samples from device"); + ADMW_LOG_WARN("Failed to get data samples from device"); return res; } } @@ -356,15 +356,15 @@ */ if (bError || bAlert) { - res = adi_sense_GetStatus(hDevice, &status); - if (res != ADI_SENSE_SUCCESS) + res = admw_GetStatus(hDevice, &status); + if (res != ADMW_SUCCESS) { - ADI_SENSE_LOG_ERROR("Failed to retrieve device status"); + ADMW_LOG_ERROR("Failed to retrieve device status"); return res; } if (status.deviceStatus & - (ADI_SENSE_DEVICE_STATUS_ERROR | ADI_SENSE_DEVICE_STATUS_ALERT)) + (ADMW_DEVICE_STATUS_ERROR | ADMW_DEVICE_STATUS_ALERT)) { utils_printStatus(&status); @@ -374,7 +374,7 @@ } } - if (eOperatingMode == ADI_SENSE_1000_OPERATING_MODE_SINGLECYCLE) + if (eOperatingMode == ADMW1001_OPERATING_MODE_SINGLECYCLE) { /* * In this mode, break out of the loop when the measurement command @@ -390,10 +390,10 @@ * completed a single cycle. */ bool bCommandRunning; - res = adi_sense_GetCommandRunningState(hDevice, &bCommandRunning); - if (res != ADI_SENSE_SUCCESS) + res = admw_GetCommandRunningState(hDevice, &bCommandRunning); + if (res != ADMW_SUCCESS) { - ADI_SENSE_LOG_ERROR("Failed to get command-running status"); + ADMW_LOG_ERROR("Failed to get command-running status"); return res; } @@ -402,20 +402,20 @@ } } - ADI_SENSE_LOG_INFO("Stopping measurement"); - res = adi_sense_StopMeasurement(hDevice); - if (res != ADI_SENSE_SUCCESS) + ADMW_LOG_INFO("Stopping measurement"); + res = admw_StopMeasurement(hDevice); + if (res != ADMW_SUCCESS) { - ADI_SENSE_LOG_ERROR("Failed to send stop measurement"); + ADMW_LOG_ERROR("Failed to send stop measurement"); return res; } free(pSampleBuffer); res = utils_deregisterCallbacks(hDevice); - if (res != ADI_SENSE_SUCCESS) + if (res != ADMW_SUCCESS) return res; - return ADI_SENSE_SUCCESS; + return ADMW_SUCCESS; }