Merge branch 'jbaker-improvements-rebased'

2011-09-07 08:38:57 -05:00
parent bd8e666a08 4147c39913
commit 3e9f9a8f7e
3 changed files with 5 additions and 0 deletions
--- a/CHANGELOG.mkd
+++ b/CHANGELOG.mkd
@@ -21,6 +21,9 @@ Added:

 Fixed:

+- Properly disable rumbling when told to. Thanks to Jeff Baker from
+	(Inv3rsion, LLC.)(http://www.inv3rsion.com/)
+
 Changed:

 - Improved header includes using feedback from (include-what-you-use)[iwyu]
--- a/README.mkd
+++ b/README.mkd
@@ -53,6 +53,7 @@ Additional Contributors:
 - Karl Semich <https://github.com/xloem>
 - Johannes Zarl <johannes.zarl@jku.at>
 - hartsantler <http://code.google.com/p/rpythonic/>
+- Jeff Baker/Inv3rsion, LLC. <http://www.inv3rsion.com/>


 License
--- a/src/wiiuse.c
+++ b/src/wiiuse.c
@@ -229,6 +229,7 @@ void wiiuse_rumble(struct wiimote_t* wm, int status) {
 	} else {
 		WIIUSE_DEBUG("Stopping rumble...");
 		WIIMOTE_DISABLE_STATE(wm, WIIMOTE_STATE_RUMBLE);
+		buf &= ~(0x01);
 	}

 	/* preserve IR state */