ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Some Work on the Guitar extension for Wiimote, untested, no gui yet 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3674 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
LPFaint99 2009-07-04 07:28:48 +00:00
parent 76b5bd49f8
commit 86a51e0c57
9 changed files with 404 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Source/Plugins/Plugin_Wiimote/Src/Config.h
View File

@ -68,10 +68,25 @@ struct Config
int TType; int TType;
}; };
struct PadGH3
{
enum EGH3Stick
{
KEYBOARD,
ANALOG1,
ANALOG2
};
int LType; // Analog Stick
int RType;
int TType; // Whammy bar
};
// Emulated Wiimote // Emulated Wiimote
bool bSidewaysDPad; bool bSidewaysDPad;
bool bWideScreen; bool bWideScreen;
bool bNunchuckConnected, bClassicControllerConnected; bool bNunchuckConnected;
bool bClassicControllerConnected;
bool bGuitarConnected;
// Real Wiimote // Real Wiimote
bool bConnectRealWiimote, bUseRealWiimote, bUpdateRealWiimote; bool bConnectRealWiimote, bUseRealWiimote, bUpdateRealWiimote;
@ -84,7 +99,7 @@ struct Config
PadTrigger Trigger; PadTrigger Trigger;
PadNunchuck Nunchuck; PadNunchuck Nunchuck;
PadClassicController ClassicController; PadClassicController ClassicController;
PadGH3 GH3Controller;
// Screen size settings // Screen size settings
bool bKeepAR43, bKeepAR169, bCrop; bool bKeepAR43, bKeepAR169, bCrop;
}; };

7
Source/Plugins/Plugin_Wiimote/Src/EmuDefinitions.cpp
View File

@ -67,9 +67,10 @@ InputCommon::CONTROLLER_STATE_NEW PadState[4];
InputCommon::CONTROLLER_MAPPING_NEW PadMapping[4]; InputCommon::CONTROLLER_MAPPING_NEW PadMapping[4];
// Keyboard input // Keyboard input
KeyboardWiimote g_Wm; KeyboardWiimote g_Wiimote_kbd;
KeyboardNunchuck g_Nc; KeyboardNunchuck g_NunchuckExt;
KeyboardClassicController g_Cc; KeyboardClassicController g_ClassicContExt;
KeyboardGH3GLP g_GH3Ext;
} // namespace } // namespace

45
Source/Plugins/Plugin_Wiimote/Src/EmuDefinitions.h
View File

@ -155,6 +155,20 @@ static const u8 classic_id[] =
0x00, 0x00, 0xa4, 0x20, 0x01, 0x01 0x00, 0x00, 0xa4, 0x20, 0x01, 0x01
}; };
/* The GH3 guitar id. It should be written to the last bytes of the
extension register */
static const u8 gh3glp_id[] =
{
0x00, 0x00, 0xa4, 0x20, 0x01, 0x03
};
/* The GHWT drums id. It should be written to the last bytes of the
extension register */
static const u8 ghwtdrums_id[] =
{
0x01, 0x00, 0xa4, 0x20, 0x01, 0x03
};
/* The id for nothing inserted */ /* The id for nothing inserted */
static const u8 nothing_id[] = static const u8 nothing_id[] =
{ {
@ -205,14 +219,14 @@ struct KeyboardWiimote
// Raw X and Y coordinate and processed X and Y coordinates // Raw X and Y coordinate and processed X and Y coordinates
SIR IR; SIR IR;
}; };
extern KeyboardWiimote g_Wm; extern KeyboardWiimote g_Wiimote_kbd;
struct KeyboardNunchuck struct KeyboardNunchuck
{ {
enum EKeyboardNunchuck enum EKeyboardNunchuck
{ {
// This is not allowed in Linux so we have to set the starting value manually // This is not allowed in Linux so we have to set the starting value manually
#ifdef _WIN32 #ifdef _WIN32
Z = g_Wm.LAST_CONSTANT, Z = g_Wiimote_kbd.LAST_CONSTANT,
#else #else
Z = 16, Z = 16,
#endif #endif
@ -222,14 +236,14 @@ struct KeyboardNunchuck
LAST_CONSTANT LAST_CONSTANT
}; };
}; };
extern KeyboardNunchuck g_Nc; extern KeyboardNunchuck g_NunchuckExt;
struct KeyboardClassicController struct KeyboardClassicController
{ {
enum EKeyboardClassicController enum EKeyboardClassicController
{ {
// This is not allowed in Linux so we have to set the starting value manually // This is not allowed in Linux so we have to set the starting value manually
#ifdef _WIN32 #ifdef _WIN32
A = g_Nc.LAST_CONSTANT, A = g_NunchuckExt.LAST_CONSTANT,
#else #else
A = 23, A = 23,
#endif #endif
@ -239,10 +253,31 @@ struct KeyboardClassicController
Tl, Tr, Zl, Zr, Tl, Tr, Zl, Zr,
Ll, Lr, Lu, Ld, Ll, Lr, Lu, Ld,
Rl, Rr, Ru, Rd, Rl, Rr, Ru, Rd,
SHAKE,
LAST_CONSTANT
};
};
extern KeyboardClassicController g_ClassicContExt;
struct KeyboardGH3GLP
{
enum EKeyboardGH3GLP
{
// This is not allowed in Linux so we have to set the starting value manually
#ifdef _WIN32
BG = g_ClassicContExt.LAST_CONSTANT,
#else
BG = 47,
#endif
BR, BY, BB,
BO, BP, BM,
WB,
Ll, Lr, Lu, Ld,
Bu, Bd,
SHAKE SHAKE
}; };
}; };
extern KeyboardClassicController g_Cc; extern KeyboardGH3GLP g_GH3Ext;
} // namespace } // namespace

14
Source/Plugins/Plugin_Wiimote/Src/EmuDynamics.cpp
View File

