From a4305e684584ebd3e4c09262820db67272b0249f Mon Sep 17 00:00:00 2001 From: Shlomo Hecht Date: Thu, 15 Aug 2019 16:59:28 +0300 Subject: automatic homing on: init, power off, end job --- .../Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c | 1 + Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c | 12 +++++++----- .../Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c | 4 ---- 3 files changed, 8 insertions(+), 9 deletions(-) (limited to 'Software/Embedded_SW/Embedded/Modules') diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c index 8956f417d..da928e8ae 100644 --- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c +++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c @@ -378,6 +378,7 @@ void DiagnosticOneSecCollection(void) MidTankpressure[i][0] = Get_MidTank_Pressure_Sensor(i); else MidTankpressure[i][0] = 1.00-(IDS_Dispenser_Data[i].consumedinnanolitter/5800000); + //double dispcapacity = (1.00-(IDS_Dispenser_Data[i].consumedinnanolitter/5800000))*130*1000*1000; } } void Diagnostic100msecCollection(void) diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c index 3e68bc0a4..4f60cfa14 100644 --- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c +++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c @@ -606,7 +606,7 @@ c. Go to step 2.a x Segment.BrushStopsCount. { NumofReadyDispensers++; tempSpeed = CurrentDispenserSpeed[i]; - updatedSpeed = (tempSpeed*0.98>100)?tempSpeed*0.98:100; + updatedSpeed = (tempSpeed*0.985>100)?tempSpeed*0.985:100; MotorSetSpeed(HW_Motor_Id, updatedSpeed); CurrentDispenserSpeed[i] = updatedSpeed; //Report("IDS reduce speed",__FILE__,i,(int)tempSpeed,RpWarning,(int)updatedSpeed,0); @@ -614,7 +614,7 @@ c. Go to step 2.a x Segment.BrushStopsCount. else { tempSpeed = CurrentDispenserSpeed[i]; - updatedSpeed = (tempSpeed*1.04<1000)?tempSpeed*1.04:1000; + updatedSpeed = (tempSpeed*1.02<1000)?tempSpeed*1.02:1000; MotorSetSpeed(HW_Motor_Id, updatedSpeed); CurrentDispenserSpeed[i] = updatedSpeed; //Report("IDS accelerate speed",__FILE__,i,(int)tempSpeed,RpWarning,(int)updatedSpeed,0); @@ -979,7 +979,7 @@ uint32_t IDS_Cleaning_Stop_Cleaning_Solution (callback_fptr callback); //IDS_Cleaning_Center_And_Stop_Rockers (int timeout,callback_fptr callback); } } - if ((InterSegmentStartWFCFDispensers > 0)&&(InterSegmentStartWFCFDispensers == (InterSegmentStepsCount+12000))) + if ((InterSegmentStartWFCFDispensers > 10000)&&(InterSegmentStartWFCFDispensers == (InterSegmentStepsCount+10000))) { //start prepare 4 seconds before wcf IDSPresegmentPrepareStart(); @@ -1495,8 +1495,10 @@ uint32_t IDSSegmentState(void *SegmentDetails, int SegmentId) //TimerMotors_t HW_Motor_Id = DispenserIdToMotorId[deviceID]; //REPORT_MSG(deviceID,"Dispenser End called"); //MotorStop(HW_Motor_Id,Hard_Hiz); - //IDS_HomeDispenser (deviceID, 1000 , NULL); - +#ifdef AUTO_HOME_DISPENSERS + if (deviceID!=LUBRICANT_DISPENSER) + IDS_HomeDispenser (deviceID, 1000 , NULL); +#endif return OK; } //******************************************************************************************************************** diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c index 2c92e0bef..153ab0e43 100644 --- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c +++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c @@ -118,10 +118,6 @@ void Stub_ProgressRequest(MessageContainer* requestContainer) { PowerOffInit(); } - else if(request->amount == 0xCC) - { - ResponseDemo(request->delay); - } else { response.has_progress = true; -- cgit v1.3.1 From 8f5c330af5177b2e09998d0f05134b173dfa2e61 Mon Sep 17 00:00:00 2001 From: Shlomo Hecht Date: Thu, 15 Aug 2019 19:02:57 +0300 Subject: machine state message added --- Software/Embedded_SW/Embedded/.cproject | 2 +- .../Embedded_SW/Embedded/Communication/Container.c | 8 ++ .../Communication/PMR/Common/MessageType.pb-c.c | 20 +++- .../Communication/PMR/Common/MessageType.pb-c.h | 6 +- .../PMR/MachineStatus/IDSPackLevel.pb-c.c | 118 ++++++++++++++++++ .../PMR/MachineStatus/IDSPackLevel.pb-c.h | 76 ++++++++++++ .../PMR/MachineStatus/MachineState.pb-c.c | 47 ++++++++ .../PMR/MachineStatus/MachineState.pb-c.h | 48 ++++++++ .../PMR/MachineStatus/MachineStatus.pb-c.c | 105 ++++++++++++++++ .../PMR/MachineStatus/MachineStatus.pb-c.h | 76 ++++++++++++ .../StartMachineStatusUpdateRequest.pb-c.c | 72 +++++++++++ .../StartMachineStatusUpdateRequest.pb-c.h | 70 +++++++++++ .../StartMachineStatusUpdateResponse.pb-c.c | 92 ++++++++++++++ .../StartMachineStatusUpdateResponse.pb-c.h | 72 +++++++++++ .../StopMachineStatusUpdateRequest.pb-c.c | 72 +++++++++++ .../StopMachineStatusUpdateRequest.pb-c.h | 70 +++++++++++ .../StopMachineStatusUpdateResponse.pb-c.c | 72 +++++++++++ .../StopMachineStatusUpdateResponse.pb-c.h | 70 +++++++++++ Software/Embedded_SW/Embedded/DataDef.h | 4 +- .../Embedded/Modules/Control/MillisecTask.c | 5 +- .../Embedded/Modules/General/MachineStatus.c | 132 +++++++++++++++++++++ .../Embedded/Modules/General/MachineStatus.h | 20 ++++ .../StateMachines/Initialization/InitSequence.c | 32 ++--- 23 files changed, 1262 insertions(+), 27 deletions(-) create mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/IDSPackLevel.pb-c.c create mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/IDSPackLevel.pb-c.h create mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/MachineState.pb-c.c create mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/MachineState.pb-c.h create mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/MachineStatus.pb-c.c create mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/MachineStatus.pb-c.h create mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/StartMachineStatusUpdateRequest.pb-c.c create mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/StartMachineStatusUpdateRequest.pb-c.h create mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/StartMachineStatusUpdateResponse.pb-c.c create mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/StartMachineStatusUpdateResponse.pb-c.h create mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/StopMachineStatusUpdateRequest.pb-c.c create mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/StopMachineStatusUpdateRequest.pb-c.h create mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/StopMachineStatusUpdateResponse.pb-c.c create mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/StopMachineStatusUpdateResponse.pb-c.h create mode 100644 Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c create mode 100644 Software/Embedded_SW/Embedded/Modules/General/MachineStatus.h (limited to 'Software/Embedded_SW/Embedded/Modules') diff --git a/Software/Embedded_SW/Embedded/.cproject b/Software/Embedded_SW/Embedded/.cproject index 6007737b7..10dda24b6 100644 --- a/Software/Embedded_SW/Embedded/.cproject +++ b/Software/Embedded_SW/Embedded/.cproject @@ -288,7 +288,7 @@ - +