cwiid 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ab3d7f6da791942d6b8756c3881fdf0988c1997
-  data.tar.gz: 04c99b6c964449170edb726ec5b5ed5cb8a7f668
+  metadata.gz: 2401496e2027e16a16eb64bb2fae7af4618d97e5
+  data.tar.gz: 63fd28dccc17c238ee0cfc434d1ab21d9116f4f1
 SHA512:
-  metadata.gz: 6dcc63f0279e8cecdcd441fd3ddb9c3acd4f63cc32dccd4529cd94038b5370657058db49967d74ed9a2263c5fc61e2810f5c67ee57f41c0b430050148e22b599
-  data.tar.gz: 0c14e5090d3bb65f9310f27b5d387795862a893ca822967917319e2496895674abefe85c419042ec21f468d84fd4c7cc79acf8fffe44307443ec91068f532f73
+  metadata.gz: 0d4b8f54f2d96299017dbeaab87036f46861a674caf395987ea36dff5ef2eca85bb68f9eeafe55e9113c8373d18fb219ad62b7b9e4a08c40516ec8297147026d
+  data.tar.gz: b5f41ef2fd859cea46a56fbabe6d57f23e72b1d8487949daea082ac5ca6cec40df9b3a559f7187bc13305e9228698fa39ad34aad6d87f7f7f6024751e71b0921

data/config.rb

@@ -1,7 +1,7 @@
 require 'rake'
 
 PKG_NAME = 'cwiid'
-PKG_VERSION = '0.1.4'
+PKG_VERSION = '0.1.5'
 CFG = RbConfig::CONFIG
 CXX = ENV[ 'CXX' ] || 'g++'
 RB_FILES = ['config.rb'] + FileList[ 'lib/**/*.rb' ]

data/ext/wiimote.cc

@@ -127,11 +127,27 @@ unsigned short int WiiMote::getButtons(void)
   return m_state.buttons;
 }
 
+unsigned short int WiiMote::getNunchukButtons(void)
+{
+  return m_state.ext.nunchuk.buttons;
+}
+
 unsigned char WiiMote::getAcc( int id )
 {
   return m_state.acc[ id ];
 }
 
+unsigned char WiiMote::getNunchukAcc( int id )
+{
+  return m_state.ext.nunchuk.acc[ id ];
+}
+
+unsigned char WiiMote::getNunchukJoyStick( int id )
+{
+  return m_state.ext.nunchuk.stick[ id ];
+}
+
+
 bool WiiMote::irValid( int i )
 {
   return m_state.ir_src[ i ].valid != 0;
@@ -180,6 +196,8 @@ VALUE WiiMote::registerRubyClass(void)
   rb_define_const( cRubyClass, "BTN_1", INT2NUM( CWIID_BTN_1 ) );
   rb_define_const( cRubyClass, "BTN_B", INT2NUM( CWIID_BTN_B ) );
   rb_define_const( cRubyClass, "BTN_A", INT2NUM( CWIID_BTN_A ) );
+  rb_define_const( cRubyClass, "NUNCHUK_BTN_C", INT2NUM( CWIID_NUNCHUK_BTN_C ) );
+  rb_define_const( cRubyClass, "NUNCHUK_BTN_Z", INT2NUM( CWIID_NUNCHUK_BTN_Z ) );
   rb_define_const( cRubyClass, "BTN_MINUS", INT2NUM( CWIID_BTN_MINUS ) );
   rb_define_const( cRubyClass, "BTN_HOME", INT2NUM( CWIID_BTN_HOME ) );
   rb_define_const( cRubyClass, "BTN_LEFT", INT2NUM( CWIID_BTN_LEFT ) );
@@ -216,8 +234,14 @@ VALUE WiiMote::registerRubyClass(void)
                     RUBY_METHOD_FUNC( wrapSetRumble ), 1 );
   rb_define_method( cRubyClass, "buttons",
                     RUBY_METHOD_FUNC( wrapGetButtons ), 0 );
+  rb_define_method( cRubyClass, "nunchuk_buttons",
+                    RUBY_METHOD_FUNC( wrapGetNunchukButtons ), 0 );
   rb_define_method( cRubyClass, "acc",
                     RUBY_METHOD_FUNC( wrapGetAcc ), 0 );
+  rb_define_method( cRubyClass, "nunchuk_acc",
+                    RUBY_METHOD_FUNC( wrapGetNunchukAcc ), 0 );
+  rb_define_method( cRubyClass, "nunchuk_stick",
+                    RUBY_METHOD_FUNC( wrapGetNunchukJoyStick ), 0 );
   rb_define_method( cRubyClass, "ir",
                     RUBY_METHOD_FUNC( wrapGetIR ), 0 );
   rb_define_method( cRubyClass, "motionplus",
@@ -289,19 +313,19 @@ VALUE WiiMote::wrapSetRptMode( VALUE rbSelf, VALUE rbMode )
     rb_raise( rb_eRuntimeError, "%s", e.what() );
   };
   return rbMode;
