Index: firmware/App/Controllers/LoadCell.c =================================================================== diff -u -r29d3dc287ced6c5d0fe483d37093cd470733eb79 -rb739ca257159d144f746e0cb460b33879bcd8596 --- firmware/App/Controllers/LoadCell.c (.../LoadCell.c) (revision 29d3dc287ced6c5d0fe483d37093cd470733eb79) +++ firmware/App/Controllers/LoadCell.c (.../LoadCell.c) (revision b739ca257159d144f746e0cb460b33879bcd8596) @@ -66,9 +66,6 @@ static U32 smallReadingsIdx; ///< Index for next sample in load cell small rolling average sample array. static U32 largeReadingsIdx; ///< Index for next sample in load cell large rolling average sample array. -// TODO - test code -static F32 rawReadings[10]; - // TODO - gain and offset for load cells should be read from NV Data calibration record. // ********** private function prototypes ********** @@ -137,13 +134,6 @@ loadcells[ LOAD_CELL_RESERVOIR_2_PRIMARY ].measuredReadingSum += getFPGALoadCellB1(); loadcells[ LOAD_CELL_RESERVOIR_2_BACKUP ].measuredReadingSum += getFPGALoadCellB2(); - // TODO - test code - A1 = (F32)getFPGALoadCellA1() * ADC2GRAM + LOAD_CELL_ZERO_OFFSET - loadcells[ LOAD_CELL_RESERVOIR_1_PRIMARY ].autoCalOffset; - B1 = (F32)getFPGALoadCellB1() * ADC2GRAM + LOAD_CELL_ZERO_OFFSET - loadcells[ LOAD_CELL_RESERVOIR_2_PRIMARY ].autoCalOffset; - rawReadings[loadCellDataPublicationTimerCounter] = A1; - prevA1 = getLoadCellFilteredWeight( LOAD_CELL_RESERVOIR_1_PRIMARY ); - prevB1 = getLoadCellFilteredWeight( LOAD_CELL_RESERVOIR_2_PRIMARY ); - // filter every 100ms if ( ++loadCellFilterTimerCount >= LOAD_CELL_SAMPLES_TO_AVERAGE ) { @@ -173,12 +163,6 @@ largeReadingsIdx = INC_WRAP( largeReadingsIdx, 0, SIZE_OF_LARGE_LOAD_CELL_AVG - 1 ); } - // TODO - test code - loadcells[ LOAD_CELL_RESERVOIR_1_BACKUP ].filteredWeight.data = loadcells[ LOAD_CELL_RESERVOIR_1_PRIMARY ].filteredWeight.data; - loadcells[ LOAD_CELL_RESERVOIR_2_BACKUP ].filteredWeight.data = loadcells[ LOAD_CELL_RESERVOIR_2_PRIMARY ].filteredWeight.data; - loadcells[ LOAD_CELL_RESERVOIR_1_PRIMARY ].filteredWeight.data = ( A1 * LOAD_CELL_FILTER_ALPHA ) + ( prevA1 * ( 1.0 - LOAD_CELL_FILTER_ALPHA ) ); - loadcells[ LOAD_CELL_RESERVOIR_2_PRIMARY ].filteredWeight.data = ( B1 * LOAD_CELL_FILTER_ALPHA ) + ( prevB1 * ( 1.0 - LOAD_CELL_FILTER_ALPHA ) ); - // broadcast load cell data if we are at scheduled interval. if ( ++loadCellDataPublicationTimerCounter >= getLoadCellDataPublishInterval() ) { @@ -187,9 +171,6 @@ // broadcast load cell data broadcastLoadCellData( getLoadCellFilteredWeight( LOAD_CELL_RESERVOIR_1_PRIMARY ), getLoadCellFilteredWeight( LOAD_CELL_RESERVOIR_1_BACKUP ), getLoadCellFilteredWeight( LOAD_CELL_RESERVOIR_2_PRIMARY ), getLoadCellFilteredWeight( LOAD_CELL_RESERVOIR_2_BACKUP ) ); - - // TODO - test code - broadcastLoadCellRawData( &rawReadings[0] ); } } Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -r45fff2549ecea601f9b603f59ade225086d36e69 -rb739ca257159d144f746e0cb460b33879bcd8596 --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 45fff2549ecea601f9b603f59ade225086d36e69) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision b739ca257159d144f746e0cb460b33879bcd8596) @@ -417,25 +417,6 @@ return result; } -BOOL broadcastLoadCellRawData( F32 *rawData ) -{ - BOOL result; - MESSAGE_T msg; - U08 *payloadPtr = msg.payload; - - // create a message record - blankMessage( &msg ); - msg.hdr.msgID = MSG_ID_DG_LOAD_CELL_RAW_DATA_BROADCAST; - msg.hdr.payloadLen = sizeof( F32 ) * 10; - - memcpy( payloadPtr, rawData, sizeof( F32 ) * 10 ); - - // serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer - result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_DG_BROADCAST, ACK_NOT_REQUIRED ); - - return result; -} - /*********************************************************************//** * @brief * The broadcastValvesStates function sends out DG valves states. Index: firmware/App/Services/SystemCommMessages.h =================================================================== diff -u -r45fff2549ecea601f9b603f59ade225086d36e69 -rb739ca257159d144f746e0cb460b33879bcd8596 --- firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision 45fff2549ecea601f9b603f59ade225086d36e69) +++ firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision b739ca257159d144f746e0cb460b33879bcd8596) @@ -62,7 +62,6 @@ // MSG_ID_LOAD_CELL_READINGS BOOL broadcastLoadCellData( F32 loadCellA1, F32 loadCellA2, F32 loadCellB1, F32 loadCellB2 ); -BOOL broadcastLoadCellRawData( F32 *rawData ); // TODO - test code - remove later // MSG_ID_DG_VALVES_STATES BOOL broadcastValvesStates( U16 valvesStates );