20221209/resurrector updates

isVM.conf

@@ -1,2 +1,33 @@
+########################################################################
+### INDI server configuration data: read by the xindiserver app
+########################################################################
 [local]
-drivers=maths_x,maths_y,timeSeriesSimulator
+
+### With [resurrector_indi], INDI [drivers] names are redundant here:
+### resurrector_indi reads config/proclist_<role>.txt to determine the
+### INDI drivers to start; after starting, each INDI driver writes its
+### named FIFO to the INDI server control FIFO ([indiserver.f] below),
+### which then triggers the INDI server to connect to that INDI driver
+
+#drivers =
+#drivers=fpga0_um_sm,fpga0_um_fg
+#drivers=maths_x,maths_y,timeSeriesSimulator
+
+
+[indiserver]
+
+########################################################################
+### Config global param [indiserver_ctrl_fifo] in [config/magaox.conf]
+### points to the INDI server control FIFO and must match the parameter
+### [indiserver.f] in this config file:
+
+f=/opt/MagAOX/drivers/fifos/indiserver.ctrl
+
+
+########################################################################
+### Other xindiserver options, passed to forked indiserver process using
+### command line options
+
+#v=,,
+#N=true
+#p=7624

magaox.conf

@@ -0,0 +1,19 @@
+########################################################################
+### Global parameters for all INDI drivers
+
+#loopPause = 1000000000
+#ignore_git = 1
+
+
+########################################################################
+### The presence of keyword [indiserver_ctrl_fifo] here directs the INDI
+### drivers to alert the host's INDI server to their presence by writing
+### [start /opt/.../{drvrname}\n] to this named INDI server control FIFO
+### N.B. that *must* match the [indiserver.f] value in is{THISROLE}.conf
+indiserver_ctrl_fifo = /opt/MagAOX/drivers/fifos/indiserver.ctrl
+
+
+########################################################################
+### Resurrector-related global configuration parameters for resurrectees
+[resurrectee]
+timeout=10

maths_x.conf

@@ -1,4 +1,4 @@
-my_val=val
-other_devName=maths_y
-other_valName=val
+myVal=val
+otherDevName=maths_y
+otherValName=val
 

maths_y.conf

@@ -1,4 +1,4 @@
-my_val=val
-other_devName=maths_x
-other_valName=val
+myVal=val
+otherDevName=maths_x
+otherValName=val
 

proclist_sandbox.txt

@@ -1,6 +1,17 @@
 # Processes for configuration to exercise magaoxMaths
 # Process-ID Executable
+# ========== ==========
 isVM xindiserver
+
+########################################################################
+### Demo setup: math apps and time series simulator
+########################################################################
 maths_x magAOXMaths
 maths_y magAOXMaths
 timeSeriesSimulator timeSeriesSimulator
+
+########################################################################
+### FPGA setup: communicate with FPGA via /dev/mem
+########################################################################
+#fpga0_um_fg CGFSMUIfpga
+#fpga0_um_sm CGFSMHIfpga