Updated vibration example.

This commit is contained in:
yellows8 2018-03-14 21:41:22 -04:00
parent e0ac4fba23
commit a6bab09fa7

View File

@ -4,8 +4,7 @@
#include <switch.h> #include <switch.h>
//Example for HID vibration/rumble. //Example for HID vibration/rumble.
//The joy-con for player-1 must be detached from the system, currently it doesn't vibrate when attached (handheld-mode). //TODO: Select CONTROLLER_HANDHELD/CONTROLLER_PLAYER_1 automatically instead of hard-coding to CONTROLLER_HANDHELD.
//TODO: Fix this for handheld-mode^.
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
@ -14,6 +13,7 @@ int main(int argc, char **argv)
HidVibrationValue VibrationValue; HidVibrationValue VibrationValue;
HidVibrationValue VibrationValue_stop; HidVibrationValue VibrationValue_stop;
HidVibrationValue VibrationValues[2];
gfxInitDefault(); gfxInitDefault();
consoleInit(NULL); consoleInit(NULL);
@ -21,16 +21,19 @@ int main(int argc, char **argv)
printf("Press PLUS to exit.\n"); printf("Press PLUS to exit.\n");
//Two VibrationDeviceHandles are returned: first one for left-joycon, second one for right-joycon. //Two VibrationDeviceHandles are returned: first one for left-joycon, second one for right-joycon.
rc = hidInitializeVibrationDevices(VibrationDeviceHandles, 2, CONTROLLER_PLAYER_1, LAYOUT_DEFAULT); //Change the total_handles param to 1, and update the hidSendVibrationValues calls, if you only want 1 VibrationDeviceHandle.
printf("hidInitializeVibrationDevice() returned: 0x%x\n", rc); rc = hidInitializeVibrationDevices(VibrationDeviceHandles, 2, CONTROLLER_HANDHELD, TYPE_HANDHELD | TYPE_JOYCON_PAIR);
printf("hidInitializeVibrationDevices() returned: 0x%x\n", rc);
if (R_SUCCEEDED(rc)) printf("Hold R to vibrate, and press A/B/X/Y to adjust values.\n"); if (R_SUCCEEDED(rc)) printf("Hold R to vibrate, and press A/B/X/Y while holding R to adjust values.\n");
VibrationValue.amp_low = 0.2f; VibrationValue.amp_low = 0.2f;
VibrationValue.freq_low = 10.0f; VibrationValue.freq_low = 10.0f;
VibrationValue.amp_high = 0.2f; VibrationValue.amp_high = 0.2f;
VibrationValue.freq_high = 10.0f; VibrationValue.freq_high = 10.0f;
memset(VibrationValues, 0, sizeof(VibrationValues));
memset(&VibrationValue_stop, 0, sizeof(HidVibrationValue)); memset(&VibrationValue_stop, 0, sizeof(HidVibrationValue));
// Switch like stop behavior with muted band channels and frequencies set to default. // Switch like stop behavior with muted band channels and frequencies set to default.
VibrationValue_stop.freq_low = 160.0f; VibrationValue_stop.freq_low = 160.0f;
@ -51,15 +54,14 @@ int main(int argc, char **argv)
if (R_SUCCEEDED(rc) && (kHeld & KEY_R)) if (R_SUCCEEDED(rc) && (kHeld & KEY_R))
{ {
//Calling hidSendVibrationValue is really only needed when sending a new VibrationValue. //Calling hidSendVibrationValue/hidSendVibrationValues is really only needed when sending new VibrationValue(s).
//If you just want to vibrate 1 device, you can also use hidSendVibrationValue.
//left-joycon memcpy(&VibrationValues[0], &VibrationValue, sizeof(HidVibrationValue));
rc2 = hidSendVibrationValue(&VibrationDeviceHandles[0], &VibrationValue); memcpy(&VibrationValues[1], &VibrationValue, sizeof(HidVibrationValue));
if (R_FAILED(rc2)) printf("hidSendVibrationValue() returned: 0x%x\n", rc2);
//right-joycon rc2 = hidSendVibrationValues(VibrationDeviceHandles, VibrationValues, 2);
rc2 = hidSendVibrationValue(&VibrationDeviceHandles[1], &VibrationValue); if (R_FAILED(rc2)) printf("hidSendVibrationValues() returned: 0x%x\n", rc2);
if (R_FAILED(rc2)) printf("hidSendVibrationValue() returned: 0x%x\n", rc2);
if (kDown & KEY_A) VibrationValue.amp_low += 0.1f; if (kDown & KEY_A) VibrationValue.amp_low += 0.1f;
if (kDown & KEY_B) VibrationValue.freq_low += 5.0f; if (kDown & KEY_B) VibrationValue.freq_low += 5.0f;
@ -68,11 +70,11 @@ int main(int argc, char **argv)
} }
else if(kUp & KEY_R)//Stop vibration. else if(kUp & KEY_R)//Stop vibration.
{ {
rc2 = hidSendVibrationValue(&VibrationDeviceHandles[0], &VibrationValue_stop); memcpy(&VibrationValues[0], &VibrationValue_stop, sizeof(HidVibrationValue));
if (R_FAILED(rc2)) printf("hidSendVibrationValue() for stop returned: 0x%x\n", rc2); memcpy(&VibrationValues[1], &VibrationValue_stop, sizeof(HidVibrationValue));
rc2 = hidSendVibrationValue(&VibrationDeviceHandles[1], &VibrationValue_stop); rc2 = hidSendVibrationValues(VibrationDeviceHandles, VibrationValues, 2);
if (R_FAILED(rc2)) printf("hidSendVibrationValue() for stop returned: 0x%x\n", rc2); if (R_FAILED(rc2)) printf("hidSendVibrationValues() for stop returned: 0x%x\n", rc2);
} }
gfxFlushBuffers(); gfxFlushBuffers();