software/js-drone: add instance parameter for subscriber script

software/js-drone/README.md

@@ -12,6 +12,7 @@
 
 * autopilotType: Select which autopilot wrapper should be used
 * autopilotIp: IPv4 address to identify the autopilot from the companion board
+* autopilotPort: Port on whichautopilot serviceis running
 * droneGuidList: List of computer id on which flight script must be deployed
 * droneNetIf: Drone network interface used for multicast traffic
 * debug: Must be set to 'true' to send drone logs through OPC-UA
@@ -19,6 +20,7 @@
 * operatorScript: URL of operator's script to prepare the flight
 * mapJson: URL of terrain's map used by the operator script
 * flightScript: URL of user's script to execute to fly drone swarm
+* subscriptionScript: URL of the script which will be executed by subscribers
 * loopPeriod: Minimal period (in milliseconds) between 2 executions of the flight script loop
 * subscriberGuidList: List of computer id on which a GUI must be deployed
 * subscriberNetIf: Subscriber network interface used for multicast traffic

software/js-drone/buildout.hash.cfg

@@ -22,11 +22,11 @@ md5sum = 01425a1c77e79788e1948398b9136724
 
 [instance-profile]
 filename = instance.cfg.in
-md5sum = b4450e238c1172a669c8de59c8df58a0
+md5sum = 3c00f072f6cc51007866bd0ae4435053
 
 [instance-root]
 filename = instance-root.cfg.jinja2
-md5sum = e3710afce90314cad4165098c59f2cae
+md5sum = a217eddf949e6e838129e61cc2a48d34
 
 [instance-subscriber]
 filename = instance-subscriber.cfg.in

software/js-drone/instance-input-schema.json

@@ -68,6 +68,12 @@
       "type": "string",
       "default": "https://lab.nexedi.com/nexedi/flight-scripts/-/raw/v2.3/default.js"
     },
+    "subscriptionScript": {
+      "title": "Script's URL for subscribers",
+      "description": "URL of the script which will be executed by subscribers.",
+      "type": "string",
+      "default": "https://lab.nexedi.com/nexedi/flight-scripts/-/raw/operator_script/subscribe.js"
+    },
     "loopPeriod": {
       "title": "Loop execution period",
       "description": "Minimal period between 2 executions of flight script loop",

software/js-drone/instance-root.cfg.jinja2

@@ -37,7 +37,7 @@ config-netIf = {{ parameter_dict['droneNetIf'] }}
 config-isADrone = {{ dumps(False) }}
 config-operatorScript = {{ parameter_dict['operatorScript'] }}
 config-mapJson = {{ parameter_dict['mapJson'] }}
-config-flightScript = https://lab.nexedi.com/nexedi/flight-scripts/-/raw/v2.3/subscribe.js
+config-flightScript = {{ parameter_dict['subscriptionScript'] }}
 config-netIf = {{ parameter_dict['subscriberNetIf'] }}
 {% endif -%}
 config-multicastIp = {{ parameter_dict['multicastIp'] }}

software/js-drone/instance.cfg.in

@@ -39,6 +39,7 @@ default-parameters =
     "operatorScript": "https://lab.nexedi.com/nexedi/flight-scripts/-/raw/v2.3/operator.js",
     "mapJson": "https://lab.nexedi.com/nexedi/flight-scripts/-/raw/v2.3/map.json",
     "flightScript": "https://lab.nexedi.com/nexedi/flight-scripts/-/raw/v2.3/default.js",
+    "subscriptionScript": "https://lab.nexedi.com/nexedi/flight-scripts/-/raw/v2.3/subscribe.js",
     "loopPeriod": 200,
     "multicastIp": "ff15::1111",
     "subscriberGuidList":[],