Merging HD Rumble support from fork?

[pengowray]

There's a fork of this project by Mizushiki (MIZUSHIKI/JoyShockLibrary-plus-HDRumble) which has added HD Rumble support like the name suggests. This seems like what I was looking for but the fork is now 38 commits behind the mainline library.

It doesn't look like they attempted to create a PR. I'm not sure how easy it would be to merge the changes, but would appreciate if anyone had a look. Or otherwise has anyone looked at adding Rumble HD support?

(Rumble HD is a core feature I'm looking for, and trying to find a JoyCon library is hard)

[r57zone]

Can also make a simple rumble on the joycons like this (based on code):

unsigned char PacketCounter = 0;
...
static float MotorFreqFromStrength(unsigned char motorValue) { // Dynamic frequency
	if (motorValue == 0) return 40.0f;
	return 40.0f + (motorValue / 255.0f) * (320.0f - 40.0f);
}

static void EncodeRumble(unsigned char* data, float freq, float amp) {
	if (freq < 41.0f) freq = 41.0f;
	if (freq > 1253.0f) freq = 1253.0f;
	if (amp < 0.0f) amp = 0.0f;
	if (amp > 1.0f) amp = 1.0f;

	uint16_t hf = (uint16_t)(320.0f * log2f(freq * 0.1f) + 0.5f);
	uint8_t hf_byte = (hf - (hf % 4)) / 4;
	uint8_t lf_byte = (uint8_t)((freq * 0.1f) / powf(2.0f, (hf_byte - 0x60) / 32.0f));

	uint16_t amp_enc = (uint16_t)(amp * 0x7FFF);
	uint8_t amp_hi = (amp_enc >> 8) & 0xFF;
	uint8_t amp_lo = amp_enc & 0xFF;

	data[0] = lf_byte;
	data[1] = hf_byte;
	data[2] = amp_lo;
	data[3] = amp_hi;
}

// https://github.com/fossephate/JoyCon-Driver/blob/main/joycon-driver/include/Joycon.hpp
void JoyConSimpleRumble(hid_device* jcHandle, bool IsLeft, unsigned char MotorValue)
{
	unsigned char outputReport[64] = { 0 };

	outputReport[0] = 0x10;
	outputReport[1] = PrimaryGamepad.PacketCounter++ & 0x0f;

	if (IsLeft) {
		if (MotorValue == 0) {
			outputReport[2] = 0x00;
			outputReport[3] = 0x01;
			outputReport[4] = 0x40;
			outputReport[5] = 0x40;
		} else
			EncodeRumble(&outputReport[2], MotorFreqFromStrength(MotorValue), (MotorValue * PrimaryGamepad.RumbleStrength * 0.9f) / 25500.0f); // It seems that values above 90% may cause wear on the motors of Nintendo controllers.
	} else { // Is right
		if (MotorValue == 0) {
			outputReport[6] = 0x00;
			outputReport[7] = 0x01;
			outputReport[8] = 0x40;
			outputReport[9] = 0x40;
		} else
			EncodeRumble(&outputReport[6], MotorFreqFromStrength(MotorValue), (MotorValue * PrimaryGamepad.RumbleStrength * 0.9f) / 25500.0f);
	}

	hid_write(jcHandle, outputReport, sizeof(outputReport));
}

JoyConSimpleRumble(PrimaryGamepad.HidHandle, true, OutState.LargeMotor);

Pro controller:

				outputReport[0] = 0x10;
				outputReport[1] = PrimaryGamepad.PacketCounter++ & 0x0f;
				EncodeRumble(&outputReport[2], MotorFreqFromStrength(OutState.SmallMotor), (OutState.SmallMotor / 255.0f) * (PrimaryGamepad.RumbleStrength / 100.0f));
				EncodeRumble(&outputReport[6], MotorFreqFromStrength(OutState.LargeMotor), (OutState.LargeMotor / 255.0f) * (PrimaryGamepad.RumbleStrength / 100.0f));
				hid_write(PrimaryGamepad.HidHandle, outputReport, 64);

[r57zone]

Added rumble support for Joycons and Pro Controller to JoyShockLibrary, but for some reason it still doesn’t work when used inside the library. It works outside the library, and I haven’t figured out the reason yet. Any tips on how to fix it would be greatly appreciated.