aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/StateMachines/Initialization
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2020-10-07 13:14:49 +0300
committerShlomo Hecht <shlomo@twine-s.com>2020-10-07 13:14:49 +0300
commitcae0bfc060f16dd75661ebba88d3c905dd2ac875 (patch)
tree9ee1b1a7e56e35bb48978b15cf551aebcf9f5008 /Software/Embedded_SW/Embedded/StateMachines/Initialization
parent574226b848b815486038498669b661e5790e93cc (diff)
downloadTango-cae0bfc060f16dd75661ebba88d3c905dd2ac875.tar.gz
Tango-cae0bfc060f16dd75661ebba88d3c905dd2ac875.zip
Head EEPROM stubs, pressurer sensor 2 read (WHS),
Diffstat (limited to 'Software/Embedded_SW/Embedded/StateMachines/Initialization')
-rw-r--r--Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c b/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c
index e543bf2a1..92d6d586b 100644
--- a/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c
+++ b/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c
@@ -430,7 +430,7 @@ uint32_t InitSequencePowerManagementInit(void)
uint32_t InitSequenceInitialBlowerActivation(void)
{
SetMachineState(MACHINE_STATE_INITIAL_BLOWER_ACTIVATION);
- int i,total1=0,total3=0;
+ int i,total1=0,total2=0,total3=0;
uint32_t ZeroValue;
uint16_t value = 0;
//WHS_Start_Blower_Control_Closed_Loop(0.0);
@@ -447,12 +447,15 @@ uint32_t InitSequenceInitialBlowerActivation(void)
{
get_orf_1(&value);
total1+=value;
+ get_orf_2(&value);
+ total2+=value;
get_orf_3(&value);
total3+=value;
- ReportWithPackageFilter(InitFilter,"load initial orifice value", __FILE__,i,total1, RpMessage, total3, 0);
+ ReportWithPackageFilter(InitFilter,"load initial orifice value", __FILE__,total1,total2, RpMessage, total3, 0);
Task_sleep(100);
}
total1/=8;
+ total2/=8;
total3/=8;
MCU_E2PromRead(EEPROM_ORIFICE1_ZERO_VALUE,&ZeroValue);
if ((total1>800)&&(total1<2000))
@@ -470,14 +473,14 @@ uint32_t InitSequenceInitialBlowerActivation(void)
else
total3 = ZeroValue;
ReportWithPackageFilter(InitFilter,"store initial orifice 3 value", __FILE__,EEPROM_ORIFICE3_ZERO_VALUE,total3, RpMessage, ZeroValue, 0);
- WHS_MAX11614_Load_OrificeZeroValue(total1,total3);
+ WHS_MAX11614_Load_OrificeZeroValue(total1,total3,total3);
}
else
{
MCU_E2PromRead(EEPROM_ORIFICE1_ZERO_VALUE,&total1);
MCU_E2PromRead(EEPROM_ORIFICE3_ZERO_VALUE,&total3);
- ReportWithPackageFilter(InitFilter,"load initial values from EEPROM", __FILE__,__LINE__,total3, RpMessage, total1, 0);
- WHS_MAX11614_Load_OrificeZeroValue(total1,total3);
+ ReportWithPackageFilter(InitFilter,"load initial values from EEPROM", __FILE__,0,total3, RpMessage, total1, 0);
+ WHS_MAX11614_Load_OrificeZeroValue(total1,0,total3);
}
}
HeadBlowersInit();
@@ -619,7 +622,7 @@ uint32_t InitSequenceStartHeating(void)
SetMachineReadyForHeating(true);
if(Head_Type == HEAD_TYPE_ARC) {
MotorMovetoLimitSwitch(MotorId,1-MotorsCfg[MotorId].directionthreadwize, 50, Motor_Id_to_LS_IdDown[MotorId], cleaningMotorCBFunction,30000);
- } else {
+ } else if(Head_Type == HEAD_TYPE_FLAT){
HeadCard_Actuators_Relocate();
}
//SetMachineStatus(MACHINE_STATE__Ready); //prevent job while waiting for the cooler