aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Modules
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2020-08-02 12:44:48 +0300
committerShlomo Hecht <shlomo@twine-s.com>2020-08-02 12:44:48 +0300
commit8341015db09be9aa52f7b349792ecaa394d73680 (patch)
tree768b33719802357782e270b37d38cfdf7ef03b2a /Software/Embedded_SW/Embedded/Modules
parent9b8bd5cac01ad553ebbda9b1b40be1bcd535c47e (diff)
parent8a5c623fd4e3247b4b24f430c14725f7a9986433 (diff)
downloadTango-8341015db09be9aa52f7b349792ecaa394d73680.tar.gz
Tango-8341015db09be9aa52f7b349792ecaa394d73680.zip
head type name change
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules')
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c2
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticActions.c4
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c30
-rw-r--r--Software/Embedded_SW/Embedded/Modules/General/process.c6
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c20
-rw-r--r--Software/Embedded_SW/Embedded/Modules/IDS/IDS_Cleaning.c15
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c7
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c10
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c2
9 files changed, 52 insertions, 44 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
index 27fc8a707..242bdc3ce 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
@@ -621,7 +621,7 @@ uint32_t MillisecLowLoop(uint32_t tick)
//ROM_IntMasterDisable();
int StartPT100 = 0;
//Screw_ENC_Velocity_to_DAC(); - for testing the screw enc
- if (Head_Type > HEAD_TYPE_SYLKO_WITHOUT_CARD)
+ if (Head_Type > HEAD_TYPE_FLAT_WITHOUT_CARD)
StartPT100 = TEMP_SENSE_ANALOG_DRYER_TEMP1;
if (Ten_msTick)
{
diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticActions.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticActions.c
index d872b30b5..79e84ebca 100644
--- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticActions.c
+++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticActions.c
@@ -378,7 +378,7 @@ uint32_t SetBlowerStateRequestFunc(MessageContainer* requestContainer)
Turn_the_Blower_Off();
break;
case HARDWARE_BLOWER_TYPE__HeadBlower1:
- if (Head_Type == HEAD_TYPE_STAPLE_SPUN)
+ if (Head_Type == HEAD_TYPE_ARC)
{
if ((request->has_voltage)&&(request->isactive == true))
Trigger_Head_Fan_Control(HEAD_FAN_RIGHT,request->voltage);
@@ -390,7 +390,7 @@ uint32_t SetBlowerStateRequestFunc(MessageContainer* requestContainer)
break;
case HARDWARE_BLOWER_TYPE__HeadBlower2:
- if (Head_Type == HEAD_TYPE_STAPLE_SPUN)
+ if (Head_Type == HEAD_TYPE_ARC)
{
if ((request->has_voltage)&&(request->isactive == true))
Trigger_Head_Fan_Control(HEAD_FAN_LEFT,request->voltage);
diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
index 0e91f4211..ed817f9cc 100644
--- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
+++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
@@ -425,8 +425,8 @@ void CopyTemperaturesToMonitor(void)
HeaterCounterIndex[HEATER_TYPE__HeaterZone2];
DiagnosticsMonitor.n_headzone3temperature =
HeaterCounterIndex[HEATER_TYPE__HeaterZone3];
- if ((Head_Type == HEAD_TYPE_SYLKO)
- || (Head_Type == HEAD_TYPE_SYLKO_WITHOUT_CARD))
+ if ((Head_Type == HEAD_TYPE_FLAT)
+ || (Head_Type == HEAD_TYPE_FLAT_WITHOUT_CARD))
{
DiagnosticsMonitor.headzone4temperature =
HeaterTemperature[HEATER_TYPE__HeaterZone4];
@@ -441,7 +441,7 @@ void CopyTemperaturesToMonitor(void)
DiagnosticsMonitor.n_headzone6temperature =
HeaterCounterIndex[HEATER_TYPE__HeaterZone6];
}
- if (Head_Type == HEAD_TYPE_SYLKO)
+ if (Head_Type == HEAD_TYPE_FLAT)
{
DiagnosticsMonitor.headzone7temperature =
HeaterTemperature[HEATER_TYPE__HeaterZone7];
@@ -478,7 +478,7 @@ void CopyTemperaturesToMonitor(void)
HeaterCounterIndex[HEATER_TYPE__HeadCoverHeater2];
}
//if ((Head_Type == HEAD_TYPE_SYLKO)||(Head_Type == HEAD_TYPE_STAPLE_SPUN))
- if (Head_Type == HEAD_TYPE_STAPLE_SPUN)
+ if (Head_Type == HEAD_TYPE_ARC)
{
DiagnosticsMonitor.headcoverheater1temperature =
HeaterTemperature[HEATER_TYPE__HeadCoverHeater1];
@@ -613,7 +613,7 @@ void DiagnosticOneMinuteCollection(void)
DiagnosticsMonitor.midtank7level = MidTankpressure[6];
DiagnosticsMonitor.n_midtank8level = 1;
DiagnosticsMonitor.midtank8level = MidTankpressure[7];
- if (Head_Type > HEAD_TYPE_SYLKO_WITHOUT_CARD) //rapid/pp machines
+ if (Head_Type > HEAD_TYPE_FLAT_WITHOUT_CARD) //rapid/pp machines
{
/*DiagnosticsMonitor.n_drierzone1heatercurrent = 1;
DiagnosticsMonitor.drierzone1heatercurrent = HeatersCurrent[HEATER_DRYER_CURRENT_1];
@@ -622,7 +622,7 @@ void DiagnosticOneMinuteCollection(void)
Get_Head_Current(HEAD_CURRENT_MIXER,&HeadCurrent[HEAD_CURRENT_ZONE_12+1][0]);
DiagnosticsMonitor.n_mixer1heatercurrent = 1;
DiagnosticsMonitor.mixer1heatercurrent = HeadCurrent[HEAD_CURRENT_ZONE_12+1];
- if (Head_Type == HEAD_TYPE_SYLKO)
+ if (Head_Type == HEAD_TYPE_FLAT)
{
for (i=0;i<HEAD_CURRENT_ZONE_12;i++)
{
@@ -853,7 +853,7 @@ void DiagnosticOneSecCollection(void)
int i;
memset(HeaterCounterIndex,0,sizeof(HeaterCounterIndex));
- if (Head_Type > HEAD_TYPE_SYLKO_WITHOUT_CARD) //rapid/pp machines
+ if (Head_Type > HEAD_TYPE_FLAT_WITHOUT_CARD) //rapid/pp machines
{
AcVoltage = ReadVAC();
DiagnosticsMonitor.whsblower2voltage = &AcVoltage;
@@ -898,7 +898,7 @@ void DiagnosticOneSecCollection(void)
DiagnosticsMonitor.n_drierzone2heatercurrent = 1;
DiagnosticsMonitor.drierzone2heatercurrent = HeatersCurrent[HEATER_DRYER_CURRENT_2];
- if (Head_Type == HEAD_TYPE_SYLKO_WITHOUT_CARD)
+ if (Head_Type == HEAD_TYPE_FLAT_WITHOUT_CARD)
{
DiagnosticLoadTemperature(HARDWARE_PID_CONTROL_TYPE__MixerHeater, MillisecGetTemperatures( MIXER_PT100));
DiagnosticLoadTemperature(HARDWARE_PID_CONTROL_TYPE__HeadHeaterZ1, MillisecGetTemperatures(TEMP_SENSE_ANALOG_DYEINGH_TEMP1));
@@ -908,7 +908,7 @@ void DiagnosticOneSecCollection(void)
DiagnosticLoadTemperature(HARDWARE_PID_CONTROL_TYPE__HeadHeaterZ5, MillisecGetTemperatures(TEMP_SENSE_ANALOG_DYEINGH_TEMP5));
DiagnosticLoadTemperature(HARDWARE_PID_CONTROL_TYPE__HeadHeaterZ6, MillisecGetTemperatures(HEAD6_PT100));
}
- if (Head_Type == HEAD_TYPE_SYLKO)
+ if (Head_Type == HEAD_TYPE_FLAT)
{
DiagnosticLoadTemperature(HEATER_TYPE__MixerHeater, MillisecGetTemperatures( HEAD_PT100_MIXER_0X8E_0));
DiagnosticLoadTemperature(HEATER_TYPE__HeaterZone1, MillisecGetTemperatures(HEAD_PT100_ZONE_1_0X80_0));
@@ -927,7 +927,7 @@ void DiagnosticOneSecCollection(void)
DiagnosticLoadTemperature(HEATER_TYPE__HeadCoverHeater1, MillisecGetTemperatures(HEAD_PT100_AIR_HEATER_2_0X8C_1));
DiagnosticLoadTemperature(HEATER_TYPE__HeadCoverHeater2, MillisecGetTemperatures(HEAD_PT100_AIR_HEATER_1_0X8C_0));
}
- if (Head_Type == HEAD_TYPE_STAPLE_SPUN)
+ if (Head_Type == HEAD_TYPE_ARC)
{
DiagnosticLoadTemperature(HEATER_TYPE__MixerHeater, MillisecGetTemperatures( HEAD_PT100_MIXER_0X8E_0));
DiagnosticLoadTemperature(HEATER_TYPE__HeaterZone1, MillisecGetTemperatures(HEAD_PT100_ZONE_1_0X80_0));
@@ -1208,22 +1208,22 @@ void SendDiagnostics(void)
LoadHeaterState(HEATER_TYPE__HeaterZone2,&HeaterInfo[i++]);
LoadHeaterState(HEATER_TYPE__HeaterZone3,&HeaterInfo[i++]);
- if ((Head_Type == HEAD_TYPE_SYLKO)||(Head_Type == HEAD_TYPE_SYLKO_WITHOUT_CARD))
+ if ((Head_Type == HEAD_TYPE_FLAT)||(Head_Type == HEAD_TYPE_FLAT_WITHOUT_CARD))
{
LoadHeaterState(HEATER_TYPE__HeaterZone4,&HeaterInfo[i++]);
}
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))
+ if ((Head_Type == HEAD_TYPE_FLAT)||(Head_Type == HEAD_TYPE_FLAT_WITHOUT_CARD))
{
LoadHeaterState(HEATER_TYPE__HeaterZone6,&HeaterInfo[i++]);
}
- if ((Head_Type == HEAD_TYPE_SYLKO)||(Head_Type == HEAD_TYPE_STAPLE_SPUN))
+ if ((Head_Type == HEAD_TYPE_FLAT)||(Head_Type == HEAD_TYPE_ARC))
{
LoadHeaterState(HEATER_TYPE__HeaterZone7,&HeaterInfo[i++]);
//LoadHeaterState(HEATER_TYPE__HeaterZone8,&HeaterInfo[i++]);
}
- if (Head_Type == HEAD_TYPE_SYLKO)
+ if (Head_Type == HEAD_TYPE_FLAT)
{
LoadHeaterState(HEATER_TYPE__HeaterZone8,&HeaterInfo[i++]);
LoadHeaterState(HEATER_TYPE__HeaterZone9,&HeaterInfo[i++]);
@@ -1231,7 +1231,7 @@ void SendDiagnostics(void)
LoadHeaterState(HEATER_TYPE__HeaterZone11,&HeaterInfo[i++]);
LoadHeaterState(HEATER_TYPE__HeaterZone12,&HeaterInfo[i++]);
}
- if ((Head_Type == HEAD_TYPE_SYLKO)||(Head_Type == HEAD_TYPE_STAPLE_SPUN))
+ if ((Head_Type == HEAD_TYPE_FLAT)||(Head_Type == HEAD_TYPE_ARC))
//if (Head_Type == HEAD_TYPE_STAPLE_SPUN)
{
LoadHeaterState(HEATER_TYPE__HeadCoverHeater1,&HeaterInfo[i++]);
diff --git a/Software/Embedded_SW/Embedded/Modules/General/process.c b/Software/Embedded_SW/Embedded/Modules/General/process.c
index 30a99ac86..7530408c9 100644
--- a/Software/Embedded_SW/Embedded/Modules/General/process.c
+++ b/Software/Embedded_SW/Embedded/Modules/General/process.c
@@ -198,7 +198,7 @@ uint32_t HandleProcessParameters(ProcessParameters* ProcessParams,bool saveData)
{
status |= HeaterCommandRequestMessage(HARDWARE_PID_CONTROL_TYPE__HeadHeaterZ3, false,ProcessParams->headzone3temp);
}
- if(Head_Type != HEAD_TYPE_STAPLE_SPUN)
+ if(Head_Type != HEAD_TYPE_ARC)
{
Trigger_HeaterWriting();
if (ProcessParams->headzone4temp>1)
@@ -230,7 +230,7 @@ uint32_t HandleProcessParameters(ProcessParameters* ProcessParams,bool saveData)
status |= HeaterCommandRequestMessage(HARDWARE_PID_CONTROL_TYPE__DryerAirTemperature, true,ProcessParams->dryerzone1temp);
else
status |= HeaterCommandRequestMessage(HARDWARE_PID_CONTROL_TYPE__DryerAirTemperature, false,ProcessParams->dryerzone1temp);
- if(Head_Type == HEAD_TYPE_SYLKO)
+ if(Head_Type == HEAD_TYPE_FLAT)
{
if (ProcessParams->headzone7temp>1)
{
@@ -283,7 +283,7 @@ uint32_t HandleProcessParameters(ProcessParameters* ProcessParams,bool saveData)
status |= HeaterCommandRequestMessage(HARDWARE_PID_CONTROL_TYPE__HeadHeaterZ12, false,ProcessParams->headzone12temp);
}
}
- if(Head_Type == HEAD_TYPE_STAPLE_SPUN)
+ if(Head_Type == HEAD_TYPE_ARC)
{
Trigger_HeaterWriting();
if (ProcessParams->rblowertemp>1)
diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
index ec743ea4a..52e9a6e85 100644
--- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
@@ -113,7 +113,7 @@ void initializeArrays(void)
HeaterId2PT100Id[i] = 0xFF;
HeaterId2CurrentId[i] = NUM_OF_CURRENT_HEATERS;
}
- if (Head_Type > HEAD_TYPE_SYLKO_WITHOUT_CARD)
+ if (Head_Type > HEAD_TYPE_FLAT_WITHOUT_CARD)
{
HeaterId2PT100Id[HEATER_TYPE__DryerAirHeater] = DRYER_AIR_PT100;
HeaterId2PT100Id[HEATER_TYPE__DryerMainHeater] = DRYER_MAIN_PT100;
@@ -466,7 +466,7 @@ uint32_t HeatersSingleHeaterEnd(int HeaterId)
HeaterCmd[HeaterId].targettemperatue = 0;
HeaterReady[HeaterId] = true;
HeaterAtTemp[HeaterId] = true;
- if(Head_Type > HEAD_TYPE_SYLKO_WITHOUT_CARD)
+ if(Head_Type > HEAD_TYPE_FLAT_WITHOUT_CARD)
Disable_Reading_Heaters_ADC(HeaterId2CurrentId[HeaterId]);
else
Disable_Reading_Heaters_Current(HeaterId2CurrentId[HeaterId]);
@@ -722,7 +722,7 @@ void PrepareACHeater(int HeaterId,uint32_t Frequency, uint32_t SetTemperatue)
HeaterAtTemp[HeaterId] = false;
if (BlowerCfg.enabled == true)
{
- if(Head_Type > HEAD_TYPE_SYLKO_WITHOUT_CARD)
+ if(Head_Type > HEAD_TYPE_FLAT_WITHOUT_CARD)
{
WHS_Set_SetPoint_Q_value(headairflow*2/3);
}
@@ -786,7 +786,7 @@ int PrepareDCHeater(int HeaterId, uint32_t Frequency, uint32_t SetTemperatue)
if (HeaterPreviousRead[HeaterId] < HeaterCmd[HeaterId].targettemperatue )
{
- if(Head_Type > HEAD_TYPE_SYLKO_WITHOUT_CARD)
+ if(Head_Type > HEAD_TYPE_FLAT_WITHOUT_CARD)
Enable_Reading_Heaters_ADC(HeaterId2CurrentId[HeaterId]);
else
Enable_Reading_Heaters_Current(HeaterId2CurrentId[HeaterId]);
@@ -1244,7 +1244,7 @@ uint32_t HeaterControlCBFunction(uint32_t IfIndex, uint32_t readValue)
AlarmHandlingSetAlarm(HeaterUnderEventType[index], false);
/*if (BlowerCfg.enabled == true)
{
- if(Head_Type > HEAD_TYPE_SYLKO_WITHOUT_CARD)
+ if(Head_Type > HEAD_TYPE_FLAT_WITHOUT_CARD)
{
WHS_Set_SetPoint_Q_value(headairflow);
}
@@ -1281,7 +1281,7 @@ uint32_t HeaterControlCBFunction(uint32_t IfIndex, uint32_t readValue)
IncreaseBlower = true;
if (BlowerCfg.enabled == true)
{
- if(Head_Type > HEAD_TYPE_SYLKO_WITHOUT_CARD)
+ if(Head_Type > HEAD_TYPE_FLAT_WITHOUT_CARD)
{
WHS_Set_SetPoint_Q_value(headairflow);
}
@@ -1454,7 +1454,7 @@ uint32_t DCHeaterControlCBFunction(uint32_t IfIndex, uint32_t readValue)
//DCInitialHeating[index] = false;
HeatersControlStart();
AlarmHandlingSetAlarm(HeaterUnderEventType[index], false);
- if(Head_Type > HEAD_TYPE_SYLKO_WITHOUT_CARD)
+ if(Head_Type > HEAD_TYPE_FLAT_WITHOUT_CARD)
Disable_Reading_Heaters_ADC(HeaterId2CurrentId[index]);
else
Disable_Reading_Heaters_Current(HeaterId2CurrentId[index]);
@@ -1560,9 +1560,9 @@ void EightMilliSecondHeatersInterrupt(UArg arg0)
ROM_TimerLoadSet(Heater_timerBase, TIMER_A,OutputProportionalSingleStep);
}
else
- {
+ {
TimerDisable(Heater_timerBase, TIMER_A);
- }
+ }
//
// Enable all interrupts.
//
@@ -1649,7 +1649,7 @@ uint32_t DrierHeaterVoltageSetup(void)
}
Histeresis = 0;
#ifndef VAC_TEST
- if (Head_Type > HEAD_TYPE_SYLKO_WITHOUT_CARD) //rapid/pp machines
+ if (Head_Type > HEAD_TYPE_FLAT_WITHOUT_CARD) //rapid/pp machines
#endif
{
DrierAcVoltage = ReadVAC();
diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_Cleaning.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_Cleaning.c
index c6be46bca..8347c5ee9 100644
--- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_Cleaning.c
+++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_Cleaning.c
@@ -51,7 +51,7 @@ int Tup = 4,Tdelay1 = 9,Tdelay2 = 29;
uint32_t IDS_Cleaning_Move_Actuators()
{
- if(Head_Type != HEAD_TYPE_SYLKO)
+ if(Head_Type != HEAD_TYPE_FLAT)
return OK;
if (CleaningStageCounter == 1)
{
@@ -83,7 +83,7 @@ uint32_t IDS_Cleaning_Move_Actuators()
return OK;
}
-/*uint32_t IDS_Cleaning_Move_Rockers (int LeftRockerSpeed,int RightRockerSpeed)
+uint32_t IDS_Cleaning_Move_Rockers (int LeftRockerSpeed,int RightRockerSpeed)
{
uint32_t status = OK;
SaveLeftRockerSpeed = LeftRockerSpeed;
@@ -109,7 +109,7 @@ uint32_t IDS_Cleaning_Center_And_Stop_Rockers (int timeout,callback_fptr callbac
Report("IDS_Cleaning_Center_And_Stop_Rockers actuator down", __FILE__, __LINE__, timeout, RpWarning, 123456, 0);
return status;
-}*/
+}
uint32_t IDS_Cleaning_Spray_Cleaning_Solution (int dispenserSpeed,callback_fptr callback)
{
uint32_t status = OK;
@@ -128,10 +128,11 @@ uint32_t IDS_Cleaning_Stop_Cleaning_Solution (callback_fptr callback)
uint32_t status = OK;
status = IDS_Dispenser_Close_Valve_And_Stop_Motor(CLEANER_DISPENSER,callback);
Report("IDS_Cleaning_Stop_Cleaning_Solution", __FILE__, __LINE__, CLEANER_DISPENSER, RpWarning, status, 0);
- HeadCard_Actuators_Relocate();
- CleaningStageCounter = 0;
- CleaningStage = CleaningStageIdle;
- Report("IDS_Cleaning_Stop_Cleaning_Solution actuator relocate", __FILE__, __LINE__, CleaningStage, RpWarning, CleaningStageCounter, 0);
+ if(Head_Type == HEAD_TYPE_FLAT)
+ {
+ Trigger_Head_Actuators_Control(ACTIN, LOW,false);
+ Report("IDS_Cleaning_MoveDown cleaning stop", __FILE__, __LINE__, Tdelay1, RpWarning, CleaningStageCounter, 0);
+ }
return status;
diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
index e14053ae3..f61eebfa8 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
+++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
@@ -87,6 +87,13 @@ void Stub_ProgressRequest(MessageContainer* requestContainer)
uint8_t ReadBackReg[1];
+
+ if(request->amount == 0xacc1e)
+ {
+ response.progress = IDS_Cleaning_Move_Actuators();
+ response.has_progress = true;
+ }
+ else
if(request->amount == 0xC04f)
{
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c
index 01c70d42f..b81c2e602 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c
@@ -209,7 +209,7 @@
}
else
{
- if(Head_Type > HEAD_TYPE_SYLKO_WITHOUT_CARD)
+ if(Head_Type > HEAD_TYPE_FLAT_WITHOUT_CARD)
{
WHS_Set_SetPoint_Q_value(headairflow*2/3);
}
@@ -349,7 +349,7 @@
//HARDWARE_MOTOR_TYPE__MOTO_DH_LID = 2,
//HARDWARE_MOTOR_TYPE__MOTO_DRYER_LID = 4,
//DeActivateHeadMagnet();
- if (Head_Type != HEAD_TYPE_STAPLE_SPUN)
+ if (Head_Type != HEAD_TYPE_ARC)
{
CallbackCounter++;
MotorMovetoLimitSwitch (HARDWARE_MOTOR_TYPE__MOTO_DH_LID,1-MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_DH_LID].directionthreadwize, 200, Motor_Id_to_LS_IdUp[HARDWARE_MOTOR_TYPE__MOTO_DH_LID], Thread_Load_HomingCallback,10000);
@@ -366,7 +366,7 @@
direction = DRIER_LID_OPEN;
}
MotorGotoWithCallback(HARDWARE_MOTOR_TYPE__MOTO_DRYER_LID, direction, Motor_Id_to_LS_IdUp[HARDWARE_MOTOR_TYPE__MOTO_DRYER_LID], Thread_Load_HomingCallback,10000);
- if (Head_Type == HEAD_TYPE_SYLKO)
+ if (Head_Type == HEAD_TYPE_FLAT)
{
Report("Thread_Load_Lift_actuators",__FILE__,__LINE__,LOW,RpMessage,false,0);
Trigger_Head_Actuators_Control(ACTOT, LOW,true);
@@ -500,7 +500,7 @@
//Close Dyeing Head Cover And Dryer Lid
//HARDWARE_MOTOR_TYPE__MOTO_DH_LID = 2,
//HARDWARE_MOTOR_TYPE__MOTO_DRYER_LID = 4,
- if (Head_Type != HEAD_TYPE_STAPLE_SPUN)
+ if (Head_Type != HEAD_TYPE_ARC)
{
CallbackCounter++;
MotorMovetoLimitSwitch (HARDWARE_MOTOR_TYPE__MOTO_DH_LID,MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_DH_LID].directionthreadwize, 200, Motor_Id_to_LS_IdDown[HARDWARE_MOTOR_TYPE__MOTO_DH_LID], Thread_Load_HomingCallback,10000);
@@ -517,7 +517,7 @@
direction = DRIER_LID_CLOSE;
}
MotorGotoWithCallback(HARDWARE_MOTOR_TYPE__MOTO_DRYER_LID, direction, Motor_Id_to_LS_IdDown[HARDWARE_MOTOR_TYPE__MOTO_DRYER_LID], Thread_Load_HomingCallback,10000);
- if (Head_Type == HEAD_TYPE_SYLKO)
+ if (Head_Type == HEAD_TYPE_FLAT)
{
Report("Thread_Load_Close_actuators",__FILE__,__LINE__,LOW,RpMessage,true,0);
Trigger_Head_Actuators_Control(ACTOT, LOW,false);
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
index f403eeeab..09ab89f24 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
@@ -1037,7 +1037,7 @@ uint32_t ThreadPrepareState(void *JobDetails)
// if ((FPGA_Read_limit_Switches(Motor_Id_to_LS_IdUp[HARDWARE_MOTOR_TYPE__MOTO_DH_LID]) == LIMIT)&&(JoggingJobActive == false))
if ((FPGA_Read_limit_Switches(Motor_Id_to_LS_IdDown[HARDWARE_MOTOR_TYPE__MOTO_DH_LID]) != LIMIT)&&(JoggingJobActive == false))
{
- if(Head_Type != HEAD_TYPE_STAPLE_SPUN)
+ if(Head_Type != HEAD_TYPE_ARC)
{
ReportWithPackageFilter(ThreadFilter,"Dyeing head is wide open!!!",__FILE__,__LINE__,HARDWARE_MOTOR_TYPE__MOTO_DH_LID,RpError,LIMIT,0);
if (SkipOpenLids == false)