Changeset 38 in flair-src for trunk/lib/FlairMeta/src/MetaDualShock3.cpp

Timestamp:

06/23/16 10:15:30 (8 years ago)

Author:

Bayard Gildas

Message:

Modif. pour ajour manette émulée (EmulatedController)

File:

• trunk/lib/FlairMeta/src/MetaDualShock3.cpp (modified) (5 diffs)

trunk/lib/FlairMeta/src/MetaDualShock3.cpp

@@ -18 +18 @@
 #include "MetaDualShock3.h"
 #include "MetaDualShock3_impl.h"
+#include "TargetController.h"
 #include "JoyReference.h"
 #include <Tab.h>
@@ -30 +31 @@
 using namespace flair::filter;
 using namespace flair::gui;
+using namespace flair::sensor;
 
 namespace flair {
@@ -35 +37 @@
 
 MetaDualShock3::MetaDualShock3(FrameworkManager *parent, string name,
-                               uint16_t port, uint8_t priority)
-    : TargetEthController(parent, name, port, priority) {
+                               TargetController *controller)
+    : controller(controller),IODevice((IODevice*)controller, name) {
   pimpl_ = new MetaDualShock3_impl(this, name);
   parent->AddDeviceToLog(pimpl_->joy_ref);
-  Start();
+  controller->Start();
 }
 
@@ -49 +51 @@
 
 void MetaDualShock3::ErrorNotify(void) {
-  TargetEthController::FlashLed(4, 10, 0);
-  TargetEthController::Rumble(0xff, 20, 0, 0);
+    controller->FlashLed(4,10,0);
+    controller->Rumble(0xff,20,0,0);
 }
 
-void MetaDualShock3::Rumble(uint8_t left_force, uint8_t left_timeout,
-                            uint8_t right_force, uint8_t right_timeout) {
-  TargetEthController::Rumble(left_force, left_timeout, right_force,
-                              right_timeout);
+void MetaDualShock3::Rumble(uint8_t left_force,uint8_t left_timeout,uint8_t right_force,uint8_t right_timeout) {
+    controller->Rumble(left_force,left_timeout,right_force,right_timeout);
 }
 
 void MetaDualShock3::SetLedON(unsigned int ledId) {
-  TargetEthController::SetLedOn(ledId);
+    controller->SetLedOn(ledId);
 }
 
 void MetaDualShock3::SetLedOFF(unsigned int ledId) {
-  TargetEthController::SetLedOff(ledId);
+    controller->SetLedOff(ledId);
 }
 
-void MetaDualShock3::FlashLed(unsigned int ledId, uint8_t on_timeout,
-                              uint8_t off_timeout) {
-  TargetEthController::FlashLed(ledId, on_timeout, off_timeout);
+void MetaDualShock3::FlashLed(unsigned int ledId,uint8_t on_timeout,uint8_t off_timeout) {
+    controller->FlashLed(ledId,on_timeout,off_timeout);
 }
 
@@ -91 +90 @@
 
 float MetaDualShock3::PitchTrim(void) const {
-  return pimpl_->joy_ref->PitchTrim();
+    return pimpl_->joy_ref->PitchTrim();
+}
+
+void MetaDualShock3::UpdateFrom(const flair::core::io_data *data) {
+    pimpl_->UpdateFrom(data);
 }