Skip to content

Commit ad15a14

Browse files
paulosousadiaspaulosousadias
committed
Merge branch 'feature/rov_console' into develop
# Conflicts: # vehicles-defs/04-squirtle.nvcl
2 parents b10175b + 0560376 commit ad15a14

26 files changed

Lines changed: 4154 additions & 487 deletions

‎build.gradle‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -273,12 +273,6 @@ allprojects {
273273
includeGroup "edu.ucar"
274274
}
275275
}
276-
// maven {
277-
// url 'https://maven.jzy3d.org/releases/'
278-
// content {
279-
// includeGroup "org.jzy3d"
280-
// }
281-
// }
282276
}
283277

284278
apply plugin: 'java'
@@ -451,8 +445,9 @@ project(':core') {
451445
implementation 'com.jgoodies:jgoodies-looks:2.5.3' //2.7.0
452446
implementation 'com.jhlabs:filters:2.0.235-1' // don't know the orig version
453447

454-
//implementation 'net.java.jinput:jinput:2.0.9' // was not this and should be before 2.0.4
455-
implementation name: 'jinput'
448+
/* Compatible Native Libs https://repo1.maven.org/maven2/net/java/jinput/jinput/2.0.9/jinput-2.0.9-natives-all.jar
449+
* Make sure the natives libs in libJNI are from the same version */
450+
implementation 'net.java.jinput:jinput:2.0.9'
456451

457452
implementation 'net.sourceforge.jmatio:jmatio:1.0'
458453
implementation 'javax.media:jmf:2.1.1e'

‎conf/consoles/bluerov.ncon‎

Lines changed: 285 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,285 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<console name="ROV Operation Console" width="1382" height="744" resizable="true" mission-file="../../missions/APDL/missao-apdl.nmisz" main-vehicle="squirtle">
3+
<!-- Data saved on 2020-12-15T23:01:44.0Z with Neptus version 2020.10.1-SNAPSHOT (compiled on 2020-12-15, gneptus-2020.01.1-407-gdda91ae-dirty). -->
4+
<mainpanel name="console main panel">
5+
<subpanel class="pt.lsts.neptus.console.plugins.containers.MigLayoutContainer" x="0" y="0" width="1380" height="667">
6+
<properties>
7+
<entry key="XML Definitions">&lt;profiles&gt;
8+
&lt;profile name="Pilot - MAP"&gt;
9+
&lt;container param="w 100%, h 100%" layoutparam="ins 0"&gt;
10+
&lt;child name="Map Panel" param="w 100%, h 100%"/&gt;
11+
&lt;/container&gt;
12+
&lt;container param="w 100px!, h 100%" layoutparam="ins 0"&gt;
13+
&lt;child name="Uav Altitude Panel" param="w 100%, h 100%"/&gt;
14+
&lt;/container&gt;
15+
&lt;container layoutparam="ins 3" param="w 250px!, h 100%"&gt;
16+
&lt;container layoutparam="ins 0, filly" param="w 100%, h 100%"&gt;
17+
&lt;child name="Uav HUD Panel" param="w 100%, h 200px!, wrap"/&gt;
18+
&lt;child name="Speed Indicator Panel" param="w 100%, h 100px!, wrap"/&gt;
19+
&lt;container layoutparam="ins 0" param="w 100%, h 55px!, wrap"&gt;
20+
&lt;child name="Plan Control" param="w 50%, h 100%"/&gt;
21+
&lt;child name="Abort Button" param="w 20%, h 50px!, wrap"/&gt;
22+
&lt;/container&gt;
23+
&lt;child name="Plan Control State" param="w 100%, h 85px!, wrap"/&gt;
24+
&lt;child name="Mission Tree" param="w 100%, h 100%, wrap"/&gt;
25+
&lt;child name="Autopilot Mode Indicator" param="w 100%, h 50px!, wrap"/&gt;
26+
&lt;child name="Pre-flight Actions" param="w 100%, h 50px!"/&gt;
27+
&lt;/container&gt;
28+
&lt;/container&gt;
29+
&lt;/profile&gt;
30+
&lt;profile name="Pilot - ROV"&gt;
31+
&lt;container param="w 100%, h 100%" layoutparam="ins 0"&gt;
32+
&lt;child name="Map Panel" param="w 100%, h 100%"/&gt;
33+
&lt;/container&gt;
34+
&lt;container param="w 80px!, h 100%" layoutparam="ins 0"&gt;
35+
&lt;child name="Uav Altitude Panel" param="w 100%, h 100%"/&gt;
36+
&lt;/container&gt;
37+
&lt;container layoutparam="ins 3" param="w 400px!, h 100%"&gt;
38+
&lt;container layoutparam="ins 0, filly" param="w 100%, h 100%"&gt;
39+
&lt;child name="Uav HUD Panel" param="w 100%, h 200px!, wrap"/&gt;
40+
&lt;child name="Speed Indicator Panel" param="w 100%, h 100px!, wrap"/&gt;
41+
&lt;container layoutparam="ins 0" param="w 100%, h 55px!, wrap"&gt;
42+
&lt;child name="Plan Control" param="w 35%, h 100%"/&gt;
43+
&lt;child name="Abort Button" param="w 15%, h 50px!, wrap"/&gt;
44+
&lt;/container&gt;
45+
&lt;container param="w 100%, h 100%" layoutparam="ins 0"&gt;
46+
&lt;child name="Mission Tree" param="w 100%, h 40%, wrap"/&gt;
47+
&lt;child name="Video Stream" param="w 100%, h 100%, wrap"/&gt;
48+
&lt;/container&gt;
49+
&lt;/container&gt;
50+
&lt;/container&gt;
51+
&lt;/profile&gt;
52+
&lt;profile name="Pilot - ROV 2"&gt;
53+
&lt;container param="w 100%, h 100%" layoutparam="ins 0"&gt;
54+
&lt;child name="Map Panel" param="w 100%, h 100%"/&gt;
55+
&lt;/container&gt;
56+
&lt;container param="w 100px!, h 100%" layoutparam="ins 0"&gt;
57+
&lt;child name="Uav Altitude Panel" param="w 100%, h 100%"/&gt;
58+
&lt;/container&gt;
59+
&lt;container layoutparam="ins 3" param="w 250px!, h 100%"&gt;
60+
&lt;container layoutparam="ins 0, filly" param="w 100%, h 100%"&gt;
61+
&lt;child name="Speed Indicator Panel" param="w 100%, h 100px!, wrap"/&gt;
62+
&lt;container layoutparam="ins 0" param="w 100%, h 55px!, wrap"&gt;
63+
&lt;child name="Plan Control" param="w 50%, h 100%"/&gt;
64+
&lt;child name="Abort Button" param="w 20%, h 50px!, wrap"/&gt;
65+
&lt;/container&gt;
66+
&lt;child name="Plan Control State" param="w 100%, h 85px!, wrap"/&gt;
67+
&lt;child name="Mission Tree" param="w 100%, h 100%, wrap"/&gt;
68+
&lt;child name="Autopilot Mode Indicator" param="w 100%, h 50px!, wrap"/&gt;
69+
&lt;child name="Pre-flight Actions" param="w 100%, h 50px!"/&gt;
70+
&lt;/container&gt;
71+
&lt;/container&gt;
72+
&lt;window name="ROV Stream"&gt;
73+
&lt;container layoutparam="ins 0" param="w 100%, h 100%"&gt;
74+
&lt;child name="Video Stream" param="w 70%, h 100%"/&gt;
75+
&lt;container layoutparam="ins 0" param="w 30%, h 100%"&gt;
76+
&lt;child name="Controllers Panel" param="w 100%, h 70%,wrap"/&gt;
77+
&lt;child name="Uav HUD Panel" param="w 100%, h 200px!, wrap"/&gt;
78+
&lt;/container&gt;
79+
&lt;/container&gt;
80+
&lt;/window&gt;
81+
&lt;/profile&gt;
82+
&lt;profile name="Video Stream"&gt;
83+
&lt;container param="w 100%, h 100%" layoutparam="ins 0"&gt;
84+
&lt;child name="Video Stream" param="w 100%, h 100%"/&gt;
85+
&lt;/container&gt;
86+
&lt;container param="w 100px!, h 100%" layoutparam="ins 0"&gt;
87+
&lt;child name="Uav Altitude Panel" param="w 100%, h 100%"/&gt;
88+
&lt;/container&gt;
89+
&lt;container layoutparam="ins 3" param="w 250px!, h 100%"&gt;
90+
&lt;container layoutparam="ins 0, filly" param="w 100%, h 100%"&gt;
91+
&lt;child name="Uav HUD Panel" param="w 100%, h 200px!, wrap"/&gt;
92+
&lt;child name="Speed Indicator Panel" param="w 100%, h 100px!, wrap"/&gt;
93+
&lt;container layoutparam="ins 0" param="w 100%, h 55px!, wrap"&gt;
94+
&lt;child name="Plan Control" param="w 50%, h 100%"/&gt;
95+
&lt;child name="Abort Button" param="w 20%, h 50px!, wrap"/&gt;
96+
&lt;/container&gt;
97+
&lt;child name="Plan Control State" param="w 100%, h 85px!, wrap"/&gt;
98+
&lt;child name="Mission Tree" param="w 100%, h 100%, wrap"/&gt;
99+
&lt;child name="Autopilot Mode Indicator" param="w 100%, h 50px!, wrap"/&gt;
100+
&lt;child name="Pre-flight Actions" param="w 100%, h 50px!"/&gt;
101+
&lt;/container&gt;
102+
&lt;/container&gt;
103+
&lt;/profile&gt;
104+
&lt;/profiles&gt;
105+
</entry> <entry key="Current Profile">Pilot - ROV</entry>
106+
</properties>
107+
<child class="pt.lsts.neptus.plugins.ipcam.AirCamDisplay" x="0" y="0" width="10" height="400">
108+
<properties/>
109+
</child>
110+
<child class="pt.lsts.neptus.plugins.uavs.panels.AutopilotModePanel" x="0" y="58" width="122" height="0">
111+
<properties/>
112+
</child>
113+
<child class="pt.lsts.neptus.console.plugins.ChronometerPlugin" x="32" y="180" width="90" height="40">
114+
<properties/>
115+
</child>
116+
<child class="pt.lsts.neptus.console.plugins.planning.CommandPlanner" x="128" y="195" width="10" height="10">
117+
<properties/>
118+
</child>
119+
<child class="pt.lsts.neptus.plugins.position.ContactMarker" x="144" y="195" width="10" height="10">
120+
<properties/>
121+
</child>
122+
<child class="pt.lsts.neptus.console.plugins.EntityStatePanel" x="160" y="138" width="51" height="125">
123+
<properties/>
124+
</child>
125+
<child class="pt.lsts.neptus.plugins.followref.FollowReferenceInteraction" x="217" y="195" width="10" height="10">
126+
<properties/>
127+
</child>
128+
<child class="pt.lsts.neptus.plugins.uavs.panels.GimbalPanel" x="233" y="195" width="10" height="10">
129+
<properties/>
130+
</child>
131+
<child class="pt.lsts.neptus.console.plugins.base.IncomingDataPanel" x="249" y="195" width="10" height="10">
132+
<properties/>
133+
</child>
134+
<child class="pt.lsts.neptus.plugins.sunfish.IridiumComms" x="265" y="195" width="10" height="10">
135+
<properties/>
136+
</child>
137+
<child class="pt.lsts.neptus.console.plugins.kml.KmlImport" x="281" y="176" width="53" height="48">
138+
<properties/>
139+
</child>
140+
<child class="pt.lsts.neptus.plugins.logs.LogBookSubPanel" x="340" y="198" width="5" height="5">
141+
<properties/>
142+
</child>
143+
<child class="pt.lsts.neptus.plugins.logs.LoggingDownloader" x="351" y="175" width="156" height="50">
144+
<properties/>
145+
</child>
146+
<child class="pt.lsts.neptus.plugins.map.MapEditor" x="513" y="195" width="10" height="10">
147+
<properties/>
148+
</child>
149+
<child class="pt.lsts.neptus.console.plugins.planning.MapPanel" x="0" y="0" width="1018" height="667">
150+
<properties/>
151+
</child>
152+
<child class="pt.lsts.neptus.console.plugins.planning.MissionTreePanel" x="0" y="358" width="244" height="251">
153+
<properties/>
154+
</child>
155+
<child class="pt.lsts.neptus.console.plugins.MyLocationDisplay" x="579" y="195" width="10" height="10">
156+
<properties/>
157+
</child>
158+
<child class="pt.lsts.neptus.console.plugins.planning.PathControlLayer" x="595" y="195" width="10" height="10">
159+
<properties/>
160+
</child>
161+
<child class="pt.lsts.neptus.plugins.uavs.panels.PayloadManagePanel" x="0" y="615" width="244" height="40">
162+
<properties/>
163+
</child>
164+
<child class="pt.lsts.neptus.console.plugins.planning.PlanControlPanel" x="0" y="0" width="122" height="52">
165+
<properties>
166+
<entry key="Use Calibration on Start Plan">false</entry>
167+
<entry key="Enable teleoperation button">true</entry>
168+
<entry key="Enable beacons button">false</entry>
169+
</properties>
170+
</child>
171+
<child class="pt.lsts.neptus.console.plugins.planning.PlanControlStatePanel" x="0" y="267" width="244" height="85">
172+
<properties/>
173+
</child>
174+
<child class="pt.lsts.neptus.console.plugins.planning.PlanEditor" x="852" y="195" width="10" height="10">
175+
<properties/>
176+
</child>
177+
<child class="pt.lsts.neptus.console.plugins.planning.PlanStatistics" x="868" y="195" width="10" height="10">
178+
<properties/>
179+
</child>
180+
<child class="pt.lsts.neptus.plugins.uavs.panels.PreflightPanel" x="884" y="195" width="10" height="10">
181+
<properties/>
182+
</child>
183+
<child class="pt.lsts.neptus.plugins.sim.SimulationActionsPlugin" x="900" y="195" width="10" height="10">
184+
<properties>
185+
<entry key="simulatedHeight">900.0</entry>
186+
</properties>
187+
</child>
188+
<child class="pt.lsts.neptus.plugins.position.StreamSpeedOverlay" x="916" y="195" width="10" height="10">
189+
<properties/>
190+
</child>
191+
<child class="pt.lsts.neptus.params.SystemConfiguration" x="932" y="195" width="10" height="10">
192+
<properties/>
193+
</child>
194+
<child class="pt.lsts.neptus.console.plugins.SystemsList" x="948" y="173" width="234" height="55">
195+
<properties>
196+
<entry key="System Class Filter">ALL</entry>
197+
</properties>
198+
</child>
199+
<child class="pt.lsts.neptus.plugins.uavs.panels.UavAltitudePanel" x="0" y="0" width="100" height="667">
200+
<properties>
201+
<entry key="Vehicles detected">UUV,UAV</entry>
202+
</properties>
203+
</child>
204+
<child class="pt.lsts.neptus.plugins.uavs.panels.UavHUDPanel" x="0" y="0" width="244" height="200">
205+
<properties/>
206+
</child>
207+
<child class="pt.lsts.neptus.console.plugins.planning.UavPiccoloControl" x="1220" y="104" width="270" height="192">
208+
<properties/>
209+
</child>
210+
<child class="pt.lsts.neptus.console.plugins.VehicleStateMonitor" x="1496" y="195" width="10" height="10">
211+
<properties/>
212+
</child>
213+
<child class="pt.lsts.neptus.plugins.videostream.VideoStream" x="0" y="0" width="1018" height="667">
214+
<properties/>
215+
</child>
216+
<child class="pt.lsts.neptus.console.plugins.GroundHeightSetting" x="1528" y="195" width="10" height="10">
217+
<properties/>
218+
</child>
219+
<child class="pt.lsts.neptus.console.plugins.PlanExporter" x="1544" y="195" width="10" height="10">
220+
<properties/>
221+
</child>
222+
<child class="pt.lsts.neptus.plugins.uavs.panels.UavStatusOverlay" x="1560" y="195" width="10" height="10">
223+
<properties/>
224+
</child>
225+
<child class="pt.lsts.neptus.controllers.ControllerPanel" x="1576" y="195" width="10" height="10">
226+
<properties>
227+
<entry key="Axis Range">1000.0</entry>
228+
</properties>
229+
</child>
230+
<child class="pt.lsts.neptus.plugins.acoustic.SimpleAbortModemRequest" x="1592" y="195" width="10" height="10">
231+
<properties/>
232+
</child>
233+
<child class="pt.lsts.neptus.console.plugins.AbortPanel" x="128" y="1" width="49" height="50">
234+
<properties>
235+
<entry key="Button Shape">RECTANGULAR</entry>
236+
</properties>
237+
</child>
238+
<child class="pt.lsts.neptus.plugins.dev.ImcCommsMonitorPanel" x="0" y="0" width="0" height="0">
239+
<properties/>
240+
</child>
241+
<child class="pt.lsts.neptus.plugins.dev.ImcMessageUdpSenderPanel" x="0" y="0" width="600" height="500">
242+
<properties/>
243+
</child>
244+
<child class="pt.lsts.neptus.plugins.acoustic.AcousticOperations" x="0" y="0" width="0" height="0">
245+
<properties>
246+
<entry key="Systems listing">squirtle</entry>
247+
</properties>
248+
</child>
249+
<child class="pt.lsts.neptus.plugins.rtplot.RealTimePlotGroovy" x="0" y="0" width="0" height="0">
250+
<properties/>
251+
</child>
252+
</subpanel>
253+
</mainpanel>
254+
<mainpanel name="console alarm panel"/>
255+
<layers>
256+
<layer class="pt.lsts.neptus.plugins.videostream.CamFootprintLayer" opacity="1.0">
257+
<properties/>
258+
</layer>
259+
<layer class="pt.lsts.neptus.console.plugins.planning.DesiredPathLayer" opacity="1.0">
260+
<properties/>
261+
</layer>
262+
<layer class="pt.lsts.neptus.plugins.position.FindMainSystemLayer" opacity="1.0">
263+
<properties/>
264+
</layer>
265+
<layer class="pt.lsts.neptus.console.plugins.planning.PlanSimulationLayer" opacity="1.0">
266+
<properties/>
267+
</layer>
268+
<layer class="pt.lsts.neptus.plugins.position.painter.SystemInfoPainter" opacity="1.0">
269+
<properties>
270+
<entry key="Display Confidence Level">false</entry>
271+
<entry key="Display GPS">true</entry>
272+
<entry key="Entity Name">Autopilot</entry>
273+
<entry key="Display Current">true</entry>
274+
</properties>
275+
</layer>
276+
<layer class="pt.lsts.neptus.plugins.acoustic.UsblLayer" opacity="1.0">
277+
<properties/>
278+
</layer>
279+
</layers>
280+
<interactions>
281+
<interaction class="pt.lsts.neptus.plugins.videostream.SnapshotsInteraction">
282+
<properties/>
283+
</interaction>
284+
</interactions>
285+
</console>

0 commit comments

Comments
 (0)