Index: firmware/App/Controllers/SensorProcess.c =================================================================== diff -u -ra24665c05496241e5ba9a73e0b1831a85dfbc3c9 -r85e0c91a9f375fcf709289ec767d00e4d61e7e6f --- firmware/App/Controllers/SensorProcess.c (.../SensorProcess.c) (revision a24665c05496241e5ba9a73e0b1831a85dfbc3c9) +++ firmware/App/Controllers/SensorProcess.c (.../SensorProcess.c) (revision 85e0c91a9f375fcf709289ec767d00e4d61e7e6f) @@ -31,44 +31,5 @@ *************************************************************************/ void execSensorProcess() { -#ifdef DEBUG_ENABLED - char debugStr[ 256 ]; -#endif - static U32 Counter = 0; - static U32 Load_cell_a1 = 0; - static U32 Load_cell_a2 = 0; - static U32 Load_cell_b1 = 0; - static U32 Load_cell_b2 = 0; - F32 load_cell_a1_f; - F32 load_cell_a2_f; - F32 load_cell_b1_f; - F32 load_cell_b2_f; - BOOL result; - - Load_cell_a1 += getFPGALoadCellA1(); // No overflow since ADC output is 24 bits. - Load_cell_a2 += getFPGALoadCellA2(); - Load_cell_b1 += getFPGALoadCellB1(); - Load_cell_b2 += getFPGALoadCellB2(); - - Counter++; - if (Counter == LOAD_CELL_REPORT_PERIOD) - { - Counter = 0; - - load_cell_a1_f = (F32)(Load_cell_a1)*ADC2GRAM; // division for averaging folded into ADC2GRAM - load_cell_a2_f = (F32)(Load_cell_a2)*ADC2GRAM; - load_cell_b1_f = (F32)(Load_cell_b1)*ADC2GRAM; - load_cell_b2_f = (F32)(Load_cell_b2)*ADC2GRAM; - result = broadcastLoadCellData( load_cell_a1_f, load_cell_a2_f, load_cell_b1_f, load_cell_b2_f ); -#ifdef DEBUG_ENABLED - if (result == FALSE) - sprintf( debugStr, "Adding load cell data to CAN buffer failed" ); -#else - (void)result; -#endif - Load_cell_a1 = 0; - Load_cell_a2 = 0; - Load_cell_b1 = 0; - Load_cell_b2 = 0; - } + execLoadCell(); } Index: firmware/App/Controllers/SensorProcess.h =================================================================== diff -u -ra24665c05496241e5ba9a73e0b1831a85dfbc3c9 -r85e0c91a9f375fcf709289ec767d00e4d61e7e6f --- firmware/App/Controllers/SensorProcess.h (.../SensorProcess.h) (revision a24665c05496241e5ba9a73e0b1831a85dfbc3c9) +++ firmware/App/Controllers/SensorProcess.h (.../SensorProcess.h) (revision 85e0c91a9f375fcf709289ec767d00e4d61e7e6f) @@ -17,11 +17,9 @@ #ifndef APP_CONTROLLERS_SENSORPROCESS_H_ #define APP_CONTROLLERS_SENSORPROCESS_H_ +void execSensorProcess(void); -#define LOAD_CELL_REPORT_PERIOD 10 // Send a load cell value CAN message to HD every multiple of taskPriority periods (10ms) -#define ADC2GRAM 0.0894/LOAD_CELL_REPORT_PERIOD // division for averaging is folded into this value - #endif /* APP_CONTROLLERS_SENSORPROCESS_H_ */ Index: firmware/App/Services/WatchdogMgmt.c =================================================================== diff -u -rf068446fdb7889d320ddb6ffbd58f347ce0501e7 -r85e0c91a9f375fcf709289ec767d00e4d61e7e6f --- firmware/App/Services/WatchdogMgmt.c (.../WatchdogMgmt.c) (revision f068446fdb7889d320ddb6ffbd58f347ce0501e7) +++ firmware/App/Services/WatchdogMgmt.c (.../WatchdogMgmt.c) (revision 85e0c91a9f375fcf709289ec767d00e4d61e7e6f) @@ -302,25 +302,3 @@ * @return TRUE if override successful, FALSE if not *************************************************************************/ DATA_ARRAY_OVERRIDE_FUNC( BOOL, testSetWatchdogTaskCheckInOverride, testResetWatchdogTaskCheckInOverride, watchdogTaskCheckedIn, task, NUM_OF_TASKS-1 ) - - - - - - - - - - - - - - - - - - - - - - Index: firmware/App/Tasks/TaskPriority.h =================================================================== diff -u -ra303cd4258157a8fbcbd8af4dd2bbaadec1a736c -r85e0c91a9f375fcf709289ec767d00e4d61e7e6f --- firmware/App/Tasks/TaskPriority.h (.../TaskPriority.h) (revision a303cd4258157a8fbcbd8af4dd2bbaadec1a736c) +++ firmware/App/Tasks/TaskPriority.h (.../TaskPriority.h) (revision 85e0c91a9f375fcf709289ec767d00e4d61e7e6f) @@ -19,7 +19,7 @@ // public definitions -#define TASK_PRIORITY_INTERVAL (5) +#define TASK_PRIORITY_INTERVAL (10) // in ms // public function prototypes