Commit Graph

112 Commits

Author SHA1 Message Date
John Peterson
47c7e9fe99 Emulated Wiimote GUI: Reorganized controls
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2261 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-15 18:44:29 +00:00
John Peterson
a8e35e976a Emulated Wiimote: Added customizable controls for the Wiimote and the Nunchuck
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2259 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-15 18:23:42 +00:00
omegadox
71d9832004 Linux compile fixes.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2246 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-15 05:43:48 +00:00
John Peterson
cf068ebb06 Emulated Wiimote: Forgot to check that we have a gamepad
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2245 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-15 02:26:30 +00:00
John Peterson
72112584de Emulated Wiimote: Forgot a few ifdefs
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2244 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-15 02:06:07 +00:00
John Peterson
34dbb40ef5 Emulated Wiimote: Added option to use analog controls for the Nunchuck stick
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2243 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-15 02:01:43 +00:00
John Peterson
ae9bb905bf Emulated Wiimote: Fixed the concurrent playback of Wiimote and Nunchuck movements
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2242 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-14 19:36:25 +00:00
John Peterson
7c638f3a51 Emulated Wiimote: Added option to use Analog 2 for roll and pitch. Now you can use the regular controls on Analog 1 and roll and pitch on Analog 2.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2240 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-14 13:03:21 +00:00
John Peterson
79947e5d29 Emulated Wiimote: Added dead zone option for the gamepad input
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2237 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-14 01:15:35 +00:00
John Peterson
57c4620902 Emulated Wiimote: Fixed the upside down mode for roll and pitch, 360° roll and pitch is now emulated by an analog gamepad
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2224 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-12 16:43:35 +00:00
John Peterson
eb1c6163f7 Emulated Wiimote: Enabled the roll and pitch function again (I had accidently disabled it in the last commit)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2220 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-12 10:49:38 +00:00
John Peterson
b932a53b68 Emulated Wiimote: Fixed the angles to x, y, z values conversion. There's just one thing left to fix before the combined roll and pitch works, when roll is more than 90 pitch has to be changed from for example 15 to -165 or something like that. Until I figure that out you can use the emulated roll and pitch separately by setting the range of either one of them to zero.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2219 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-12 08:46:48 +00:00
John Peterson
9651a30c1b Wiimote: Disabled the combined pitch and roll option that was not ready yet
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2217 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-11 10:47:50 +00:00
John Peterson
68f39cb287 nJoy:
1. Circumvent the IDirectInputDevice2::SetDataFormat() error when opening the configuration window to.

2. Fixed the Allow out of focus input option again

3. Allow changing of the mapped pads while a game is running

4. Prevented crashes or problems from any combination of having the configuration window open when a game is started or stopped

5. Fixed a crash that would occur after nJoy was started with a connected pad, then stopped, and all pads disconnected, then started again

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2215 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-11 10:30:02 +00:00
John Peterson
5ba51ed789 Wiimote: Fixed crash that would occur if no gamepad was detected
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2211 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-10 20:20:52 +00:00
John Peterson
c1214d2026 Wiimote: Compile fix
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2210 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-10 18:46:39 +00:00
John Peterson
88d41e3ff4 Wiimote: Non-windows compilation fix
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2209 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-10 18:36:37 +00:00
John Peterson
516a14150a Wiimote: Improved the emulated Wiimote, added gamepad controls for analog tilting.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2207 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-10 17:25:08 +00:00
John Peterson
c18613a580 nJoy: Fixed the Hat / Custom D-Pad setting in the save by slot mode
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2194 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-10 00:41:43 +00:00
nakeee
4200f69c5a fix unresolved symbols
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2188 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-09 21:19:35 +00:00
John Peterson
b59d023cbf Wiimote: Build fix, forgot to recomment a logging function
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2186 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-09 21:01:02 +00:00
John Peterson
5edef94753 SimplePad: Added input recording options to the GUI, now we just need to get rerecording to work to, perhaps one can rewind the input counter when a state is loaded? So the input counter is saved in the savestate for the pad.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2184 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-09 20:06:27 +00:00
daco65
2ff2852771 Njoy: added an option to choose what kind of analog filtering you want. it should be changeable when you choose to view advanced settings. this solved my analog/digital config problems i had and it *should* still work for those who had np with Jpeterson's change. i was told the wiimote had the same problem (makes sense) but im not sure if alot of ppl had that problem with their controllers so i have kept it as an ini changeable option only (set AdvancedMapFilter to True to use the same filtering as Njoy 0.3 does with AdvancedMapFilter enabled.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2180 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-09 18:43:03 +00:00
John Peterson
1fbebb4ce1 Wiimote: Configure gamepad in Wiimote plugin
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2172 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-09 13:10:29 +00:00
John Peterson
2757dbe2a8 InputCommon and Wiimote: Detect pads in the Wiimote plugin
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2151 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-08 15:39:28 +00:00
John Peterson
5045119da3 Wiimote: Typo
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2143 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-08 12:31:07 +00:00
John Peterson
ca0e807db6 Wiimote: Fixed the speaker status bar status, the status is [Green] [Blue] [Green] that means [On/Off] [Muted/Unmuted] [Activity]
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2142 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-08 12:27:04 +00:00
John Peterson
e926bc61d1 Wiimote: Added logging messages for the speaker configuration and for the 0x18 sound reports, the speaker currently produce a low humming noise in the wpad tools demo, but no real sound
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2141 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-08 10:15:55 +00:00
John Peterson
60e89dfc6f nJoy: Fixed bug that would cause the settings to be lost when nJoy was started without any detected gamepad
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2131 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-07 05:57:28 +00:00
John Peterson
382b4af74b Wiimote: Fixed the dual mode bug I mentioned in the last commit, now the Nunchuck should not get stuck when switching between the real and emulated Nunchuck. The only important problem left is disconnect problem that occurs about one in five times you switch to the real wiimote.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2130 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-07 04:19:52 +00:00
John Peterson
fcdd2a8e17 Wiimote:
1. Fixed the dual mode. You should now be able to change between the real and emulated Wiimote at any time, even when the Nunchuck is connected. It also supports third party Wireless Nunchucks that never sends any calibration values. The Nunchuck status should be automatically updated. The Nunchuck stick may get stuck, but that should fix itself if you disconnect and reconnect again. The only important problems seems to be that the real Wiimote fails to answer sometimes so that the Core functions disconnect it.

