Index: firmware/App/Controllers/AirPump.c =================================================================== diff -u -rb9e150edbdb63661806f6ef9c52e4ae2837f5f93 -rf267032333f872d729d33614f48373eeb6c422d2 --- firmware/App/Controllers/AirPump.c (.../AirPump.c) (revision b9e150edbdb63661806f6ef9c52e4ae2837f5f93) +++ firmware/App/Controllers/AirPump.c (.../AirPump.c) (revision f267032333f872d729d33614f48373eeb6c422d2) @@ -39,15 +39,15 @@ typedef struct { U32 h12State; ///< Air pump state to command. - U32 h12Power; ///< Air pump power level to command. + F32 h12Power; ///< Air pump power level to command. } AIR_PUMP_SET_CMD_PAYLOAD_T; #pragma pack(pop) // ********** private data ********** static AIR_PUMP_STATE_T currentAirPumpState; ///< Current air pump control state. -static U08 currentAirPumpPowerLevel; ///< Current air pump power level setting. static U16 currentAirPumpRPM; ///< Current air pump RPM. +static F32 currentAirPumpPowerLevel; ///< Current air pump power level setting. static U32 airPumpDataPublicationTimerCounter; ///< Air pump data broadcast timer counter. static OVERRIDE_U32_T airPumpDataPublishInterval; ///< Air pump data broadcast interval (in ms). @@ -91,7 +91,7 @@ * @param power Power level to set air pump to * @return none *************************************************************************/ -void setAirPumpState( AIR_PUMP_STATE_T state, U08 power ) +void setAirPumpState( AIR_PUMP_STATE_T state, F32 power ) { if ( state < NUM_OF_AIR_PUMP_STATES ) { @@ -226,8 +226,8 @@ AIR_PUMP_PAYLOAD_T data; data.h12State = getAirPumpState(); - data.h12Power = (U32)currentAirPumpPowerLevel; data.h12Rpm = (U32)currentAirPumpRPM; + data.h12Power = currentAirPumpPowerLevel; broadcastData( MSG_ID_TD_AIR_PUMP_DATA, COMM_BUFFER_OUT_CAN_TD_BROADCAST, (U08*)&data, sizeof( AIR_PUMP_PAYLOAD_T ) ); airPumpDataPublicationTimerCounter = 0; @@ -279,7 +279,7 @@ AIR_PUMP_SET_CMD_PAYLOAD_T payload; memcpy( &payload, msgPayload, sizeof( AIR_PUMP_SET_CMD_PAYLOAD_T ) ); - setAirPumpState( (AIR_PUMP_STATE_T)payload.h12State, (U08)payload.h12Power ); + setAirPumpState( (AIR_PUMP_STATE_T)payload.h12State, payload.h12Power ); result = TRUE; } }