diff options
| author | Tharo <17233964+Thar0@users.noreply.github.com> | 2021-12-01 00:08:57 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-30 19:08:57 -0500 |
| commit | f1d183d6feac23275306bfa2dee939d123702765 (patch) | |
| tree | c20585c17dea94561f7c4cfcff572e39bc033a3e /src/code/padmgr.c | |
| parent | eabc91881761a82856cca3fab9a4749c60ea1fe7 (diff) | |
libultra files and directories restructure (#1038)
* Restructure files, begin header restructure
* Format
* us2dex
* Fix parallel spelling
Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com>
* Use OS_K0_TO_PHYSICAL in place of VIRTUAL_TO_PHYSICAL in osAiSetNextBuffer
* Uppercase hex, exception vector address defines
* Interrupt flags 1
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Interrupt flags 2
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com>
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
Diffstat (limited to 'src/code/padmgr.c')
| -rw-r--r-- | src/code/padmgr.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/code/padmgr.c b/src/code/padmgr.c index 02477e205..9de0882cc 100644 --- a/src/code/padmgr.c +++ b/src/code/padmgr.c @@ -72,7 +72,7 @@ void PadMgr_RumbleControl(PadMgr* padMgr) { osSyncPrintf("padmgr: %dコン: %s\n", i + 1, "振動パック ぶるぶるぶるぶる"); osSyncPrintf(VT_RST); - if (osSetRumble(&padMgr->pfs[i], temp) != 0) { + if (__osMotorAccess(&padMgr->pfs[i], temp) != 0) { padMgr->pakType[i] = 0; osSyncPrintf(VT_FGCOL(YELLOW)); // "A communication error has occurred with the vibration pack" @@ -94,7 +94,7 @@ void PadMgr_RumbleControl(PadMgr* padMgr) { osSyncPrintf("padmgr: %dコン: %s\n", i + 1, "振動パック 停止"); osSyncPrintf(VT_RST); - if (osSetRumble(&padMgr->pfs[i], 0) != 0) { + if (osMotorStop(&padMgr->pfs[i]) != 0) { padMgr->pakType[i] = 0; osSyncPrintf(VT_FGCOL(YELLOW)); // "A communication error has occurred with the vibration pack" @@ -133,12 +133,12 @@ void PadMgr_RumbleControl(PadMgr* padMgr) { i = frame % 4; if (padMgr->ctrlrIsConnected[i] && (padMgr->padStatus[i].status & 1) && (padMgr->pakType[i] != 1)) { - var4 = osProbeRumblePak(ctrlrQ, &padMgr->pfs[i], i); + var4 = osMotorInit(ctrlrQ, &padMgr->pfs[i], i); if (var4 == 0) { padMgr->pakType[i] = 1; - osSetRumble(&padMgr->pfs[i], 1); - osSetRumble(&padMgr->pfs[i], 0); + osMotorStart(&padMgr->pfs[i]); + osMotorStop(&padMgr->pfs[i]); osSyncPrintf(VT_FGCOL(YELLOW)); // "Recognized vibration pack" osSyncPrintf("padmgr: %dコン: %s\n", i + 1, "振動パックを認識しました"); @@ -164,7 +164,7 @@ void PadMgr_RumbleStop(PadMgr* padMgr) { OSMesgQueue* ctrlrQ = PadMgr_LockSerialMesgQueue(padMgr); for (i = 0; i < 4; i++) { - if (osProbeRumblePak(ctrlrQ, &padMgr->pfs[i], i) == 0) { + if (osMotorInit(ctrlrQ, &padMgr->pfs[i], i) == 0) { if ((gFaultStruct.msgId == 0) && (padMgr->rumbleOnFrames != 0)) { osSyncPrintf(VT_FGCOL(YELLOW)); // "Stop vibration pack" @@ -172,7 +172,7 @@ void PadMgr_RumbleStop(PadMgr* padMgr) { osSyncPrintf(VT_RST); } - osSetRumble(&padMgr->pfs[i], 0); + osMotorStop(&padMgr->pfs[i]); } } |