Added ability to deactivate WMP

Flafla2 · Sep 3, 2015 · 4ec0e04 · 4ec0e04
1 parent 82da5be
commit 4ec0e04
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/Assets/Scripts/WiimoteDemo.cs b/Assets/Scripts/WiimoteDemo.cs
@@ -147,6 +147,10 @@ void OnGUI()
             wiimote.RequestIdentifyWiiMotionPlus();
         if ((wiimote.wmp_attached || wiimote.Type == WiimoteType.PROCONTROLLER) && GUILayout.Button("Activate WMP"))
             wiimote.ActivateWiiMotionPlus();
+        if ((wiimote.current_ext == ExtensionController.MOTIONPLUS ||
+            wiimote.current_ext == ExtensionController.MOTIONPLUS_CLASSIC ||
+            wiimote.current_ext == ExtensionController.MOTIONPLUS_NUNCHUCK) && GUILayout.Button("Deactivate WMP"))
+            wiimote.DeactivateWiiMotionPlus();
 
         GUILayout.Label("Calibrate Accelerometer");
         GUILayout.BeginHorizontal();

diff --git a/Assets/Wiimote/Scripts/Wiimote.cs b/Assets/Wiimote/Scripts/Wiimote.cs
@@ -357,6 +357,14 @@ public bool ActivateWiiMotionPlus()
         return true;
     }
 
+    public bool DeactivateWiiMotionPlus()
+    {
+        if (current_ext != ExtensionController.MOTIONPLUS && current_ext != ExtensionController.MOTIONPLUS_CLASSIC && current_ext != ExtensionController.MOTIONPLUS_NUNCHUCK)
+            Debug.LogWarning("There is a request to deactivate the Wii Motion Plus even though it has not been activated!  Trying anyway.");
+
+        return SendRegisterWriteRequest(RegisterType.CONTROL, 0xA400F0, new byte[] { 0x55 }) > 0;
+    }
+
     /// \brief Attempts to activate any connected extension controller
     /// \sa RequestIdentifyExtension(), StatusData::ext_connected
     /// \return If the activation request was successfully sent to the Wii Remote.

diff --git a/Assets/Wiimote/Scripts/mainpage.dox b/Assets/Wiimote/Scripts/mainpage.dox
@@ -126,6 +126,9 @@ WiimoteApi::Wiimote::wmp_attached to see if a Wii Motion Plus is attached.  If y
 using WiimoteApi::Wiimote::ActivateWiiMotionPlus().  This makes the Wii Motion Plus behave as an extension controller (such as the
 nunchuck or the classic controller).  See *Reading from Extension Controllers* for details.
 
+If you want to deactivate the Wii Motion Plus (and use any extension controller connected to it such as a Nunchuck or Classic
+Controller) you can use WiimoteApi::Wiimote::DeactivateWiiMotionPlus().
+
 <b>Example:</b>
 ~~~~~~~~~~~~~~~{.cs}
 Wiimote remote; // Initialized previously