Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-01 02:41:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

"using" directives are no longer used in global namespaces (#219)

Browse Source
This commit is contained in:
Tyler Veness
2016-11-01 23:09:51 -07:00
committed by Peter Johnson
parent 78f0b1562c
commit ba8761e39e
39 changed files with 292 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
wpilibc/sim/include/DriverStation.h
View File

@@ -119,14 +119,14 @@ class DriverStation : public SensorBase, public RobotStateInterface {
///< TODO: Get rid of this and use the semaphore signaling
static const float kUpdatePeriod;
void stateCallback(const msgs::ConstDriverStationPtr& msg);
void joystickCallback(const msgs::ConstFRCJoystickPtr& msg, int i);
void joystickCallback0(const msgs::ConstFRCJoystickPtr& msg);
void joystickCallback1(const msgs::ConstFRCJoystickPtr& msg);
void joystickCallback2(const msgs::ConstFRCJoystickPtr& msg);
void joystickCallback3(const msgs::ConstFRCJoystickPtr& msg);
void joystickCallback4(const msgs::ConstFRCJoystickPtr& msg);
void joystickCallback5(const msgs::ConstFRCJoystickPtr& msg);
void stateCallback(const gazebo::msgs::ConstDriverStationPtr& msg);
void joystickCallback(const gazebo::msgs::ConstFRCJoystickPtr& msg, int i);
void joystickCallback0(const gazebo::msgs::ConstFRCJoystickPtr& msg);
void joystickCallback1(const gazebo::msgs::ConstFRCJoystickPtr& msg);
void joystickCallback2(const gazebo::msgs::ConstFRCJoystickPtr& msg);
void joystickCallback3(const gazebo::msgs::ConstFRCJoystickPtr& msg);
void joystickCallback4(const gazebo::msgs::ConstFRCJoystickPtr& msg);
void joystickCallback5(const gazebo::msgs::ConstFRCJoystickPtr& msg);
int m_digitalOut = 0;
std::condition_variable m_waitForDataCond;
@@ -140,10 +140,10 @@ class DriverStation : public SensorBase, public RobotStateInterface {
bool m_userInTeleop = false;
bool m_userInTest = false;
transport::SubscriberPtr stateSub;
transport::SubscriberPtr joysticksSub[6];
msgs::DriverStationPtr state;
msgs::FRCJoystickPtr joysticks[6];
gazebo::transport::SubscriberPtr stateSub;
gazebo::transport::SubscriberPtr joysticksSub[6];
gazebo::msgs::DriverStationPtr state;
gazebo::msgs::FRCJoystickPtr joysticks[6];
};
} // namespace frc

2
wpilibc/sim/include/RobotBase.h
View File

@@ -50,7 +50,7 @@ class RobotBase {
RobotBase& operator=(const RobotBase&) = delete;
DriverStation& m_ds;
transport::SubscriberPtr time_sub;
gazebo::transport::SubscriberPtr time_sub;
};
} // namespace frc

16
wpilibc/sim/include/simulation/MainNode.h
View File

