Merge remote-tracking branch 'origin/master' into nightly

This commit is contained in:
fgsfds 2020-08-30 15:41:45 +03:00
commit 8419991c02

View file

@ -30,12 +30,14 @@ s32 osContInit(UNUSED OSMesgQueue *mq, u8 *controllerBits, UNUSED OSContStatus *
s32 osMotorStart(UNUSED void *pfs) {
// Since rumble stops by osMotorStop, its duration is not nessecary.
// Set it to 5 seconds and hope osMotorStop() is called in time.
controller_rumble_play(configRumbleStrength / 100.0f, 5.0f);
if (configRumbleStrength)
controller_rumble_play(configRumbleStrength / 100.0f, 5.0f);
return 0;
}
s32 osMotorStop(UNUSED void *pfs) {
controller_rumble_stop();
if (configRumbleStrength)
controller_rumble_stop();
return 0;
}