Index: firmware/App/Controllers/LoadCell.c =================================================================== diff -u -rbcd2887a992f73548dc0d9603595b57523b31902 -r05f42ecd223cf512e9e8f3434dd01bdac3aca86d --- firmware/App/Controllers/LoadCell.c (.../LoadCell.c) (revision bcd2887a992f73548dc0d9603595b57523b31902) +++ firmware/App/Controllers/LoadCell.c (.../LoadCell.c) (revision 05f42ecd223cf512e9e8f3434dd01bdac3aca86d) @@ -20,6 +20,10 @@ #include "FPGA.h" #include "TaskPriority.h" +static F32 Load_cell_a1_ave; +static F32 Load_cell_a2_ave; +static F32 Load_cell_b1_ave; +static F32 Load_cell_b2_ave; /**@}*/ /*********************************************************************//** @@ -56,11 +60,11 @@ { 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 ); + Load_cell_a1_ave = (F32)(Load_cell_a1)*ADC2GRAM; // division for averaging folded into ADC2GRAM + Load_cell_a2_ave = (F32)(Load_cell_a2)*ADC2GRAM; + Load_cell_b1_ave = (F32)(Load_cell_b1)*ADC2GRAM; + Load_cell_b2_ave = (F32)(Load_cell_b2)*ADC2GRAM; + result = broadcastLoadCellData( Load_cell_a1_ave, Load_cell_a2_ave, Load_cell_b1_ave, Load_cell_b2_ave ); #ifdef DEBUG_ENABLED if (result == FALSE) sprintf( debugStr, "Adding load cell data to CAN buffer failed" ); @@ -74,5 +78,23 @@ } } +F32 getLoadCellA1Ave(void) +{ + return Load_cell_a1_ave; +} +F32 getLoadCellA2Ave(void) +{ + return Load_cell_a2_ave; +} +F32 getLoadCellB1Ave(void) +{ + return Load_cell_b1_ave; +} + +F32 getLoadCellB2Ave(void) +{ + return Load_cell_b2_ave; +} + Index: firmware/App/Controllers/LoadCell.h =================================================================== diff -u -rbcd2887a992f73548dc0d9603595b57523b31902 -r05f42ecd223cf512e9e8f3434dd01bdac3aca86d --- firmware/App/Controllers/LoadCell.h (.../LoadCell.h) (revision bcd2887a992f73548dc0d9603595b57523b31902) +++ firmware/App/Controllers/LoadCell.h (.../LoadCell.h) (revision 05f42ecd223cf512e9e8f3434dd01bdac3aca86d) @@ -23,5 +23,9 @@ #define LOAD_CELL_SAMPLES_TO_AVERAGE LOAD_CELL_REPORT_PERIOD // Averaging load cell data over the reporting interval #define ADC2GRAM 0.0894/LOAD_CELL_SAMPLES_TO_AVERAGE // division for averaging is folded into this value +F32 getLoadCellA1Ave(void); +F32 getLoadCellA2Ave(void); +F32 getLoadCellB1Ave(void); +F32 getLoadCellB2Ave(void); #endif /* APP_CONTROLLERS_LOADCELL_H_ */ Index: firmware/App/Services/FPGA.c =================================================================== diff -u -ra24665c05496241e5ba9a73e0b1831a85dfbc3c9 -r05f42ecd223cf512e9e8f3434dd01bdac3aca86d --- firmware/App/Services/FPGA.c (.../FPGA.c) (revision a24665c05496241e5ba9a73e0b1831a85dfbc3c9) +++ firmware/App/Services/FPGA.c (.../FPGA.c) (revision 05f42ecd223cf512e9e8f3434dd01bdac3aca86d) @@ -114,37 +114,6 @@ U16 dialysateTempBackupData; } DG_FPGA_SENSORS_T; - -typedef struct // TODO - add all sensor readings to this structure per FPGA register map -{ - U08 bloodFlowMeterDataPktCount; - U08 bloodFlowMeterSlowPktCounts; - U08 bloodFlowMeterDeviceStatus; - U08 bloodFlowMeterResponse; - F32 bloodFlowLast; - U08 dialysateFlowMeterDataPktCount; - U08 dialysateFlowMeterSlowPckCounts; - U08 dialysateFlowMeterDeviceStatus; - U08 dialysateFlowMeterResponse; - F32 dialysateFlowLast; - U08 bloodFlowMeterErrorCount; - U08 dialysateFlowMeterErrorCount; - U16 bloodOcclusionData; - U08 bloodOcclusionReadCount; - U08 bloodOcclusionErrorCount; - U16 dialysateInOcclusionData; - U08 dialysateInOcclusionReadCount; - U08 dialysateInOcclusionErrorCount; - U16 dialysateOutOcclusionData; - U08 dialysateOutOcclusionReadCount; - U08 dialysateOutOcclusionErrorCount; - U16 arterialPressureData; - U08 arterialPressureReadCount; - U08 arterialPressureErrorCount; - U16 dialysateTempPrimaryData; - U16 dialysateTempBackupData; -} FPGA_SENSORS_T; - typedef struct // TODO - add all actuator set points to this structure per FPGA register map { U08 bloodValveSetState; Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -r6d2d8f0267c57135554e5a1acaca9aef37f27949 -r05f42ecd223cf512e9e8f3434dd01bdac3aca86d --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 6d2d8f0267c57135554e5a1acaca9aef37f27949) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 05f42ecd223cf512e9e8f3434dd01bdac3aca86d) @@ -57,14 +57,6 @@ F32 loadCellB2inGram; } LOAD_CELL_DATA_T; -typedef struct -{ - F32 res1PrimaryLoadCell; - F32 res1BackupLoadCell; - F32 res2PrimaryLoadCell; - F32 res2BackupLoadCell; -} LOAD_CELL_READINGS_PAYLOAD_T; - #pragma pack(pop) // ********** private data **********