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
f46e05ce
Commit
f46e05ce
authored
Aug 29, 2023
by
Léo-Paul Géneau
👾
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
component/qjs-wrapper: rename setAirspeed into setAirSpeed
parent
02c050d6
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
14 additions
and
13 deletions
+14
-13
component/mavsdk/buildout.cfg
component/mavsdk/buildout.cfg
+1
-1
component/qjs-wrapper/autopilot_wrapper.h
component/qjs-wrapper/autopilot_wrapper.h
+1
-1
component/qjs-wrapper/buildout.cfg
component/qjs-wrapper/buildout.cfg
+1
-1
component/qjs-wrapper/buildout.hash.cfg
component/qjs-wrapper/buildout.hash.cfg
+1
-1
software/js-drone/buildout.hash.cfg
software/js-drone/buildout.hash.cfg
+1
-1
software/js-drone/drone-scripts/worker.js.jinja
software/js-drone/drone-scripts/worker.js.jinja
+9
-8
No files found.
component/mavsdk/buildout.cfg
View file @
f46e05ce
...
@@ -83,7 +83,7 @@ CMAKE_CFLAGS=-I${tinyxml2:location}/include
...
@@ -83,7 +83,7 @@ CMAKE_CFLAGS=-I${tinyxml2:location}/include
recipe = slapos.recipe.cmmi
recipe = slapos.recipe.cmmi
configure-command = true
configure-command = true
url = https://lab.nexedi.com/nexedi/mavsdk-wrapper/-/archive/update_set_target_coordinates/mavsdk-wrapper-update_set_target_coordinates.tar.gz
url = https://lab.nexedi.com/nexedi/mavsdk-wrapper/-/archive/update_set_target_coordinates/mavsdk-wrapper-update_set_target_coordinates.tar.gz
md5sum =
aced1bbc97c1ead062c0ce508b7b9a4d
md5sum =
e049c40019aca46513e06630ce947ac9
environment =
environment =
CPLUS_INCLUDE_PATH=${autopilot-wrapper-header:location}:${mavsdk:location}/include:${mavsdk:location}/include/mavsdk
CPLUS_INCLUDE_PATH=${autopilot-wrapper-header:location}:${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
component/qjs-wrapper/autopilot_wrapper.h
View file @
f46e05ce
...
@@ -36,7 +36,7 @@ DLL_PUBLIC int triggerParachute(void);
...
@@ -36,7 +36,7 @@ DLL_PUBLIC int triggerParachute(void);
// Flight management functions
// Flight management functions
DLL_PUBLIC
int
loiter
(
double
la
,
double
lo
,
float
a
,
float
radius
);
DLL_PUBLIC
int
loiter
(
double
la
,
double
lo
,
float
a
,
float
radius
);
DLL_PUBLIC
int
setAir
s
peed
(
float
airspeed
);
DLL_PUBLIC
int
setAir
S
peed
(
float
airspeed
);
DLL_PUBLIC
int
setTargetCoordinates
(
double
la
,
double
lo
,
float
a
);
DLL_PUBLIC
int
setTargetCoordinates
(
double
la
,
double
lo
,
float
a
);
// Information functions
// Information functions
...
...
component/qjs-wrapper/buildout.cfg
View file @
f46e05ce
...
@@ -10,7 +10,7 @@ parts = qjs-wrapper
...
@@ -10,7 +10,7 @@ parts = qjs-wrapper
recipe = slapos.recipe.cmmi
recipe = slapos.recipe.cmmi
configure-command = true
configure-command = true
url = https://lab.nexedi.com/nexedi/qjs-wrapper/-/archive/update_settarget/qjs-wrapper-update_settarget.tar.gz
url = https://lab.nexedi.com/nexedi/qjs-wrapper/-/archive/update_settarget/qjs-wrapper-update_settarget.tar.gz
md5sum =
4e4814806c7e893cb9c176dc9f430b5b
md5sum =
1487b2f30b99e5c2870d0fa955b2bb23
environment =
environment =
C_INCLUDE_PATH=include:${open62541:location}/include:${open62541:location}/deps:${open62541:location}/src/pubsub:${quickjs:location}/include:${autopilot-wrapper-header:location}
C_INCLUDE_PATH=include:${open62541:location}/include:${open62541:location}/deps:${open62541:location}/src/pubsub:${quickjs:location}/include:${autopilot-wrapper-header:location}
LDFLAGS=-L${open62541:location}/lib -Wl,-rpath=${open62541:location}/lib -L${mavsdk-wrapper:location}/lib -Wl,-rpath=${mavsdk-wrapper:location}/lib
LDFLAGS=-L${open62541:location}/lib -Wl,-rpath=${open62541:location}/lib -L${mavsdk-wrapper:location}/lib -Wl,-rpath=${mavsdk-wrapper:location}/lib
component/qjs-wrapper/buildout.hash.cfg
View file @
f46e05ce
...
@@ -14,4 +14,4 @@
...
@@ -14,4 +14,4 @@
# not need these here).
# not need these here).
[autopilot-wrapper-header]
[autopilot-wrapper-header]
filename = autopilot_wrapper.h
filename = autopilot_wrapper.h
md5sum =
037878cef0233a5769c890651561df4d
md5sum =
16347f35ac6803e1f225bd98c5b92f2c
software/js-drone/buildout.hash.cfg
View file @
f46e05ce
...
@@ -42,4 +42,4 @@ md5sum = 0d51149929f3cbcaac966b815bb1fb0b
...
@@ -42,4 +42,4 @@ md5sum = 0d51149929f3cbcaac966b815bb1fb0b
[worker]
[worker]
_update_hash_filename_ = drone-scripts/worker.js.jinja
_update_hash_filename_ = drone-scripts/worker.js.jinja
md5sum =
29dd9fa7326dee0cce06adb76c7c59c2
md5sum =
4af40990337396ad41decb6f143ca443
software/js-drone/drone-scripts/worker.js.jinja
View file @
f46e05ce
/*jslint nomen: true, indent: 2, maxerr: 3, maxlen: 80 */
/*jslint nomen: true, indent: 2, maxerr: 3, maxlen: 80 */
/*global console, getAltitude, getAltitudeRel, getInitialAltitude, getLatitude,
/*global console, getAltitude, getAltitudeRel, getInitialAltitude, getLatitude,
getLongitude, getYaw, execUserScript, initPubsub, loiter, setAir
s
peed,
getLongitude, getYaw, execUserScript, initPubsub, loiter, setAir
S
peed,
setMessage, setTargetCoordinates, std, triggerParachute,
setMessage, setTargetCoordinates, std, triggerParachute,
updateLogAndProjection Drone, Worker*/
updateLogAndProjection
,
Drone, Worker*/
import {
import {
Drone,
Drone,
triggerParachute,
triggerParachute,
...
@@ -17,7 +17,7 @@ import {
...
@@ -17,7 +17,7 @@ import {
getYaw,
getYaw,
initPubsub,
initPubsub,
loiter,
loiter,
setAir
s
peed,
setAir
S
peed,
setMessage,
setMessage,
setTargetCoordinates,
setTargetCoordinates,
updateLogAndProjection
updateLogAndProjection
...
@@ -38,8 +38,9 @@ import { evalScript, fdopen, loadFile, open } from "std";
...
@@ -38,8 +38,9 @@ import { evalScript, fdopen, loadFile, open } from "std";
(function (Drone, SIGTERM, WNOHANG, Worker, close, console, evalScript, exec,
(function (Drone, SIGTERM, WNOHANG, Worker, close, console, evalScript, exec,
fdopen, getAltitude, getAltitudeRel, getInitialAltitude,
fdopen, getAltitude, getAltitudeRel, getInitialAltitude,
getLatitude, getLongitude, getLog, getYaw, initPubsub, kill,
getLatitude, getLongitude, getLog, getYaw, initPubsub, kill,
loadFile, loiter, open, pipe, setAirspeed, setMessage,
loadFile, loiter, open, pipe, setAirSpeed, setMessage,
setReadHandler, setTargetCoordinates, triggerParachute, waitpid) {
setReadHandler, setTargetCoordinates, triggerParachute,
updateLogAndProjection, waitpid) {
// Every script is evaluated per drone
// Every script is evaluated per drone
"use strict";
"use strict";
...
@@ -82,7 +83,7 @@ import { evalScript, fdopen, loadFile, open } from "std";
...
@@ -82,7 +83,7 @@ import { evalScript, fdopen, loadFile, open } from "std";
dest_id: id
dest_id: id
}));
}));
},
},
setAir
speed: setAirs
peed,
setAir
Speed: setAirS
peed,
setTargetCoordinates: setTargetCoordinates
setTargetCoordinates: setTargetCoordinates
};
};
conf_file.close();
conf_file.close();
...
@@ -281,5 +282,5 @@ import { evalScript, fdopen, loadFile, open } from "std";
...
@@ -281,5 +282,5 @@ import { evalScript, fdopen, loadFile, open } from "std";
}(Drone, SIGTERM, WNOHANG, Worker, close, console, evalScript, exec,
}(Drone, SIGTERM, WNOHANG, Worker, close, console, evalScript, exec,
fdopen, getAltitude, getAltitudeRel, getInitialAltitude,
fdopen, getAltitude, getAltitudeRel, getInitialAltitude,
getLatitude, getLongitude, getLog, getYaw, initPubsub, kill, loadFile,
getLatitude, getLongitude, getLog, getYaw, initPubsub, kill, loadFile,
loiter, open, pipe, setAir
s
peed, setMessage, setReadHandler,
loiter, open, pipe, setAir
S
peed, setMessage, setReadHandler,
setTargetCoordinates, triggerParachute, waitpid));
setTargetCoordinates, triggerParachute,
updateLogAndProjection,
waitpid));
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