aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Modules
diff options
context:
space:
mode:
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules')
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c25
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c76
2 files changed, 94 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++]);
diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
index d28ca4f21..0575f0388 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
+++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
@@ -49,7 +49,10 @@
#include "drivers/Uart_Comm/WHS_Controller_Comm/WHS_UART/WHS_Uart.h"
#include <Drivers/I2C_Communication/WHS_Card/IO_Extender_Ports_TCA9555/WHS_IO.h>
+#include "drivers/Heater/TemperatureSensor.h"
+#include "Drivers/I2C_Communication/Head_Card/PT100/ADS122X04.h"
+extern HeadBoardTempSensConfigStruc HeadTempSensConfig[MAX_HEAD_CARD_TEMP_SENS_ID];
extern float NumberOfRotationPerPassage; // how many rotations per spool passage
extern void HeaterSafetyTestSetLimits(int limit);
@@ -80,6 +83,65 @@ void Stub_ProgressRequest(MessageContainer* requestContainer)
uint8_t pin = 0;
uint8_t value= 0;
+ uint8_t ReadBackReg[1];
+
+ if(request->amount == 0xC04f)
+ {
+
+ switch(request->delay)
+ {
+ case 0x8400:
+ HeadADCPT100_ReadReg(HEAD_PT100_ZONE_5_0X84_0, ADS122X_CONFIG_0_REG, &ReadBackReg[0]);
+ response.progress = ReadBackReg[0];
+ //response.progress = HeadTempSensConfig[14].Reg0.Byte;
+ break;
+ case 0x8401:
+ HeadADCPT100_ReadReg(HEAD_PT100_ZONE_5_0X84_0, ADS122X_CONFIG_1_REG, &ReadBackReg[0]);
+ response.progress = ReadBackReg[0];
+ //response.progress = HeadTempSensConfig[14].Reg1.Byte;
+ break;
+ case 0x8402:
+ HeadADCPT100_ReadReg(HEAD_PT100_ZONE_5_0X84_0, ADS122X_CONFIG_2_REG, &ReadBackReg[0]);
+ response.progress = ReadBackReg[0];
+ //response.progress = HeadTempSensConfig[14].Reg2.Byte;
+ break;
+ case 0x8403:
+ HeadADCPT100_ReadReg(HEAD_PT100_ZONE_5_0X84_0, ADS122X_CONFIG_3_REG, &ReadBackReg[0]);
+ response.progress = ReadBackReg[0];
+ //response.progress = HeadTempSensConfig[14].Reg3.Byte;
+ break;
+ case 0x8600:
+ HeadADCPT100_ReadReg(HEAD_PT100_ZONE_7_0X86_0, ADS122X_CONFIG_0_REG, &ReadBackReg[0]);
+ response.progress = ReadBackReg[0];
+ //response.progress = HeadTempSensConfig[15].Reg0.Byte;
+ break;
+ case 0x8601:
+ HeadADCPT100_ReadReg(HEAD_PT100_ZONE_7_0X86_0, ADS122X_CONFIG_1_REG, &ReadBackReg[0]);
+ response.progress = ReadBackReg[0];
+ //response.progress = HeadTempSensConfig[15].Reg1.Byte;
+ break;
+ case 0x8602:
+ HeadADCPT100_ReadReg(HEAD_PT100_ZONE_7_0X86_0, ADS122X_CONFIG_2_REG, &ReadBackReg[0]);
+ response.progress = ReadBackReg[0];
+ //response.progress = HeadTempSensConfig[15].Reg2.Byte;
+ break;
+ case 0x8603:
+ HeadADCPT100_ReadReg(HEAD_PT100_ZONE_7_0X86_0, ADS122X_CONFIG_3_REG, &ReadBackReg[0]);
+ response.progress = ReadBackReg[0];
+ //response.progress = HeadTempSensConfig[15].Reg3.Byte;
+ break;
+
+ default:
+ if((request->delay >= HEAD_PT100_ZONE_1_0X80_0) && (request->delay <= HEAD_PT100_RESERVE_0X8E_1))
+ {
+ response.progress = TempSensorResponse[request->delay].PT100_ADC_Reading_Bits;
+ }
+ break;
+ }
+
+ response.has_progress = true;
+ }
+ else
if(request->amount == 0xb05)
{
response.progress = Test_Uart3(request->delay);
@@ -105,6 +167,20 @@ void Stub_ProgressRequest(MessageContainer* requestContainer)
response.has_progress = true;
}
else
+ if(request->amount == 0xb10) //S.S Head Sensor board
+ {
+ if(request->delay == 0x01)
+ {
+ response.progress = HeadCard_ActivateHeadPressureArcBlowers();
+ }
+ else if(request->delay == 0x00)
+ {
+ response.progress = HeadCard_DeActivateHeadPressureArcBlowers();
+ }
+ response.has_progress = true;
+ }
+
+ else
if(request->amount == 0x3EC)
{
if(request->delay == 0x01)
generated by cgit v1.3.1 (git 2.54.0) at 2026-06-19 22:05:13 +0000