Config change; quick dac display

Author: klauer

cli/ppmac_plugin.py

@@ -86,7 +86,7 @@ class PpmacCore(Configurable):
     instance = None
 
     ide_host = traitlets.Unicode('10.0.0.6', config=True)
-    host = traitlets.Unicode('10.0.0.98', config=True)
+    host = traitlets.Unicode('10.3.2.115', config=True)
     port = traitlets.Int(22, config=True)
     user = traitlets.Unicode('root', config=True)
     password = traitlets.Unicode('deltatau', config=True)
@@ -203,6 +203,8 @@ def connect(self, host=None, port=None, user=None, password=None):
             self.completer = None
             self.open_completer_db()
 
+        self.shell.user_ns['conn'] = self.comm.gpascii
+
     def check_comm(self):
         if self.comm is None:
             if self.auto_connect:
@@ -1530,6 +1532,24 @@ def clock(self, magic_self, arg):
         if not args.accept:
             print('--- dry run ---')
 
+    @magic_arguments()
+    @argument('device', type=str,
+              help='')
+    @argument('channels', type=int,
+              help='')
+    @argument('dacs', type=int,
+              help='')
+    def dac(self, magic_self, arg):
+        args = parse_argstring(self.dac, arg)
+
+        if not args or not self.check_comm():
+            return
+
+        for chan in range(args.channels):
+            for dac in range(args.dacs):
+                dac_chan = '%s.Chan[%d].Dac[%d]' % (args.device, chan, dac)
+                self.get_verbose(dac_chan)
+
 
 @PpmacExport
 def create_util_makefile(source_files, output_name):

misc/pos

@@ -1,4 +1,4 @@
-python position_gui.py 1 6 -f %.4f -r 0.05 -t &
+python position_gui.py 3 5 -f %.4f -r 0.05 -t &
 PID1=$!
 
 python position_gui.py 11 12 -f %.4f -r 0.05 -t &

misc/position_gui.py

@@ -22,7 +22,7 @@
 sys.path.insert(0, os.path.join(MODULE_PATH, '..'))
 from ppmac import pp_comm
 
-PPMAC_HOST = os.environ.get('PPMAC_HOST', '10.0.0.98')
+PPMAC_HOST = os.environ.get('PPMAC_HOST', '10.3.2.115')
 PPMAC_PORT = int(os.environ.get('PPMAC_PORT', '22'))
 PPMAC_USER = os.environ.get('PPMAC_USER', 'root')
 PPMAC_PASS = os.environ.get('PPMAC_PASS', 'deltatau')