diff options
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c | 51 |
1 files changed, 15 insertions, 36 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c index 05987ee7f..37d6b5ec1 100644 --- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c +++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c @@ -17,13 +17,13 @@ #include "drivers/Motors/Motor.h" #include "drivers/Heater/TemperatureSensor.h" #include "drivers/SSI_Comm/Dancer/Dancer.h" -#include <Drivers/SSI_Comm/SSI_Comm.h> #include "drivers/FPGA/FPGA_SPI_Comm.h" #include "drivers/FPGA/FPGA_GPIO/FPGA_GPIO.h" #include "drivers/FPGA/FPGA.h" #include "drivers/I2C_Communication/ADC_MUX/ADC_MUX.h" #include "drivers/I2C_Communication/Head_Card/ADC/Head_ADC.h" #include "drivers/I2C_Communication/DAC/Blower.h" +#include <Drivers/I2C_Communication/I2C_Task.h> #include "drivers/valves/valve.h" #include "modules/ids/ids_ex.h" @@ -265,6 +265,7 @@ double MotorValue[MAX_THREAD_MOTORS_NUM][DIAGNOSTICS_LIMIT+1]; uint8_t SpeedCounterIndex= 0; double SpeedValue[DIAGNOSTICS_DANCER_LIMIT+1]; double headblowervoltage1 = 0.0, headblowervoltage2 = 0.0; +double headblower1airflow = 0.0, headblower2airflow = 0.0; void DiagnosticLoadMotor(int MotorId, int frequency) { @@ -408,9 +409,6 @@ void DiagnosticLoadDancerError(int DancerId, double value) // DancerErrorCounterIndex[DancerId] = 0; } -#ifdef FOUR_WINDERS - double dancer2,dancer3,dancer4; -#endif void CopyTemperaturesToMonitor(void) { DiagnosticsMonitor.mixertemperature = @@ -500,33 +498,22 @@ void CopyTemperaturesToMonitor(void) HeaterCounterIndex[HEATER_TYPE__HeaterZone4]; DiagnosticsMonitor.n_headzone6temperature = HeaterCounterIndex[HEATER_TYPE__HeaterZone6]; + DiagnosticsMonitor.n_headblower1airflow = HeaterCounterIndex[HEATER_TYPE__HeaterZone5]; DiagnosticsMonitor.n_headblower2airflow = HeaterCounterIndex[HEATER_TYPE__HeaterZone7]; - DiagnosticsMonitor.headblower1airflow = HeaterTemperature[HEATER_TYPE__HeaterZone5]; - DiagnosticsMonitor.headblower2airflow = HeaterTemperature[HEATER_TYPE__HeaterZone7]; + headblower1airflow = PressureSensorGetPressure(HEAD_PT100_ZONE_5_0X84_0); + headblower2airflow = PressureSensorGetPressure(HEAD_PT100_ZONE_7_0X86_0); + DiagnosticsMonitor.headblower1airflow = &headblower1airflow; + DiagnosticsMonitor.headblower2airflow = &headblower2airflow; + + DiagnosticsMonitor.n_headblowervoltage1 = 1; + DiagnosticsMonitor.n_headblowervoltage2 = 1; + headblowervoltage1 = HeadBlowersGetRPM(HEAD_FAN_RIGHT); + headblowervoltage2 = HeadBlowersGetRPM(HEAD_FAN_LEFT); + DiagnosticsMonitor.headblowervoltage1 = &headblowervoltage1; + DiagnosticsMonitor.headblowervoltage2 = &headblowervoltage2; } - DiagnosticsMonitor.n_headblower1airflow = HeaterCounterIndex[HEATER_TYPE__HeaterZone5]; - DiagnosticsMonitor.n_headblower2airflow = HeaterCounterIndex[HEATER_TYPE__HeaterZone7]; - DiagnosticsMonitor.headblower1airflow = HeaterTemperature[HEATER_TYPE__HeaterZone5]; - DiagnosticsMonitor.headblower2airflow = HeaterTemperature[HEATER_TYPE__HeaterZone7]; - headblowervoltage1 =(double )Head_Fan_PWM_Command[HEAD_FAN_RIGHT]; - headblowervoltage2 =(double )Head_Fan_PWM_Command[HEAD_FAN_LEFT]; - DiagnosticsMonitor.headblowervoltage1 = &headblowervoltage1; - DiagnosticsMonitor.headblowervoltage2 = &headblowervoltage2; - DiagnosticsMonitor.n_headblowervoltage1 = 1; - DiagnosticsMonitor.n_headblowervoltage2 = 1; -#ifdef FOUR_WINDERS -// double dancer2,dancer3,dancer4; - dancer2 = Control_Read_Dancer_Position(HARDWARE_DANCER_2,0); - dancer3 = Control_Read_Dancer_Position(HARDWARE_DANCER_3,0); - dancer4 = Control_Read_Dancer_Position(HARDWARE_DANCER_4,0); - DiagnosticsMonitor.n_headblower1airflow = 1; - DiagnosticsMonitor.n_headblower2airflow = 1; - DiagnosticsMonitor.headblower1airflow = &dancer4; - DiagnosticsMonitor.headblower2airflow = &dancer3; - DiagnosticsMonitor.headblowervoltage1 = &dancer2; - DiagnosticsMonitor.n_headblowervoltage1 = 1; -#endif + DiagnosticsMonitor.dryerzone1temperature = HeaterTemperature[HEATER_TYPE__DryerAirHeater]; DiagnosticsMonitor.dryerzone2temperature = @@ -991,19 +978,11 @@ void Diagnostic100msecCollection(void) { //if (JobIsActive()) { -#ifdef FOUR_WINDERS - DiagnosticLoadMotor(FEEDER_MOTOR, ThreadGetMotorSpeed (WINDER_2_MOTOR)); - DiagnosticLoadMotor(DRYER_MOTOR, ThreadGetMotorSpeed (WINDER_3_MOTOR)); - DiagnosticLoadMotor(POOLER_MOTOR, ThreadGetMotorSpeed (WINDER_4_MOTOR)); - DiagnosticLoadMotor(WINDER_MOTOR, ThreadGetMotorSpeed (WINDER_MOTOR)); - DiagnosticLoadMotor(SCREW_MOTOR, ThreadGetMotorSpeed (SCREW_MOTOR)); -#else DiagnosticLoadMotor(FEEDER_MOTOR, ThreadGetMotorSpeed (FEEDER_MOTOR)); DiagnosticLoadMotor(DRYER_MOTOR, ThreadGetMotorSpeed (DRYER_MOTOR)); DiagnosticLoadMotor(POOLER_MOTOR, ThreadGetMotorSpeed (POOLER_MOTOR)); DiagnosticLoadMotor(WINDER_MOTOR, ThreadGetMotorSpeed (WINDER_MOTOR)); DiagnosticLoadMotor(SCREW_MOTOR, ThreadGetMotorSpeed (SCREW_MOTOR)); -#endif } for (i=0;i<MAX_SYSTEM_DISPENSERS;i++) { |