From 0bd74b9a961597be25b73a78cdefee40b85e4ef4 Mon Sep 17 00:00:00 2001 From: Shlomo Hecht Date: Thu, 14 May 2020 20:41:37 +0300 Subject: Version 1.4.6.26 #2: cartridge suction afetr extraction, waste tank reading improved --- Software/Embedded_SW/Embedded/Modules/General/process.c | 4 +--- Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c | 1 + Software/Embedded_SW/Embedded/Modules/IDS/IDS_dispenser.c | 2 +- Software/Embedded_SW/Embedded/Modules/Waste/Waste_init.c | 3 +++ 4 files changed, 6 insertions(+), 4 deletions(-) (limited to 'Software/Embedded_SW/Embedded/Modules') diff --git a/Software/Embedded_SW/Embedded/Modules/General/process.c b/Software/Embedded_SW/Embedded/Modules/General/process.c index ab4c6daac..fafdbed65 100644 --- a/Software/Embedded_SW/Embedded/Modules/General/process.c +++ b/Software/Embedded_SW/Embedded/Modules/General/process.c @@ -320,10 +320,7 @@ void ProcessRequestFunc(MessageContainer* requestContainer) */ ///////////////////////////////////////////////////////// UploadProcessParametersResponse response = UPLOAD_PROCESS_PARAMETERS_RESPONSE__INIT; - responseContainer = createContainer(MESSAGE_TYPE__UploadProcessParametersResponse, requestContainer->token, true, &response, &upload_process_parameters_response__pack, &upload_process_parameters_response__get_packed_size); - container_buffer = my_malloc(message_container__get_packed_size(&responseContainer)); - //REPORT_MSG (ProcessParams->dryerzone1temp,"Process Params Dryer"); PowerIdleOutOfIdleState(); @@ -336,6 +333,7 @@ void ProcessRequestFunc(MessageContainer* requestContainer) responseContainer.error = (ErrorCode)status; responseContainer.errormessage = ProcessErrorMsg; } + container_buffer = my_malloc(message_container__get_packed_size(&responseContainer)); size_t container_size = message_container__pack(&responseContainer, container_buffer); my_free(responseContainer.data.data); SendChars(container_buffer, container_size); diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c index 89bdcc66b..45a0e374b 100644 --- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c +++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c @@ -1131,6 +1131,7 @@ uint32_t HeaterControlCBFunction(uint32_t IfIndex, uint32_t readValue) if ((readValue>(HeaterCmd[index].targettemperatue+800))&&(getIdleState() == false)) { ReportWithPackageFilter(HeatersFilter, "AC OverHeating in progress",__FILE__,readValue,HeaterReady[index],RpError, HeaterAtTemp[index],0); + ReportWithPackageFilter(HeatersFilter, "AC OverHeating PID",__FILE__,(int)HeaterPIDConfig[index].m_calculatedError,(int)HeaterPIDConfig[index].m_SetParam,RpError, (int)HeaterPIDConfig[index].m_integral,0); } // check if the read value is within the proportional band if (HeaterReady[index]==false) diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_dispenser.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_dispenser.c index bb9f0616e..3798e9aee 100644 --- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_dispenser.c +++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_dispenser.c @@ -366,7 +366,7 @@ void IDS_Dispenser_Content_Calculation (char DispenserId) } if (DispenserId == 0) { - if ((seconds_counter++>=900)&&(DispenserDataUpdated == true))//9000)// - one hour) + if ((seconds_counter++>=9000)&&(DispenserDataUpdated == true))//9000)// - one hour) { seconds_counter = 0; if (IDS_Dispenser_Data[DispenserId].consumedinnanolitter) diff --git a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_init.c b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_init.c index 922da21b1..f266cb9da 100644 --- a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_init.c +++ b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_init.c @@ -834,6 +834,7 @@ bool WasteTankCBFunction() MidTankValvesAction(Cartridge_MidTank_OFF); IFS_info.Ink.time_out = 0; IFS_info.Cartridge_Ink_TimeOut_device_Id = RemoveControlCallback(IFS_info.Cartridge_Ink_TimeOut_device_Id, WasteTankCBFunction ); + WHS_Set_IFS_Clearing_Suction(); } } break; @@ -884,6 +885,7 @@ bool WasteTankCBFunction() Pannel_Leds(CART_2, MODE_OFF); cart2.color = colorOFF; WHS_info.cartridge_1.autheticate = FAILED; + WHS_Set_IFS_Clearing_Suction(); } //SetActiveWastCartridge(); break; @@ -926,6 +928,7 @@ bool WasteTankCBFunction() WHS_info.WHS_valve = waste_cartridge1; */ } + WHS_Set_IFS_Clearing_Suction(); //SetActiveWastCartridge(); break; -- cgit v1.3.1 From dbaa3118334f2de0a8225dbc130404e3085c551e Mon Sep 17 00:00:00 2001 From: Shlomo Hecht Date: Fri, 15 May 2020 12:39:00 +0300 Subject: version 1.4.6.27 --- .../Embedded_SW/Embedded/Common/SW_Info/SW_Info.c | 2 +- .../WHS_Card/D_MAX11614_ADC/WHS_MAX11614_A2D.c | 5 ++-- .../Embedded/Modules/Thread/Thread_print.c | 29 +++++++++++++++++++++- .../Embedded/Software Release Notes.txt | 2 +- .../Embedded/StateMachines/Printing/JobSTM.c | 2 +- 5 files changed, 34 insertions(+), 6 deletions(-) (limited to 'Software/Embedded_SW/Embedded/Modules') diff --git a/Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c b/Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c index 3e84bd761..e234d8b6a 100644 --- a/Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c +++ b/Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c @@ -20,7 +20,7 @@ typedef struct } TangoVersion_t; -TangoVersion_t _gTangoVersion = {1,4,6,26}; +TangoVersion_t _gTangoVersion = {1,4,6,27}; #define BUILD_DATE __DATE__ char Dat[50] = BUILD_DATE; char _gTangoName [MAX_STRING_LEN] = "Tango01 ";//d diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_MAX11614_ADC/WHS_MAX11614_A2D.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_MAX11614_ADC/WHS_MAX11614_A2D.c index 2afb59dcc..23196d361 100644 --- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_MAX11614_ADC/WHS_MAX11614_A2D.c +++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_MAX11614_ADC/WHS_MAX11614_A2D.c @@ -655,6 +655,7 @@ bool waste_seq_step2() return status; } bool ContinouosWaste = false; +#define WASTE_PROCESS_TIME 500 bool waste_seq_step1_cont() { bool status = OK; @@ -666,7 +667,7 @@ bool waste_seq_step1_cont() Trigger_SetWHS_VOC_Valve(OPEN); - WasteControlId = AddControlCallback(NULL, Trigger_ReadWHS_WasteContinouos, eOneSecond, TemplateDataReadCBFunction,0,0, 0 ); + WasteControlId = AddControlCallback(NULL, Trigger_ReadWHS_WasteContinouos, WASTE_PROCESS_TIME, TemplateDataReadCBFunction,0,0, 0 ); Report("------------ waste_seq_step1_cont -----------------", __FILE__, __LINE__, WasteControlId, RpMessage, 0, 0); return status; @@ -699,7 +700,7 @@ bool waste_seq_step1() Trigger_SetWHS_VOC_Valve(OPEN); ReportWithPackageFilter(WasteFilter,"------------ wait 1 second -----------------", __FILE__, __LINE__, 0, RpMessage, 0, 0); - WasteControlId = AddControlCallback(NULL, Trigger_ReadWHS_Waste, eOneSecond, TemplateDataReadCBFunction,0,0, 0 ); + WasteControlId = AddControlCallback(NULL, Trigger_ReadWHS_Waste, WASTE_PROCESS_TIME, TemplateDataReadCBFunction,0,0, 0 ); return status; } diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c index 69f640c45..f0e459514 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c @@ -140,6 +140,13 @@ uint32_t Control_Delta_Position_Pass(uint32_t Current_Read,uint32_t Previous_Rea * **************************************************************************************/ uint32_t initialpos = 0xFFFF; uint32_t Poolerinitialpos = 0xFFFF; +#define SPEED_STORE_SIZE 20 +float PullerSpeedStore[SPEED_STORE_SIZE]; +float PullerSpeedAverage; +int PullerSpeedIndex = 0; +float FeederSpeedStore[SPEED_STORE_SIZE]; +float FeederSpeedAverage; +int FeederSpeedIndex = 0,Speed_i; void ThreadUpdateProcessLength (double length, void *Funcptr) { @@ -206,6 +213,15 @@ uint32_t ThreadLengthCBFunction(uint32_t IfIndex, uint32_t ReadValue) } } + FeederSpeedStore[FeederSpeedIndex++] = length; + if (FeederSpeedIndex>=SPEED_STORE_SIZE) + { + FeederSpeedIndex = 0; + for (Speed_i = 0;Speed_i=SPEED_STORE_SIZE) + { + PullerSpeedIndex = 0; + for (Speed_i = 0;Speed_i job_length) { - Report("job length bigger than assigned",__FILE__,__LINE__,PoolerTotalProcessedLength,RpWarning,job_length, done); + Report("job length bigger than assigned",__FILE__,__LINE__,(int)(PoolerTotalProcessedLength*100),RpWarning,(int)(job_length*100), done); //TotalProcessedLength = job_length; totlength = job_length; } -- cgit v1.3.1