@@ -14,8 +14,6 @@
#include "simulation/gz_msgs/msgs.h"
using namespace gazebo;
namespace frc {
class MainNode {
@@ -26,14 +24,14 @@ class MainNode {
}
template <typename M>
static transport::PublisherPtr Advertise(const std::string& topic,
int queueLimit = 10,
bool latch = false) {
static gazebo::transport::PublisherPtr Advertise(const std::string& topic,
int queueLimit = 10,
bool latch = false) {
return GetInstance()->main->Advertise<M>(topic, queueLimit, latch);
}
template <typename M, typename T>
static transport::SubscriberPtr Subscribe(
static gazebo::transport::SubscriberPtr Subscribe(
const std::string& topic,
void (T::*fp)(const boost::shared_ptr<M const>&), T* obj,
bool latching = false) {
@@ -41,20 +39,20 @@ class MainNode {
}
template <typename M>
static transport::SubscriberPtr Subscribe(
static gazebo::transport::SubscriberPtr Subscribe(
const std::string& topic, void (*fp)(const boost::shared_ptr<M const>&),
bool latching = false) {
return GetInstance()->main->Subscribe(topic, fp, latching);
}
transport::NodePtr main;
gazebo::transport::NodePtr main;
private:
MainNode() {
bool success = gazebo::client::setup();
if (success) {
main = transport::NodePtr(new transport::Node());
main = gazebo::transport::NodePtr(new gazebo::transport::Node());
main->Init("frc");
gazebo::transport::run();
} else {

4
wpilibc/sim/include/simulation/SimContinuousOutput.h
View File

@@ -19,13 +19,11 @@
#include <Winsock2.h>
#endif
using namespace gazebo;
namespace frc {
class SimContinuousOutput {
private:
transport::PublisherPtr pub;
gazebo::transport::PublisherPtr pub;
float speed;
public:

6
wpilibc/sim/include/simulation/SimDigitalInput.h
View File

@@ -13,8 +13,6 @@
#include "simulation/gz_msgs/msgs.h"
using namespace gazebo;
namespace frc {
class SimDigitalInput {
@@ -28,8 +26,8 @@ class SimDigitalInput {
private:
bool value;
transport::SubscriberPtr sub;
void callback(const msgs::ConstBoolPtr& msg);
gazebo::transport::SubscriberPtr sub;
void callback(const gazebo::msgs::ConstBoolPtr& msg);
};
} // namespace frc

10
wpilibc/sim/include/simulation/SimEncoder.h
View File

@@ -14,8 +14,6 @@
#include "simulation/gz_msgs/msgs.h"
using namespace gazebo;
namespace frc {
class SimEncoder {
@@ -32,10 +30,10 @@ class SimEncoder {
void sendCommand(std::string cmd);
double position, velocity;
transport::SubscriberPtr posSub, velSub;
transport::PublisherPtr commandPub;
void positionCallback(const msgs::ConstFloat64Ptr& msg);
void velocityCallback(const msgs::ConstFloat64Ptr& msg);
gazebo::transport::SubscriberPtr posSub, velSub;
gazebo::transport::PublisherPtr commandPub;
void positionCallback(const gazebo::msgs::ConstFloat64Ptr& msg);
void velocityCallback(const gazebo::msgs::ConstFloat64Ptr& msg);
};
} // namespace frc

6
wpilibc/sim/include/simulation/SimFloatInput.h
View File

@@ -13,8 +13,6 @@
#include "simulation/gz_msgs/msgs.h"
using namespace gazebo;
namespace frc {
class SimFloatInput {
@@ -28,8 +26,8 @@ class SimFloatInput {
private:
double value;
transport::SubscriberPtr sub;
void callback(const msgs::ConstFloat64Ptr& msg);
gazebo::transport::SubscriberPtr sub;
void callback(const gazebo::msgs::ConstFloat64Ptr& msg);
};
} // namespace frc

10
wpilibc/sim/include/simulation/SimGyro.h
View File

@@ -13,8 +13,6 @@
#include "simulation/gz_msgs/msgs.h"
using namespace gazebo;
namespace frc {
class SimGyro {
@@ -29,10 +27,10 @@ class SimGyro {
void sendCommand(std::string cmd);
double position, velocity;
transport::SubscriberPtr posSub, velSub;
transport::PublisherPtr commandPub;
void positionCallback(const msgs::ConstFloat64Ptr& msg);
void velocityCallback(const msgs::ConstFloat64Ptr& msg);
gazebo::transport::SubscriberPtr posSub, velSub;
gazebo::transport::PublisherPtr commandPub;
void positionCallback(const gazebo::msgs::ConstFloat64Ptr& msg);
void velocityCallback(const gazebo::msgs::ConstFloat64Ptr& msg);
};
} // namespace frc

2
wpilibc/sim/include/simulation/simTime.h
View File

@@ -21,6 +21,6 @@
namespace wpilib {
namespace internal {
extern double simTime;
extern void time_callback(const msgs::ConstFloat64Ptr& msg);
extern void time_callback(const gazebo::msgs::ConstFloat64Ptr& msg);
}
}