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
52a7c269
Commit
52a7c269
authored
Jul 04, 2024
by
Léo-Paul Géneau
👾
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
component/qjs-wrapper: v↑ qjs-wrapper (2.2 -> 2.3)
parent
e50a444a
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
17 additions
and
15 deletions
+17
-15
component/qjs-wrapper/buildout.cfg
component/qjs-wrapper/buildout.cfg
+1
-1
software/js-drone/buildout.hash.cfg
software/js-drone/buildout.hash.cfg
+1
-1
software/js-drone/drone-scripts/worker.js.jinja2
software/js-drone/drone-scripts/worker.js.jinja2
+12
-10
software/js-drone/software-c-astral.cfg
software/js-drone/software-c-astral.cfg
+2
-2
software/js-drone/software-sqdr.cfg
software/js-drone/software-sqdr.cfg
+1
-1
No files found.
component/qjs-wrapper/buildout.cfg
View file @
52a7c269
...
@@ -9,7 +9,7 @@ parts = qjs-wrapper
...
@@ -9,7 +9,7 @@ parts = qjs-wrapper
[qjs-wrapper-source]
[qjs-wrapper-source]
recipe = slapos.recipe.build:gitclone
recipe = slapos.recipe.build:gitclone
repository = https://lab.nexedi.com/nexedi/qjs-wrapper.git
repository = https://lab.nexedi.com/nexedi/qjs-wrapper.git
revision = v2.
2
revision = v2.
3
git-executable = ${git:location}/bin/git
git-executable = ${git:location}/bin/git
[qjs-wrapper]
[qjs-wrapper]
...
...
software/js-drone/buildout.hash.cfg
View file @
52a7c269
...
@@ -46,4 +46,4 @@ md5sum = 3bbb0f80b644d86784aab99b03e88c2f
...
@@ -46,4 +46,4 @@ md5sum = 3bbb0f80b644d86784aab99b03e88c2f
[worker]
[worker]
_update_hash_filename_ = drone-scripts/worker.js.jinja2
_update_hash_filename_ = drone-scripts/worker.js.jinja2
md5sum =
f4e21f22719347c8a22d6a82f0782eba
md5sum =
2afbc5c18a453404f6c60e874f592577
software/js-drone/drone-scripts/worker.js.jinja2
View file @
52a7c269
/*jslint nomen: true, indent: 2, maxerr: 3, maxlen: 80 */
/*jslint nomen: true, indent: 2, maxerr: 3, maxlen: 80 */
{% if isADrone -%}
{% if isADrone -%}
/*global console, execUserScript, getAltitude, getClimbRate, getInitialAltitude,
/*global console, execUserScript, getAltitude, getClimbRate, getInitialAltitude,
gpsIsOk, get
Position, getSpeed, getYaw, initPubsub, isLanding, isReadyToFly
,
gpsIsOk, get
MaxCommandFrequency, getPosition, getSpeed, getYaw, initPubsub
,
land, loiter, setMessage, setTargetCoordinates, std, takeOff
,
isLanding, isReadyToFly, land, loiter, setMessage, setTargetCoordinates, std
,
updateLogAndProjection, ArrayBuffer, Drone, Uint8Array, Worker*/
takeOff,
updateLogAndProjection, ArrayBuffer, Drone, Uint8Array, Worker*/
{% else -%}
{% else -%}
/*global console, execUserScript, initPubsub, setMessage, setTargetCoordinates,
/*global console, execUserScript, initPubsub, setMessage, setTargetCoordinates,
std, updateLogAndProjection, Drone, Worker*/
std, updateLogAndProjection, Drone, Worker*/
...
@@ -15,6 +15,7 @@ import {
...
@@ -15,6 +15,7 @@ import {
getClimbRate,
getClimbRate,
getInitialAltitude,
getInitialAltitude,
gpsIsOk,
gpsIsOk,
getMaxCommandFrequency,
getPosition,
getPosition,
getSpeed,
getSpeed,
getYaw,
getYaw,
...
@@ -48,10 +49,10 @@ import { evalScript, fdopen, loadFile, open } from "std";
...
@@ -48,10 +49,10 @@ import { evalScript, fdopen, loadFile, open } from "std";
{% if isADrone -%}
{% if isADrone -%}
(function (Drone, SIGTERM, WNOHANG, Worker, close, console, evalScript, exec,
(function (Drone, SIGTERM, WNOHANG, Worker, close, console, evalScript, exec,
fdopen, getAltitude, getInitialAltitude, gpsIsOk,
getPosition,
fdopen, getAltitude, getInitialAltitude, gpsIsOk,
get
Yaw, initPubsub, isLanding, kill, loadFile, loiter, open
,
get
MaxCommandFrequency, getPosition, getYaw, initPubsub, isLanding
,
pipe, setMessage, setReadHandler, setTargetCoordinates
,
kill, loadFile, loiter, open, pipe, setMessage, setReadHandler
,
land, updateLogAndProjection, waitpid) {
setTargetCoordinates,
land, updateLogAndProjection, waitpid) {
{% else -%}
{% else -%}
(function (Drone, SIGTERM, WNOHANG, Worker, close, console, evalScript, exec,
(function (Drone, SIGTERM, WNOHANG, Worker, close, console, evalScript, exec,
fdopen, initPubsub, kill, loadFile, open, pipe, setMessage,
fdopen, initPubsub, kill, loadFile, open, pipe, setMessage,
...
@@ -82,6 +83,7 @@ import { evalScript, fdopen, loadFile, open } from "std";
...
@@ -82,6 +83,7 @@ import { evalScript, fdopen, loadFile, open } from "std";
getCurrentPosition: getPosition,
getCurrentPosition: getPosition,
getInitialAltitude: getInitialAltitude,
getInitialAltitude: getInitialAltitude,
gpsIsOk: gpsIsOk,
gpsIsOk: gpsIsOk,
getMaxCommandFrequency: getMaxCommandFrequency,
getSpeed: getSpeed,
getSpeed: getSpeed,
getYaw: getYaw,
getYaw: getYaw,
{% endif -%}
{% endif -%}
...
@@ -324,9 +326,9 @@ import { evalScript, fdopen, loadFile, open } from "std";
...
@@ -324,9 +326,9 @@ import { evalScript, fdopen, loadFile, open } from "std";
};
};
{% if isADrone -%}
{% if isADrone -%}
}(Drone, SIGTERM, WNOHANG, Worker, close, console, evalScript, exec,
}(Drone, SIGTERM, WNOHANG, Worker, close, console, evalScript, exec,
fdopen, getAltitude, getInitialAltitude, gpsIsOk, get
Position, getYaw
,
fdopen, getAltitude, getInitialAltitude, gpsIsOk, get
MaxCommandFrequency
,
initPubsub, isLanding, kill, loadFile, loiter, open, pipe, setMessage
,
getPosition, getYaw, initPubsub, isLanding, kill, loadFile, loiter, open
,
setReadHandler, setTargetCoordinates, land,
pipe, setMessage,
setReadHandler, setTargetCoordinates, land,
updateLogAndProjection, waitpid));
updateLogAndProjection, waitpid));
{% else -%}
{% else -%}
}(Drone, SIGTERM, WNOHANG, Worker, close, console, evalScript, exec,
}(Drone, SIGTERM, WNOHANG, Worker, close, console, evalScript, exec,
...
...
software/js-drone/software-c-astral.cfg
View file @
52a7c269
...
@@ -17,8 +17,8 @@ pre-configure +=
...
@@ -17,8 +17,8 @@ pre-configure +=
[c-astral-wrapper]
[c-astral-wrapper]
recipe = slapos.recipe.cmmi
recipe = slapos.recipe.cmmi
configure-command = true
configure-command = true
url = https://lab.nexedi.com/nexedi/c-astral-wrapper/-/archive/v2.
2/c-astral-wrapper-v2.2
.tar.gz
url = https://lab.nexedi.com/nexedi/c-astral-wrapper/-/archive/v2.
3/c-astral-wrapper-v2.3
.tar.gz
md5sum =
08cb41102f87475af0b6ec19e0c2965b
md5sum =
c08dafb84d7cffecb1faf5450d5cc650
environment =
environment =
CPLUS_INCLUDE_PATH=${qjs-wrapper-source:location}/include:${mavsdk:location}/include:${mavsdk:location}/include/mavsdk
CPLUS_INCLUDE_PATH=${qjs-wrapper-source:location}/include:${mavsdk:location}/include:${mavsdk:location}/include/mavsdk
LDFLAGS=-L${mavsdk:location}/lib -Wl,-rpath=${mavsdk:location}/lib
LDFLAGS=-L${mavsdk:location}/lib -Wl,-rpath=${mavsdk:location}/lib
...
...
software/js-drone/software-sqdr.cfg
View file @
52a7c269
...
@@ -5,7 +5,7 @@ extends =
...
@@ -5,7 +5,7 @@ extends =
[sqdr-source]
[sqdr-source]
recipe = slapos.recipe.build:gitclone
recipe = slapos.recipe.build:gitclone
repository = https://lab.nexedi.com/slaposdrone/squadrone.git
repository = https://lab.nexedi.com/slaposdrone/squadrone.git
revision = v2.
2
revision = v2.
3
git-executable = ${git:location}/bin/git
git-executable = ${git:location}/bin/git
[sqdr-wrapper]
[sqdr-wrapper]
...
...
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