Index: firmware/App/Services/Reservoirs.c =================================================================== diff -u -rcbcd41ec1ac2d5ae6446ec206ed6991a5306c249 -r622eebf6fb7f1c6c232ffd82bc072dd30a7b3f94 --- firmware/App/Services/Reservoirs.c (.../Reservoirs.c) (revision cbcd41ec1ac2d5ae6446ec206ed6991a5306c249) +++ firmware/App/Services/Reservoirs.c (.../Reservoirs.c) (revision 622eebf6fb7f1c6c232ffd82bc072dd30a7b3f94) @@ -18,6 +18,7 @@ #include // for memcpy() #include "LoadCell.h" +#include "MessageSupport.h" #include "ModeGenIdle.h" #include "OperationModes.h" #include "Reservoirs.h" @@ -99,11 +100,14 @@ // publish active reservoir, fill/drain volume targets at 1 Hz. if ( ++reservoirDataPublicationTimerCounter >= RESERVOIR_DATA_PUB_INTERVAL ) - { - U32 actRes = getU32OverrideValue( &activeReservoir ); - U32 filVol = getU32OverrideValue( &fillVolumeTargetMl ); - U32 drnVol = getU32OverrideValue( &drainVolumeTargetMl ); - broadcastReservoirData( actRes, filVol, drnVol ); + { + RESERVOIR_DATA_T data; + + data.activeReservoir = getU32OverrideValue( &activeReservoir ); + data.fillToVolumeMl = getU32OverrideValue( &fillVolumeTargetMl ); + data.drainToVolumeMl = getU32OverrideValue( &drainVolumeTargetMl ); + + broadcastData( MSG_ID_DG_RESERVOIR_DATA, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&data, sizeof( RESERVOIR_DATA_T ) ); reservoirDataPublicationTimerCounter = 0; } }