Skip to content

Commit ab34b22

Browse files
committed
v1.8 source
1 parent 125c6ab commit ab34b22

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+910
-12627
lines changed

WiimoteCS/WiimoteLib/DataTypes.cs

Lines changed: 76 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,11 +206,18 @@ public class WiimoteState
206206
/// </summary>
207207
public BalanceBoardState BalanceBoardState;
208208
/// <summary>
209+
/// Current state of the Taiko TaTaCon drum controller
210+
/// </summary>
211+
public TaikoDrumState TaikoDrumState;
212+
/// <summary>
213+
/// Current state of the MotionPlus controller
214+
/// </summary>
215+
public MotionPlusState MotionPlusState;
216+
/// <summary>
209217
/// Current state of LEDs
210218
/// </summary>
211219
[DataMember]
212220
public LEDState LEDState;
213-
214221
/// <summary>
215222
/// Constructor for WiimoteState class
216223
/// </summary>
@@ -554,6 +561,49 @@ public struct BalanceBoardState
554561
public PointF CenterOfGravity;
555562
}
556563

564+
/// <summary>
565+
/// Current state of the Taiko Drum (TaTaCon) controller
566+
/// </summary>
567+
[Serializable]
568+
[DataContract]
569+
public struct TaikoDrumState
570+
{
571+
/// <summary>
572+
/// Drum hit location
573+
/// </summary>
574+
[DataMember]
575+
public bool InnerLeft, InnerRight, OuterLeft, OuterRight;
576+
}
577+
578+
/// <summary>
579+
/// Current state of the MotionPlus controller
580+
/// </summary>
581+
[Serializable]
582+
[DataContract]
583+
public struct MotionPlusState
584+
{
585+
/// <summary>
586+
/// Raw speed data
587+
/// <remarks>Values range between 0 - 16384</remarks>
588+
/// </summary>
589+
[DataMember]
590+
public Point3 RawValues;
591+
592+
/// <summary>
593+
/// Normalized speed data
594+
/// <remarks>Values range between 0 - ?</remarks>
595+
/// </summary>
596+
[DataMember]
597+
public Point3F Values;
598+
599+
/// <summary>
600+
/// Yaw/Pitch/Roll rotating "quickly" (no definition for "quickly" yet...)
601+
/// </summary>
602+
[DataMember]
603+
public bool YawFast, PitchFast, RollFast;
604+
}
605+
606+
557607
/// <summary>
558608
/// Calibration information
559609
/// </summary>
@@ -716,7 +766,8 @@ public struct AccelState
716766
[DataMember]
717767
public Point3 RawValues;
718768
/// <summary>
719-
/// Normalized accelerometer data. Values range between 0 - ?, but values > 3 and &lt; -3 are inaccurate.
769+
/// Normalized accelerometer data.
770+
/// <remarks>Values range between 0 - ?, but values > 3 and &lt; -3 are inaccurate.</remarks>
720771
/// </summary>
721772
[DataMember]
722773
public Point3F Values;
@@ -786,6 +837,14 @@ public enum ExtensionType : long
786837
/// </summary>
787838
BalanceBoard = 0x0000a4200402,
788839
/// <summary>
840+
/// Taiko "TaTaCon" drum controller
841+
/// </summary>
842+
TaikoDrum = 0x0000a4200111,
843+
/// <summary>
844+
/// Wii MotionPlus extension
845+
/// </summary>
846+
MotionPlus = 0x0000a4200405,
847+
/// <summary>
789848
/// Partially inserted extension. This is an error condition.
790849
/// </summary>
791850
ParitallyInserted = 0xffffffffffff
@@ -904,4 +963,19 @@ public enum GuitarType
904963
/// </summary>
905964
GuitarHeroWorldTour
906965
}
966+
967+
/// <summary>
968+
/// Last ReadData status
969+
/// </summary>
970+
public enum LastReadStatus
971+
{
972+
/// <summary>
973+
/// Successful read
974+
/// </summary>
975+
Success,
976+
/// <summary>
977+
/// Attempt to read from write only memory
978+
/// </summary>
979+
ReadFromWriteOnlyMemory
980+
};
907981
}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Text;
4+
5+
namespace WiimoteLib.Extensions
6+
{
7+
public class ExtensionController<T>
8+
{
9+
}
10+
}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Text;
4+
5+
namespace WiimoteLib.Extensions
6+
{
7+
public interface IExtensionController<T>
8+
{
9+
T State;
10+
}
11+
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Text;
4+
5+
namespace WiimoteLib.Extensions
6+
{
7+
public class NunchukExtension : IExtensionController<T>
8+
{
9+
}
10+
11+
public class
12+
}

WiimoteCS/WiimoteLib/Properties/AssemblyInfo.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyCompany("Brian Peek (www.brianpeek.com)")]
1212
[assembly: AssemblyProduct("WiimoteLib")]
13-
[assembly: AssemblyCopyright("Copyright © 2008 Brian Peek (www.brianpeek.com)")]
13+
[assembly: AssemblyCopyright("Copyright © 2009 Brian Peek (www.brianpeek.com)")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]
1616

@@ -31,5 +31,5 @@
3131
//
3232
// You can specify all the values or you can default the Revision and Build Numbers
3333
// by using the '*' as shown below:
34-
[assembly: AssemblyVersion("1.7.0.0")]
35-
[assembly: AssemblyFileVersion("1.7.0.0")]
34+
[assembly: AssemblyVersion("1.8.0.0")]
35+
[assembly: AssemblyFileVersion("1.8.0.0")]

0 commit comments

Comments
 (0)