diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2020-06-11 17:02:29 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2020-06-11 17:02:29 +0300 |
| commit | affbf528aa9dade4eb73a644d152bd018bca23f3 (patch) | |
| tree | 34c8d65eb2b074e8ad0b8c48ab8c328cfe1b9bc6 /Software/Embedded_SW/Embedded/Modules/Diagnostics | |
| parent | 2340225e580d8d04078ada948b5958b1e7ce40e7 (diff) | |
| parent | 00af45baf4efebd5f06450604d276cfe231a3d8e (diff) | |
| download | Tango-affbf528aa9dade4eb73a644d152bd018bca23f3.tar.gz Tango-affbf528aa9dade4eb73a644d152bd018bca23f3.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Diagnostics')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c index 79dd2899f..602073f3c 100644 --- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c +++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c @@ -794,8 +794,11 @@ void DiagnosticOneSecCollection(void) DiagnosticLoadTemperature(HEATER_TYPE__HeaterZone3, MillisecGetTemperatures(HEAD_PT100_ZONE_3_0X82_0)); DiagnosticLoadTemperature(HEATER_TYPE__HeadCoverHeater1, MillisecGetTemperatures(HEAD_PT100_AIR_HEATER_2_0X8C_1)); DiagnosticLoadTemperature(HEATER_TYPE__HeadCoverHeater2, MillisecGetTemperatures(HEAD_PT100_AIR_HEATER_1_0X8C_0)); - DiagnosticLoadTemperature(HEATER_TYPE__HeaterZone4, MillisecGetTemperatures(HEAD_PT100_ZONE_4_0X82_1)); - DiagnosticLoadTemperature(HEATER_TYPE__HeaterZone6, MillisecGetTemperatures(HEAD_PT100_ZONE_6_0X84_1)); + + DiagnosticLoadTemperature(HEATER_TYPE__HeaterZone5, MillisecGetTemperatures(HEAD_PT100_ZONE_5_0X84_0)); + //DiagnosticLoadTemperature(HEATER_TYPE__HeaterZone6, MillisecGetTemperatures(HEAD_PT100_ZONE_6_0X84_1)); + DiagnosticLoadTemperature(HEATER_TYPE__HeaterZone7, MillisecGetTemperatures(HEAD_PT100_ZONE_7_0X86_0)); + //DiagnosticLoadTemperature(HEATER_TYPE__HeaterZone8, MillisecGetTemperatures(HEAD_PT100_ZONE_8_0X86_1)); } DiagnosticLoadTemperature(HARDWARE_PID_CONTROL_TYPE__DryerAirTemperature, MillisecGetTemperatures(TEMP_SENSE_ANALOG_DRYER_TEMP1)); DiagnosticLoadTemperature(HARDWARE_PID_CONTROL_TYPE__DryerHeaterMain, MillisecGetTemperatures(TEMP_SENSE_ANALOG_DRYER_TEMP2)); @@ -1147,15 +1150,23 @@ void SendDiagnostics(void) if ((Head_Type == HEAD_TYPE_SYLKO)||(Head_Type == HEAD_TYPE_SYLKO_WITHOUT_CARD)) { - LoadHeaterState(HEATER_TYPE__HeaterZone4,&HeaterInfo[i++]); - LoadHeaterState(HEATER_TYPE__HeaterZone5,&HeaterInfo[i++]); - LoadHeaterState(HEATER_TYPE__HeaterZone6,&HeaterInfo[i++]); + LoadHeaterState(HEATER_TYPE__HeaterZone4,&HeaterInfo[i++]); } - if (Head_Type == HEAD_TYPE_SYLKO) + LoadHeaterState(HEATER_TYPE__HeaterZone5,&HeaterInfo[i++]); + //LoadHeaterState(HEATER_TYPE__HeaterZone6,&HeaterInfo[i++]); + if ((Head_Type == HEAD_TYPE_SYLKO)||(Head_Type == HEAD_TYPE_SYLKO_WITHOUT_CARD)) { + LoadHeaterState(HEATER_TYPE__HeaterZone6,&HeaterInfo[i++]); + } + if ((Head_Type == HEAD_TYPE_SYLKO)||(Head_Type == HEAD_TYPE_STAPLE_SPUN)) + { LoadHeaterState(HEATER_TYPE__HeaterZone7,&HeaterInfo[i++]); + //LoadHeaterState(HEATER_TYPE__HeaterZone8,&HeaterInfo[i++]); + } + if (Head_Type == HEAD_TYPE_SYLKO) + { LoadHeaterState(HEATER_TYPE__HeaterZone8,&HeaterInfo[i++]); - LoadHeaterState(HEATER_TYPE__HeaterZone9,&HeaterInfo[i++]); + LoadHeaterState(HEATER_TYPE__HeaterZone9,&HeaterInfo[i++]); LoadHeaterState(HEATER_TYPE__HeaterZone10,&HeaterInfo[i++]); LoadHeaterState(HEATER_TYPE__HeaterZone11,&HeaterInfo[i++]); LoadHeaterState(HEATER_TYPE__HeaterZone12,&HeaterInfo[i++]); |