Context Navigation

Changeset 165 in flair-src for trunk/lib/FlairMeta/src

Timestamp:

Mar 7, 2017, 8:26:53 PM (8 years ago)

Author:

Sanahuja Guillaume

Message:

modifs

Location:

trunk/lib/FlairMeta/src

Files:

r157	r165
30	30	std::string GetDefaultVrpnAddress(void) const{return "192.168.147.197:3883";}
31	31	bool isReadyToFly(void) const;
	32	virtual std::string GetType(void) const{return "hds_x8";}
32	33
33	34	private:

r160	r165
31	31	~SimuX4();
32	32	void StartSensors(void);
	33	virtual std::string GetType(void) const{return "x4_simu";}
33	34
34	35	private:

r160	r165
30	30	~SimuX8();
31	31	void StartSensors(void);
	32	virtual std::string GetType(void) const{return "simu_x8";}
32	33
33	34	private:

r157	r165
64	64	virtual std::string GetDefaultVrpnAddress(void) const{return "127.0.0.1:3883";}
65	65	virtual bool isReadyToFly(void) const { return true;}
	66	virtual std::string GetType(void) const=0;
66	67
67	68	protected:

-              r122
+              r165
   const sensor::TargetController *GetJoystick(void) const;
+  MetaDualShock3 *joy;
   gui::Tab *setupLawTab, *graphLawTab;
 …
   filter::Pid *uYaw;
   filter::PidThrust *uZ;
-  MetaDualShock3 *joy;
   filter::TrajectoryGenerator1D *altitudeTrajectory;
 };

r157	r165
30	30	std::string GetDefaultVrpnAddress(void) const{return "192.168.147.197:3883";}
31	31	bool isReadyToFly(void) const;
	32	virtual std::string GetType(void) const{return "xair";}
32	33
33	34	private:

Note: See TracChangeset for help on using the changeset viewer.