[Updated] Add 9430 to NHR project

Control_Interface/controlInterface.py

@@ -6,7 +6,7 @@ from UtilitiesRei.IPFinder import IPFinder
 class controlInterface:
     
     def __init__(self):
-        self.__listIp = ['192.168.0.150']
+        self.__listIp = ['192.168.0.150', '192.168.0.151']
         self.__listUsedIp = []
         self.__nhr9410 = []
         self.__nhr9430 = []

NHR9400series/NHR9400.py

@@ -548,11 +548,10 @@ class NHR9400():
 
         #Fetch the average current of all channels
     def getCurrent(self):
-        self.__s.send("FECT:CURR?\n".encode())
+        self.__s.send("CURR?\n".encode())
         value = self.__s.recv(1024)
-        print(value.decode())
-        print(value)
         return self.receiveFloat(value)
+
     #fetch individual value of current of one channel
     def getCurrentA(self):
         self.__s.send("FETC:CURR:APHase?\n".encode())

NHR9400series/NHR9430.py

@@ -65,6 +65,11 @@ class NHR9430(NHR9400):
         value = self.__s.recv(1024)
         return self.receiveArray(value)
 
+    def getCurrent(self):
+        self.__s.send("CURR?\n".encode())
+        value = self.__s.recv(1024)
+        return self.receiveFloat(value)
+
 ###################### Instrument Capabilities #################
 
 #Query returns the minimum and maximum allowable set value for crest factor in NORMal loading mode Refer to CONFigure:LOAD:MODE for information about setting the 9430 in NORmal loading mode.

main.py

@@ -38,7 +38,7 @@ interface.newNhr("9430")
 
 NHRs = {  
      "9410" : interface.getNhr9410()[0],
-    #  "9430" : interface.getNhr9430()[0], 
+     "9430" : interface.getNhr9430()[0], 
 }
 
 def on_connect(client, userdata, flags, rc):
@@ -134,14 +134,14 @@ def connect_mqtt():
 
 def publish(client):
     while not FLAG_EXIT:
-        for nhr_id, nhr_instance in NHRs.items():
-            voltage = nhr_instance.getVoltage() 
-            freq = nhr_instance.getFreq() 
-            data = [
+        voltage = NHRs["9410"].getVoltage() 
+        freq = NHRs["9410"].getFreq() 
+        curr = NHRs["9430"].getCurrent()
+        data = [
                 {
                     "measurement": "mqtt_consumer",
                     "tags": {
-                        "nhr": nhr_id,
+                        "nhr": "9410",
                         "method": "Voltage"
                     },
                     "time": datetime.datetime.utcnow().isoformat(),
@@ -152,17 +152,28 @@ def publish(client):
                 {
                     "measurement": "mqtt_consumer",
                     "tags": {
-                        "nhr": nhr_id,
+                        "nhr": "9410",
                         "method": "Freq"
                     },
                     "time": datetime.datetime.utcnow().isoformat(),
                     "fields": {
                         "value": str(freq)
                     }
+                },
+                {
+                    "measurement": "mqtt_consumer",
+                    "tags": {
+                        "nhr": "9430",
+                        "method": "Curr"
+                    },
+                    "time": datetime.datetime.utcnow().isoformat(),
+                    "fields": {
+                        "value": str(curr)
+                    }
                 }
-            ]
-            client_influxdb.write_points(data)
-        time.sleep(1) 
+        ]
+        client_influxdb.write_points(data)
+    time.sleep(1)