-}  
+}
 
 VALUE WiiMote::wrapGetBattery( VALUE rbSelf )
 {
   WiiMotePtr *self; Data_Get_Struct( rbSelf, WiiMotePtr, self );
   return INT2NUM( (*self)->getBattery() );
-}  
+}
 
 VALUE WiiMote::wrapGetLED( VALUE rbSelf )
 {
   WiiMotePtr *self; Data_Get_Struct( rbSelf, WiiMotePtr, self );
   return INT2NUM( (*self)->getLED() );
-}  
+}
 
 VALUE WiiMote::wrapSetLED( VALUE rbSelf, VALUE rbState )
 {
@@ -312,13 +336,13 @@ VALUE WiiMote::wrapSetLED( VALUE rbSelf, VALUE rbState )
     rb_raise( rb_eRuntimeError, "%s", e.what() );
   };
   return rbState;
-}  
+}
 
 VALUE WiiMote::wrapGetRumble( VALUE rbSelf )
 {
   WiiMotePtr *self; Data_Get_Struct( rbSelf, WiiMotePtr, self );
   return (*self)->getRumble() ? Qtrue : Qfalse;
-}  
+}
 
 VALUE WiiMote::wrapSetRumble( VALUE rbSelf, VALUE rbState )
 {
@@ -329,13 +353,15 @@ VALUE WiiMote::wrapSetRumble( VALUE rbSelf, VALUE rbState )
     rb_raise( rb_eRuntimeError, "%s", e.what() );
   };
   return rbState;
-}  
+}
 
 VALUE WiiMote::wrapGetButtons( VALUE rbSelf )
 {
   WiiMotePtr *self; Data_Get_Struct( rbSelf, WiiMotePtr, self );
   return INT2NUM( (*self)->getButtons() );
-}  
+}
+
+
 
 VALUE WiiMote::wrapGetAcc( VALUE rbSelf )
 {
@@ -343,7 +369,7 @@ VALUE WiiMote::wrapGetAcc( VALUE rbSelf )
   return rb_ary_new3( 3, INT2NUM( (*self)->getAcc( 0 ) ),
                          INT2NUM( (*self)->getAcc( 1 ) ),
                          INT2NUM( (*self)->getAcc( 2 ) ) );
-}  
+}
 
 VALUE WiiMote::wrapGetIR( VALUE rbSelf )
 {
@@ -364,5 +390,26 @@ VALUE WiiMote::wrapGetMotionPlus( VALUE rbSelf )
   return rb_ary_new3( 3, INT2NUM( (*self)->getMotionPlus( 0 ) ),
                          INT2NUM( (*self)->getMotionPlus( 1 ) ),
                          INT2NUM( (*self)->getMotionPlus( 2 ) ) );
-}  
+}
+
+VALUE WiiMote::wrapGetNunchukAcc( VALUE rbSelf )
+{
+  WiiMotePtr *self; Data_Get_Struct( rbSelf, WiiMotePtr, self );
+  return rb_ary_new3( 3, INT2NUM( (*self)->getNunchukAcc( 0 ) ),
+                         INT2NUM( (*self)->getNunchukAcc( 1 ) ),
+                         INT2NUM( (*self)->getNunchukAcc( 2 ) ) );
+}
+
+VALUE WiiMote::wrapGetNunchukJoyStick( VALUE rbSelf )
+{
+  WiiMotePtr *self; Data_Get_Struct( rbSelf, WiiMotePtr, self );
+  return rb_ary_new3( 2, INT2NUM( (*self)->getNunchukJoyStick( 0 ) ),
+                         INT2NUM( (*self)->getNunchukJoyStick( 1 ) ));
+}
+
+VALUE WiiMote::wrapGetNunchukButtons( VALUE rbSelf )
+{
+  WiiMotePtr *self; Data_Get_Struct( rbSelf, WiiMotePtr, self );
+  return INT2NUM( (*self)->getNunchukButtons() );
+}
 

data/ext/wiimote.hh

@@ -37,7 +37,10 @@ public:
   bool getRumble(void);
   void setRumble( bool state ) throw(Error);
   unsigned short int getButtons(void);
+  unsigned short int getNunchukButtons(void);
   unsigned char getAcc( int id );
+  unsigned char getNunchukAcc( int id );
+  unsigned char getNunchukJoyStick( int id );
   bool irValid( int i );
   unsigned short int getIRX( int i );
   unsigned short int getIRY( int i );
@@ -60,6 +63,9 @@ public:
   static VALUE wrapSetRumble( VALUE rbSelf, VALUE rbState );
   static VALUE wrapGetButtons( VALUE rbSelf );
   static VALUE wrapGetAcc( VALUE rbSelf );
+  static VALUE wrapGetNunchukButtons( VALUE rbSelf );
+  static VALUE wrapGetNunchukAcc( VALUE rbSelf );
+  static VALUE wrapGetNunchukJoyStick( VALUE rbSelf );
   static VALUE wrapGetIR( VALUE rbSelf );
   static VALUE wrapGetMotionPlus( VALUE rbSelf );
   static WiiMote *current;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cwiid
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Jan Wedekind
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-15 00:00:00.000000000 Z
+date: 2016-08-08 00:00:00.000000000 Z
 dependencies: []
 description: This Ruby extension provides an inerface to access a Wii Remote using
   the libcwiid library.