merged from frcsim branch

verified to work on real robots
adds sim eclipse plugins, fixed JavaGazebo, made wpilibC++Sim build on windows
 - Java and C++ simulation robot programs run on windows
 - simulation eclipse plugin delivers models and gazebo plugins
 - Java Gazebo now respects GAZEBO_IP variables and can work across networks
 - hal and network tables win32 hacked to work on windows
 - smart dashboard broken on windows due to network tables hacks
 - wpilibC++Sim, gz_msgs, and frcsim_gazebo_plugins build with CMake
 - removed constexpr for cross platform compatibility
 - msgs generated using .protos as a part of build process
 - some spare and unused cmake/pom files deleted
 - simulation ubuntu debians removed entirely
 - refactored CMake project flags and macros
 - updated to match non-sim C++ API
 - fixed and updated documentation
 - servo added to simulation

Change-Id: Ia702ff0f1fee10d77f543810ad88f56696443b05
This commit is contained in:
peter mitrano
2015-04-26 19:19:57 -04:00
parent 4e46692191
commit 29d029fa61
211 changed files with 2143 additions and 6491 deletions

View File

@@ -1,7 +1,5 @@
#include "external_limit_switch.h"
#include <gazebo/sensors/sensors.hh>
#include <boost/pointer_cast.hpp>
ExternalLimitSwitch::ExternalLimitSwitch(sdf::ElementPtr sdf) {
sensor = boost::dynamic_pointer_cast<sensors::ContactSensor>(
@@ -11,7 +9,7 @@ ExternalLimitSwitch::ExternalLimitSwitch(sdf::ElementPtr sdf) {
}
ExternalLimitSwitch::~ExternalLimitSwitch() {}
bool ExternalLimitSwitch::Get() {
return sensor->GetContacts().contact().size() > 0;
}

View File

@@ -1,16 +1,22 @@
#pragma once
#include <gazebo/gazebo.hh>
#include "switch.h"
#ifdef _WIN32
#include <Winsock2.h>
#endif
#include <gazebo/sensors/sensors.hh>
#include <boost/pointer_cast.hpp>
#include <gazebo/gazebo.hh>
using namespace gazebo;
class ExternalLimitSwitch : public Switch {
public:
public:
ExternalLimitSwitch(sdf::ElementPtr sdf);
~ExternalLimitSwitch();
/// \brief Returns true when the switch is triggered.
virtual bool Get();

View File

@@ -1,12 +1,10 @@
#include "internal_limit_switch.h"
#include <gazebo/physics/physics.hh>
InternalLimitSwitch::InternalLimitSwitch(physics::ModelPtr model, sdf::ElementPtr sdf) {
joint = model->GetJoint(sdf->Get<std::string>("joint"));
min = sdf->Get<double>("min");
max = sdf->Get<double>("max");
if (sdf->HasElement("units")) {
radians = sdf->Get<std::string>("units") != "degrees";
} else {
@@ -18,7 +16,7 @@ InternalLimitSwitch::InternalLimitSwitch(physics::ModelPtr model, sdf::ElementPt
}
InternalLimitSwitch::~InternalLimitSwitch() {}
bool InternalLimitSwitch::Get() {
double value;
joint->GetAngle(0).Normalize();

View File

@@ -1,16 +1,20 @@
#pragma once
#include <gazebo/gazebo.hh>
#include "switch.h"
#ifdef _WIN32
#include <Winsock2.h>
#endif
#include <gazebo/physics/physics.hh>
#include <gazebo/gazebo.hh>
using namespace gazebo;
class InternalLimitSwitch : public Switch {
public:
public:
InternalLimitSwitch(physics::ModelPtr model, sdf::ElementPtr sdf);
~InternalLimitSwitch();
/// \brief Returns true when the switch is triggered.
virtual bool Get();

View File

@@ -1,11 +1,4 @@
#include "limit_switch.h"
#include "internal_limit_switch.h"
#include "external_limit_switch.h"
#include <gazebo/physics/physics.hh>
#include <gazebo/transport/transport.hh>
#include "msgs/msgs.h"
GZ_REGISTER_MODEL_PLUGIN(LimitSwitch)

View File

@@ -1,9 +1,16 @@
#pragma once
#include <gazebo/gazebo.hh>
#include "simulation/gz_msgs/msgs.h"
#include "switch.h"
#include "internal_limit_switch.h"
#include "external_limit_switch.h"
#include <gazebo/physics/physics.hh>
#include <gazebo/transport/transport.hh>
#include <gazebo/gazebo.hh>
using namespace gazebo;
/**
@@ -53,13 +60,13 @@ using namespace gazebo;
* - `sensor`: Name of the contact sensor that this limit switch uses.
*/
class LimitSwitch: public ModelPlugin {
public:
public:
LimitSwitch();
~LimitSwitch();
/// \brief Load the limit switch and configures it according to the sdf.
void Load(physics::ModelPtr model, sdf::ElementPtr sdf);
/// \brief Sends out the limit switch reading each timestep.
void Update(const common::UpdateInfo &info);
@@ -69,9 +76,9 @@ private:
/// \brief LimitSwitch object, currently internal or external.
Switch* ls;
physics::ModelPtr model; ///< \brief The model that this is attached to.
physics::ModelPtr model; ///< \brief The model that this is attached to.
event::ConnectionPtr updateConn; ///< \brief Pointer to the world update function.
transport::NodePtr node; ///< \brief The node we're advertising on.
transport::PublisherPtr pub; ///< \brief Publisher handle.

View File

@@ -1,9 +1,9 @@
#pragma once
class Switch {
public:
public:
virtual ~Switch() {}
/// \brief Returns true when the switch is triggered.
virtual bool Get() = 0;
};