@ -221,7 +221,7 @@ void PitchAccelerometerToDegree(u8 _x, u8 _y, u8 _z, int &_Roll, int &_Pitch, in
// ¯¯¯¯¯¯¯¯¯¯¯¯¯ // ¯¯¯¯¯¯¯¯¯¯¯¯¯
void IRData2DotsBasic(u8 *Data) void IRData2DotsBasic(u8 *Data)
{ {
struct SDot* Dot = g_Wm.IR.Dot; struct SDot* Dot = g_Wiimote_kbd.IR.Dot;
Dot[0].Rx = 1023 - (Data[0] | ((Data[2] & 0x30) << 4)); Dot[0].Rx = 1023 - (Data[0] | ((Data[2] & 0x30) << 4));
Dot[0].Ry = Data[1] | ((Data[2] & 0xc0) << 2); Dot[0].Ry = Data[1] | ((Data[2] & 0xc0) << 2);
@ -263,7 +263,7 @@ void IRData2DotsBasic(u8 *Data)
// ¯¯¯¯¯¯¯¯¯¯¯¯¯ // ¯¯¯¯¯¯¯¯¯¯¯¯¯
void IRData2Dots(u8 *Data) void IRData2Dots(u8 *Data)
{ {
struct SDot* Dot = g_Wm.IR.Dot; struct SDot* Dot = g_Wiimote_kbd.IR.Dot;
for (int i = 0; i < 4; ++i) for (int i = 0; i < 4; ++i)
{ {
@ -299,7 +299,7 @@ void IRData2Dots(u8 *Data)
void ReorderIRDots() void ReorderIRDots()
{ {
// Create a shortcut // Create a shortcut
struct SDot* Dot = g_Wm.IR.Dot; struct SDot* Dot = g_Wiimote_kbd.IR.Dot;
// Variables // Variables
int i, j, order; int i, j, order;
@ -335,7 +335,7 @@ void ReorderIRDots()
void IRData2Distance() void IRData2Distance()
{ {
// Create a shortcut // Create a shortcut
struct SDot* Dot = g_Wm.IR.Dot; struct SDot* Dot = g_Wiimote_kbd.IR.Dot;
// Make these ones global // Make these ones global
int i1, i2; int i1, i2;
@ -344,14 +344,14 @@ void IRData2Distance()
if (Dot[i1].Visible) break; if (Dot[i1].Visible) break;
// Only one dot was visible, we can not calculate the distance // Only one dot was visible, we can not calculate the distance
if (i1 == 4) { g_Wm.IR.Distance = 0; return; } if (i1 == 4) { g_Wiimote_kbd.IR.Distance = 0; return; }
// Look at the next dot // Look at the next dot
for (i2 = i1 + 1; i2 < 4; ++i2) for (i2 = i1 + 1; i2 < 4; ++i2)
if (Dot[i2].Visible) break; if (Dot[i2].Visible) break;
// Only one dot was visible, we can not calculate the distance // Only one dot was visible, we can not calculate the distance
if (i2 == 4) { g_Wm.IR.Distance = 0; return; } if (i2 == 4) { g_Wiimote_kbd.IR.Distance = 0; return; }
/* For the emulated Wiimote the y distance is always zero so then the distance is the /* For the emulated Wiimote the y distance is always zero so then the distance is the
simple distance between the x dots, i.e. the sensor bar width */ simple distance between the x dots, i.e. the sensor bar width */
@ -359,7 +359,7 @@ void IRData2Distance()
int yd = Dot[i2].Y - Dot[i1].Y; int yd = Dot[i2].Y - Dot[i1].Y;
// Save the distance // Save the distance
g_Wm.IR.Distance = (int)sqrt((float)(xd*xd) + (float)(yd*yd)); g_Wiimote_kbd.IR.Distance = (int)sqrt((float)(xd*xd) + (float)(yd*yd));
} }
//////////////////////////////// ////////////////////////////////

41
Source/Plugins/Plugin_Wiimote/Src/EmuMain.cpp
View File

@ -379,22 +379,22 @@ void UpdateEeprom()
} }
else if(g_Config.bClassicControllerConnected) else if(g_Config.bClassicControllerConnected)
{ {
g_cc.Lx.max = g_RegExt[0x20]; g_ClassicContCalibration.Lx.max = g_RegExt[0x20];
g_cc.Lx.min = g_RegExt[0x21]; g_ClassicContCalibration.Lx.min = g_RegExt[0x21];
g_cc.Lx.center = g_RegExt[0x22]; g_ClassicContCalibration.Lx.center = g_RegExt[0x22];
g_cc.Ly.max = g_RegExt[0x23]; g_ClassicContCalibration.Ly.max = g_RegExt[0x23];
g_cc.Ly.min = g_RegExt[0x24]; g_ClassicContCalibration.Ly.min = g_RegExt[0x24];
g_cc.Ly.center = g_RegExt[0x25]; g_ClassicContCalibration.Ly.center = g_RegExt[0x25];
g_cc.Rx.max = g_RegExt[0x26]; g_ClassicContCalibration.Rx.max = g_RegExt[0x26];
g_cc.Rx.min = g_RegExt[0x27]; g_ClassicContCalibration.Rx.min = g_RegExt[0x27];
g_cc.Rx.center = g_RegExt[0x28]; g_ClassicContCalibration.Rx.center = g_RegExt[0x28];
g_cc.Ry.max = g_RegExt[0x29]; g_ClassicContCalibration.Ry.max = g_RegExt[0x29];
g_cc.Ry.min = g_RegExt[0x2a]; g_ClassicContCalibration.Ry.min = g_RegExt[0x2a];
g_cc.Ry.center = g_RegExt[0x2b]; g_ClassicContCalibration.Ry.center = g_RegExt[0x2b];
g_cc.Tl.neutral = g_RegExt[0x2c]; g_ClassicContCalibration.Tl.neutral = g_RegExt[0x2c];
g_cc.Tr.neutral = g_RegExt[0x2d]; g_ClassicContCalibration.Tr.neutral = g_RegExt[0x2d];
INFO_LOG(CONSOLE, "UpdateCC: %i %i %i %i %i\n\n", INFO_LOG(CONSOLE, "UpdateCC: %i %i %i %i %i\n\n",
WiiMoteEmu::g_RegExt[0x2a], WiiMoteEmu::g_RegExt[0x2d], WiiMoteEmu::g_RegExt[0x2a], WiiMoteEmu::g_RegExt[0x2d],
@ -459,6 +459,12 @@ void SetDefaultExtensionRegistry()
memcpy(g_RegExt + 0x30, classic_calibration, sizeof(classic_calibration)); memcpy(g_RegExt + 0x30, classic_calibration, sizeof(classic_calibration));
memcpy(g_RegExt + 0xfa, classic_id, sizeof(classic_id)); memcpy(g_RegExt + 0xfa, classic_id, sizeof(classic_id));
} }
else if(g_Config.bGuitarConnected)
{
// memcpy(g_RegExt + 0x20, classic_calibration, sizeof(classic_calibration));
// memcpy(g_RegExt + 0x30, classic_calibration, sizeof(classic_calibration));
memcpy(g_RegExt + 0xfa, gh3glp_id, sizeof(gh3glp_id));
}
INFO_LOG(CONSOLE, "\nSetDefaultExtensionRegistry()\n\n"); INFO_LOG(CONSOLE, "\nSetDefaultExtensionRegistry()\n\n");
@ -537,9 +543,9 @@ void DoState(PointerWrap &p)
p.DoArray(PadState, 4); p.DoArray(PadState, 4);
p.DoArray(PadMapping, 4); p.DoArray(PadMapping, 4);
p.Do(g_Wm); p.Do(g_Wiimote_kbd);
p.Do(g_Nc); p.Do(g_NunchuckExt);
p.Do(g_Cc); p.Do(g_ClassicContExt);
} }
/* This is not needed if we call FreeLibrary() when we stop a game, but if it's not called we need to reset /* This is not needed if we call FreeLibrary() when we stop a game, but if it's not called we need to reset
@ -782,4 +788,3 @@ void Update()
} // end of namespace } // end of namespace

372
Source/Plugins/Plugin_Wiimote/Src/FillReport.cpp
View File

@ -322,60 +322,60 @@ int IsKey(int Key)
switch(Key) switch(Key)
{ {
// Wiimote // Wiimote
case g_Wm.MA: return GetAsyncKeyState(VK_LBUTTON); case g_Wiimote_kbd.MA: return GetAsyncKeyState(VK_LBUTTON);
case g_Wm.MB: return GetAsyncKeyState(VK_RBUTTON); case g_Wiimote_kbd.MB: return GetAsyncKeyState(VK_RBUTTON);
case g_Wm.A: return GetAsyncKeyState(PadMapping[0].Wm.A); case g_Wiimote_kbd.A: return GetAsyncKeyState(PadMapping[0].Wm.A);
case g_Wm.B: return GetAsyncKeyState(PadMapping[0].Wm.B); case g_Wiimote_kbd.B: return GetAsyncKeyState(PadMapping[0].Wm.B);
case g_Wm.ONE: return GetAsyncKeyState(PadMapping[0].Wm.One); case g_Wiimote_kbd.ONE: return GetAsyncKeyState(PadMapping[0].Wm.One);
case g_Wm.TWO: return GetAsyncKeyState(PadMapping[0].Wm.Two); case g_Wiimote_kbd.TWO: return GetAsyncKeyState(PadMapping[0].Wm.Two);
case g_Wm.P: return GetAsyncKeyState(PadMapping[0].Wm.P); case g_Wiimote_kbd.P: return GetAsyncKeyState(PadMapping[0].Wm.P);
case g_Wm.M: return GetAsyncKeyState(PadMapping[0].Wm.M); case g_Wiimote_kbd.M: return GetAsyncKeyState(PadMapping[0].Wm.M);
case g_Wm.H: return GetAsyncKeyState(PadMapping[0].Wm.H); case g_Wiimote_kbd.H: return GetAsyncKeyState(PadMapping[0].Wm.H);
case g_Wm.L: return GetAsyncKeyState(PadMapping[0].Wm.L); case g_Wiimote_kbd.L: return GetAsyncKeyState(PadMapping[0].Wm.L);
case g_Wm.R: return GetAsyncKeyState(PadMapping[0].Wm.R); case g_Wiimote_kbd.R: return GetAsyncKeyState(PadMapping[0].Wm.R);
case g_Wm.U: return GetAsyncKeyState(PadMapping[0].Wm.U); case g_Wiimote_kbd.U: return GetAsyncKeyState(PadMapping[0].Wm.U);
case g_Wm.D: return GetAsyncKeyState(PadMapping[0].Wm.D); case g_Wiimote_kbd.D: return GetAsyncKeyState(PadMapping[0].Wm.D);
case g_Wm.PITCH_L: return GetAsyncKeyState(PadMapping[0].Wm.PitchL); case g_Wiimote_kbd.PITCH_L: return GetAsyncKeyState(PadMapping[0].Wm.PitchL);
case g_Wm.PITCH_R: return GetAsyncKeyState(PadMapping[0].Wm.PitchR); case g_Wiimote_kbd.PITCH_R: return GetAsyncKeyState(PadMapping[0].Wm.PitchR);
case g_Wm.SHAKE: return GetAsyncKeyState(PadMapping[0].Wm.Shake) || GetAsyncKeyState(VK_MBUTTON); case g_Wiimote_kbd.SHAKE: return GetAsyncKeyState(PadMapping[0].Wm.Shake) || GetAsyncKeyState(VK_MBUTTON);
// Nunchuck // Nunchuck
case g_Nc.Z: return GetAsyncKeyState(PadMapping[0].Nc.Z); case g_NunchuckExt.Z: return GetAsyncKeyState(PadMapping[0].Nc.Z);
case g_Nc.C: return GetAsyncKeyState(PadMapping[0].Nc.C); case g_NunchuckExt.C: return GetAsyncKeyState(PadMapping[0].Nc.C);
case g_Nc.L: return GetAsyncKeyState(PadMapping[0].Nc.L); case g_NunchuckExt.L: return GetAsyncKeyState(PadMapping[0].Nc.L);
case g_Nc.R: return GetAsyncKeyState(PadMapping[0].Nc.R); case g_NunchuckExt.R: return GetAsyncKeyState(PadMapping[0].Nc.R);
case g_Nc.U: return GetAsyncKeyState(PadMapping[0].Nc.U); case g_NunchuckExt.U: return GetAsyncKeyState(PadMapping[0].Nc.U);
case g_Nc.D: return GetAsyncKeyState(PadMapping[0].Nc.D); case g_NunchuckExt.D: return GetAsyncKeyState(PadMapping[0].Nc.D);
case g_Nc.SHAKE: return GetAsyncKeyState(PadMapping[0].Nc.Shake); case g_NunchuckExt.SHAKE: return GetAsyncKeyState(PadMapping[0].Nc.Shake);
// Classic Controller // Classic Controller
case g_Cc.A: return GetAsyncKeyState(PadMapping[0].Cc.A); case g_ClassicContExt.A: return GetAsyncKeyState(PadMapping[0].Cc.A);
case g_Cc.B: return GetAsyncKeyState(PadMapping[0].Cc.B); case g_ClassicContExt.B: return GetAsyncKeyState(PadMapping[0].Cc.B);
case g_Cc.X: return GetAsyncKeyState(PadMapping[0].Cc.X); case g_ClassicContExt.X: return GetAsyncKeyState(PadMapping[0].Cc.X);
case g_Cc.Y: return GetAsyncKeyState(PadMapping[0].Cc.Y); case g_ClassicContExt.Y: return GetAsyncKeyState(PadMapping[0].Cc.Y);
case g_Cc.P: return GetAsyncKeyState(PadMapping[0].Cc.P); // Default is O instead of P case g_ClassicContExt.P: return GetAsyncKeyState(PadMapping[0].Cc.P); // Default is O instead of P
case g_Cc.M: return GetAsyncKeyState(PadMapping[0].Cc.M); // Default is N instead of M case g_ClassicContExt.M: return GetAsyncKeyState(PadMapping[0].Cc.M); // Default is N instead of M
case g_Cc.H: return GetAsyncKeyState(PadMapping[0].Cc.H); // Default is U instead of H case g_ClassicContExt.H: return GetAsyncKeyState(PadMapping[0].Cc.H); // Default is U instead of H
case g_Cc.Tl: return GetAsyncKeyState(PadMapping[0].Cc.Tl); // Digital left trigger case g_ClassicContExt.Tl: return GetAsyncKeyState(PadMapping[0].Cc.Tl); // Digital left trigger
case g_Cc.Zl: return GetAsyncKeyState(PadMapping[0].Cc.Zl); case g_ClassicContExt.Zl: return GetAsyncKeyState(PadMapping[0].Cc.Zl);
case g_Cc.Zr: return GetAsyncKeyState(PadMapping[0].Cc.Zr); case g_ClassicContExt.Zr: return GetAsyncKeyState(PadMapping[0].Cc.Zr);
case g_Cc.Tr: return GetAsyncKeyState(PadMapping[0].Cc.Tr); // Digital right trigger case g_ClassicContExt.Tr: return GetAsyncKeyState(PadMapping[0].Cc.Tr); // Digital right trigger
case g_Cc.Dl: return GetAsyncKeyState(PadMapping[0].Cc.Dl); // Digital left case g_ClassicContExt.Dl: return GetAsyncKeyState(PadMapping[0].Cc.Dl); // Digital left
case g_Cc.Du: return GetAsyncKeyState(PadMapping[0].Cc.Du); // Up case g_ClassicContExt.Du: return GetAsyncKeyState(PadMapping[0].Cc.Du); // Up
case g_Cc.Dr: return GetAsyncKeyState(PadMapping[0].Cc.Dr); // Right case g_ClassicContExt.Dr: return GetAsyncKeyState(PadMapping[0].Cc.Dr); // Right
case g_Cc.Dd: return GetAsyncKeyState(PadMapping[0].Cc.Dd); // Down case g_ClassicContExt.Dd: return GetAsyncKeyState(PadMapping[0].Cc.Dd); // Down
case g_Cc.Ll: return GetAsyncKeyState(PadMapping[0].Cc.Ll); // Left analog case g_ClassicContExt.Ll: return GetAsyncKeyState(PadMapping[0].Cc.Ll); // Left analog
case g_Cc.Lu: return GetAsyncKeyState(PadMapping[0].Cc.Lu); case g_ClassicContExt.Lu: return GetAsyncKeyState(PadMapping[0].Cc.Lu);
case g_Cc.Lr: return GetAsyncKeyState(PadMapping[0].Cc.Lr); case g_ClassicContExt.Lr: return GetAsyncKeyState(PadMapping[0].Cc.Lr);
case g_Cc.Ld: return GetAsyncKeyState(PadMapping[0].Cc.Ld); case g_ClassicContExt.Ld: return GetAsyncKeyState(PadMapping[0].Cc.Ld);
case g_Cc.Rl: return GetAsyncKeyState(PadMapping[0].Cc.Rl); // Right analog case g_ClassicContExt.Rl: return GetAsyncKeyState(PadMapping[0].Cc.Rl); // Right analog
case g_Cc.Ru: return GetAsyncKeyState(PadMapping[0].Cc.Ru); case g_ClassicContExt.Ru: return GetAsyncKeyState(PadMapping[0].Cc.Ru);
case g_Cc.Rr: return GetAsyncKeyState(PadMapping[0].Cc.Rr); case g_ClassicContExt.Rr: return GetAsyncKeyState(PadMapping[0].Cc.Rr);
case g_Cc.Rd: return GetAsyncKeyState(PadMapping[0].Cc.Rd); case g_ClassicContExt.Rd: return GetAsyncKeyState(PadMapping[0].Cc.Rd);
// This should not happen // This should not happen
default: PanicAlert("There is syntax error in a function that is calling IsKey(%i)", Key); return false; default: PanicAlert("There is syntax error in a function that is calling IsKey(%i)", Key); return false;
@ -404,31 +404,31 @@ void FillReportInfo(wm_core& _core)
bool InsideScreen = !(x < 0 || x > 1 || y < 0 || y > 1); bool InsideScreen = !(x < 0 || x > 1 || y < 0 || y > 1);
// Allow both mouse buttons and keyboard to press a and b // Allow both mouse buttons and keyboard to press a and b
if((IsKey(g_Wm.MA) && InsideScreen) || IsKey(g_Wm.A)) if((IsKey(g_Wiimote_kbd.MA) && InsideScreen) || IsKey(g_Wiimote_kbd.A))
_core.a = 1; _core.a = 1;
if((IsKey(g_Wm.MB) && InsideScreen) || IsKey(g_Wm.B)) if((IsKey(g_Wiimote_kbd.MB) && InsideScreen) || IsKey(g_Wiimote_kbd.B))
_core.b = 1; _core.b = 1;
_core.one = IsKey(g_Wm.ONE) ? 1 : 0; _core.one = IsKey(g_Wiimote_kbd.ONE) ? 1 : 0;
_core.two = IsKey(g_Wm.TWO) ? 1 : 0; _core.two = IsKey(g_Wiimote_kbd.TWO) ? 1 : 0;
_core.plus = IsKey(g_Wm.P) ? 1 : 0; _core.plus = IsKey(g_Wiimote_kbd.P) ? 1 : 0;
_core.minus = IsKey(g_Wm.M) ? 1 : 0; _core.minus = IsKey(g_Wiimote_kbd.M) ? 1 : 0;
_core.home = IsKey(g_Wm.H) ? 1 : 0; _core.home = IsKey(g_Wiimote_kbd.H) ? 1 : 0;
/* Sideways controls (for example for Wario Land) if the Wiimote is intended to be held sideways */ /* Sideways controls (for example for Wario Land) if the Wiimote is intended to be held sideways */
if(g_Config.bSidewaysDPad) if(g_Config.bSidewaysDPad)
{ {
_core.left = IsKey(g_Wm.D) ? 1 : 0; _core.left = IsKey(g_Wiimote_kbd.D) ? 1 : 0;
_core.up = IsKey(g_Wm.L) ? 1 : 0; _core.up = IsKey(g_Wiimote_kbd.L) ? 1 : 0;
_core.right = IsKey(g_Wm.U) ? 1 : 0; _core.right = IsKey(g_Wiimote_kbd.U) ? 1 : 0;
_core.down = IsKey(g_Wm.R) ? 1 : 0; _core.down = IsKey(g_Wiimote_kbd.R) ? 1 : 0;
} }
else else
{ {
_core.left = IsKey(g_Wm.L) ? 1 : 0; _core.left = IsKey(g_Wiimote_kbd.L) ? 1 : 0;
_core.up = IsKey(g_Wm.U) ? 1 : 0; _core.up = IsKey(g_Wiimote_kbd.U) ? 1 : 0;
_core.right = IsKey(g_Wm.R) ? 1 : 0; _core.right = IsKey(g_Wiimote_kbd.R) ? 1 : 0;
_core.down = IsKey(g_Wm.D) ? 1 : 0; _core.down = IsKey(g_Wiimote_kbd.D) ? 1 : 0;
} }
} }
////////////////////////// //////////////////////////
@ -467,7 +467,7 @@ void SingleShake(u8 &_y, u8 &_z, int i)
{ {
#ifdef _WIN32 #ifdef _WIN32
// Shake Wiimote with S, Nunchuck with D // Shake Wiimote with S, Nunchuck with D
if((i == 0 && IsKey(g_Wm.SHAKE)) || (i == 1 && IsKey(g_Nc.SHAKE))) if((i == 0 && IsKey(g_Wiimote_kbd.SHAKE)) || (i == 1 && IsKey(g_NunchuckExt.SHAKE)))
{ {
_z = 0; _z = 0;
_y = 0; _y = 0;
@ -572,13 +572,13 @@ void TiltWiimoteGamepad(float &Roll, float &Pitch)
void TiltWiimoteKeyboard(float &Roll, float &Pitch) void TiltWiimoteKeyboard(float &Roll, float &Pitch)
{ {
#ifdef _WIN32 #ifdef _WIN32
if(IsKey(g_Wm.PITCH_L)) if(IsKey(g_Wiimote_kbd.PITCH_L))
{ {
// Stop at the upper end of the range // Stop at the upper end of the range
if(KbDegree < g_Config.Trigger.Range.Pitch) if(KbDegree < g_Config.Trigger.Range.Pitch)
KbDegree += 3; // aim left KbDegree += 3; // aim left
} }
else if(IsKey(g_Wm.PITCH_R)) else if(IsKey(g_Wiimote_kbd.PITCH_R))
{ {
// Stop at the lower end of the range // Stop at the lower end of the range
if(KbDegree > -g_Config.Trigger.Range.Pitch) if(KbDegree > -g_Config.Trigger.Range.Pitch)
@ -590,8 +590,8 @@ void TiltWiimoteKeyboard(float &Roll, float &Pitch)
// ---------- // ----------
// Check for activity // Check for activity
yhist[yhist.size() - 1] = ( yhist[yhist.size() - 1] = (
IsKey(g_Wm.PITCH_L) IsKey(g_Wiimote_kbd.PITCH_L)
||IsKey(g_Wm.PITCH_R) ||IsKey(g_Wiimote_kbd.PITCH_R)
); );
// Move all items back, and check if any of them are true // Move all items back, and check if any of them are true
@ -1013,14 +1013,14 @@ void FillReportExtension(wm_extension& _ext)
if (g_Config.Nunchuck.Type == g_Config.Nunchuck.KEYBOARD) if (g_Config.Nunchuck.Type == g_Config.Nunchuck.KEYBOARD)
{ {
// Set the max values to the current calibration values // Set the max values to the current calibration values
if(IsKey(g_Nc.L)) // x if(IsKey(g_NunchuckExt.L)) // x
_ext.jx = g_nu.jx.min; _ext.jx = g_nu.jx.min;
if(IsKey(g_Nc.R)) if(IsKey(g_NunchuckExt.R))
_ext.jx = g_nu.jx.max; _ext.jx = g_nu.jx.max;
if(IsKey(g_Nc.D)) // y if(IsKey(g_NunchuckExt.D)) // y
_ext.jy = g_nu.jy.min; _ext.jy = g_nu.jy.min;
if(IsKey(g_Nc.U)) if(IsKey(g_NunchuckExt.U))
_ext.jy = g_nu.jy.max; _ext.jy = g_nu.jy.max;
} }
else else
@ -1079,11 +1079,11 @@ void FillReportExtension(wm_extension& _ext)
} }
} }
if(IsKey(g_Nc.C)) if(IsKey(g_NunchuckExt.C))
_ext.bt = 0x01; _ext.bt = 0x01;
if(IsKey(g_Nc.Z)) if(IsKey(g_NunchuckExt.Z))
_ext.bt = 0x02; _ext.bt = 0x02;
if(IsKey(g_Nc.C) && IsKey(g_Nc.Z)) if(IsKey(g_NunchuckExt.C) && IsKey(g_NunchuckExt.Z))
_ext.bt = 0x00; _ext.bt = 0x00;
/* Here we encrypt the report */ /* Here we encrypt the report */
@ -1109,9 +1109,9 @@ void FillReportExtension(wm_extension& _ext)
void FillReportClassicExtension(wm_classic_extension& _ext) void FillReportClassicExtension(wm_classic_extension& _ext)
{ {
/* These are the default neutral values for the analog triggers and sticks */ /* These are the default neutral values for the analog triggers and sticks */
u8 Rx = g_cc.Rx.center, Ry = g_cc.Ry.center, u8 Rx = g_ClassicContCalibration.Rx.center, Ry = g_ClassicContCalibration.Ry.center,
Lx = g_cc.Lx.center, Ly = g_cc.Ly.center, Lx = g_ClassicContCalibration.Lx.center, Ly = g_ClassicContCalibration.Ly.center,
lT = g_cc.Tl.neutral, rT = g_cc.Tl.neutral; lT = g_ClassicContCalibration.Tl.neutral, rT = g_ClassicContCalibration.Tl.neutral;
_ext.b1.padding = 0x01; // 0x01 means not pressed _ext.b1.padding = 0x01; // 0x01 means not pressed
_ext.b1.bRT = 0x01; _ext.b1.bRT = 0x01;
@ -1156,14 +1156,14 @@ void FillReportClassicExtension(wm_classic_extension& _ext)
// Update the left analog stick // Update the left analog stick
if (g_Config.ClassicController.LType == g_Config.ClassicController.KEYBOARD) if (g_Config.ClassicController.LType == g_Config.ClassicController.KEYBOARD)
{ {
if(IsKey(g_Cc.Ll)) // Left analog left if(IsKey(g_ClassicContExt.Ll)) // Left analog left
Lx = g_cc.Lx.min; Lx = g_ClassicContCalibration.Lx.min;
if(IsKey(g_Cc.Lu)) // up if(IsKey(g_ClassicContExt.Lu)) // up
Ly = g_cc.Ly.max; Ly = g_ClassicContCalibration.Ly.max;
if(IsKey(g_Cc.Lr)) // right if(IsKey(g_ClassicContExt.Lr)) // right
Lx = g_cc.Lx.max; Lx = g_ClassicContCalibration.Lx.max;
if(IsKey(g_Cc.Ld)) // down if(IsKey(g_ClassicContExt.Ld)) // down
Ly = g_cc.Ly.min; Ly = g_ClassicContCalibration.Ly.min;
} }
else else
@ -1196,14 +1196,14 @@ void FillReportClassicExtension(wm_classic_extension& _ext)
// Update the right analog stick // Update the right analog stick
if (g_Config.ClassicController.RType == g_Config.ClassicController.KEYBOARD) if (g_Config.ClassicController.RType == g_Config.ClassicController.KEYBOARD)
{ {
if(IsKey(g_Cc.Rl)) // Right analog left if(IsKey(g_ClassicContExt.Rl)) // Right analog left
Rx = g_cc.Rx.min; Rx = g_ClassicContCalibration.Rx.min;
if(IsKey(g_Cc.Ru)) // up if(IsKey(g_ClassicContExt.Ru)) // up
Ry = g_cc.Ry.max; Ry = g_ClassicContCalibration.Ry.max;
if(IsKey(g_Cc.Rr)) // right if(IsKey(g_ClassicContExt.Rr)) // right
Rx = g_cc.Rx.max; Rx = g_ClassicContCalibration.Rx.max;
if(IsKey(g_Cc.Rd)) // down if(IsKey(g_ClassicContExt.Rd)) // down
Ry = g_cc.Ry.min; Ry = g_ClassicContCalibration.Ry.min;
} }
else else
{ {
@ -1235,9 +1235,9 @@ void FillReportClassicExtension(wm_classic_extension& _ext)
// Update the left and right analog triggers // Update the left and right analog triggers
if (g_Config.ClassicController.TType == g_Config.ClassicController.KEYBOARD) if (g_Config.ClassicController.TType == g_Config.ClassicController.KEYBOARD)
{ {
if(IsKey(g_Cc.Tl)) // analog left trigger if(IsKey(g_ClassicContExt.Tl)) // analog left trigger
{ _ext.b1.bLT = 0x00; lT = 0x1f; } { _ext.b1.bLT = 0x00; lT = 0x1f; }
if(IsKey(g_Cc.Tr)) // analog right trigger if(IsKey(g_ClassicContExt.Tr)) // analog right trigger
{ _ext.b1.bRT = 0x00; rT = 0x1f; } { _ext.b1.bRT = 0x00; rT = 0x1f; }
} }
else // g_Config.ClassicController.TRIGGER else // g_Config.ClassicController.TRIGGER
@ -1276,10 +1276,10 @@ void FillReportClassicExtension(wm_classic_extension& _ext)
0: bdU 0: bdU
1: bdL 1: bdL
*/ */
if(IsKey(g_Cc.Dl)) _ext.b2.bdL = 0x00; // Digital left if(IsKey(g_ClassicContExt.Dl)) _ext.b2.bdL = 0x00; // Digital left
if(IsKey(g_Cc.Du)) _ext.b2.bdU = 0x00; // Up if(IsKey(g_ClassicContExt.Du)) _ext.b2.bdU = 0x00; // Up
if(IsKey(g_Cc.Dr)) _ext.b1.bdR = 0x00; // Right if(IsKey(g_ClassicContExt.Dr)) _ext.b1.bdR = 0x00; // Right
if(IsKey(g_Cc.Dd)) _ext.b1.bdD = 0x00; // Down if(IsKey(g_ClassicContExt.Dd)) _ext.b1.bdD = 0x00; // Down
// -------------- // --------------
// -------------------------------------- // --------------------------------------
@ -1299,31 +1299,31 @@ void FillReportClassicExtension(wm_classic_extension& _ext)
6: bB 6: bB
7: bZl 7: bZl
*/ */
if(IsKey(g_Cc.A)) if(IsKey(g_ClassicContExt.A))
_ext.b2.bA = 0x00; _ext.b2.bA = 0x00;
if(IsKey(g_Cc.B)) if(IsKey(g_ClassicContExt.B))
_ext.b2.bB = 0x00; _ext.b2.bB = 0x00;
if(IsKey(g_Cc.Y)) if(IsKey(g_ClassicContExt.Y))
_ext.b2.bY = 0x00; _ext.b2.bY = 0x00;
if(IsKey(g_Cc.X)) if(IsKey(g_ClassicContExt.X))
_ext.b2.bX = 0x00; _ext.b2.bX = 0x00;
if(IsKey(g_Cc.P)) // O instead of P if(IsKey(g_ClassicContExt.P)) // O instead of P
_ext.b1.bP = 0x00; _ext.b1.bP = 0x00;
if(IsKey(g_Cc.M)) // N instead of M if(IsKey(g_ClassicContExt.M)) // N instead of M
_ext.b1.bM = 0x00; _ext.b1.bM = 0x00;
if(IsKey(g_Cc.H)) // Home button if(IsKey(g_ClassicContExt.H)) // Home button
_ext.b1.bH = 0x00; _ext.b1.bH = 0x00;
if(IsKey(g_Cc.Zl)) // Digital left trigger if(IsKey(g_ClassicContExt.Zl)) // Digital left trigger
_ext.b2.bZL = 0x00; _ext.b2.bZL = 0x00;
if(IsKey(g_Cc.Zr)) // Digital right trigger if(IsKey(g_ClassicContExt.Zr)) // Digital right trigger
_ext.b2.bZR = 0x00; _ext.b2.bZR = 0x00;
// All buttons pressed // All buttons pressed
@ -1370,5 +1370,163 @@ void FillReportClassicExtension(wm_classic_extension& _ext)
} }
// ======================= // =======================
// ===================================================
/* Generate the 6 byte extension report for the Classic Controller, encrypted.
The bytes are ... */
// ----------------
void FillReportGuitarHero3Extension(wm_GH3_extension& _ext)
{
//_ext.SX : 6;
//_ext.SY : 6;
// u8 TB : 5; // not used in GH3
// u8 WB : 5;
u8 SX = g_GH3Calibration.Lx.center,
SY = g_GH3Calibration.Ly.center;
_ext.pad1 = 3;
_ext.pad2 = 3;
_ext.pad3 = 0;
_ext.pad4 = 0;
_ext.pad5 = 3;
_ext.pad6 = 1;
_ext.pad7 = 1;
_ext.pad8 = 1;
_ext.pad9 = 3;
_ext.BP = 1;
_ext.BM = 1;
_ext.BD = 1;
_ext.BU = 1;
_ext.BY = 1;
_ext.BG = 1;
_ext.BB = 1;
_ext.BR = 1;
_ext.BO = 1;
// --------------------------------------
// Check that Dolphin is in focus
if (IsFocus())
{
// --------------------------------------
/* Left and right analog sticks and analog triggers
u8 Lx : 6; // byte 0
u8 Rx : 2;
u8 Ly : 6; // byte 1
u8 Rx2 : 2;
u8 Ry : 5; // byte 2
u8 lT : 2;
u8 Rx3 : 1;
u8 rT : 5; // byte 3
u8 lT2 : 3;
We use a 200 range (28 to 228) for the left analog stick and a 176 range
(40 to 216) for the right analog stick to match our calibration values
in classic_calibration
*/
// Update the left analog stick
if (g_Config.GH3Controller.LType == g_Config.GH3Controller.KEYBOARD)
{
if(IsKey(g_GH3Ext.Ll)) // Left analog left
_ext.SX = g_GH3Calibration.Lx.min;
if(IsKey(g_ClassicContExt.Lu)) // up
_ext.SY = g_GH3Calibration.Ly.max;
if(IsKey(g_ClassicContExt.Lr)) // right
_ext.SX = g_GH3Calibration.Lx.max;
if(IsKey(g_ClassicContExt.Ld)) // down
_ext.SY = g_GH3Calibration.Ly.min;
}
else
{
// Get adjusted pad state values
int _Sx, _Sy,
_Rx, _Ry, _Tl, _Tr; // Not Yet used
PadStateAdjustments(_Sx, _Sy, _Rx, _Ry, _Tl, _Tr);
// The Y-axis is inverted
_Sy = 0xff - _Sy;
//_Ry = 0xff - _Ry;
/* This is if we are also using a real Classic Controller that we are sharing the calibration with.
It's not needed if we are using our default values. We adjust the values to the configured range.
Status: Not added, we are not currently sharing the calibration with the real Classic Controller
*/
if (g_Config.GH3Controller.LType == g_Config.GH3Controller.ANALOG1)
{
SX = _Sx;
SY = _Sy;
}
else // ANALOG2
{
// Lx = _Rx;
// Ly = _Ry;
}
}
if(IsKey(g_GH3Ext.Bu)) _ext.BU = 0x00; // Strum Up
if(IsKey(g_GH3Ext.Bd)) _ext.BD= 0x00; // Strum Down
if(IsKey(g_GH3Ext.BP))
_ext.BP = 0x00;
if(IsKey(g_GH3Ext.BM))
_ext.BM = 0x00;
if(IsKey(g_GH3Ext.BY))
_ext.BY = 0x00;
if(IsKey(g_GH3Ext.BG))
_ext.BG = 0x00;
if(IsKey(g_GH3Ext.BB))
_ext.BB = 0x00;
if(IsKey(g_GH3Ext.BR))
_ext.BR = 0x00;
if(IsKey(g_GH3Ext.BO))
_ext.BO = 0x00;
}
// --------------------------------------
// --------------------------------------
// Convert data for reporting
// --------------
_ext.SX = (SX >> 2);
_ext.SY = (SY >> 2);
/* // 5 bit to 1 bit
_ext.Rx = (Rx >> 3) & 0x01;
// 5 bit to the next 2 bit
_ext.Rx2 = ((Rx >> 3) >> 1) & 0x03;
// 5 bit to the next 2 bit
_ext.Rx3 = ((Rx >> 3) >> 3) & 0x03;
_ext.Ry = (Ry >> 3);
// 5 bit to 3 bit
_ext.lT = (lT >> 3) & 0x07;
// 5 bit to the highest two bits
_ext.lT2 = (lT >> 3) >> 3;
_ext.rT = (rT >> 3);
// --------------
*/
/* Here we encrypt the report */
// Create a temporary storage for the data
u8 Tmp[sizeof(_ext)];
// Clear the array by copying zeroes to it
memset(Tmp, 0, sizeof(_ext));
// Copy the data to it
memcpy(Tmp, &_ext, sizeof(_ext));
// Encrypt it
wiimote_encrypt(&g_ExtKey, Tmp, 0x00, sizeof(_ext));
// Write it back to the struct
memcpy(&_ext, Tmp, sizeof(_ext));
}
} // end of namespace } // end of namespace

9
Source/Plugins/Plugin_Wiimote/Src/main.cpp
View File

@ -75,7 +75,8 @@ bool g_WiimoteUnexpectedDisconnect = false;
// Settings // Settings
accel_cal g_wm; accel_cal g_wm;
nu_cal g_nu; nu_cal g_nu;
cc_cal g_cc; cc_cal g_ClassicContCalibration;
gh3_cal g_GH3Calibration;
// Debugging // Debugging
bool g_DebugAccelerometer = false; bool g_DebugAccelerometer = false;
@ -489,7 +490,7 @@ void DisableExtensions()
g_Config.bNunchuckConnected = false; g_Config.bNunchuckConnected = false;
g_Config.bClassicControllerConnected = false; g_Config.bClassicControllerConnected = false;
//g_Config.bBalanceBoard = false; //g_Config.bBalanceBoard = false;
//g_Config.bGuitar = false; g_Config.bGuitarConnected = false;
//g_Config.bDrums = false; //g_Config.bDrums = false;
} }
@ -841,7 +842,7 @@ void ReadDebugging(bool Emu, const void* _pData, int Size)
if (data[1] == WM_REPORT_CORE_ACCEL_IR10_EXT6) WiiMoteEmu::IRData2DotsBasic(&data[7]); else WiiMoteEmu::IRData2Dots(&data[7]); if (data[1] == WM_REPORT_CORE_ACCEL_IR10_EXT6) WiiMoteEmu::IRData2DotsBasic(&data[7]); else WiiMoteEmu::IRData2Dots(&data[7]);
std::string IRData; std::string IRData;
// Create a shortcut // Create a shortcut
struct WiiMoteEmu::SDot* Dot = WiiMoteEmu::g_Wm.IR.Dot; struct WiiMoteEmu::SDot* Dot = WiiMoteEmu::g_Wiimote_kbd.IR.Dot;
for (int i = 0; i < 4; ++i) for (int i = 0; i < 4; ++i)
{ {
if(Dot[i].Visible) if(Dot[i].Visible)
@ -850,7 +851,7 @@ void ReadDebugging(bool Emu, const void* _pData, int Size)
IRData += StringFromFormat("[%i]", Dot[i].Order); IRData += StringFromFormat("[%i]", Dot[i].Order);
} }
// Dot distance // Dot distance
IRData += StringFromFormat(" | Distance:%i", WiiMoteEmu::g_Wm.IR.Distance); IRData += StringFromFormat(" | Distance:%i", WiiMoteEmu::g_Wiimote_kbd.IR.Distance);
// ------------------------- // -------------------------
// Classic Controller data // Classic Controller data

3
Source/Plugins/Plugin_Wiimote/Src/main.h
View File

@ -63,7 +63,8 @@ struct SRecordingAll
// Settings // Settings
extern accel_cal g_wm; extern accel_cal g_wm;
extern nu_cal g_nu; extern nu_cal g_nu;
extern cc_cal g_cc; extern cc_cal g_ClassicContCalibration;
extern gh3_cal g_GH3Calibration;
// Debugging // Debugging
extern bool g_DebugAccelerometer; extern bool g_DebugAccelerometer;

40
Source/Plugins/Plugin_Wiimote/Src/wiimote_hid.h
View File

@ -226,6 +226,39 @@ struct wm_classic_extension
wm_cc_5 b2; // byte 5 wm_cc_5 b2; // byte 5
}; };
struct wm_GH3_extension
{
u8 SX : 6;
u8 pad1 : 2; // 1 on GH3, 0 on GHWT
u8 SY : 6;
u8 pad2 : 2; // 1 on GH3, 0 on GHWT
u8 TB : 5; // not used in GH3
u8 pad3 : 3; // Always 0
u8 WB : 5;
u8 pad4 : 3; // Always 0
u8 pad5 : 2; // Always 1
u8 BP : 1;
u8 pad6 : 1; // Always 1
u8 BM : 1;
u8 pad7 : 1; // Always 1
u8 BD : 1;
u8 pad8 : 1; // Always 1
u8 BU : 1;
u8 pad9 : 2; // Always 1
u8 BY : 1;
u8 BG : 1;
u8 BB : 1;
u8 BR : 1;
u8 BO : 1;
};
//****************************************************************************** //******************************************************************************
// Data reports // Data reports
//****************************************************************************** //******************************************************************************
@ -324,6 +357,13 @@ struct cc_cal
cc_trigger Tl; // cc_trigger Tl; //
cc_trigger Tr; // cc_trigger Tr; //
}; };
struct gh3_cal
{
nu_js Lx
nu_js Ly;
nu_js Rx;
nu_js Ry;
};
#pragma pack(pop) #pragma pack(pop)