Added ampfactor to serial haptic log message
This commit is contained in:
parent
27fcea8f0d
commit
12509e9709
|
|
@ -104,13 +104,13 @@ int arduino_simhaptic_update(SimDevice* this, SimData* simdata)
|
||||||
{
|
{
|
||||||
serialdevice->u.simhapticdata.effect1 = effectspeed;
|
serialdevice->u.simhapticdata.effect1 = effectspeed;
|
||||||
serialdevice->u.simhapticdata.motor1 = 1;
|
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);
|
slogt("Updating arduino haptic device with effect type %i speed motor speed %i on motor %i from original effect %f with ampfactor %f", this->hapticeffect.effecttype, serialdevice->u.simhapticdata.effect3, serialdevice->motorsposition, rplay, serialdevice->ampfactor);
|
||||||
}
|
}
|
||||||
if (motor == 2 || motor == 6 || motor == 8 || motor == 9 || motor == 10 || motor == 11 || motor == 12 || motor == 14)
|
if (motor == 2 || motor == 6 || motor == 8 || motor == 9 || motor == 10 || motor == 11 || motor == 12 || motor == 14)
|
||||||
{
|
{
|
||||||
serialdevice->u.simhapticdata.effect3 = effectspeed;
|
serialdevice->u.simhapticdata.effect3 = effectspeed;
|
||||||
serialdevice->u.simhapticdata.motor3 = 1;
|
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);
|
slogt("Updating arduino haptic device with effect type %i speed motor speed %i on motor %i from original effect %f with ampfactor %f", this->hapticeffect.effecttype, serialdevice->u.simhapticdata.effect3, serialdevice->motorsposition, rplay, serialdevice->ampfactor);
|
||||||
}
|
}
|
||||||
serialdevice->state = play;
|
serialdevice->state = play;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue