Explorar o código

fixed the leds and added frame rate calculation function

Meghana %!s(int64=3) %!d(string=hai) anos
pai
achega
e2057a217a
Modificáronse 2 ficheiros con 22 adicións e 7 borrados
  1. 15 7
      GUI.py
  2. 7 0
      kalypso_registers.json

+ 15 - 7
GUI.py

@@ -1386,9 +1386,10 @@ class Ui_MainWindow(object):
                 self.led11.value=False
                 self.led12.value=False
             else:
-                if (status_led[4] != '0'):
+                # True = red = error
+                if (status_led[4] != '1'):
                     self.led1.value=True
-                if (status_led[5] != '0'):
+                if (status_led[5] != '1'):
                     self.led2.value=True
                 if (status_led[17] != '0'):
                     self.led3.value=True
@@ -1396,15 +1397,15 @@ class Ui_MainWindow(object):
                     self.led4.value=True
                 if (status_led[19] != '0'):
                     self.led5.value=True
-                if (status_led[20] != '0'):
+                if (status_led[20] != '1'):
                     self.led6.value=True
-                if (status_led[21] != '0'):
+                if (status_led[21] != '1'):
                     self.led7.value=True
-                if (status_led[22] != '0'):
+                if (status_led[22] != '1'):
                     self.led8.value=True
-                if (status_led[23] != '0'):
+                if (status_led[23] != '1'):
                     self.led9.value=True
-                if (status_led[25] != '0'):
+                if (status_led[25] != '1'):
                     self.led10.value=True
                 if (status_led[26] != '0'):
                     self.led11.value=True
@@ -1412,6 +1413,13 @@ class Ui_MainWindow(object):
                     self.led12.value=True
             return
 
+        def framerate_calc():
+            acq_time = read_register("FRAME_RATE", hex = False)
+            acq_time = acq_time*200/1000000000
+            total_samples = read_register("FT_TO_ACQ", hex = False)
+            framerate = float(total_samples / acq_time)
+
+        return framerate
 
 
         with open('kalypso_registers.json') as registers_file:

+ 7 - 0
kalypso_registers.json

@@ -63,6 +63,13 @@
     "notes": ""
   },
 
+  "FRAME_RATE" : {
+      "name" : "Time for total Acquisition",
+      "address": "0x90C0",
+      "mask" : "0xFFFFFFFF",
+      "notes": "total orbits / (Value in hex * 220 ns) = Actual Frame rate "
+    },
+
   "VERSION_REG" : {
     "name" : "Firmware version",
     "address" : "0x9030",