Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
slapos
Commits
857a68af
Commit
857a68af
authored
Jul 26, 2024
by
Léo-Paul Géneau
👾
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
software/js-drone: add instance parameter for subscriber script
parent
4d81077b
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
3 deletions
+12
-3
software/js-drone/README.md
software/js-drone/README.md
+2
-0
software/js-drone/buildout.hash.cfg
software/js-drone/buildout.hash.cfg
+2
-2
software/js-drone/instance-input-schema.json
software/js-drone/instance-input-schema.json
+6
-0
software/js-drone/instance-root.cfg.jinja2
software/js-drone/instance-root.cfg.jinja2
+1
-1
software/js-drone/instance.cfg.in
software/js-drone/instance.cfg.in
+1
-0
No files found.
software/js-drone/README.md
View file @
857a68af
...
@@ -12,6 +12,7 @@
...
@@ -12,6 +12,7 @@
*
autopilotType: Select which autopilot wrapper should be used
*
autopilotType: Select which autopilot wrapper should be used
*
autopilotIp: IPv4 address to identify the autopilot from the companion board
*
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
*
droneGuidList: List of computer id on which flight script must be deployed
*
droneNetIf: Drone network interface used for multicast traffic
*
droneNetIf: Drone network interface used for multicast traffic
*
debug: Must be set to 'true' to send drone logs through OPC-UA
*
debug: Must be set to 'true' to send drone logs through OPC-UA
...
@@ -19,6 +20,7 @@
...
@@ -19,6 +20,7 @@
*
operatorScript: URL of operator's script to prepare the flight
*
operatorScript: URL of operator's script to prepare the flight
*
mapJson: URL of terrain's map used by the operator script
*
mapJson: URL of terrain's map used by the operator script
*
flightScript: URL of user's script to execute to fly drone swarm
*
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
*
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
*
subscriberGuidList: List of computer id on which a GUI must be deployed
*
subscriberNetIf: Subscriber network interface used for multicast traffic
*
subscriberNetIf: Subscriber network interface used for multicast traffic
...
...
software/js-drone/buildout.hash.cfg
View file @
857a68af
...
@@ -22,11 +22,11 @@ md5sum = 01425a1c77e79788e1948398b9136724
...
@@ -22,11 +22,11 @@ md5sum = 01425a1c77e79788e1948398b9136724
[instance-profile]
[instance-profile]
filename = instance.cfg.in
filename = instance.cfg.in
md5sum =
44d78f9ee8bb4475d521bce8694cc963
md5sum =
13a389530d919937901f6c4b12cfbc19
[instance-root]
[instance-root]
filename = instance-root.cfg.jinja2
filename = instance-root.cfg.jinja2
md5sum =
2bec05e86d88d27c3c672a6be9a0d0b
4
md5sum =
a217eddf949e6e838129e61cc2a48d3
4
[instance-subscriber]
[instance-subscriber]
filename = instance-subscriber.cfg.in
filename = instance-subscriber.cfg.in
...
...
software/js-drone/instance-input-schema.json
View file @
857a68af
...
@@ -68,6 +68,12 @@
...
@@ -68,6 +68,12 @@
"type"
:
"string"
,
"type"
:
"string"
,
"default"
:
"https://lab.nexedi.com/nexedi/flight-scripts/-/raw/operator_script/default.js"
"default"
:
"https://lab.nexedi.com/nexedi/flight-scripts/-/raw/operator_script/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"
:
{
"loopPeriod"
:
{
"title"
:
"Loop execution period"
,
"title"
:
"Loop execution period"
,
"description"
:
"Minimal period between 2 executions of flight script loop"
,
"description"
:
"Minimal period between 2 executions of flight script loop"
,
...
...
software/js-drone/instance-root.cfg.jinja2
View file @
857a68af
...
@@ -37,7 +37,7 @@ config-netIf = {{ parameter_dict['droneNetIf'] }}
...
@@ -37,7 +37,7 @@ config-netIf = {{ parameter_dict['droneNetIf'] }}
config-isADrone = {{ dumps(False) }}
config-isADrone = {{ dumps(False) }}
config-operatorScript = {{ parameter_dict['operatorScript'] }}
config-operatorScript = {{ parameter_dict['operatorScript'] }}
config-mapJson = {{ parameter_dict['mapJson'] }}
config-mapJson = {{ parameter_dict['mapJson'] }}
config-flightScript =
https://lab.nexedi.com/nexedi/flight-scripts/-/raw/operator_script/subscribe.js
config-flightScript =
{{ parameter_dict['subscriptionScript'] }}
config-netIf = {{ parameter_dict['subscriberNetIf'] }}
config-netIf = {{ parameter_dict['subscriberNetIf'] }}
{% endif -%}
{% endif -%}
config-multicastIp = {{ parameter_dict['multicastIp'] }}
config-multicastIp = {{ parameter_dict['multicastIp'] }}
...
...
software/js-drone/instance.cfg.in
View file @
857a68af
...
@@ -40,6 +40,7 @@ default-parameters =
...
@@ -40,6 +40,7 @@ default-parameters =
"operatorScript": "https://lab.nexedi.com/nexedi/flight-scripts/-/raw/operator_script/operator.js",
"operatorScript": "https://lab.nexedi.com/nexedi/flight-scripts/-/raw/operator_script/operator.js",
"mapJson": "https://lab.nexedi.com/nexedi/flight-scripts/-/raw/operator_script/map.json",
"mapJson": "https://lab.nexedi.com/nexedi/flight-scripts/-/raw/operator_script/map.json",
"flightScript": "https://lab.nexedi.com/nexedi/flight-scripts/-/raw/operator_script/default.js",
"flightScript": "https://lab.nexedi.com/nexedi/flight-scripts/-/raw/operator_script/default.js",
"subscriptionScript": "https://lab.nexedi.com/nexedi/flight-scripts/-/raw/operator_script/subscribe.js",
"loopPeriod": 200,
"loopPeriod": 200,
"multicastIp": "ff15::1111",
"multicastIp": "ff15::1111",
"subscriberGuidList":[],
"subscriberGuidList":[],
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment