Changeset 158 in flair-src for trunk/demos/SimpleFleet

Timestamp:

Mar 5, 2017, 10:50:56 AM (8 years ago)

Author:

Sanahuja Guillaume

Message:

corrected simu/device id for sensors

Location:

trunk/demos/SimpleFleet

Files:

• simulator/src/main.cpp (modified) (1 diff)
• uav/build_x86_64/bin/setup_x8.xml (modified) (2 diffs)

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

@@ -84 +84 @@
 int main(int argc, char* argv[])
 {
-    Simulator *simu;
+  Simulator *simu;
 
-    parseOptions(argc,argv);
+  parseOptions(argc,argv);
 
-    simu= new Simulator("simulator",opti_time,90);
-    simu->SetupConnection(address,port);
-    simu->SetupUserInterface(xml_file);
+  simu= new Simulator("simulator",opti_time,90);
+  simu->SetupConnection(address,port);
+  simu->SetupUserInterface(xml_file);
+  #ifdef GL
+  Parser *gui=new Parser(1024,768,1024,768,media_path,scene_file);
+  #endif
+  for(int i=0; i<2;i++) {
+    stringstream uavName;
+    uavName << name.c_str() << "_" << i;
+    Model *drone=new X8(uavName.str(),i);
 #ifdef GL
-    Parser *gui=new Parser(simu,640,480,640,480,media_path,scene_file);
+    SimuUsGL *us_gl=new SimuUsGL(drone,"us",i,0);
 #endif
-    for(int i=0; i<2;i++)
-        {
-                stringstream s;
-                s << name.c_str() << "_" << i;
-        Model *drone=new X8(simu,s.str(),i);
-#ifdef GL
-        SimuUsGL *us_gl=new SimuUsGL(drone,"us",i);
-#endif
-        SimuImu *imu=new SimuImu(drone,"imu",i);
-        }
+    SimuImu *imu=new SimuImu(drone,"imu",i,0);
+  }
 
-    simu->RunSimu();
+  simu->RunSimu();
 
-    delete simu;
+  delete simu;
 
         return 0;

trunk/demos/SimpleFleet/uav/build_x86_64/bin/setup_x8.xml

@@ -135 +135 @@
     </DataPlot1D>
    </Tab>
-  </TabWidget>
+  <Tab name="Quaternion"><DataPlot1D name="q0" period="100" enabled="0"/><DataPlot1D name="q1" period="100" enabled="0"/><DataPlot1D name="q2" period="100" enabled="0"/><DataPlot1D name="q3" period="100" enabled="0"/></Tab><Tab name="IMU"><DataPlot1D name="acc_x" period="100" enabled="0"/><DataPlot1D name="acc_y" period="100" enabled="0"/><DataPlot1D name="acc_z" period="100" enabled="0"/><DataPlot1D name="gyr_x" period="100" enabled="0"/><DataPlot1D name="gyr_y" period="100" enabled="0"/><DataPlot1D name="gyr_z" period="100" enabled="0"/><DataPlot1D name="mag_x" period="100" enabled="0"/><DataPlot1D name="mag_y" period="100" enabled="0"/><DataPlot1D name="mag_z" period="100" enabled="0"/></Tab></TabWidget>
  </Tab>
  <Tab name="battery">
@@ -340 +340 @@
  </Tab>
 </TabWidget>
-<TabWidget name="App_TabWidget"><Tab name="x8_0"><PushButton name="save config on target" value="1"/></Tab><Tab name="x8_1"><PushButton name="save config on target" value="1"/></Tab></TabWidget></root>
+<TabWidget name="App_TabWidget"><Tab name="x8_0"><PushButton name="save config on target" value="1"/></Tab><Tab name="x8_1"><PushButton name="save config on target" value="1"/></Tab></TabWidget><PushButton name="save config on target (x8_0)" value="1"/></root>