Changeset 333 in flair-src for trunk

Timestamp:

Oct 2, 2019, 11:07:51 AM (5 years ago)

Author:

Sanahuja Guillaume

Message:

add x4 to simple fleet

Location:

trunk/demos/SimpleFleet

Files:

• simulator/resources/core2-64/simulator_x4.sh (added)
• simulator/resources/core2-64/simulator_x4.xml (added)
• simulator/resources/core2-64/simulator_x8.sh (modified) (1 diff)
• simulator/src/main.cpp (modified) (5 diffs)
• uav/resources/core2-64/setup_x4.xml (added)
• uav/resources/core2-64/x4_0.sh (added)
• uav/resources/core2-64/x4_1.sh (added)

trunk/demos/SimpleFleet/simulator/resources/core2-64/simulator_x8.sh

@@ -9 +9 @@
 . $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh
 
-$EXEC -n x8 -a 127.0.0.1 -p 9000 -x simulator_x8.xml -o 10 -m $FLAIR_ROOT/flair-src/models -s $FLAIR_ROOT/flair-src/models/indoor_flight_arena.xml
+$EXEC -n x8 -a 127.0.0.1 -p 9000 -x simulator_x8.xml -o 10 -m $FLAIR_ROOT/flair-src/models -s $FLAIR_ROOT/flair-src/models/indoor_flight_arena.xml -t x8

trunk/demos/SimpleFleet/simulator/src/main.cpp

@@ -35 +35 @@
 string name;
 string address;
+string type;
 
 void parseOptions(int argc, char** argv)
@@ -62 +63 @@
         ValueArg<string> addressArg("a","address","ground station address",true,"127.0.0.1","string");
         cmd.add( addressArg );
+        
+        ValueArg<string> typeArg("t", "type", "uav type, x4 or x8", true, "x4", "string");
+        cmd.add(typeArg);
 
         cmd.parse( argc, argv );
@@ -71 +75 @@
         opti_time = optiArg.getValue();
         name=nameArg.getValue();
+        type = typeArg.getValue();
 #ifdef GL
         media_path=mediaArg.getValue();
@@ -84 +89 @@
 
 
-int main(int argc, char* argv[])
-{
+int main(int argc, char* argv[]) {
   Simulator *simu;
 
@@ -98 +102 @@
   for(int i=0; i<2;i++) {
     stringstream uavName;
+    Model *drone;
     uavName << name.c_str() << "_" << i;
-    Model *drone=new X8(uavName.str(),i);
+    if(type == "x4") {
+      drone = new X4(uavName.str(),i);
+    } else {
+      drone = new X8(uavName.str(),i);
+    }
+    
 #ifdef GL
     SimuUsGL *us_gl=new SimuUsGL(drone,"us",i,0);