2. Began looking at how to reconnect the Wiimote after an unwanted HCI disconnect command

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2129 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-07 03:16:41 +00:00
John Peterson
5df69d0384 Wiimote Configuration: Changed the height of the configuration window to 748 pixels, that should give enough room for it inside a 768 pixels screen height.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2123 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-06 07:09:21 +00:00
John Peterson
6f39549842 Wiimote: Changed a %s to a %u that could cause a crash in WII_IPC_HLE_WiiMote.cpp. Made the configuration window center only if there is room for it, that should fix issue 557.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2122 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-06 07:03:09 +00:00
John Peterson
79f56c9e97 Wiimote: Added GUI controls for gamepad input, not connected yet
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2121 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-06 06:15:59 +00:00
XTra.KrazzY
7cc80c32f9 Fixed Wiimote config window closing (Don't use EndModal if you aren't using ShowModal)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2117 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-05 05:44:16 +00:00
John Peterson
3d73d781ec Wiimote: Reset variables on Shutdown(). I think this makes DoesChannelExist(scid) in the Core to return false.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2116 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-05 00:13:38 +00:00
John Peterson
c9c95534c8 Wiimote: Added timeout for Eeprom data reading, it should fail very rarely, but if it would we now stop waiting for it after two seconds. If it fails it will break the functionality of the real wiimote because g_WiiMotes[i]->ReadData() will not be called by ReadWiimote_ThreadFunc() while we are waiting for it.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2115 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-05 00:02:54 +00:00
Shawn Hoffman
7b7cfa940e remove stuff from ogl debugger that did nothing. (copied from dsp hle a while ago)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2111 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-04 17:33:59 +00:00
John Peterson
c43d8e9dcd Wiimote: Added new gamepad controller options to the GUI, they are not connected yet
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2108 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-04 13:35:28 +00:00
John Peterson
cf303e70e9 Wiimote: Show the decrypted Nunchuck calibration values in the log when a real Wiimote and Nunchuck is used. Fixed an earlier bug that made the neutral emulated nunchuck accelerometer values zero, now they are back to 0x80,0x80,0xb3.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2104 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-04 06:40:05 +00:00
magumagu9
4307803090 A bit more _MSC_VER cleanup.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2100 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-04 01:55:24 +00:00
John Peterson
ec39c45dd5 Wiimote: Added decryption function, it could be useful for debugging real Wiimote extensions
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2099 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-04 00:06:11 +00:00
nakeee
c10d69fe07 more MSC_VER
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2098 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-03 23:25:30 +00:00
nakeee
25b7942de2 real Wiimote connects on linux (thanks sonic1!)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2097 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-03 23:05:31 +00:00
nakeee
9981670e37 removed more MSV_VER
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2095 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-03 22:46:18 +00:00
nakeee
a1b7a91348 I mean * honestly :)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2094 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-03 22:09:13 +00:00
nakeee
bde4241e9e fixed underrun buffer in hle on linux
made wiimote compile on linux again


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2093 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-03 22:06:18 +00:00
John Peterson
4660943322 Wiimote: Added option to record adjusted wiimote accelerometer values
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2089 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-03 11:45:59 +00:00
John Peterson
1ead45ca04 Wiimote: Fixed slight oversight in the last commit
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2086 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-03 09:39:35 +00:00
John Peterson
5972f886ab Wiimote: Fixed the hanging for real. Any call to a function in the wxDialog frame class while the main thread is in a WaitForSingleObject() loop or any other loop will hang the g_pReadThread execution until sometime after that loop has ended. So we must wait for pReadThread to stop from the wxDialog with a timer, we can not use any loop in the main thread to wait for it to stop.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2083 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-03 07:43:52 +00:00