paul
/
monocoque
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix floating point issue on moza

This commit is contained in:
Paul Dino Jones 2025-01-14 20:23:43 -05:00
parent f2a5872520
commit 8dfc4c0435
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/monocoque/devices/serial/moza.c
View File

@ -31,38 +31,40 @@ int moza_update(SerialDevice* serialdevice, unsigned short maxrpm, unsigned shor
unsigned char bytes[] = MOZA_SERIAL_TEMPLATE; unsigned char bytes[] = MOZA_SERIAL_TEMPLATE;
int size = sizeof(bytes)/sizeof(bytes[0]); int size = sizeof(bytes)/sizeof(bytes[0]);
if (rpm/maxrpm >= 0.8) float perct = (float)rpm/(float)maxrpm;
if (perct >= 0.8)
bytes[9] |= BIT(0); bytes[9] |= BIT(0);
if (rpm/maxrpm >= 0.83) if (perct >= 0.83)
bytes[9] |= BIT(1); bytes[9] |= BIT(1);
if (rpm/maxrpm >= 0.86) if (perct >= 0.86)
bytes[9] |= BIT(2); bytes[9] |= BIT(2);
if (rpm/maxrpm >= 0.89) if (perct >= 0.89)
bytes[9] |= BIT(3); bytes[9] |= BIT(3);
if (rpm/maxrpm >= 0.91) if (perct >= 0.91)
bytes[8] |= BIT(4); bytes[8] |= BIT(4);
if (rpm/maxrpm >= 0.92) if (perct >= 0.92)
bytes[8] |= BIT(5); bytes[8] |= BIT(5);
if (rpm/maxrpm >= 0.93) if (perct >= 0.93)
bytes[8] |= BIT(6); bytes[8] |= BIT(6);
if (rpm/maxrpm >= 0.94) if (perct >= 0.94)
bytes[8] |= BIT(7); bytes[8] |= BIT(7);
if (rpm/maxrpm >= 0.96) if (perct >= 0.96)
bytes[8] |= BIT(0); bytes[8] |= BIT(0);
if (rpm/maxrpm >= 0.96) if (perct >= 0.96)
bytes[8] |= BIT(1); bytes[8] |= BIT(1);
// blinking // blinking
if (rpm/maxrpm >= 0.97) if (perct >= 0.97)
bytes[9] |= BIT(MOZA_BLINKING_BIT); bytes[9] |= BIT(MOZA_BLINKING_BIT);
bytes[10] = moza_checksum(bytes); bytes[10] = moza_checksum(bytes);
@ -70,7 +72,8 @@ int moza_update(SerialDevice* serialdevice, unsigned short maxrpm, unsigned shor
int result = 1; int result = 1;
if (serialdevice->port) if (serialdevice->port)
{ {
slogt("copying %i bytes to moza device", size); slogd("copying %i bytes to moza device", size);
slogt("writing bytes %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x from rpm %i maxrpm %i", bytes[0], bytes[1], bytes[2], bytes[3], bytes[4], bytes[5], bytes[6], bytes[7], bytes[8], bytes[9], bytes[10], rpm, maxrpm);
result = moza_serial_check(sp_blocking_write(serialdevice->port, bytes, size, MOZA_TIMEOUT)); result = moza_serial_check(sp_blocking_write(serialdevice->port, bytes, size, MOZA_TIMEOUT));
} }

2
src/monocoque/devices/serialdevice.c
View File

@ -19,7 +19,7 @@ int serial_wheel_update(SimDevice* this, SimData* simdata)
{ {
SerialDevice* serialdevice = (void *) this->derived; SerialDevice* serialdevice = (void *) this->derived;
moza_update(serialdevice, simdata->rpms, simdata->maxrpm); moza_update(serialdevice, simdata->maxrpm, simdata->rpms);
return 0; return 0;
} }