Diff: src/adi_sense_1000.c

Revision:

4:2ca06eee5735

Parent:

0:85855ecd3257

--- a/src/adi_sense_1000.c	Mon Apr 29 12:32:03 2019 +0000
+++ b/src/adi_sense_1000.c	Tue Jun 04 10:09:11 2019 +0000
@@ -1712,6 +1712,42 @@
     case ADI_SENSE_1000_ADC_SENSOR_THERMOCOUPLE_2_ADV_L2:
     case ADI_SENSE_1000_ADC_SENSOR_THERMOCOUPLE_3_ADV_L2:
     case ADI_SENSE_1000_ADC_SENSOR_THERMOCOUPLE_4_ADV_L2:
+    case ADI_SENSE_1000_ADC_SENSOR_BRIDGE_4WIRE_1_DEF_L2:
+    case ADI_SENSE_1000_ADC_SENSOR_BRIDGE_4WIRE_2_DEF_L2:
+    case ADI_SENSE_1000_ADC_SENSOR_BRIDGE_4WIRE_3_DEF_L2:
+    case ADI_SENSE_1000_ADC_SENSOR_BRIDGE_4WIRE_4_DEF_L2:
+    case ADI_SENSE_1000_ADC_SENSOR_BRIDGE_4WIRE_1_ADV_L2:
+    case ADI_SENSE_1000_ADC_SENSOR_BRIDGE_4WIRE_2_ADV_L2:
+    case ADI_SENSE_1000_ADC_SENSOR_BRIDGE_4WIRE_3_ADV_L2:
+    case ADI_SENSE_1000_ADC_SENSOR_BRIDGE_4WIRE_4_ADV_L2:
+    case ADI_SENSE_1000_ADC_SENSOR_BRIDGE_6WIRE_1_DEF_L2:
+    case ADI_SENSE_1000_ADC_SENSOR_BRIDGE_6WIRE_2_DEF_L2:
+    case ADI_SENSE_1000_ADC_SENSOR_BRIDGE_6WIRE_3_DEF_L2:
+    case ADI_SENSE_1000_ADC_SENSOR_BRIDGE_6WIRE_4_DEF_L2:
+    case ADI_SENSE_1000_ADC_SENSOR_BRIDGE_6WIRE_1_ADV_L2:
+    case ADI_SENSE_1000_ADC_SENSOR_BRIDGE_6WIRE_2_ADV_L2:
+    case ADI_SENSE_1000_ADC_SENSOR_BRIDGE_6WIRE_3_ADV_L2:
+    case ADI_SENSE_1000_ADC_SENSOR_BRIDGE_6WIRE_4_ADV_L2:
+        if (! ADI_SENSE_1000_CHANNEL_IS_ADC_SENSOR(eChannelId))
+        {
+            ADI_SENSE_LOG_ERROR(
+                "Invalid ADC sensor type %d specified for channel %d",
+                sensorType, eChannelId);
+            return ADI_SENSE_INVALID_PARAM;
+        }
+        break;
+    case ADI_SENSE_1000_ADC_SENSOR_RTD_2WIRE_PT100_DEF_L1:
+    case ADI_SENSE_1000_ADC_SENSOR_RTD_2WIRE_PT1000_DEF_L1:
+    case ADI_SENSE_1000_ADC_SENSOR_RTD_2WIRE_1_DEF_L2:
+    case ADI_SENSE_1000_ADC_SENSOR_RTD_2WIRE_2_DEF_L2:
+    case ADI_SENSE_1000_ADC_SENSOR_RTD_2WIRE_3_DEF_L2:
+    case ADI_SENSE_1000_ADC_SENSOR_RTD_2WIRE_4_DEF_L2:
+    case ADI_SENSE_1000_ADC_SENSOR_RTD_2WIRE_PT100_ADV_L1:
+    case ADI_SENSE_1000_ADC_SENSOR_RTD_2WIRE_PT1000_ADV_L1:
+    case ADI_SENSE_1000_ADC_SENSOR_RTD_2WIRE_1_ADV_L2:
+    case ADI_SENSE_1000_ADC_SENSOR_RTD_2WIRE_2_ADV_L2:
+    case ADI_SENSE_1000_ADC_SENSOR_RTD_2WIRE_3_ADV_L2:
+    case ADI_SENSE_1000_ADC_SENSOR_RTD_2WIRE_4_ADV_L2:
     case ADI_SENSE_1000_ADC_SENSOR_RTD_3WIRE_PT100_DEF_L1:
     case ADI_SENSE_1000_ADC_SENSOR_RTD_3WIRE_PT1000_DEF_L1:
     case ADI_SENSE_1000_ADC_SENSOR_RTD_3WIRE_1_DEF_L2:
@@ -1736,31 +1772,7 @@
     case ADI_SENSE_1000_ADC_SENSOR_RTD_4WIRE_2_ADV_L2:
     case ADI_SENSE_1000_ADC_SENSOR_RTD_4WIRE_3_ADV_L2:
     case ADI_SENSE_1000_ADC_SENSOR_RTD_4WIRE_4_ADV_L2:
-    case ADI_SENSE_1000_ADC_SENSOR_BRIDGE_4WIRE_1_DEF_L2:
-    case ADI_SENSE_1000_ADC_SENSOR_BRIDGE_4WIRE_2_DEF_L2:
-    case ADI_SENSE_1000_ADC_SENSOR_BRIDGE_4WIRE_3_DEF_L2:
-    case ADI_SENSE_1000_ADC_SENSOR_BRIDGE_4WIRE_4_DEF_L2:
-    case ADI_SENSE_1000_ADC_SENSOR_BRIDGE_4WIRE_1_ADV_L2:
-    case ADI_SENSE_1000_ADC_SENSOR_BRIDGE_4WIRE_2_ADV_L2:
-    case ADI_SENSE_1000_ADC_SENSOR_BRIDGE_4WIRE_3_ADV_L2:
-    case ADI_SENSE_1000_ADC_SENSOR_BRIDGE_4WIRE_4_ADV_L2:
-    case ADI_SENSE_1000_ADC_SENSOR_BRIDGE_6WIRE_1_DEF_L2:
-    case ADI_SENSE_1000_ADC_SENSOR_BRIDGE_6WIRE_2_DEF_L2:
-    case ADI_SENSE_1000_ADC_SENSOR_BRIDGE_6WIRE_3_DEF_L2:
-    case ADI_SENSE_1000_ADC_SENSOR_BRIDGE_6WIRE_4_DEF_L2:
-    case ADI_SENSE_1000_ADC_SENSOR_BRIDGE_6WIRE_1_ADV_L2:
-    case ADI_SENSE_1000_ADC_SENSOR_BRIDGE_6WIRE_2_ADV_L2:
-    case ADI_SENSE_1000_ADC_SENSOR_BRIDGE_6WIRE_3_ADV_L2:
-    case ADI_SENSE_1000_ADC_SENSOR_BRIDGE_6WIRE_4_ADV_L2:
-    case ADI_SENSE_1000_ADC_SENSOR_MICROPHONE_A_DEF_L1:
-    case ADI_SENSE_1000_ADC_SENSOR_MICROPHONE_B_DEF_L1:
-    case ADI_SENSE_1000_ADC_SENSOR_MICROPHONE_1_DEF_L2:
-    case ADI_SENSE_1000_ADC_SENSOR_MICROPHONE_2_DEF_L2:
-    case ADI_SENSE_1000_ADC_SENSOR_MICROPHONE_A_ADV_L1:
-    case ADI_SENSE_1000_ADC_SENSOR_MICROPHONE_B_ADV_L1:
-    case ADI_SENSE_1000_ADC_SENSOR_MICROPHONE_1_ADV_L2:
-    case ADI_SENSE_1000_ADC_SENSOR_MICROPHONE_2_ADV_L2:
-        if (! ADI_SENSE_1000_CHANNEL_IS_ADC_SENSOR(eChannelId))
+            if (!ADI_SENSE_1000_CHANNEL_IS_ADC_CJC(eChannelId))
         {
             ADI_SENSE_LOG_ERROR(
                 "Invalid ADC sensor type %d specified for channel %d",
@@ -1768,18 +1780,6 @@
             return ADI_SENSE_INVALID_PARAM;
         }
         break;
-    case ADI_SENSE_1000_ADC_SENSOR_RTD_2WIRE_PT100_DEF_L1:
-    case ADI_SENSE_1000_ADC_SENSOR_RTD_2WIRE_PT1000_DEF_L1:
-    case ADI_SENSE_1000_ADC_SENSOR_RTD_2WIRE_1_DEF_L2:
-    case ADI_SENSE_1000_ADC_SENSOR_RTD_2WIRE_2_DEF_L2:
-    case ADI_SENSE_1000_ADC_SENSOR_RTD_2WIRE_3_DEF_L2:
-    case ADI_SENSE_1000_ADC_SENSOR_RTD_2WIRE_4_DEF_L2:
-    case ADI_SENSE_1000_ADC_SENSOR_RTD_2WIRE_PT100_ADV_L1:
-    case ADI_SENSE_1000_ADC_SENSOR_RTD_2WIRE_PT1000_ADV_L1:
-    case ADI_SENSE_1000_ADC_SENSOR_RTD_2WIRE_1_ADV_L2:
-    case ADI_SENSE_1000_ADC_SENSOR_RTD_2WIRE_2_ADV_L2:
-    case ADI_SENSE_1000_ADC_SENSOR_RTD_2WIRE_3_ADV_L2:
-    case ADI_SENSE_1000_ADC_SENSOR_RTD_2WIRE_4_ADV_L2:
     case ADI_SENSE_1000_ADC_SENSOR_DIODE_2C_TYPEA_DEF_L1:
     case ADI_SENSE_1000_ADC_SENSOR_DIODE_3C_TYPEA_DEF_L1:
     case ADI_SENSE_1000_ADC_SENSOR_DIODE_2C_1_DEF_L2: