Diff: common/utils.c

Revision:

56:38b36e947602

Parent:

55:215da406282b

--- a/common/utils.c	Mon Feb 24 07:04:35 2020 +0000
+++ b/common/utils.c	Mon Feb 24 08:49:25 2020 +0000
@@ -132,18 +132,15 @@
     uint32_t nNumSamples,
     ADMW_MEASUREMENT_MODE eMeasurementMode)
 {
-    static uint32_t samplesCounter;
     for (uint32_t i = 0; i < nNumSamples; i++) {
-        ADMW_LOG_INFO("Sample # %2d Channel # %2d :: Raw %X %f :: Processed %f :: flags:%s%s",
+        ADMW_LOG_INFO("Sample # %2d Channel # %2d :: Raw %f :: Processed %f :: flags: ERROR:%X , ALERT:%X",
                       i+1,
                       pSampleBuffer[i].channelId,
-                      pSampleBuffer[i].rawValue, (pSampleBuffer[i].rawValue/1024.0),
+                      pSampleBuffer[i].rawValue,
                       pSampleBuffer[i].processedValue,
-                      pSampleBuffer[i].status & ADMW_DEVICE_STATUS_ERROR ? " ERROR" : "",
-                      pSampleBuffer[i].status & ADMW_DEVICE_STATUS_ALERT ? " ALERT" : "");
+                      pSampleBuffer[i].status & ADMW_DEVICE_STATUS_ERROR,
+                      pSampleBuffer[i].status & ADMW_DEVICE_STATUS_ALERT );
     }
-    samplesCounter++;
-    ADMW_LOG_INFO("Sample count=%d",samplesCounter);
 }
 
 static void gpioCallbackFn(ADMW_GPIO_PIN ePinId, void * pArg)
@@ -239,7 +236,6 @@
     ADMW_MEASUREMENT_MODE eMeasurementMode)
 {
     ADMW_RESULT res;
-    static uint32_t samplesLost;
     volatile bool bDataReady = false;
     volatile bool bError = false;
     volatile bool bAlert = false;
@@ -318,9 +314,7 @@
                          */
                          
                         ADMW_LOG_DEBUG("Retrieved %u of %u requested data samples",
-                                       nReturned, nSamplesPerDataready);
-                        samplesLost++;
-                        ADMW_LOG_INFO("samples lost=%d",samplesLost);               
+                                       nReturned, nSamplesPerDataready);           
                         continue;
                     } else {
                         ADMW_LOG_WARN("Failed to get data samples from device");