diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2020-08-30 09:21:15 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2020-08-30 09:21:15 +0300 |
| commit | b91e38b4265ffe413d9b54aabb3e17d8cd150570 (patch) | |
| tree | 9112d82803bd2f7a804834976a1a57252cdcb097 /Software | |
| parent | ac6d62249d43b4e6a3c227af7b8281b9e3ce2635 (diff) | |
| download | Tango-b91e38b4265ffe413d9b54aabb3e17d8cd150570.tar.gz Tango-b91e38b4265ffe413d9b54aabb3e17d8cd150570.zip | |
advanced merge + additional debug log filters
Diffstat (limited to 'Software')
3 files changed, 27 insertions, 0 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c index 37d6b5ec1..18793ce28 100644 --- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c +++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c @@ -17,6 +17,7 @@ #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" @@ -409,6 +410,9 @@ void DiagnosticLoadDancerError(int DancerId, double value) // DancerErrorCounterIndex[DancerId] = 0; } +#ifdef FOUR_WINDERS + double dancer2,dancer3,dancer4; +#endif void CopyTemperaturesToMonitor(void) { DiagnosticsMonitor.mixertemperature = @@ -513,6 +517,18 @@ void CopyTemperaturesToMonitor(void) DiagnosticsMonitor.headblowervoltage1 = &headblowervoltage1; DiagnosticsMonitor.headblowervoltage2 = &headblowervoltage2; } +#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]; @@ -978,11 +994,19 @@ 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++) { diff --git a/Software/PMR/Messages/Debugging/DebugDistributorType.proto b/Software/PMR/Messages/Debugging/DebugDistributorType.proto index 4cf523dc4..c976afd5a 100644 --- a/Software/PMR/Messages/Debugging/DebugDistributorType.proto +++ b/Software/PMR/Messages/Debugging/DebugDistributorType.proto @@ -21,4 +21,6 @@ enum DebugDistributorType MaintFilter = 13; IFSFilter = 14; FilesFilter = 15; + I2CFilter = 16; + MotorFilter = 17; }
\ No newline at end of file diff --git a/Software/PMR/Messages/Debugging/StartDebugLogResponse.proto b/Software/PMR/Messages/Debugging/StartDebugLogResponse.proto index 6648604a1..09e238517 100644 --- a/Software/PMR/Messages/Debugging/StartDebugLogResponse.proto +++ b/Software/PMR/Messages/Debugging/StartDebugLogResponse.proto @@ -13,4 +13,5 @@ message StartDebugLogResponse uint32 Filter = 4; string Message = 5; uint32 ModuleId = 6; + uint32 Parameter = 7; }
\ No newline at end of file |