New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WIP - Wiimote emu motion plus #7589

Closed

jordan-woyak wants to merge 21 commits into dolphin-emu:master from jordan-woyak:wiimote-emu-motion-plus

Member

jordan-woyak commented Nov 24, 2018

Cleanup Wiimote emu code to more closely simulate the real thing.
Simulate Motion Plus attachment.
Eliminated some dead code.

jordan-woyak added 8 commits

November 22, 2018 12:17


          Remove some remnants of hybrid wiimote.

f566234


          Partially emulate i2c bus of emulated wiimote to more closely simulat…

79f96d1

…e the real thing. Transfer most of IR camera logic to the i2c bus. Temporarily break everything else.


          Unbreak wiimote extensions.

ab42b18


          Add wiimote speaker logic to i2c bus. Temporarily break the "pan" set…

7a2d2da

…ting.


          Process wiimote read data requests like they are on a real wiimote. I…

56f7d54

…t's not a queue. New requests are ignored and input is suppressed while processing a request. This simplifies the save state code greatly.


          Fix usage of ReportFeatures in TAS related code.

b5fce7c


          Tweak the i2c bus code to better support motion plus and its passthro…

176f24c

…ugh port.


          Emulated motion plus is detected by game now.

86e4fea

BhaaLseN reviewed

View reviewed changes

Member

BhaaLseN left a comment

Yay for cleanup!

Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp

-                // hybrid Wiimote stuff
-                if (WIIMOTE_SRC_REAL & g_wiimote_sources[m_index] && (m_extension->switch_extension <= 0))
-                {
-                  using namespace WiimoteReal;

This comment was marked as off-topic.

Sign in to view

Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp Outdated Show resolved Hide resolved

Source/Core/Core/HW/WiimoteEmu/Speaker.cpp Outdated Show resolved Hide resolved

Source/Core/Core/HW/WiimoteEmu/Speaker.cpp Outdated Show resolved Hide resolved

Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp Show resolved Hide resolved

Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp Show resolved Hide resolved

Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h Outdated Show resolved Hide resolved

Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h Show resolved Hide resolved

Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h Show resolved Hide resolved

Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h Show resolved Hide resolved

jordan-woyak added 7 commits

November 24, 2018 13:09


          Kill some magic numbers and unbreak wiimote speaker pan setting.

0aa403e


          Cleanup and magic number killing.

a90ae77


          Advance save state version.

28d7068


          More cleanups and work towards making motion plus fully functional.

8a028cf


          More attempts to make motion plus stay connected.

ad11e21


          Unbreak real wiimotes.

7ed1661


          Implement the rest of the wiimote input reports.

feabbde

riking reviewed

View reviewed changes

Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp Outdated Show resolved Hide resolved

Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp Outdated

@@ @@ -202,53 +209,54 @@ void Wiimote::HandleExtensionSwap() @@
               void Wiimote::RequestStatus(const wm_request_status* const rs)
               {
-                HandleExtensionSwap();
+                INFO_LOG(WIIMOTE, "Wiimote::RequestStatus");

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp Outdated

-                // ignore the 0x010000 bit
-                address &= ~0x010000;
+                INFO_LOG(WIIMOTE, "Wiimote::WriteData: 0x%02x @ 0x%02x @ 0x%02x (%d)", wd->space, wd->slave_address, address, wd->size);

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp Outdated Show resolved Hide resolved

Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp Outdated Show resolved Hide resolved

Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp

		@@ -620,4 +478,4 @@ void Wiimote::RealState()
		g_wiimotes[m_index]->EnableDataReporting(m_reporting_mode);

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

BhaaLseN reviewed

View reviewed changes

Source/Core/Core/HW/Wiimote.cpp

		@@ -135,21 +135,37 @@ void Pause()
		// An L2CAP packet is passed from the Core to the Wiimote on the HID CONTROL channel.
		void ControlChannel(int number, u16 channel_id, const void* data, u32 size)

This comment was marked as off-topic.

Sign in to view

Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp Show resolved Hide resolved

riking reviewed

View reviewed changes

Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h Show resolved Hide resolved

Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h

+              class I2CBus
+              {
+              public:
+                void AddSlave(I2CSlave* slave) { m_slaves.emplace_back(slave); }

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp Outdated Show resolved Hide resolved

Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp Outdated

+                static const u8 c1[16] = {0x78, 0xd9, 0x78, 0x38, 0x77, 0x9d, 0x2f, 0x0c,
+xcf, 0xf0, 0x31, 0xad, 0xc8, 0x0b, 0x5e, 0x39};
+                static const u8 c2[16] = {0x6f, 0x81, 0x7b, 0x89, 0x78, 0x51, 0x33, 0x60,
+xc9, 0xf5, 0x37, 0xc1, 0x2d, 0xe9, 0x15, 0x8d};

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp

+                // Address 0x58
+                m_i2c_bus.AddSlave(&m_camera_logic);
+                // TODO: only add to bus when enabled

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp Outdated

+                {
+                  ++times_updated_since_activation;
+                  // TODO: wtf is this value actually..

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp

+                // For some reason the first read seems to have garbage data
+                // is_mp_data and extension_connected are set, but the data is junk
+                // it does seem to have some sort of pattern though, byte 5 is always 2
+                // something like: d5, b0, 4e, 6e, fc, 2

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp Show resolved Hide resolved

Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h

+                        return result;
+                        // It seems a write of any value triggers deactivation.
+                        if (0xf0 == addr)

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h

+                        auto const result = RawWrite(&reg_data, addr, count, data_in);
+                        // It seems a write of any value triggers activation.
+                        if (0xfe == addr)

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

Warepire commented Nov 27, 2018

Reading through this code I am missing the handing of the read/write bit in i2c addressing. Am I missing the relevant code blocks or is the addressing handling wrong?

If necessary, this document describes the i2c bus: https://www.nxp.com/docs/en/user-guide/UM10204.pdf

Member Author

jordan-woyak commented Nov 27, 2018

The read/write bit (lsb of slave_address) is ignored by a real wiimote. I chop it off in Read/WriteData calls (>> 1) and the high level i2c bus simulation just makes use of the 7 bit address.

Warepire commented Nov 28, 2018

Ah, that makes sense.

Would it be meaningful to name the operation using a small constexpr function?

jordan-woyak added 6 commits

November 29, 2018 17:42


          Some cleanups per code reviews.


          Motion plus now works half of the time in Wii Sports Resort.

3e3b48d


          Cleanup.

74f1a28


          Kill some more magic numbers. Use some enum classes.

e653b53


          More WiimoteEmu cleanup: Cleanup ack handling. Improve accuracy of re…

…port handling with unusual values. Eliminated outdated comments.


          Fix wiimote pan setting from keeping center at half volume.

7369a84

jordan-woyak force-pushed the wiimote-emu-motion-plus branch from da8e649 to 7369a84 Compare

December 5, 2018 00:48

jordan-woyak closed this

jordan-woyak deleted the wiimote-emu-motion-plus branch

February 3, 2019 15:05

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment