Changeset 137 in flair-src for trunk/tools/Controller/DualShock3/src

Timestamp:

Feb 14, 2017, 3:06:20 PM (8 years ago)

Author:

Sanahuja Guillaume

Message:

singleton manager

Location:

trunk/tools/Controller/DualShock3/src

Files:

• DualShock3.cpp (modified) (1 diff)
• DualShock3.h (modified) (1 diff)
• main.cpp (modified) (1 diff)

trunk/tools/Controller/DualShock3/src/DualShock3.cpp

@@ -79 +79 @@
 namespace sensor {
 
-DualShock3::DualShock3(const FrameworkManager *parent, string name,
+DualShock3::DualShock3(string name,
                        string receiverAddress, int receiverPort,
                        ConnectionType_t _connectionType, uint32_t period,
                        uint32_t bitsPerAxis, uint8_t priority)
-    : HostEthController(parent, name, receiverAddress, receiverPort, period,
+    : HostEthController(name, receiverAddress, receiverPort, period,
                         bitsPerAxis, priority),
       connectionType(_connectionType) {

trunk/tools/Controller/DualShock3/src/DualShock3.h

@@ -52 +52 @@
   typedef enum { Usb, Bluetooth } ConnectionType_t;
 
-  DualShock3(const core::FrameworkManager *parent, std::string name,
+  DualShock3(std::string name,
              std::string receiverAddress, int receiverPort,
              ConnectionType_t connectionType, uint32_t period = 10,

trunk/tools/Controller/DualShock3/src/main.cpp

@@ -47 +47 @@
   if (connection == "usb") {
     //        manager->Warn("!! adresse = %s !!\n", address.c_str());
-    joystick = new DualShock3(manager, "dualshock3", receiverAddress,
+    joystick = new DualShock3("dualshock3", receiverAddress,
                               receiverPort, DualShock3::Usb, period, 6);
   } else {
-    joystick = new DualShock3(manager, "dualshock3", receiverAddress,
+    joystick = new DualShock3("dualshock3", receiverAddress,
                               receiverPort, DualShock3::Bluetooth, period, 6);
   }