From 47cf4b3fa9b5b824000e7021bbe3c0ff13e43011 Mon Sep 17 00:00:00 2001 From: Paul Dino Jones Date: Sun, 4 Aug 2024 17:07:09 -0400 Subject: [PATCH] Reverse regression in previous commit --- src/monocoque/devices/serialdevice.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/src/monocoque/devices/serialdevice.c b/src/monocoque/devices/serialdevice.c index 247f96e..05fe077 100644 --- a/src/monocoque/devices/serialdevice.c +++ b/src/monocoque/devices/serialdevice.c @@ -79,26 +79,17 @@ int arduino_simhaptic_update(SimDevice* this, SimData* simdata) { if (motor == 0 || motor == 4 || motor == 7 || motor == 8 || motor == 10 || motor == 11 || motor == 13 || motor == 14) { - if(play != serialdevice->u.simhapticdata.motor1) - { - serialdevice->u.simhapticdata.effect1 = effectspeed; - slogt("Updating arduino haptic device with effect type %i speed motor speed %i on motor %i from original effect %f", this->hapticeffect.effecttype, serialdevice->u.simhapticdata.effect1, serialdevice->motorsposition, rplay); - } + serialdevice->u.simhapticdata.effect1 = effectspeed; + serialdevice->u.simhapticdata.motor1 = 1; + slogt("Updating arduino haptic device with effect type %i speed motor speed %i on motor %i from original effect %f", this->hapticeffect.effecttype, serialdevice->u.simhapticdata.effect3, serialdevice->motorsposition, rplay); } if (motor == 2 || motor == 6 || motor == 8 || motor == 9 || motor == 10 || motor == 11 || motor == 12 || motor == 14) { - if(play != serialdevice->u.simhapticdata.motor3) - { - serialdevice->u.simhapticdata.effect3 = effectspeed; - slogt("Updating arduino haptic device with effect type %i speed motor speed %i on motor %i from original effect %f", this->hapticeffect.effecttype, serialdevice->u.simhapticdata.effect3, serialdevice->motorsposition, rplay); - } + serialdevice->u.simhapticdata.effect3 = effectspeed; + serialdevice->u.simhapticdata.motor3 = 1; + slogt("Updating arduino haptic device with effect type %i speed motor speed %i on motor %i from original effect %f", this->hapticeffect.effecttype, serialdevice->u.simhapticdata.effect3, serialdevice->motorsposition, rplay); } - serialdevice->state = play; - serialdevice->u.simhapticdata.motor1 = play; - serialdevice->u.simhapticdata.motor2 = play; - serialdevice->u.simhapticdata.motor3 = play; - serialdevice->u.simhapticdata.motor4 = play; } size_t size = sizeof(SimHapticData);