From 2a85f8d0a25260276c458074019fc58030317918 Mon Sep 17 00:00:00 2001 From: Shlomo Hecht Date: Wed, 7 Oct 2020 21:25:54 +0300 Subject: some changes to the protobuf --- .../Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Software/Embedded_SW') diff --git a/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c b/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c index e543bf2a1..3fb5c4cfa 100644 --- a/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c +++ b/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c @@ -619,7 +619,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 -- cgit v1.3.1 From a20d25bb885b3ec46d63bda7263fd98faa4095c2 Mon Sep 17 00:00:00 2001 From: Shlomo Hecht Date: Wed, 7 Oct 2020 21:40:34 +0300 Subject: winder calibration from main EEPROM (for #3782, #3761). waste prepare (#2995) increased suction after job (#2994) --- .../WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.c | 16 ++++++++ .../WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.h | 2 + .../Embedded/Drivers/flash_ram/MCU_E2Prom.h | 2 +- .../Embedded/Modules/AlarmHandling/AlarmHandling.c | 2 +- .../Embedded/Modules/Stubs_Handler/Progress.c | 9 ++++- .../Embedded/Modules/Thread/Thread_Winder.c | 11 +++++- .../Embedded_SW/Embedded/Modules/Waste/Waste_ex.h | 1 + .../Embedded/Modules/Waste/Waste_maint.c | 44 +++++++++++++++++++++- .../Embedded/StateMachines/Printing/JobSTM.c | 32 +++++++--------- 9 files changed, 94 insertions(+), 25 deletions(-) (limited to 'Software/Embedded_SW') diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.c index 764ef0d44..9e626ec7f 100644 --- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.c +++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.c @@ -391,6 +391,8 @@ bool IFS_Clearing_Suction = false; bool IFS_Clearing_SuctionWaiting = false; int midtank_cleared = NUM_OF_MIDTANKS; +bool JobEndSuction = false; + void WHS_Set_IFS_Clearing_Suction (int midtank) { if (JobIsActive()) @@ -405,6 +407,12 @@ void WHS_Set_IFS_Clearing_Suction (int midtank) } Report("------------ WHS_Set_IFS_Clearing_Suction :-----------------", __FILE__,__LINE__, (int) IFS_Clearing_Suction, RpMessage, (int)JobIsActive(), 0); } +#define JobEndSuctionTime 30 +void WHS_Set_JobEndSuction (void) +{ + JobEndSuction = true; + Report("------------ WHS_Set_JobEndSuction :-----------------", __FILE__,__LINE__, (int) JobEndSuction, RpMessage, (int)JobIsActive(), 0); +} #define MAX_ALLOWED_BLOWER_VOLTAGE 4300 #define MIN_ALLOWED_BLOWER_VOLTAGE 2400 @@ -482,6 +490,14 @@ bool WHS_Set_Blower_Control_Closed_Loop(double Q_value) } } + if (JobEndSuction == true) + { + JobEndSuction = false; + Report("------------ Job end Clearing Suction -----------------", __FILE__,__LINE__, (int)4000, RpMessage, (int)JobEndSuctionTime, 0); + Control_Voltage_To_Blower(4000); + close_loop_time = JobEndSuctionTime; + return OK; + } volt = getBlowerState(); WHS_Pid_Testing_Func(Q_value,current_dying_head_flow_Q); //close_loop_time = 1; diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.h b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.h index f5bc52858..3033d6d06 100644 --- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.h +++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.h @@ -28,6 +28,8 @@ double get_average_Q(WHS_Flow_Meter ORF_id); bool WHS_Set_Blower_Control_Closed_Loop(double Q_value); void WHS_Start_Blower_Control_Closed_Loop (void); void WHS_Set_IFS_Clearing_Suction (int midtank); +void WHS_Set_JobEndSuction (void); + double WHS_Get_Blower_Control_Closed_Loop_SetPoint(void); void WHS_Set_SetPoint_Q_value(double value); void WHS_enable_control_loop(bool value); diff --git a/Software/Embedded_SW/Embedded/Drivers/flash_ram/MCU_E2Prom.h b/Software/Embedded_SW/Embedded/Drivers/flash_ram/MCU_E2Prom.h index bb171dda4..12598ed07 100644 --- a/Software/Embedded_SW/Embedded/Drivers/flash_ram/MCU_E2Prom.h +++ b/Software/Embedded_SW/Embedded/Drivers/flash_ram/MCU_E2Prom.h @@ -33,7 +33,7 @@ typedef enum { EEPROM_STORAGE_MIDTANK_8_B, //EEPROM_STORAGE_SERIAL_NUM, //EEPROM_STORAGE_MAC_ADDR, - EEPROM_STORAGE_DRYER_BACKLASH, + EEPROM_STORAGE_WINDER_CALIBRATION, EEPROM_STORAGE_EMBEDDED_VERSION, EEPROM_ALARM_SUPPORT, EEPROM_ORIFICE1_ZERO_VALUE, diff --git a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c index ca6c4d51f..01e3533d6 100644 --- a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c +++ b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c @@ -972,7 +972,7 @@ JobEndReasonEnum AlarmHandlingPrepareJob(void *CurrentJob) } if (Configured[Module_Waste]) { - FoundReason = Waste_Prepare(); + FoundReason = Waste_CheckState(); } if ((AlarmState[Alarm_i].Status == true)&&(FoundReason == JOB_OK)) { diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c index e4a573e7b..a81cfff52 100644 --- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c +++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c @@ -1041,7 +1041,6 @@ void Stub_ProgressRequest(MessageContainer* requestContainer) response.progress = (double)MCU_E2PromProgram(EEPROM_STORAGE_DRYER_CYCLES,request->delay); response.has_progress = true; } - else if(request->amount == 0xB3) //fast refresh for pressure { @@ -1207,6 +1206,14 @@ void Stub_ProgressRequest(MessageContainer* requestContainer) response.has_progress = true; } else + if(request->amount == 0xB20) //Set loading arm cycles + { + LOG_ERROR(request->delay,"Set winding calibration data"); + + response.progress = (double)MCU_E2PromProgram(EEPROM_STORAGE_WINDER_CALIBRATION,request->delay); + response.has_progress = true; + } + else if(request->amount == 0xC3) //suspend I2C task { if (request->delay == 0) diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c index f4d34284d..4ec45c5b8 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c @@ -17,7 +17,7 @@ #include "Common/report/report.h" #include "drivers/FPGA/FPGA.h" - +#include "drivers/Flash_ram/MCU_E2Prom.h" #include "drivers/FPGA/FPGA_SPI_Comm.h" #include "drivers/FPGA/FPGA_GPIO/FPGA_GPIO.h" @@ -102,15 +102,22 @@ char ScrewStr[150]; uint32_t InternalWindingConfigMessage(JobSpool* request) { uint32_t status = PASSED; + int limitswitchstartpointoffset = 0; InternalWinderCfg.segmentoffsetpulses = request->segmentoffsetpulses; InternalWinderCfg.spoolbackingrate = request->backingrate; InternalWinderCfg.startoffsetpulses = request->startoffsetpulses; if (request->has_limitswitchstartpointoffset) { - InternalWinderCfg.startoffsetpulses += request->limitswitchstartpointoffset; + //InternalWinderCfg.startoffsetpulses += request->limitswitchstartpointoffset; Report("limit switch start point offset",__FILE__,__LINE__,(int)(request->startoffsetpulses),RpWarning,(int)(request->limitswitchstartpointoffset), 0); } + status |= MCU_E2PromRead(EEPROM_STORAGE_WINDER_CALIBRATION,&limitswitchstartpointoffset); + if ((status!= OK )||(limitswitchstartpointoffset == 0xFFFF)) + limitswitchstartpointoffset = 0; + Report("limit switch start point offset",__FILE__,(int)(request->startoffsetpulses),(int)(limitswitchstartpointoffset),RpWarning,status, 0); + InternalWinderCfg.startoffsetpulses += limitswitchstartpointoffset; + InternalWinderCfg.SpoolBottomBackingRate = request->bottombackingrate; InternalWinderCfg.NumberOfRotationPerPassage = 3.1415926*3;//request->rotationsperpassage; if (request->rotationsperpassage > 6.1) diff --git a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_ex.h b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_ex.h index 996191b63..0a7534635 100644 --- a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_ex.h +++ b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_ex.h @@ -44,6 +44,7 @@ bool WHS_IsContainerFull(); bool WHS_WasteCartridgeLowerPresent(); bool WHS_WasteCartridgeMiddlePresent(); bool WHS_IsEmptying(); +uint32_t Waste_CheckState(void); uint32_t Waste_Prepare(void); bool WHS_IsVocPpmOverAlarmLimit(); diff --git a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c index 28a5720ab..fa89164d3 100644 --- a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c +++ b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c @@ -19,6 +19,7 @@ #include "CartridgeValidationRequest.pb-c.h" #include "CartridgeValidationResponse.pb-c.h" #include "Modules/General/buttons.h" +#include "modules/General/process.h" #include "Modules/IFS/ifs.h" #include #include @@ -501,7 +502,7 @@ void Waste_StateMachine(void) break; } } -uint32_t Waste_Prepare(void) +uint32_t Waste_CheckState(void) { //check if the waste is ready to run - waste level not above overflow level and no cartridge in the slots if (wasteLevel > wasteLevelOverflow) @@ -528,6 +529,45 @@ uint32_t Waste_Prepare(void) return JOB_WASTE_HANDLING_PROBLEM; } } +bool WHS_FlowReady = false,HeadIn_FlowReady = false,HeadOut_FlowReady = false; +uint32_t WasteReadyControlId = 0xFF; +uint32_t Waste_PrepareCallbak(uint32_t IfIndex, uint32_t ReadValue) +{ + bool ready = false, headready = false,whsready = false; + double HeadFlow = GetWHSAirFlow(HEAD_FLOW_METER); + double HeadIn_Flow = PressureSensorGetPressure(HEAD_PT100_ZONE_5_0X84_0); + double HeadOut_Flow = PressureSensorGetPressure(HEAD_PT100_ZONE_7_0X86_0); + if ((HeadFlow<(headairflow*1.07))&&(HeadFlow>(headairflow*0.93))) + WHS_FlowReady = true; + if ((HeadIn_FlowReady<(headBlowersFlow[0]*1.07))&&(HeadIn_FlowReady>(headBlowersFlow[0]*0.93))) + HeadIn_FlowReady = true; + if ((HeadOut_Flow<(headBlowersFlow[1]*1.07))&&(HeadOut_Flow>(headBlowersFlow[1]*0.93))) + HeadOut_FlowReady = true; + if (Head_Type Date: Thu, 8 Oct 2020 11:01:57 +0300 Subject: remove compilation warnings --- Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA.c | 1 - .../I2C_Communication/WHS_Card/D_MAX11614_ADC/WHS_MAX11614_A2D.c | 2 -- .../I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.c | 3 +-- .../Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c | 1 - Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c | 7 ++++--- Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c | 1 - Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c | 3 +-- Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c | 4 +++- Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c | 6 ++---- Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c | 1 - .../Embedded_SW/Embedded/StateMachines/Initialization/PowerIdle.c | 4 ++-- .../Embedded/StateMachines/Initialization/PowerOffSequence.c | 4 ++-- 12 files changed, 15 insertions(+), 22 deletions(-) (limited to 'Software/Embedded_SW') diff --git a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA.c b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA.c index 21056e162..95651eba2 100644 --- a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA.c +++ b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA.c @@ -434,7 +434,6 @@ uint32_t Read_Speed_Sensor_TypeII()//must be delay between Set_Speed_Sensor_Type temp1/=F1_Prescaler1_reg6; Speed_Hz = temp1; #endif - #warning change the speed from Hz to Cm/Sec return Speed_Hz; } 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 f7253a2e2..fff11f493 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 @@ -396,8 +396,6 @@ double GetWHSAirFlow(uint8_t OR_Id) //------------------------------ waste volume measurement ------------------------------ -#warning need to update low and high limits and to read the eeprom on the initialization - double DefaultCoefficient = 10.5;//Coefficient is 10.5mV/mm for TI (not water). 9.72//TBD double Coefficient_LowLimit = 0;//TBD double Coefficient_HighLimit = 255;//TBD diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.c index 9e626ec7f..4484f1932 100644 --- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.c +++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.c @@ -175,7 +175,6 @@ bool WHS_init_Blower() bool LDACn_value = true; bool AUXn_value = true; bool update = 0; - int i; /* ---- config the WHS card 9555 configuration ----*/ @@ -630,7 +629,7 @@ uint32_t WHS_Pid_Testing_Func(double setParam,double measuredParam) { float calculated_speed; //float avreageSampleValue = 0; - int i; + //int i; /*WhsBlowerSamples[WhsBlowerSamplesPointer] = measuredParam;//(-1 * TranslatedReadValue); WhsBlowerSamplesPointer++; diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c index 4cd91443b..71343c78f 100644 --- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c +++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c @@ -631,7 +631,6 @@ uint32_t Diagnostics_Dryer_Loading_Callback(uint32_t MotorId, uint32_t ReadValue uint32_t Diagnostics_Dryer_Loading(void) { //float Calc_angle; -#warning assuming loading starts from 0 if (dryerbufferlength) LoadArmRounds = (int)dryerbufferlength; MCU_E2PromRead(EEPROM_STORAGE_DRYER_CENTER,&D_DrierPrevLocation); diff --git a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c index 6f5b5fe23..3f5e4f5b2 100644 --- a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c +++ b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c @@ -837,10 +837,11 @@ void FlashInitAndLoad(void) uint32_t Bytes = 0; ConfigurationParameters *Params = NULL; - ProcessParameters* ProcessParams = NULL; - UploadProcessParametersRequest* request = NULL; + //ProcessParameters* ProcessParams = NULL; + //UploadProcessParametersRequest* request = NULL; + + //char ProcessParamsPath[50] = "0://SysInfo//ProcessP.cfg"; - char ProcessParamsPath[50] = "0://SysInfo//ProcessP.cfg"; #ifdef WATCHDOG ROM_WatchdogResetDisable(WATCHDOG0_BASE); uint32_t timeout = 0xFFFFFFFFU; diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c index 2abcc2b31..1568e51c5 100644 --- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c +++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c @@ -1115,7 +1115,6 @@ uint32_t HeaterBlowerMaxTempCBFunction(uint32_t IfIndex, uint32_t readValue) uint32_t BlowerPt100Read = 0; int index=HEATER_TYPE_MAX_HEATERS; - int32_t MaxreadValue; if (IfIndex>>8 != IfTypeHeaters) { diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c index 0d81e5447..b52f8b908 100644 --- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c +++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c @@ -558,7 +558,6 @@ bool AdjustDispenserSpeedToPressure(int DispenserId, double RefMaxPressure,doubl int i; int NumofReadyDispensers = 0; TimerMotors_t HW_Motor_Id; - float updatedSpeed,tempSpeed; JobDispenser **Dispensers; //set the speed only before the first segment, speed is constant accros job int Dispenser_i,n_dispensers; @@ -1230,7 +1229,7 @@ uint32_t IDS_Cleaning_Stop_Cleaning_Solution (callback_fptr callback); } if (segmentfirst_speed > MINIMAL_MOTOR_SPEED) { - char IdMessage[100]; + //char IdMessage[100]; segmentfirst_speed *= (100+WFCF); segmentfirst_speed /= 100; DispenserSegmentReady[DispenserId] = false; diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c index 4ec45c5b8..c37617037 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c @@ -363,7 +363,9 @@ uint32_t Screw100msecDirectionChange(uint32_t deviceID, uint32_t BusyFlag) { //uint32_t Steps; double temp,tempScrewSpeed; - int i,tempmot; +#ifdef FOUR_WINDERS + int tempmot; +#endif //double screw_horizontal_speed = 0; //double RotationsPerSecond; if (WinderMotorSpeedCounter++>=MAX_WINDER_SPEED_CALCULATION) diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c index e7336cc9d..f13f76cfb 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c @@ -560,7 +560,6 @@ uint32_t ThreadControlCBFunction(uint32_t IfIndex, uint32_t ReadValue) //extern int MotorSamplePointer[MAX_THREAD_MOTORS_NUM]; //read value is the dancer angle int i,index=MAX_THREAD_MOTORS_NUM; - int len; int DancerId; int32_t TranslatedReadValue, avreageSampleValue = 0;//,avreageMotorSampleValue = 0; //double tempcalcspeed = 0; @@ -747,7 +746,7 @@ uint32_t ThreadControlCBFunction(uint32_t IfIndex, uint32_t ReadValue) if (index >= WINDER_MOTOR) { // FirstCalcInJob = false; - len = usnprintf(ATMessage[index], 150, "index %d read %d avg %d error(6) %d integral(9) %d,delta(9) %d, calc(3) %d speed %d %d",index-WINDER_MOTOR+1, + usnprintf(ATMessage[index], 150, "index %d read %d avg %d error(6) %d integral(9) %d,delta(9) %d, calc(3) %d speed %d %d",index-WINDER_MOTOR+1, TranslatedReadValue,avreageSampleValue,(int)(MotorControlConfig[index].m_mesuredParam*1000000), (int)(MotorControlConfig[index].m_integral*1000000000),(int)((MotorControlConfig[index].m_mesuredParam*MotorControlConfig[index].m_params.dt)*1000000000), (int)(MotorControlConfig[index].m_calculatedError*1000),(int)calculated_speed, (int)(InitialDryerSpeed*100/OriginalMotorSpd_2PPS[DRYER_MOTOR])); @@ -784,7 +783,6 @@ uint32_t ThreadControlCBFunction(uint32_t IfIndex, uint32_t ReadValue) ReportWithPackageFilter(ThreadFilter,"MotorSpeedUpdated",__FILE__,index,(int)OriginalMotorSpd_2PPS[index],RpWarning,(int)CurrentControlledSpeed[index],0); }*/ #ifdef TEST_PID_THREAD - int len; if ((JobCounter % 2000) == index*100) //if (keepdata == true) { @@ -796,7 +794,7 @@ uint32_t ThreadControlCBFunction(uint32_t IfIndex, uint32_t ReadValue) NormError[controlIndex] = MotorControlConfig[index].m_mesuredParam; mIntegral[controlIndex] = MotorControlConfig[index].m_integral; timestamp[controlIndex] = msec_millisecondCounter;*/ - len = usnprintf(TMessage, 150, "read %d avg %d error(6) %d integral(9) %d,delta(9) %d, calc(3) %d speed %d", + usnprintf(TMessage, 150, "read %d avg %d error(6) %d integral(9) %d,delta(9) %d, calc(3) %d speed %d", ReadValue,avreageSampleValue,(int)(MotorControlConfig[index].m_mesuredParam*1000000), (int)(MotorControlConfig[index].m_integral*1000000000),(int)((MotorControlConfig[index].m_mesuredParam*MotorControlConfig[index].m_params.dt)*1000000000), (int)(MotorControlConfig[index].m_calculatedError*1000),(int)calculated_speed); diff --git a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c index fa89164d3..1ace8a50b 100644 --- a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c +++ b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c @@ -330,7 +330,6 @@ uint32_t Waste_DoorOpenDuringEmptying(uint32_t IfIndex, uint32_t ReadValue) } } return OK; -#warning add alarm on door open } void Waste_StateMachine_OneSecond_Call(void) diff --git a/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerIdle.c b/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerIdle.c index 57da1574b..604324948 100644 --- a/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerIdle.c +++ b/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerIdle.c @@ -187,7 +187,7 @@ bool getIdleState (void) {return powerIdleState;} uint32_t OutOfIdleUpdate(bool last) { uint32_t status = NOT_SUPPORTED; - +/* double calculate; int result = 0; MessageContainer responseContainer; @@ -197,7 +197,7 @@ uint32_t OutOfIdleUpdate(bool last) if (PowerUpToken[0] == 0) return OK; -/* response.has_state = true; + response.has_state = true; response.has_progresspercentage = true; if (last == false) diff --git a/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerOffSequence.c b/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerOffSequence.c index 15f363b9a..0a980159d 100644 --- a/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerOffSequence.c +++ b/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerOffSequence.c @@ -286,7 +286,7 @@ uint32_t PowerOffWaitForProcessesCallback(uint32_t IfIndex, uint32_t BusyFlag) } } if ((WHS_IsEmptying()|| - //MidTankFillingActive()|| + IFS_MidTankFilling()|| ThreadLoadingActive()|| SwUpgradeActive()|| (HomingActive == true))&& @@ -321,7 +321,7 @@ uint32_t PowerOffWaitForProcesses(void) } if (WHS_IsEmptying()|| - //MidTankFillingActive()|| + IFS_MidTankFilling()|| ThreadLoadingActive()|| SwUpgradeActive()|| (HomingActive == true)) -- cgit v1.3.1 From 8eee63332a293937bf3f4bf90eb0489b3e6be2f3 Mon Sep 17 00:00:00 2001 From: Shlomo Hecht Date: Thu, 8 Oct 2020 16:13:16 +0300 Subject: fix waste_prepare, suggested protobuf changes --- .../Embedded/Modules/AlarmHandling/AlarmHandling.c | 3 ++- .../Embedded_SW/Embedded/Modules/Waste/Waste_maint.c | 17 ++++++++++++++++- .../Embedded/StateMachines/Printing/PrintingSTM.c | 2 +- Software/PMR/Messages/Diagnostics/FillingAction.proto | 14 ++++++++++++++ .../PMR/Messages/Diagnostics/InkFillingRequest.proto | 9 +++++++++ .../PMR/Messages/Diagnostics/InkFillingResponse.proto | 15 +++++++++++++++ .../PMR/Messages/Diagnostics/WasteEmptyingRequest.proto | 8 ++++++++ .../Messages/Diagnostics/WasteEmptyingResponse.proto | 15 +++++++++++++++ Software/PMR/Messages/MachineStatus/MachineStatus.proto | 3 +++ .../Messages/MachineStatus/WasteCartridgeState.proto | 13 +++++++++++++ 10 files changed, 96 insertions(+), 3 deletions(-) create mode 100644 Software/PMR/Messages/Diagnostics/FillingAction.proto create mode 100644 Software/PMR/Messages/Diagnostics/InkFillingRequest.proto create mode 100644 Software/PMR/Messages/Diagnostics/InkFillingResponse.proto create mode 100644 Software/PMR/Messages/Diagnostics/WasteEmptyingRequest.proto create mode 100644 Software/PMR/Messages/Diagnostics/WasteEmptyingResponse.proto create mode 100644 Software/PMR/Messages/MachineStatus/WasteCartridgeState.proto (limited to 'Software/Embedded_SW') diff --git a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c index 01e3533d6..120df71df 100644 --- a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c +++ b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c @@ -29,6 +29,7 @@ #include "drivers/I2C_Communication/Dispenser_Card/IO_Ports/Dispenser_IO.h" #include #include "drivers/I2C_Communication/Head_Card/ADC/Head_ADC.h" +#include #include "Common/SWUpdate/FileSystem.h" #include "drivers/Flash_ram/MCU_E2Prom.h" @@ -970,7 +971,7 @@ JobEndReasonEnum AlarmHandlingPrepareJob(void *CurrentJob) } } } - if (Configured[Module_Waste]) + if ((IFS_Availability[1] == IFS_RECOGNIZED_INIT_PASSED)&&(IFS_Availability[2] == IFS_RECOGNIZED_INIT_PASSED)) //ifs installed -check cartridges { FoundReason = Waste_CheckState(); } diff --git a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c index 1ace8a50b..84609035a 100644 --- a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c +++ b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c @@ -537,11 +537,23 @@ uint32_t Waste_PrepareCallbak(uint32_t IfIndex, uint32_t ReadValue) double HeadIn_Flow = PressureSensorGetPressure(HEAD_PT100_ZONE_5_0X84_0); double HeadOut_Flow = PressureSensorGetPressure(HEAD_PT100_ZONE_7_0X86_0); if ((HeadFlow<(headairflow*1.07))&&(HeadFlow>(headairflow*0.93))) + { + if (WHS_FlowReady == false) + Report("Module waste WHS_FlowReady ready", __FILE__, __LINE__, (int)(HeadFlow*100), RpMessage, WHS_FlowReady, 0); WHS_FlowReady = true; - if ((HeadIn_FlowReady<(headBlowersFlow[0]*1.07))&&(HeadIn_FlowReady>(headBlowersFlow[0]*0.93))) + } + if ((HeadIn_Flow<(headBlowersFlow[0]*1.07))&&(HeadIn_Flow>(headBlowersFlow[0]*0.93))) + { + if (HeadIn_FlowReady == false) + Report("Module waste HeadIn_FlowReady ready", __FILE__, __LINE__, (int)(HeadIn_Flow*100), RpMessage, HeadIn_FlowReady, 0); HeadIn_FlowReady = true; + } if ((HeadOut_Flow<(headBlowersFlow[1]*1.07))&&(HeadOut_Flow>(headBlowersFlow[1]*0.93))) + { + if (HeadOut_FlowReady == false) + Report("Module waste HeadOut_FlowReady ready", __FILE__, __LINE__, (int)(HeadOut_Flow*100), RpMessage, WHS_FlowReady, 0); HeadOut_FlowReady = true; + } if (Head_Type n_winders == 1) Configured[Module_Winder] = true; - if ((IFS_Availability[1] == IFS_RECOGNIZED_INIT_PASSED)&&(IFS_Availability[2] == IFS_RECOGNIZED_INIT_PASSED)) //ifs installed -check cartridges + //if ((IFS_Availability[1] == IFS_RECOGNIZED_INIT_PASSED)&&(IFS_Availability[2] == IFS_RECOGNIZED_INIT_PASSED)) //ifs installed -check cartridges Configured[Module_Waste] = true; if (request->n_motors) diff --git a/Software/PMR/Messages/Diagnostics/FillingAction.proto b/Software/PMR/Messages/Diagnostics/FillingAction.proto new file mode 100644 index 000000000..fff3cc66c --- /dev/null +++ b/Software/PMR/Messages/Diagnostics/FillingAction.proto @@ -0,0 +1,14 @@ +syntax = "proto3"; + +package Tango.PMR.Diagnostics; +option java_package = "com.twine.tango.pmr.diagnostics"; + +enum FillingAction +{ + None = 0; + Inserted = 1; + Filling = 2; + End = 3; + Error = 4; + Ejected = 5; +} \ No newline at end of file diff --git a/Software/PMR/Messages/Diagnostics/InkFillingRequest.proto b/Software/PMR/Messages/Diagnostics/InkFillingRequest.proto new file mode 100644 index 000000000..ddb174ca4 --- /dev/null +++ b/Software/PMR/Messages/Diagnostics/InkFillingRequest.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; + + +package Tango.PMR.Diagnostics; +option java_package = "com.twine.tango.pmr.diagnostics"; + +message InkFillingRequest +{ +} \ No newline at end of file diff --git a/Software/PMR/Messages/Diagnostics/InkFillingResponse.proto b/Software/PMR/Messages/Diagnostics/InkFillingResponse.proto new file mode 100644 index 000000000..877d82036 --- /dev/null +++ b/Software/PMR/Messages/Diagnostics/InkFillingResponse.proto @@ -0,0 +1,15 @@ +syntax = "proto3"; + +import "Cartridge.proto"; +import "FillingAction.proto"; + +package Tango.PMR.Diagnostics; +option java_package = "com.twine.tango.pmr.diagnostics"; + +message FillingActionResponse +{ + Cartridge Cartridge = 1; + FillingAction Action = 2; + double ProgressPercentage = 3; + string Message = 4; +} \ No newline at end of file diff --git a/Software/PMR/Messages/Diagnostics/WasteEmptyingRequest.proto b/Software/PMR/Messages/Diagnostics/WasteEmptyingRequest.proto new file mode 100644 index 000000000..18b366e7c --- /dev/null +++ b/Software/PMR/Messages/Diagnostics/WasteEmptyingRequest.proto @@ -0,0 +1,8 @@ +syntax = "proto3"; + +package Tango.PMR.Diagnostics; +option java_package = "com.twine.tango.pmr.diagnostics"; + +message WasteEmptyingRequest +{ +} \ No newline at end of file diff --git a/Software/PMR/Messages/Diagnostics/WasteEmptyingResponse.proto b/Software/PMR/Messages/Diagnostics/WasteEmptyingResponse.proto new file mode 100644 index 000000000..877d82036 --- /dev/null +++ b/Software/PMR/Messages/Diagnostics/WasteEmptyingResponse.proto @@ -0,0 +1,15 @@ +syntax = "proto3"; + +import "Cartridge.proto"; +import "FillingAction.proto"; + +package Tango.PMR.Diagnostics; +option java_package = "com.twine.tango.pmr.diagnostics"; + +message FillingActionResponse +{ + Cartridge Cartridge = 1; + FillingAction Action = 2; + double ProgressPercentage = 3; + string Message = 4; +} \ No newline at end of file diff --git a/Software/PMR/Messages/MachineStatus/MachineStatus.proto b/Software/PMR/Messages/MachineStatus/MachineStatus.proto index 312e26e01..2dc60a6e1 100644 --- a/Software/PMR/Messages/MachineStatus/MachineStatus.proto +++ b/Software/PMR/Messages/MachineStatus/MachineStatus.proto @@ -3,6 +3,7 @@ syntax = "proto3"; import "MachineState.proto"; import "IDSPackLevel.proto"; import "SpoolState.proto"; +import "WasteCartridgeState.proto"; package Tango.PMR.MachineStatus; option java_package = "com.twine.tango.pmr.machinestatus"; @@ -13,4 +14,6 @@ message MachineStatus repeated IDSPackLevel IDSPacksLevels = 2; double OverallTemperature = 3; SpoolState SpoolState = 4; + WasteCartridgeState MiddleCartridgeState = 5; + WasteCartridgeState LowerCartridgeState = 6; } \ No newline at end of file diff --git a/Software/PMR/Messages/MachineStatus/WasteCartridgeState.proto b/Software/PMR/Messages/MachineStatus/WasteCartridgeState.proto new file mode 100644 index 000000000..a7156d3a4 --- /dev/null +++ b/Software/PMR/Messages/MachineStatus/WasteCartridgeState.proto @@ -0,0 +1,13 @@ +syntax = "proto3"; + +package Tango.PMR.MachineStatus; +option java_package = "com.twine.tango.pmr.machinestatus"; + +enum WasteCartridgeState +{ + Absent = 0; + Empty = 1; + Filling = 2; + Full = 3; + Error = 4; +} -- cgit v1.3.1 From 07276289ff121853256bb894bc3040c4f5bfb2b0 Mon Sep 17 00:00:00 2001 From: Shlomo Hecht Date: Fri, 9 Oct 2020 16:46:20 +0300 Subject: ifs filling / waste emptying interface --- .../Embedded/Common/Utilities/RFIDTagHandling.c | 18 ++ .../Embedded/Common/Utilities/RFIDTagHandling.h | 2 + .../Embedded_SW/Embedded/Communication/Container.c | 7 + .../Communication/PMR/Common/MessageType.pb-c.c | 264 +++++++++++---------- .../Communication/PMR/Common/MessageType.pb-c.h | 6 + .../PMR/Debugging/StartDebugLogResponse.pb-c.c | 8 +- .../PMR/Debugging/StartDebugLogResponse.pb-c.h | 8 +- .../PMR/Diagnostics/FillingAction.pb-c.c | 45 ++++ .../PMR/Diagnostics/FillingAction.pb-c.h | 47 ++++ .../PMR/Diagnostics/StartInkFillingRequest.pb-c.c | 72 ++++++ .../PMR/Diagnostics/StartInkFillingRequest.pb-c.h | 70 ++++++ .../PMR/Diagnostics/StartInkFillingResponse.pb-c.c | 131 ++++++++++ .../PMR/Diagnostics/StartInkFillingResponse.pb-c.h | 78 ++++++ .../Diagnostics/StartWasteEmptyingRequest.pb-c.c | 72 ++++++ .../Diagnostics/StartWasteEmptyingRequest.pb-c.h | 70 ++++++ .../Diagnostics/StartWasteEmptyingResponse.pb-c.c | 131 ++++++++++ .../Diagnostics/StartWasteEmptyingResponse.pb-c.h | 78 ++++++ .../PMR/MachineStatus/MachineStatus.pb-c.c | 32 ++- .../PMR/MachineStatus/MachineStatus.pb-c.h | 7 +- .../PMR/MachineStatus/WasteCartridgeState.pb-c.c | 43 ++++ .../PMR/MachineStatus/WasteCartridgeState.pb-c.h | 46 ++++ .../PMR/Stubs/StubAllHardwareRequest.pb-c.c | 72 ++++++ .../PMR/Stubs/StubAllHardwareRequest.pb-c.h | 70 ++++++ .../PMR/Stubs/StubAllHardwareResponse.pb-c.c | 144 +++++++++++ .../PMR/Stubs/StubAllHardwareResponse.pb-c.h | 81 +++++++ .../Embedded_SW/Embedded/Drivers/Valves/Valve.c | 1 + .../Embedded/Modules/AlarmHandling/AlarmHandling.c | 1 + .../Embedded/Modules/General/MachineStatus.c | 51 +++- .../Embedded/Modules/Heaters/Heaters_ex.h | 1 + Software/Embedded_SW/Embedded/Modules/IFS/ifs.c | 51 ++++ Software/Embedded_SW/Embedded/Modules/IFS/ifs.h | 1 + .../Embedded/Modules/Thread/ThreadLoad.c | 2 +- .../Embedded_SW/Embedded/Modules/Waste/Waste_ex.h | 2 + .../Embedded/Modules/Waste/Waste_maint.c | 55 ++++- .../Initialization/PowerOffSequence.c | 1 + .../Embedded/StateMachines/Printing/JobSTM.c | 1 + Software/PMR/Messages/Common/MessageType.proto | 7 +- .../Diagnostics/StartInkFillingRequest.proto | 2 +- .../Diagnostics/StartInkFillingResponse.proto | 2 +- .../Diagnostics/StartWasteEmptyingRequest.proto | 2 +- .../Diagnostics/StartWasteEmptyingResponse.proto | 2 +- 41 files changed, 1636 insertions(+), 148 deletions(-) create mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/FillingAction.pb-c.c create mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/FillingAction.pb-c.h create mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartInkFillingRequest.pb-c.c create mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartInkFillingRequest.pb-c.h create mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartInkFillingResponse.pb-c.c create mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartInkFillingResponse.pb-c.h create mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartWasteEmptyingRequest.pb-c.c create mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartWasteEmptyingRequest.pb-c.h create mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartWasteEmptyingResponse.pb-c.c create mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartWasteEmptyingResponse.pb-c.h create mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/WasteCartridgeState.pb-c.c create mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/WasteCartridgeState.pb-c.h create mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubAllHardwareRequest.pb-c.c create mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubAllHardwareRequest.pb-c.h create mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubAllHardwareResponse.pb-c.c create mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubAllHardwareResponse.pb-c.h (limited to 'Software/Embedded_SW') diff --git a/Software/Embedded_SW/Embedded/Common/Utilities/RFIDTagHandling.c b/Software/Embedded_SW/Embedded/Common/Utilities/RFIDTagHandling.c index f6bc50a7e..2bb073bf8 100644 --- a/Software/Embedded_SW/Embedded/Common/Utilities/RFIDTagHandling.c +++ b/Software/Embedded_SW/Embedded/Common/Utilities/RFIDTagHandling.c @@ -18,6 +18,24 @@ #include "CartridgeTagContent.pb-c.h" #include "Cartridge.pb-c.h" +uint32_t LoadCartridgeData(PANEL_BUTTON_OR_CRAT_ID Cart,void *CartridgePtr) +{ + if (CartridgePtr == NULL) return ERROR; + if (Cart>CART_3) return ERROR; + Cartridge *Cartridge = CartridgePtr; + /* + ProtobufCMessage base; + protobuf_c_boolean has_slot; + CartridgeSlot slot; + CartridgeTagContent *tag; + protobuf_c_boolean has_index; + int32_t index; + * */ + Cartridge->has_slot = true; + Cartridge->slot = Cart-1; + //Cartridge->tag = NFCTag_Tag2PPC(NFC_TagRead[Cart-1].Struct); + return OK; +} /* typedef struct { diff --git a/Software/Embedded_SW/Embedded/Common/Utilities/RFIDTagHandling.h b/Software/Embedded_SW/Embedded/Common/Utilities/RFIDTagHandling.h index 496b1aae3..0eee787f4 100644 --- a/Software/Embedded_SW/Embedded/Common/Utilities/RFIDTagHandling.h +++ b/Software/Embedded_SW/Embedded/Common/Utilities/RFIDTagHandling.h @@ -11,4 +11,6 @@ CartridgeTagContent * NFCTag_Tag2PPC(NFCTag_t *Tag); NFCTag_t * NFCTag_PPC2Tag( CartridgeTagContent *PpcTag); + uint32_t LoadCartridgeData(PANEL_BUTTON_OR_CRAT_ID Cart,void *CartridgePtr); + diff --git a/Software/Embedded_SW/Embedded/Communication/Container.c b/Software/Embedded_SW/Embedded/Communication/Container.c index 307e4eecb..546f4bb58 100644 --- a/Software/Embedded_SW/Embedded/Communication/Container.c +++ b/Software/Embedded_SW/Embedded/Communication/Container.c @@ -42,6 +42,7 @@ #include "Modules/General/process.h" #include "Modules/Thread/Thread_ex.h" #include "Modules/Ids/Ids_ex.h" +#include "Modules/waste/waste_ex.h" #include "Modules/Ifs/Ifs.h" #include "Common/SWUpdate/FileSystem.h" @@ -469,6 +470,12 @@ void receive_callback(char* buffer, size_t length) case MESSAGE_TYPE__CartridgeValidationResponse: CartridgeValidationResponseFunc(requestContainer); break; + case MESSAGE_TYPE__StartWasteEmptyingRequest: + StartWasteEmptyingRequestFunc(requestContainer); + break; + case MESSAGE_TYPE__StartInkFillingRequest: + StartInkFillingRequestFunc(requestContainer); + break; case MESSAGE_TYPE__MidTankDataSetupRequest: MidTankDataSetupFunc(requestContainer); break; diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Common/MessageType.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Common/MessageType.pb-c.c index d6c0259e2..a59dccb97 100644 --- a/Software/Embedded_SW/Embedded/Communication/PMR/Common/MessageType.pb-c.c +++ b/Software/Embedded_SW/Embedded/Communication/PMR/Common/MessageType.pb-c.c @@ -7,7 +7,7 @@ #endif #include "MessageType.pb-c.h" -static const ProtobufCEnumValue message_type__enum_values_by_number[263] = +static const ProtobufCEnumValue message_type__enum_values_by_number[269] = { { "", "", 0 }, { "", "", 1 }, @@ -121,6 +121,8 @@ static const ProtobufCEnumValue message_type__enum_values_by_number[263] = { "", "", 110 }, { "", "", 111 }, { "", "", 112 }, + { "", "", 113 }, + { "", "", 114 }, { "", "", 1000 }, { "", "", 1001 }, { "", "", 1002 }, @@ -188,6 +190,10 @@ static const ProtobufCEnumValue message_type__enum_values_by_number[263] = { "", "", 2043 }, { "", "", 2044 }, { "", "", 2045 }, + { "", "", 2046 }, + { "", "", 2047 }, + { "", "", 2048 }, + { "", "", 2049 }, { "", "", 3000 }, { "", "", 3001 }, { "", "", 3002 }, @@ -274,151 +280,155 @@ static const ProtobufCEnumValue message_type__enum_values_by_number[263] = { "", "", 11007 }, }; static const ProtobufCIntRange message_type__value_ranges[] = { -{0, 0},{3, 2},{1000, 112},{2000, 133},{3000, 179},{4000, 193},{5000, 201},{6000, 205},{7000, 211},{8000, 235},{9000, 243},{10000, 247},{11000, 255},{0, 263} +{0, 0},{3, 2},{1000, 114},{2000, 135},{3000, 185},{4000, 199},{5000, 207},{6000, 211},{7000, 217},{8000, 241},{9000, 249},{10000, 253},{11000, 261},{0, 269} }; -static const ProtobufCEnumValueIndex message_type__enum_values_by_name[263] = +static const ProtobufCEnumValueIndex message_type__enum_values_by_name[269] = { - { "", 191 }, - { "", 192 }, - { "", 181 }, - { "", 182 }, - { "", 249 }, - { "", 250 }, - { "", 253 }, - { "", 254 }, - { "", 233 }, - { "", 234 }, + { "", 197 }, + { "", 198 }, + { "", 187 }, + { "", 188 }, + { "", 255 }, + { "", 256 }, + { "", 259 }, + { "", 260 }, + { "", 239 }, + { "", 240 }, { "", 2 }, { "", 3 }, - { "", 177 }, - { "", 178 }, - { "", 125 }, - { "", 126 }, - { "", 131 }, - { "", 132 }, - { "", 207 }, - { "", 208 }, - { "", 257 }, - { "", 258 }, - { "", 219 }, - { "", 220 }, - { "", 185 }, - { "", 186 }, - { "", 221 }, - { "", 222 }, - { "", 117 }, - { "", 118 }, - { "", 209 }, - { "", 210 }, - { "", 143 }, - { "", 144 }, - { "", 149 }, - { "", 150 }, - { "", 235 }, - { "", 236 }, + { "", 179 }, + { "", 180 }, + { "", 127 }, + { "", 128 }, + { "", 133 }, + { "", 134 }, + { "", 213 }, + { "", 214 }, + { "", 263 }, + { "", 264 }, + { "", 225 }, + { "", 226 }, + { "", 191 }, + { "", 192 }, + { "", 227 }, + { "", 228 }, + { "", 119 }, + { "", 120 }, + { "", 215 }, + { "", 216 }, { "", 145 }, { "", 146 }, + { "", 151 }, + { "", 152 }, + { "", 241 }, + { "", 242 }, { "", 147 }, { "", 148 }, + { "", 149 }, + { "", 150 }, { "", 1 }, - { "", 215 }, - { "", 216 }, - { "", 113 }, - { "", 114 }, + { "", 221 }, + { "", 222 }, { "", 115 }, { "", 116 }, - { "", 112 }, + { "", 117 }, + { "", 118 }, + { "", 114 }, + { "", 235 }, + { "", 236 }, + { "", 219 }, + { "", 220 }, + { "", 233 }, + { "", 234 }, + { "", 217 }, + { "", 218 }, + { "", 131 }, + { "", 132 }, + { "", 231 }, + { "", 232 }, { "", 229 }, { "", 230 }, - { "", 213 }, - { "", 214 }, - { "", 227 }, - { "", 228 }, + { "", 185 }, + { "", 186 }, { "", 211 }, { "", 212 }, - { "", 129 }, - { "", 130 }, - { "", 225 }, - { "", 226 }, { "", 223 }, { "", 224 }, - { "", 179 }, - { "", 180 }, - { "", 205 }, - { "", 206 }, - { "", 217 }, - { "", 218 }, - { "", 239 }, - { "", 240 }, - { "", 241 }, - { "", 242 }, - { "", 237 }, - { "", 238 }, - { "", 135 }, - { "", 136 }, - { "", 141 }, - { "", 142 }, + { "", 245 }, + { "", 246 }, + { "", 247 }, + { "", 248 }, + { "", 243 }, + { "", 244 }, { "", 137 }, { "", 138 }, + { "", 143 }, + { "", 144 }, { "", 139 }, { "", 140 }, + { "", 141 }, + { "", 142 }, { "", 0 }, - { "", 119 }, - { "", 120 }, + { "", 121 }, + { "", 122 }, { "", 4 }, { "", 5 }, + { "", 161 }, + { "", 162 }, + { "", 193 }, + { "", 194 }, + { "", 171 }, + { "", 172 }, { "", 159 }, { "", 160 }, - { "", 187 }, - { "", 188 }, + { "", 203 }, + { "", 204 }, + { "", 153 }, + { "", 154 }, { "", 169 }, { "", 170 }, - { "", 157 }, - { "", 158 }, - { "", 197 }, - { "", 198 }, - { "", 151 }, - { "", 152 }, - { "", 167 }, - { "", 168 }, - { "", 171 }, - { "", 172 }, - { "", 199 }, - { "", 200 }, - { "", 121 }, - { "", 122 }, { "", 173 }, { "", 174 }, - { "", 193 }, - { "", 194 }, - { "", 133 }, - { "", 134 }, - { "", 163 }, - { "", 164 }, - { "", 189 }, - { "", 190 }, - { "", 243 }, - { "", 244 }, - { "", 247 }, - { "", 248 }, - { "", 251 }, - { "", 252 }, - { "", 255 }, - { "", 256 }, + { "", 205 }, + { "", 206 }, { "", 123 }, { "", 124 }, { "", 175 }, { "", 176 }, - { "", 195 }, - { "", 196 }, - { "", 161 }, - { "", 162 }, + { "", 199 }, + { "", 200 }, + { "", 135 }, + { "", 136 }, { "", 165 }, { "", 166 }, - { "", 245 }, - { "", 246 }, - { "", 259 }, - { "", 260 }, + { "", 195 }, + { "", 196 }, + { "", 183 }, + { "", 184 }, + { "", 249 }, + { "", 250 }, + { "", 253 }, + { "", 254 }, + { "", 257 }, + { "", 258 }, + { "", 261 }, + { "", 262 }, + { "", 181 }, + { "", 182 }, + { "", 125 }, + { "", 126 }, + { "", 177 }, + { "", 178 }, + { "", 201 }, + { "", 202 }, + { "", 163 }, + { "", 164 }, + { "", 167 }, + { "", 168 }, + { "", 251 }, + { "", 252 }, + { "", 265 }, + { "", 266 }, { "", 100 }, { "", 101 }, { "", 6 }, @@ -461,6 +471,8 @@ static const ProtobufCEnumValueIndex message_type__enum_values_by_name[263] = { "", 21 }, { "", 56 }, { "", 57 }, + { "", 112 }, + { "", 113 }, { "", 22 }, { "", 23 }, { "", 62 }, @@ -525,22 +537,22 @@ static const ProtobufCEnumValueIndex message_type__enum_values_by_name[263] = { "", 31 }, { "", 106 }, { "", 107 }, - { "", 203 }, - { "", 204 }, + { "", 209 }, + { "", 210 }, + { "", 157 }, + { "", 158 }, { "", 155 }, { "", 156 }, - { "", 153 }, - { "", 154 }, - { "", 261 }, - { "", 262 }, - { "", 127 }, - { "", 128 }, - { "", 201 }, - { "", 202 }, - { "", 183 }, - { "", 184 }, - { "", 231 }, - { "", 232 }, + { "", 267 }, + { "", 268 }, + { "", 129 }, + { "", 130 }, + { "", 207 }, + { "", 208 }, + { "", 189 }, + { "", 190 }, + { "", 237 }, + { "", 238 }, }; const ProtobufCEnumDescriptor message_type__descriptor = { @@ -549,9 +561,9 @@ const ProtobufCEnumDescriptor message_type__descriptor = "", "", "", - 263, + 269, message_type__enum_values_by_number, - 263, + 269, message_type__enum_values_by_name, 13, message_type__value_ranges, diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Common/MessageType.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Common/MessageType.pb-c.h index 58bd2112c..6df8fa5f9 100644 --- a/Software/Embedded_SW/Embedded/Communication/PMR/Common/MessageType.pb-c.h +++ b/Software/Embedded_SW/Embedded/Communication/PMR/Common/MessageType.pb-c.h @@ -132,6 +132,8 @@ typedef enum _MessageType { MESSAGE_TYPE__StubMainCardEEpromReadResponse = 110, MESSAGE_TYPE__StubMainCardEEpromWriteRequest = 111, MESSAGE_TYPE__StubMainCardEEpromWriteResponse = 112, + MESSAGE_TYPE__StubHeadEEpromRequest = 113, + MESSAGE_TYPE__StubHeadEEpromResponse = 114, MESSAGE_TYPE__ExternalBridgeUdpDiscoveryPacket = 1000, MESSAGE_TYPE__ExternalBridgeLoginRequest = 1001, MESSAGE_TYPE__ExternalBridgeLoginResponse = 1002, @@ -199,6 +201,10 @@ typedef enum _MessageType { MESSAGE_TYPE__StopCartridgesUpdateResponse = 2043, MESSAGE_TYPE__CartridgeValidationRequest = 2044, MESSAGE_TYPE__CartridgeValidationResponse = 2045, + MESSAGE_TYPE__StartWasteEmptyingRequest = 2046, + MESSAGE_TYPE__StartWasteEmptyingResponse = 2047, + MESSAGE_TYPE__StartInkFillingRequest = 2048, + MESSAGE_TYPE__StartInkFillingResponse = 2049, MESSAGE_TYPE__JobRequest = 3000, MESSAGE_TYPE__JobResponse = 3001, MESSAGE_TYPE__AbortJobRequest = 3002, diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/StartDebugLogResponse.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/StartDebugLogResponse.pb-c.c index 855480fa4..2640767b6 100644 --- a/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/StartDebugLogResponse.pb-c.c +++ b/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/StartDebugLogResponse.pb-c.c @@ -82,7 +82,7 @@ static const ProtobufCFieldDescriptor start_debug_log_response__field_descriptor "", 3, PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_UINT32, + PROTOBUF_C_TYPE_INT32, offsetof(StartDebugLogResponse, has_linenumber), offsetof(StartDebugLogResponse, linenumber), NULL, @@ -94,7 +94,7 @@ static const ProtobufCFieldDescriptor start_debug_log_response__field_descriptor "", 4, PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_UINT32, + PROTOBUF_C_TYPE_INT32, offsetof(StartDebugLogResponse, has_filter), offsetof(StartDebugLogResponse, filter), NULL, @@ -118,7 +118,7 @@ static const ProtobufCFieldDescriptor start_debug_log_response__field_descriptor "", 6, PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_UINT32, + PROTOBUF_C_TYPE_INT32, offsetof(StartDebugLogResponse, has_moduleid), offsetof(StartDebugLogResponse, moduleid), NULL, @@ -130,7 +130,7 @@ static const ProtobufCFieldDescriptor start_debug_log_response__field_descriptor "", 7, PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_UINT32, + PROTOBUF_C_TYPE_INT32, offsetof(StartDebugLogResponse, has_parameter), offsetof(StartDebugLogResponse, parameter), NULL, diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/StartDebugLogResponse.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/StartDebugLogResponse.pb-c.h index ec58375ac..5a58da7ea 100644 --- a/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/StartDebugLogResponse.pb-c.h +++ b/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/StartDebugLogResponse.pb-c.h @@ -31,14 +31,14 @@ struct _StartDebugLogResponse DebugLogCategory category; char *filename; protobuf_c_boolean has_linenumber; - uint32_t linenumber; + int32_t linenumber; protobuf_c_boolean has_filter; - uint32_t filter; + int32_t filter; char *message; protobuf_c_boolean has_moduleid; - uint32_t moduleid; + int32_t moduleid; protobuf_c_boolean has_parameter; - uint32_t parameter; + int32_t parameter; }; #define START_DEBUG_LOG_RESPONSE__INIT \ { PROTOBUF_C_MESSAGE_INIT (&start_debug_log_response__descriptor) \ diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/FillingAction.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/FillingAction.pb-c.c new file mode 100644 index 000000000..686c3c58f --- /dev/null +++ b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/FillingAction.pb-c.c @@ -0,0 +1,45 @@ +/* Generated by the protocol buffer compiler. DO NOT EDIT! */ +/* Generated from: FillingAction.proto */ + +/* Do not generate deprecated warnings for self */ +#ifndef PROTOBUF_C__NO_DEPRECATED +#define PROTOBUF_C__NO_DEPRECATED +#endif + +#include "FillingAction.pb-c.h" +static const ProtobufCEnumValue filling_action__enum_values_by_number[6] = +{ + { "", "", 0 }, + { "", "", 1 }, + { "", "", 2 }, + { "", "", 3 }, + { "", "", 4 }, + { "", "", 5 }, +}; +static const ProtobufCIntRange filling_action__value_ranges[] = { +{0, 0},{0, 6} +}; +static const ProtobufCEnumValueIndex filling_action__enum_values_by_name[6] = +{ + { "", 5 }, + { "", 3 }, + { "", 4 }, + { "", 2 }, + { "", 1 }, + { "", 0 }, +}; +const ProtobufCEnumDescriptor filling_action__descriptor = +{ + PROTOBUF_C__ENUM_DESCRIPTOR_MAGIC, + "", + "", + "", + "", + 6, + filling_action__enum_values_by_number, + 6, + filling_action__enum_values_by_name, + 1, + filling_action__value_ranges, + NULL,NULL,NULL,NULL /* reserved[1234] */ +}; diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/FillingAction.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/FillingAction.pb-c.h new file mode 100644 index 000000000..e48f99397 --- /dev/null +++ b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/FillingAction.pb-c.h @@ -0,0 +1,47 @@ +/* Generated by the protocol buffer compiler. DO NOT EDIT! */ +/* Generated from: FillingAction.proto */ + +#ifndef PROTOBUF_C_FillingAction_2eproto__INCLUDED +#define PROTOBUF_C_FillingAction_2eproto__INCLUDED + +#include + +PROTOBUF_C__BEGIN_DECLS + +#if PROTOBUF_C_VERSION_NUMBER < 1003000 +# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers. +#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION +# error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c. +#endif + + + + +/* --- enums --- */ + +typedef enum _FillingAction { + FILLING_ACTION__None = 0, + FILLING_ACTION__Inserted = 1, + FILLING_ACTION__Filling = 2, + FILLING_ACTION__End = 3, + FILLING_ACTION__Error = 4, + FILLING_ACTION__Ejected = 5 + PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(FILLING_ACTION) +} FillingAction; + +/* --- messages --- */ + +/* --- per-message closures --- */ + + +/* --- services --- */ + + +/* --- descriptors --- */ + +extern const ProtobufCEnumDescriptor filling_action__descriptor; + +PROTOBUF_C__END_DECLS + + +#endif /* PROTOBUF_C_FillingAction_2eproto__INCLUDED */ diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartInkFillingRequest.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartInkFillingRequest.pb-c.c new file mode 100644 index 000000000..b56884185 --- /dev/null +++ b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartInkFillingRequest.pb-c.c @@ -0,0 +1,72 @@ +/* Generated by the protocol buffer compiler. DO NOT EDIT! */ +/* Generated from: StartInkFillingRequest.proto */ + +/* Do not generate deprecated warnings for self */ +#ifndef PROTOBUF_C__NO_DEPRECATED +#define PROTOBUF_C__NO_DEPRECATED +#endif + +#include "StartInkFillingRequest.pb-c.h" +void start_ink_filling_request__init + (StartInkFillingRequest *message) +{ + static const StartInkFillingRequest init_value = START_INK_FILLING_REQUEST__INIT; + *message = init_value; +} +size_t start_ink_filling_request__get_packed_size + (const StartInkFillingRequest *message) +{ + assert(message->base.descriptor == &start_ink_filling_request__descriptor); + return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message)); +} +size_t start_ink_filling_request__pack + (const StartInkFillingRequest *message, + uint8_t *out) +{ + assert(message->base.descriptor == &start_ink_filling_request__descriptor); + return protobuf_c_message_pack ((const ProtobufCMessage*)message, out); +} +size_t start_ink_filling_request__pack_to_buffer + (const StartInkFillingRequest *message, + ProtobufCBuffer *buffer) +{ + assert(message->base.descriptor == &start_ink_filling_request__descriptor); + return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer); +} +StartInkFillingRequest * + start_ink_filling_request__unpack + (ProtobufCAllocator *allocator, + size_t len, + const uint8_t *data) +{ + return (StartInkFillingRequest *) + protobuf_c_message_unpack (&start_ink_filling_request__descriptor, + allocator, len, data); +} +void start_ink_filling_request__free_unpacked + (StartInkFillingRequest *message, + ProtobufCAllocator *allocator) +{ + if(!message) + return; + assert(message->base.descriptor == &start_ink_filling_request__descriptor); + protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator); +} +#define start_ink_filling_request__field_descriptors NULL +#define start_ink_filling_request__field_indices_by_name NULL +#define start_ink_filling_request__number_ranges NULL +const ProtobufCMessageDescriptor start_ink_filling_request__descriptor = +{ + PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC, + "", + "", + "", + "", + sizeof(StartInkFillingRequest), + 0, + start_ink_filling_request__field_descriptors, + start_ink_filling_request__field_indices_by_name, + 0, start_ink_filling_request__number_ranges, + (ProtobufCMessageInit) start_ink_filling_request__init, + NULL,NULL,NULL /* reserved[123] */ +}; diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartInkFillingRequest.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartInkFillingRequest.pb-c.h new file mode 100644 index 000000000..bda7b4229 --- /dev/null +++ b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartInkFillingRequest.pb-c.h @@ -0,0 +1,70 @@ +/* Generated by the protocol buffer compiler. DO NOT EDIT! */ +/* Generated from: StartInkFillingRequest.proto */ + +#ifndef PROTOBUF_C_StartInkFillingRequest_2eproto__INCLUDED +#define PROTOBUF_C_StartInkFillingRequest_2eproto__INCLUDED + +#include + +PROTOBUF_C__BEGIN_DECLS + +#if PROTOBUF_C_VERSION_NUMBER < 1003000 +# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers. +#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION +# error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c. +#endif + + +typedef struct _StartInkFillingRequest StartInkFillingRequest; + + +/* --- enums --- */ + + +/* --- messages --- */ + +struct _StartInkFillingRequest +{ + ProtobufCMessage base; +}; +#define START_INK_FILLING_REQUEST__INIT \ + { PROTOBUF_C_MESSAGE_INIT (&start_ink_filling_request__descriptor) \ + } + + +/* StartInkFillingRequest methods */ +void start_ink_filling_request__init + (StartInkFillingRequest *message); +size_t start_ink_filling_request__get_packed_size + (const StartInkFillingRequest *message); +size_t start_ink_filling_request__pack + (const StartInkFillingRequest *message, + uint8_t *out); +size_t start_ink_filling_request__pack_to_buffer + (const StartInkFillingRequest *message, + ProtobufCBuffer *buffer); +StartInkFillingRequest * + start_ink_filling_request__unpack + (ProtobufCAllocator *allocator, + size_t len, + const uint8_t *data); +void start_ink_filling_request__free_unpacked + (StartInkFillingRequest *message, + ProtobufCAllocator *allocator); +/* --- per-message closures --- */ + +typedef void (*StartInkFillingRequest_Closure) + (const StartInkFillingRequest *message, + void *closure_data); + +/* --- services --- */ + + +/* --- descriptors --- */ + +extern const ProtobufCMessageDescriptor start_ink_filling_request__descriptor; + +PROTOBUF_C__END_DECLS + + +#endif /* PROTOBUF_C_StartInkFillingRequest_2eproto__INCLUDED */ diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartInkFillingResponse.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartInkFillingResponse.pb-c.c new file mode 100644 index 000000000..d68ad33e7 --- /dev/null +++ b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartInkFillingResponse.pb-c.c @@ -0,0 +1,131 @@ +/* Generated by the protocol buffer compiler. DO NOT EDIT! */ +/* Generated from: StartInkFillingResponse.proto */ + +/* Do not generate deprecated warnings for self */ +#ifndef PROTOBUF_C__NO_DEPRECATED +#define PROTOBUF_C__NO_DEPRECATED +#endif + +#include "StartInkFillingResponse.pb-c.h" +void start_ink_filling_response__init + (StartInkFillingResponse *message) +{ + static const StartInkFillingResponse init_value = START_INK_FILLING_RESPONSE__INIT; + *message = init_value; +} +size_t start_ink_filling_response__get_packed_size + (const StartInkFillingResponse *message) +{ + assert(message->base.descriptor == &start_ink_filling_response__descriptor); + return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message)); +} +size_t start_ink_filling_response__pack + (const StartInkFillingResponse *message, + uint8_t *out) +{ + assert(message->base.descriptor == &start_ink_filling_response__descriptor); + return protobuf_c_message_pack ((const ProtobufCMessage*)message, out); +} +size_t start_ink_filling_response__pack_to_buffer + (const StartInkFillingResponse *message, + ProtobufCBuffer *buffer) +{ + assert(message->base.descriptor == &start_ink_filling_response__descriptor); + return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer); +} +StartInkFillingResponse * + start_ink_filling_response__unpack + (ProtobufCAllocator *allocator, + size_t len, + const uint8_t *data) +{ + return (StartInkFillingResponse *) + protobuf_c_message_unpack (&start_ink_filling_response__descriptor, + allocator, len, data); +} +void start_ink_filling_response__free_unpacked + (StartInkFillingResponse *message, + ProtobufCAllocator *allocator) +{ + if(!message) + return; + assert(message->base.descriptor == &start_ink_filling_response__descriptor); + protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator); +} +static const ProtobufCFieldDescriptor start_ink_filling_response__field_descriptors[4] = +{ + { + "", + 1, + PROTOBUF_C_LABEL_OPTIONAL, + PROTOBUF_C_TYPE_MESSAGE, + 0, /* quantifier_offset */ + offsetof(StartInkFillingResponse, cartridge), + &cartridge__descriptor, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, + { + "", + 2, + PROTOBUF_C_LABEL_OPTIONAL, + PROTOBUF_C_TYPE_ENUM, + offsetof(StartInkFillingResponse, has_action), + offsetof(StartInkFillingResponse, action), + &filling_action__descriptor, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, + { + "", + 3, + PROTOBUF_C_LABEL_OPTIONAL, + PROTOBUF_C_TYPE_DOUBLE, + offsetof(StartInkFillingResponse, has_progresspercentage), + offsetof(StartInkFillingResponse, progresspercentage), + NULL, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, + { + "", + 4, + PROTOBUF_C_LABEL_OPTIONAL, + PROTOBUF_C_TYPE_STRING, + 0, /* quantifier_offset */ + offsetof(StartInkFillingResponse, message), + NULL, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, +}; +static const unsigned start_ink_filling_response__field_indices_by_name[] = { + 1, /* field[1] = Action */ + 0, /* field[0] = Cartridge */ + 3, /* field[3] = Message */ + 2, /* field[2] = ProgressPercentage */ +}; +static const ProtobufCIntRange start_ink_filling_response__number_ranges[1 + 1] = +{ + { 1, 0 }, + { 0, 4 } +}; +const ProtobufCMessageDescriptor start_ink_filling_response__descriptor = +{ + PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC, + "", + "", + "", + "", + sizeof(StartInkFillingResponse), + 4, + start_ink_filling_response__field_descriptors, + start_ink_filling_response__field_indices_by_name, + 1, start_ink_filling_response__number_ranges, + (ProtobufCMessageInit) start_ink_filling_response__init, + NULL,NULL,NULL /* reserved[123] */ +}; diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartInkFillingResponse.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartInkFillingResponse.pb-c.h new file mode 100644 index 000000000..5c1c7ddb2 --- /dev/null +++ b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartInkFillingResponse.pb-c.h @@ -0,0 +1,78 @@ +/* Generated by the protocol buffer compiler. DO NOT EDIT! */ +/* Generated from: StartInkFillingResponse.proto */ + +#ifndef PROTOBUF_C_StartInkFillingResponse_2eproto__INCLUDED +#define PROTOBUF_C_StartInkFillingResponse_2eproto__INCLUDED + +#include + +PROTOBUF_C__BEGIN_DECLS + +#if PROTOBUF_C_VERSION_NUMBER < 1003000 +# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers. +#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION +# error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c. +#endif + +#include "Cartridge.pb-c.h" +#include "FillingAction.pb-c.h" + +typedef struct _StartInkFillingResponse StartInkFillingResponse; + + +/* --- enums --- */ + + +/* --- messages --- */ + +struct _StartInkFillingResponse +{ + ProtobufCMessage base; + Cartridge *cartridge; + protobuf_c_boolean has_action; + FillingAction action; + protobuf_c_boolean has_progresspercentage; + double progresspercentage; + char *message; +}; +#define START_INK_FILLING_RESPONSE__INIT \ + { PROTOBUF_C_MESSAGE_INIT (&start_ink_filling_response__descriptor) \ + , NULL, 0, FILLING_ACTION__None, 0, 0, NULL } + + +/* StartInkFillingResponse methods */ +void start_ink_filling_response__init + (StartInkFillingResponse *message); +size_t start_ink_filling_response__get_packed_size + (const StartInkFillingResponse *message); +size_t start_ink_filling_response__pack + (const StartInkFillingResponse *message, + uint8_t *out); +size_t start_ink_filling_response__pack_to_buffer + (const StartInkFillingResponse *message, + ProtobufCBuffer *buffer); +StartInkFillingResponse * + start_ink_filling_response__unpack + (ProtobufCAllocator *allocator, + size_t len, + const uint8_t *data); +void start_ink_filling_response__free_unpacked + (StartInkFillingResponse *message, + ProtobufCAllocator *allocator); +/* --- per-message closures --- */ + +typedef void (*StartInkFillingResponse_Closure) + (const StartInkFillingResponse *message, + void *closure_data); + +/* --- services --- */ + + +/* --- descriptors --- */ + +extern const ProtobufCMessageDescriptor start_ink_filling_response__descriptor; + +PROTOBUF_C__END_DECLS + + +#endif /* PROTOBUF_C_StartInkFillingResponse_2eproto__INCLUDED */ diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartWasteEmptyingRequest.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartWasteEmptyingRequest.pb-c.c new file mode 100644 index 000000000..1b9c856fa --- /dev/null +++ b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartWasteEmptyingRequest.pb-c.c @@ -0,0 +1,72 @@ +/* Generated by the protocol buffer compiler. DO NOT EDIT! */ +/* Generated from: StartWasteEmptyingRequest.proto */ + +/* Do not generate deprecated warnings for self */ +#ifndef PROTOBUF_C__NO_DEPRECATED +#define PROTOBUF_C__NO_DEPRECATED +#endif + +#include "StartWasteEmptyingRequest.pb-c.h" +void start_waste_emptying_request__init + (StartWasteEmptyingRequest *message) +{ + static const StartWasteEmptyingRequest init_value = START_WASTE_EMPTYING_REQUEST__INIT; + *message = init_value; +} +size_t start_waste_emptying_request__get_packed_size + (const StartWasteEmptyingRequest *message) +{ + assert(message->base.descriptor == &start_waste_emptying_request__descriptor); + return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message)); +} +size_t start_waste_emptying_request__pack + (const StartWasteEmptyingRequest *message, + uint8_t *out) +{ + assert(message->base.descriptor == &start_waste_emptying_request__descriptor); + return protobuf_c_message_pack ((const ProtobufCMessage*)message, out); +} +size_t start_waste_emptying_request__pack_to_buffer + (const StartWasteEmptyingRequest *message, + ProtobufCBuffer *buffer) +{ + assert(message->base.descriptor == &start_waste_emptying_request__descriptor); + return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer); +} +StartWasteEmptyingRequest * + start_waste_emptying_request__unpack + (ProtobufCAllocator *allocator, + size_t len, + const uint8_t *data) +{ + return (StartWasteEmptyingRequest *) + protobuf_c_message_unpack (&start_waste_emptying_request__descriptor, + allocator, len, data); +} +void start_waste_emptying_request__free_unpacked + (StartWasteEmptyingRequest *message, + ProtobufCAllocator *allocator) +{ + if(!message) + return; + assert(message->base.descriptor == &start_waste_emptying_request__descriptor); + protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator); +} +#define start_waste_emptying_request__field_descriptors NULL +#define start_waste_emptying_request__field_indices_by_name NULL +#define start_waste_emptying_request__number_ranges NULL +const ProtobufCMessageDescriptor start_waste_emptying_request__descriptor = +{ + PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC, + "", + "", + "", + "", + sizeof(StartWasteEmptyingRequest), + 0, + start_waste_emptying_request__field_descriptors, + start_waste_emptying_request__field_indices_by_name, + 0, start_waste_emptying_request__number_ranges, + (ProtobufCMessageInit) start_waste_emptying_request__init, + NULL,NULL,NULL /* reserved[123] */ +}; diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartWasteEmptyingRequest.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartWasteEmptyingRequest.pb-c.h new file mode 100644 index 000000000..44a104321 --- /dev/null +++ b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartWasteEmptyingRequest.pb-c.h @@ -0,0 +1,70 @@ +/* Generated by the protocol buffer compiler. DO NOT EDIT! */ +/* Generated from: StartWasteEmptyingRequest.proto */ + +#ifndef PROTOBUF_C_StartWasteEmptyingRequest_2eproto__INCLUDED +#define PROTOBUF_C_StartWasteEmptyingRequest_2eproto__INCLUDED + +#include + +PROTOBUF_C__BEGIN_DECLS + +#if PROTOBUF_C_VERSION_NUMBER < 1003000 +# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers. +#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION +# error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c. +#endif + + +typedef struct _StartWasteEmptyingRequest StartWasteEmptyingRequest; + + +/* --- enums --- */ + + +/* --- messages --- */ + +struct _StartWasteEmptyingRequest +{ + ProtobufCMessage base; +}; +#define START_WASTE_EMPTYING_REQUEST__INIT \ + { PROTOBUF_C_MESSAGE_INIT (&start_waste_emptying_request__descriptor) \ + } + + +/* StartWasteEmptyingRequest methods */ +void start_waste_emptying_request__init + (StartWasteEmptyingRequest *message); +size_t start_waste_emptying_request__get_packed_size + (const StartWasteEmptyingRequest *message); +size_t start_waste_emptying_request__pack + (const StartWasteEmptyingRequest *message, + uint8_t *out); +size_t start_waste_emptying_request__pack_to_buffer + (const StartWasteEmptyingRequest *message, + ProtobufCBuffer *buffer); +StartWasteEmptyingRequest * + start_waste_emptying_request__unpack + (ProtobufCAllocator *allocator, + size_t len, + const uint8_t *data); +void start_waste_emptying_request__free_unpacked + (StartWasteEmptyingRequest *message, + ProtobufCAllocator *allocator); +/* --- per-message closures --- */ + +typedef void (*StartWasteEmptyingRequest_Closure) + (const StartWasteEmptyingRequest *message, + void *closure_data); + +/* --- services --- */ + + +/* --- descriptors --- */ + +extern const ProtobufCMessageDescriptor start_waste_emptying_request__descriptor; + +PROTOBUF_C__END_DECLS + + +#endif /* PROTOBUF_C_StartWasteEmptyingRequest_2eproto__INCLUDED */ diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartWasteEmptyingResponse.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartWasteEmptyingResponse.pb-c.c new file mode 100644 index 000000000..55ca27102 --- /dev/null +++ b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartWasteEmptyingResponse.pb-c.c @@ -0,0 +1,131 @@ +/* Generated by the protocol buffer compiler. DO NOT EDIT! */ +/* Generated from: StartWasteEmptyingResponse.proto */ + +/* Do not generate deprecated warnings for self */ +#ifndef PROTOBUF_C__NO_DEPRECATED +#define PROTOBUF_C__NO_DEPRECATED +#endif + +#include "StartWasteEmptyingResponse.pb-c.h" +void start_waste_emptying_response__init + (StartWasteEmptyingResponse *message) +{ + static const StartWasteEmptyingResponse init_value = START_WASTE_EMPTYING_RESPONSE__INIT; + *message = init_value; +} +size_t start_waste_emptying_response__get_packed_size + (const StartWasteEmptyingResponse *message) +{ + assert(message->base.descriptor == &start_waste_emptying_response__descriptor); + return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message)); +} +size_t start_waste_emptying_response__pack + (const StartWasteEmptyingResponse *message, + uint8_t *out) +{ + assert(message->base.descriptor == &start_waste_emptying_response__descriptor); + return protobuf_c_message_pack ((const ProtobufCMessage*)message, out); +} +size_t start_waste_emptying_response__pack_to_buffer + (const StartWasteEmptyingResponse *message, + ProtobufCBuffer *buffer) +{ + assert(message->base.descriptor == &start_waste_emptying_response__descriptor); + return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer); +} +StartWasteEmptyingResponse * + start_waste_emptying_response__unpack + (ProtobufCAllocator *allocator, + size_t len, + const uint8_t *data) +{ + return (StartWasteEmptyingResponse *) + protobuf_c_message_unpack (&start_waste_emptying_response__descriptor, + allocator, len, data); +} +void start_waste_emptying_response__free_unpacked + (StartWasteEmptyingResponse *message, + ProtobufCAllocator *allocator) +{ + if(!message) + return; + assert(message->base.descriptor == &start_waste_emptying_response__descriptor); + protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator); +} +static const ProtobufCFieldDescriptor start_waste_emptying_response__field_descriptors[4] = +{ + { + "", + 1, + PROTOBUF_C_LABEL_OPTIONAL, + PROTOBUF_C_TYPE_MESSAGE, + 0, /* quantifier_offset */ + offsetof(StartWasteEmptyingResponse, cartridge), + &cartridge__descriptor, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, + { + "", + 2, + PROTOBUF_C_LABEL_OPTIONAL, + PROTOBUF_C_TYPE_ENUM, + offsetof(StartWasteEmptyingResponse, has_action), + offsetof(StartWasteEmptyingResponse, action), + &filling_action__descriptor, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, + { + "", + 3, + PROTOBUF_C_LABEL_OPTIONAL, + PROTOBUF_C_TYPE_DOUBLE, + offsetof(StartWasteEmptyingResponse, has_progresspercentage), + offsetof(StartWasteEmptyingResponse, progresspercentage), + NULL, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, + { + "", + 4, + PROTOBUF_C_LABEL_OPTIONAL, + PROTOBUF_C_TYPE_STRING, + 0, /* quantifier_offset */ + offsetof(StartWasteEmptyingResponse, message), + NULL, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, +}; +static const unsigned start_waste_emptying_response__field_indices_by_name[] = { + 1, /* field[1] = Action */ + 0, /* field[0] = Cartridge */ + 3, /* field[3] = Message */ + 2, /* field[2] = ProgressPercentage */ +}; +static const ProtobufCIntRange start_waste_emptying_response__number_ranges[1 + 1] = +{ + { 1, 0 }, + { 0, 4 } +}; +const ProtobufCMessageDescriptor start_waste_emptying_response__descriptor = +{ + PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC, + "", + "", + "", + "", + sizeof(StartWasteEmptyingResponse), + 4, + start_waste_emptying_response__field_descriptors, + start_waste_emptying_response__field_indices_by_name, + 1, start_waste_emptying_response__number_ranges, + (ProtobufCMessageInit) start_waste_emptying_response__init, + NULL,NULL,NULL /* reserved[123] */ +}; diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartWasteEmptyingResponse.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartWasteEmptyingResponse.pb-c.h new file mode 100644 index 000000000..11254b220 --- /dev/null +++ b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartWasteEmptyingResponse.pb-c.h @@ -0,0 +1,78 @@ +/* Generated by the protocol buffer compiler. DO NOT EDIT! */ +/* Generated from: StartWasteEmptyingResponse.proto */ + +#ifndef PROTOBUF_C_StartWasteEmptyingResponse_2eproto__INCLUDED +#define PROTOBUF_C_StartWasteEmptyingResponse_2eproto__INCLUDED + +#include + +PROTOBUF_C__BEGIN_DECLS + +#if PROTOBUF_C_VERSION_NUMBER < 1003000 +# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers. +#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION +# error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c. +#endif + +#include "Cartridge.pb-c.h" +#include "FillingAction.pb-c.h" + +typedef struct _StartWasteEmptyingResponse StartWasteEmptyingResponse; + + +/* --- enums --- */ + + +/* --- messages --- */ + +struct _StartWasteEmptyingResponse +{ + ProtobufCMessage base; + Cartridge *cartridge; + protobuf_c_boolean has_action; + FillingAction action; + protobuf_c_boolean has_progresspercentage; + double progresspercentage; + char *message; +}; +#define START_WASTE_EMPTYING_RESPONSE__INIT \ + { PROTOBUF_C_MESSAGE_INIT (&start_waste_emptying_response__descriptor) \ + , NULL, 0, FILLING_ACTION__None, 0, 0, NULL } + + +/* StartWasteEmptyingResponse methods */ +void start_waste_emptying_response__init + (StartWasteEmptyingResponse *message); +size_t start_waste_emptying_response__get_packed_size + (const StartWasteEmptyingResponse *message); +size_t start_waste_emptying_response__pack + (const StartWasteEmptyingResponse *message, + uint8_t *out); +size_t start_waste_emptying_response__pack_to_buffer + (const StartWasteEmptyingResponse *message, + ProtobufCBuffer *buffer); +StartWasteEmptyingResponse * + start_waste_emptying_response__unpack + (ProtobufCAllocator *allocator, + size_t len, + const uint8_t *data); +void start_waste_emptying_response__free_unpacked + (StartWasteEmptyingResponse *message, + ProtobufCAllocator *allocator); +/* --- per-message closures --- */ + +typedef void (*StartWasteEmptyingResponse_Closure) + (const StartWasteEmptyingResponse *message, + void *closure_data); + +/* --- services --- */ + + +/* --- descriptors --- */ + +extern const ProtobufCMessageDescriptor start_waste_emptying_response__descriptor; + +PROTOBUF_C__END_DECLS + + +#endif /* PROTOBUF_C_StartWasteEmptyingResponse_2eproto__INCLUDED */ diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/MachineStatus.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/MachineStatus.pb-c.c index ad257ca79..7b73b08b9 100644 --- a/Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/MachineStatus.pb-c.c +++ b/Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/MachineStatus.pb-c.c @@ -52,7 +52,7 @@ void machine_status__free_unpacked assert(message->base.descriptor == &machine_status__descriptor); protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator); } -static const ProtobufCFieldDescriptor machine_status__field_descriptors[4] = +static const ProtobufCFieldDescriptor machine_status__field_descriptors[6] = { { "", @@ -102,9 +102,35 @@ static const ProtobufCFieldDescriptor machine_status__field_descriptors[4] = 0, /* flags */ 0,NULL,NULL /* reserved1,reserved2, etc */ }, + { + "", + 5, + PROTOBUF_C_LABEL_OPTIONAL, + PROTOBUF_C_TYPE_ENUM, + offsetof(MachineStatus, has_middlecartridgestate), + offsetof(MachineStatus, middlecartridgestate), + &waste_cartridge_state__descriptor, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, + { + "", + 6, + PROTOBUF_C_LABEL_OPTIONAL, + PROTOBUF_C_TYPE_ENUM, + offsetof(MachineStatus, has_lowercartridgestate), + offsetof(MachineStatus, lowercartridgestate), + &waste_cartridge_state__descriptor, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, }; static const unsigned machine_status__field_indices_by_name[] = { 1, /* field[1] = IDSPacksLevels */ + 5, /* field[5] = LowerCartridgeState */ + 4, /* field[4] = MiddleCartridgeState */ 2, /* field[2] = OverallTemperature */ 3, /* field[3] = SpoolState */ 0, /* field[0] = State */ @@ -112,7 +138,7 @@ static const unsigned machine_status__field_indices_by_name[] = { static const ProtobufCIntRange machine_status__number_ranges[1 + 1] = { { 1, 0 }, - { 0, 4 } + { 0, 6 } }; const ProtobufCMessageDescriptor machine_status__descriptor = { @@ -122,7 +148,7 @@ const ProtobufCMessageDescriptor machine_status__descriptor = "", "", sizeof(MachineStatus), - 4, + 6, machine_status__field_descriptors, machine_status__field_indices_by_name, 1, machine_status__number_ranges, diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/MachineStatus.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/MachineStatus.pb-c.h index 003fcd09c..a8e12e87f 100644 --- a/Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/MachineStatus.pb-c.h +++ b/Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/MachineStatus.pb-c.h @@ -17,6 +17,7 @@ PROTOBUF_C__BEGIN_DECLS #include "MachineState.pb-c.h" #include "IDSPackLevel.pb-c.h" #include "SpoolState.pb-c.h" +#include "WasteCartridgeState.pb-c.h" typedef struct _MachineStatus MachineStatus; @@ -37,10 +38,14 @@ struct _MachineStatus double overalltemperature; protobuf_c_boolean has_spoolstate; SpoolState spoolstate; + protobuf_c_boolean has_middlecartridgestate; + WasteCartridgeState middlecartridgestate; + protobuf_c_boolean has_lowercartridgestate; + WasteCartridgeState lowercartridgestate; }; #define MACHINE_STATUS__INIT \ { PROTOBUF_C_MESSAGE_INIT (&machine_status__descriptor) \ - , 0, MACHINE_STATE__PowerUp, 0,NULL, 0, 0, 0, SPOOL_STATE__Absent } + , 0, MACHINE_STATE__PowerUp, 0,NULL, 0, 0, 0, SPOOL_STATE__Absent, 0, WASTE_CARTRIDGE_STATE__CartAbsent, 0, WASTE_CARTRIDGE_STATE__CartAbsent } /* MachineStatus methods */ diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/WasteCartridgeState.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/WasteCartridgeState.pb-c.c new file mode 100644 index 000000000..f179ce199 --- /dev/null +++ b/Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/WasteCartridgeState.pb-c.c @@ -0,0 +1,43 @@ +/* Generated by the protocol buffer compiler. DO NOT EDIT! */ +/* Generated from: WasteCartridgeState.proto */ + +/* Do not generate deprecated warnings for self */ +#ifndef PROTOBUF_C__NO_DEPRECATED +#define PROTOBUF_C__NO_DEPRECATED +#endif + +#include "WasteCartridgeState.pb-c.h" +static const ProtobufCEnumValue waste_cartridge_state__enum_values_by_number[5] = +{ + { "", "", 0 }, + { "", "", 1 }, + { "", "", 2 }, + { "", "", 3 }, + { "", "", 4 }, +}; +static const ProtobufCIntRange waste_cartridge_state__value_ranges[] = { +{0, 0},{0, 5} +}; +static const ProtobufCEnumValueIndex waste_cartridge_state__enum_values_by_name[5] = +{ + { "", 0 }, + { "", 1 }, + { "", 4 }, + { "", 2 }, + { "", 3 }, +}; +const ProtobufCEnumDescriptor waste_cartridge_state__descriptor = +{ + PROTOBUF_C__ENUM_DESCRIPTOR_MAGIC, + "", + "", + "", + "", + 5, + waste_cartridge_state__enum_values_by_number, + 5, + waste_cartridge_state__enum_values_by_name, + 1, + waste_cartridge_state__value_ranges, + NULL,NULL,NULL,NULL /* reserved[1234] */ +}; diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/WasteCartridgeState.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/WasteCartridgeState.pb-c.h new file mode 100644 index 000000000..c100d36d8 --- /dev/null +++ b/Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/WasteCartridgeState.pb-c.h @@ -0,0 +1,46 @@ +/* Generated by the protocol buffer compiler. DO NOT EDIT! */ +/* Generated from: WasteCartridgeState.proto */ + +#ifndef PROTOBUF_C_WasteCartridgeState_2eproto__INCLUDED +#define PROTOBUF_C_WasteCartridgeState_2eproto__INCLUDED + +#include + +PROTOBUF_C__BEGIN_DECLS + +#if PROTOBUF_C_VERSION_NUMBER < 1003000 +# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers. +#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION +# error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c. +#endif + + + + +/* --- enums --- */ + +typedef enum _WasteCartridgeState { + WASTE_CARTRIDGE_STATE__CartAbsent = 0, + WASTE_CARTRIDGE_STATE__CartEmpty = 1, + WASTE_CARTRIDGE_STATE__CartFilling = 2, + WASTE_CARTRIDGE_STATE__CartFull = 3, + WASTE_CARTRIDGE_STATE__CartError = 4 + PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(WASTE_CARTRIDGE_STATE) +} WasteCartridgeState; + +/* --- messages --- */ + +/* --- per-message closures --- */ + + +/* --- services --- */ + + +/* --- descriptors --- */ + +extern const ProtobufCEnumDescriptor waste_cartridge_state__descriptor; + +PROTOBUF_C__END_DECLS + + +#endif /* PROTOBUF_C_WasteCartridgeState_2eproto__INCLUDED */ diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubAllHardwareRequest.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubAllHardwareRequest.pb-c.c new file mode 100644 index 000000000..5334c1193 --- /dev/null +++ b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubAllHardwareRequest.pb-c.c @@ -0,0 +1,72 @@ +/* Generated by the protocol buffer compiler. DO NOT EDIT! */ +/* Generated from: StubAllHardwareRequest.proto */ + +/* Do not generate deprecated warnings for self */ +#ifndef PROTOBUF_C__NO_DEPRECATED +#define PROTOBUF_C__NO_DEPRECATED +#endif + +#include "StubAllHardwareRequest.pb-c.h" +void stub_all_hardware_request__init + (StubAllHardwareRequest *message) +{ + static const StubAllHardwareRequest init_value = STUB_ALL_HARDWARE_REQUEST__INIT; + *message = init_value; +} +size_t stub_all_hardware_request__get_packed_size + (const StubAllHardwareRequest *message) +{ + assert(message->base.descriptor == &stub_all_hardware_request__descriptor); + return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message)); +} +size_t stub_all_hardware_request__pack + (const StubAllHardwareRequest *message, + uint8_t *out) +{ + assert(message->base.descriptor == &stub_all_hardware_request__descriptor); + return protobuf_c_message_pack ((const ProtobufCMessage*)message, out); +} +size_t stub_all_hardware_request__pack_to_buffer + (const StubAllHardwareRequest *message, + ProtobufCBuffer *buffer) +{ + assert(message->base.descriptor == &stub_all_hardware_request__descriptor); + return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer); +} +StubAllHardwareRequest * + stub_all_hardware_request__unpack + (ProtobufCAllocator *allocator, + size_t len, + const uint8_t *data) +{ + return (StubAllHardwareRequest *) + protobuf_c_message_unpack (&stub_all_hardware_request__descriptor, + allocator, len, data); +} +void stub_all_hardware_request__free_unpacked + (StubAllHardwareRequest *message, + ProtobufCAllocator *allocator) +{ + if(!message) + return; + assert(message->base.descriptor == &stub_all_hardware_request__descriptor); + protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator); +} +#define stub_all_hardware_request__field_descriptors NULL +#define stub_all_hardware_request__field_indices_by_name NULL +#define stub_all_hardware_request__number_ranges NULL +const ProtobufCMessageDescriptor stub_all_hardware_request__descriptor = +{ + PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC, + "", + "", + "", + "", + sizeof(StubAllHardwareRequest), + 0, + stub_all_hardware_request__field_descriptors, + stub_all_hardware_request__field_indices_by_name, + 0, stub_all_hardware_request__number_ranges, + (ProtobufCMessageInit) stub_all_hardware_request__init, + NULL,NULL,NULL /* reserved[123] */ +}; diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubAllHardwareRequest.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubAllHardwareRequest.pb-c.h new file mode 100644 index 000000000..d22bddaaf --- /dev/null +++ b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubAllHardwareRequest.pb-c.h @@ -0,0 +1,70 @@ +/* Generated by the protocol buffer compiler. DO NOT EDIT! */ +/* Generated from: StubAllHardwareRequest.proto */ + +#ifndef PROTOBUF_C_StubAllHardwareRequest_2eproto__INCLUDED +#define PROTOBUF_C_StubAllHardwareRequest_2eproto__INCLUDED + +#include + +PROTOBUF_C__BEGIN_DECLS + +#if PROTOBUF_C_VERSION_NUMBER < 1003000 +# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers. +#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION +# error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c. +#endif + + +typedef struct _StubAllHardwareRequest StubAllHardwareRequest; + + +/* --- enums --- */ + + +/* --- messages --- */ + +struct _StubAllHardwareRequest +{ + ProtobufCMessage base; +}; +#define STUB_ALL_HARDWARE_REQUEST__INIT \ + { PROTOBUF_C_MESSAGE_INIT (&stub_all_hardware_request__descriptor) \ + } + + +/* StubAllHardwareRequest methods */ +void stub_all_hardware_request__init + (StubAllHardwareRequest *message); +size_t stub_all_hardware_request__get_packed_size + (const StubAllHardwareRequest *message); +size_t stub_all_hardware_request__pack + (const StubAllHardwareRequest *message, + uint8_t *out); +size_t stub_all_hardware_request__pack_to_buffer + (const StubAllHardwareRequest *message, + ProtobufCBuffer *buffer); +StubAllHardwareRequest * + stub_all_hardware_request__unpack + (ProtobufCAllocator *allocator, + size_t len, + const uint8_t *data); +void stub_all_hardware_request__free_unpacked + (StubAllHardwareRequest *message, + ProtobufCAllocator *allocator); +/* --- per-message closures --- */ + +typedef void (*StubAllHardwareRequest_Closure) + (const StubAllHardwareRequest *message, + void *closure_data); + +/* --- services --- */ + + +/* --- descriptors --- */ + +extern const ProtobufCMessageDescriptor stub_all_hardware_request__descriptor; + +PROTOBUF_C__END_DECLS + + +#endif /* PROTOBUF_C_StubAllHardwareRequest_2eproto__INCLUDED */ diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubAllHardwareResponse.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubAllHardwareResponse.pb-c.c new file mode 100644 index 000000000..898aea50b --- /dev/null +++ b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubAllHardwareResponse.pb-c.c @@ -0,0 +1,144 @@ +/* Generated by the protocol buffer compiler. DO NOT EDIT! */ +/* Generated from: StubAllHardwareResponse.proto */ + +/* Do not generate deprecated warnings for self */ +#ifndef PROTOBUF_C__NO_DEPRECATED +#define PROTOBUF_C__NO_DEPRECATED +#endif + +#include "StubAllHardwareResponse.pb-c.h" +void stub_all_hardware_response__init + (StubAllHardwareResponse *message) +{ + static const StubAllHardwareResponse init_value = STUB_ALL_HARDWARE_RESPONSE__INIT; + *message = init_value; +} +size_t stub_all_hardware_response__get_packed_size + (const StubAllHardwareResponse *message) +{ + assert(message->base.descriptor == &stub_all_hardware_response__descriptor); + return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message)); +} +size_t stub_all_hardware_response__pack + (const StubAllHardwareResponse *message, + uint8_t *out) +{ + assert(message->base.descriptor == &stub_all_hardware_response__descriptor); + return protobuf_c_message_pack ((const ProtobufCMessage*)message, out); +} +size_t stub_all_hardware_response__pack_to_buffer + (const StubAllHardwareResponse *message, + ProtobufCBuffer *buffer) +{ + assert(message->base.descriptor == &stub_all_hardware_response__descriptor); + return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer); +} +StubAllHardwareResponse * + stub_all_hardware_response__unpack + (ProtobufCAllocator *allocator, + size_t len, + const uint8_t *data) +{ + return (StubAllHardwareResponse *) + protobuf_c_message_unpack (&stub_all_hardware_response__descriptor, + allocator, len, data); +} +void stub_all_hardware_response__free_unpacked + (StubAllHardwareResponse *message, + ProtobufCAllocator *allocator) +{ + if(!message) + return; + assert(message->base.descriptor == &stub_all_hardware_response__descriptor); + protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator); +} +static const ProtobufCFieldDescriptor stub_all_hardware_response__field_descriptors[5] = +{ + { + "", + 1, + PROTOBUF_C_LABEL_OPTIONAL, + PROTOBUF_C_TYPE_STRING, + 0, /* quantifier_offset */ + offsetof(StubAllHardwareResponse, mcu_serial), + NULL, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, + { + "", + 2, + PROTOBUF_C_LABEL_OPTIONAL, + PROTOBUF_C_TYPE_MESSAGE, + 0, /* quantifier_offset */ + offsetof(StubAllHardwareResponse, headeeprom), + &stub_head_eeprom_data__descriptor, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, + { + "", + 3, + PROTOBUF_C_LABEL_OPTIONAL, + PROTOBUF_C_TYPE_MESSAGE, + 0, /* quantifier_offset */ + offsetof(StubAllHardwareResponse, whseeprom), + &stub_whs_eeprom_data__descriptor, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, + { + "", + 4, + PROTOBUF_C_LABEL_REPEATED, + PROTOBUF_C_TYPE_MESSAGE, + offsetof(StubAllHardwareResponse, n_maincardeepromdata), + offsetof(StubAllHardwareResponse, maincardeepromdata), + &stub_main_card_eeprom_read_response__descriptor, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, + { + "", + 5, + PROTOBUF_C_LABEL_REPEATED, + PROTOBUF_C_TYPE_MESSAGE, + offsetof(StubAllHardwareResponse, n_dispensereepromdata), + offsetof(StubAllHardwareResponse, dispensereepromdata), + &stub_dispenser_eeprom_response__descriptor, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, +}; +static const unsigned stub_all_hardware_response__field_indices_by_name[] = { + 4, /* field[4] = DispenserEEpromData */ + 1, /* field[1] = HeadEEprom */ + 0, /* field[0] = MCU_Serial */ + 3, /* field[3] = MainCardEEpromData */ + 2, /* field[2] = WhsEEprom */ +}; +static const ProtobufCIntRange stub_all_hardware_response__number_ranges[1 + 1] = +{ + { 1, 0 }, + { 0, 5 } +}; +const ProtobufCMessageDescriptor stub_all_hardware_response__descriptor = +{ + PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC, + "", + "", + "", + "", + sizeof(StubAllHardwareResponse), + 5, + stub_all_hardware_response__field_descriptors, + stub_all_hardware_response__field_indices_by_name, + 1, stub_all_hardware_response__number_ranges, + (ProtobufCMessageInit) stub_all_hardware_response__init, + NULL,NULL,NULL /* reserved[123] */ +}; diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubAllHardwareResponse.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubAllHardwareResponse.pb-c.h new file mode 100644 index 000000000..2678952fa --- /dev/null +++ b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubAllHardwareResponse.pb-c.h @@ -0,0 +1,81 @@ +/* Generated by the protocol buffer compiler. DO NOT EDIT! */ +/* Generated from: StubAllHardwareResponse.proto */ + +#ifndef PROTOBUF_C_StubAllHardwareResponse_2eproto__INCLUDED +#define PROTOBUF_C_StubAllHardwareResponse_2eproto__INCLUDED + +#include + +PROTOBUF_C__BEGIN_DECLS + +#if PROTOBUF_C_VERSION_NUMBER < 1003000 +# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers. +#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION +# error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c. +#endif + +#include "StubHeadEEpromData.pb-c.h" +#include "StubWhsEEpromData.pb-c.h" +#include "StubDispenserEEpromResponse.pb-c.h" +#include "StubMainCardEEpromReadResponse.pb-c.h" + +typedef struct _StubAllHardwareResponse StubAllHardwareResponse; + + +/* --- enums --- */ + + +/* --- messages --- */ + +struct _StubAllHardwareResponse +{ + ProtobufCMessage base; + char *mcu_serial; + StubHeadEEpromData *headeeprom; + StubWhsEEpromData *whseeprom; + size_t n_maincardeepromdata; + StubMainCardEEpromReadResponse **maincardeepromdata; + size_t n_dispensereepromdata; + StubDispenserEEpromResponse **dispensereepromdata; +}; +#define STUB_ALL_HARDWARE_RESPONSE__INIT \ + { PROTOBUF_C_MESSAGE_INIT (&stub_all_hardware_response__descriptor) \ + , NULL, NULL, NULL, 0,NULL, 0,NULL } + + +/* StubAllHardwareResponse methods */ +void stub_all_hardware_response__init + (StubAllHardwareResponse *message); +size_t stub_all_hardware_response__get_packed_size + (const StubAllHardwareResponse *message); +size_t stub_all_hardware_response__pack + (const StubAllHardwareResponse *message, + uint8_t *out); +size_t stub_all_hardware_response__pack_to_buffer + (const StubAllHardwareResponse *message, + ProtobufCBuffer *buffer); +StubAllHardwareResponse * + stub_all_hardware_response__unpack + (ProtobufCAllocator *allocator, + size_t len, + const uint8_t *data); +void stub_all_hardware_response__free_unpacked + (StubAllHardwareResponse *message, + ProtobufCAllocator *allocator); +/* --- per-message closures --- */ + +typedef void (*StubAllHardwareResponse_Closure) + (const StubAllHardwareResponse *message, + void *closure_data); + +/* --- services --- */ + + +/* --- descriptors --- */ + +extern const ProtobufCMessageDescriptor stub_all_hardware_response__descriptor; + +PROTOBUF_C__END_DECLS + + +#endif /* PROTOBUF_C_StubAllHardwareResponse_2eproto__INCLUDED */ diff --git a/Software/Embedded_SW/Embedded/Drivers/Valves/Valve.c b/Software/Embedded_SW/Embedded/Drivers/Valves/Valve.c index 2ae3da453..841a8d1da 100644 --- a/Software/Embedded_SW/Embedded/Drivers/Valves/Valve.c +++ b/Software/Embedded_SW/Embedded/Drivers/Valves/Valve.c @@ -148,6 +148,7 @@ uint32_t ValveCallback(uint32_t deviceID, uint32_t ReadValue) MidtankMitigationCounter[deviceID] = 0; } } + return OK; } void Valve_Command(Valves_t Valve_Id) //1 - OPEN, 0 - CLOSE diff --git a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c index 120df71df..de45cacaa 100644 --- a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c +++ b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c @@ -36,6 +36,7 @@ #include "modules/thread/thread_ex.h" #include "modules/heaters/heaters_ex.h" #include "modules/ids/ids_ex.h" +#include "modules/waste/waste_ex.h" #include #include #include diff --git a/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c b/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c index 9297d3bb8..b9bcc1624 100644 --- a/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c +++ b/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c @@ -27,7 +27,9 @@ #include "StateMachines/Initialization/InitSequence.h" #include "Modules/General/MachineStatus.h" +#include "Modules/AlarmHandling/AlarmHandling.h" #include "Modules/Control/MillisecTask.h" +#include "modules/waste/waste_ex.h" #include "modules/ids/ids_ex.h" MachineState StoredMachineStatus = MACHINE_STATE__PowerUp; @@ -78,6 +80,7 @@ int MachineUpdateResponseFunc(void) int1valid = false; if((internaltemp2<=MINIMUM_HEATER_READ*100)||(MAXIMUM_HEATER_READ*100<=internaltemp2)) int2valid = false; + MachineStatus.has_overalltemperature = true; if ((int2valid == true)&&(int1valid == true)) { usetemp = (max(internaltemp1,internaltemp2))/100; @@ -89,17 +92,19 @@ int MachineUpdateResponseFunc(void) } else { - AlarmHandlingSetAlarm(EVENT_TYPE__TEMPERATURE_MEASUREMENT_ERROR, true); + //AlarmHandlingSetAlarm(EVENT_TYPE__TEMPERATURE_MEASUREMENT_ERROR, true); temp_measure_alarm = true; if ((int2valid == false)&&(int1valid == true)) usetemp = internaltemp1/100; else if ((int2valid == false)&&(int1valid == false)) + { + MachineStatus.has_overalltemperature = FALSE; usetemp = 0; + } else if ((int1valid == false)&&(int2valid == true)) usetemp = internaltemp2/100; } - MachineStatus.has_overalltemperature = true; if (FPGA_Read_limit_Switches(GPI_SW_SPOOL_EXISTS)==LIMIT) @@ -133,7 +138,47 @@ int MachineUpdateResponseFunc(void) } else return ERROR; - + MachineStatus.has_middlecartridgestate = true; + switch (cartGetState(WasteCartridge_middle)) + { + case CartridgeStateOUT: + MachineStatus.middlecartridgestate = WASTE_CARTRIDGE_STATE__CartAbsent; + break; + case CartridgeStateIN: + case CartridgeStateSELECTED: + MachineStatus.middlecartridgestate = WASTE_CARTRIDGE_STATE__CartEmpty; + break; + case CartridgeStateACTIVE: + MachineStatus.middlecartridgestate = WASTE_CARTRIDGE_STATE__CartFilling; + break; + case CartridgeStateFULL: + MachineStatus.middlecartridgestate = WASTE_CARTRIDGE_STATE__CartFull; + break; + default: + MachineStatus.middlecartridgestate = WASTE_CARTRIDGE_STATE__CartAbsent; + break; + } + MachineStatus.has_lowercartridgestate = true; + MachineStatus.lowercartridgestate = WASTE_CARTRIDGE_STATE__CartAbsent; + switch (cartGetState(WasteCartridge_lower)) + { + case CartridgeStateOUT: + MachineStatus.lowercartridgestate = WASTE_CARTRIDGE_STATE__CartAbsent; + break; + case CartridgeStateIN: + case CartridgeStateSELECTED: + MachineStatus.lowercartridgestate = WASTE_CARTRIDGE_STATE__CartEmpty; + break; + case CartridgeStateACTIVE: + MachineStatus.lowercartridgestate = WASTE_CARTRIDGE_STATE__CartFilling; + break; + case CartridgeStateFULL: + MachineStatus.lowercartridgestate = WASTE_CARTRIDGE_STATE__CartFull; + break; + default: + MachineStatus.lowercartridgestate = WASTE_CARTRIDGE_STATE__CartAbsent; + break; + } responseContainer = /*MachineUpdate*/createContainer(MESSAGE_TYPE__StartMachineStatusUpdateResponse, MachineUpdateToken, false, &response, &start_machine_status_update_response__pack, &start_machine_status_update_response__get_packed_size); diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_ex.h b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_ex.h index 6d50eb926..e85694c48 100644 --- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_ex.h +++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_ex.h @@ -47,6 +47,7 @@ double PressureSensorGetPressure(uint8_t SensorId); int HeadBlowersGetRPM(uint8_t fanId); double PressureSensorInit(); void HeadBlowersInit(); +uint32_t HeadBlowerPidRequestMessage(void* request, int BlowerId); void HeadBlowersCfg(); void HeadBlowersControlLoop (); uint32_t HeadBlowerCommandRequestMessage(int blowerId, float flow); diff --git a/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c b/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c index 747df1a61..abad051cb 100644 --- a/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c +++ b/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c @@ -11,10 +11,14 @@ #include #include "PMR/Diagnostics/CartridgeSlot.pb-c.h" #include "PMR/Diagnostics/CartridgeTagContent.pb-c.h" +#include "PMR/Diagnostics/StartInkFillingRequest.pb-c.h" +#include "PMR/Diagnostics/StartInkFillingResponse.pb-c.h" +#include "PMR/Diagnostics/FillingAction.pb-c.h" #include #include "drivers/FPGA/FPGA_GPIO/FPGA_GPIO.h"//#include "FPGA_GPIO.h" // use for FPGA IO #include "drivers/I2C_Communication/ADC_MUX/ADC_MUX.h" #include "StateMachines/Initialization/PowerOffSequence.h" +#include #include "include.h" #include "Modules/IDS/ids_ex.h" @@ -229,7 +233,54 @@ bool CartridgeValidationResponseFunc(MessageContainer* requestContainer) } return OK; } +char InkFillingToken[36+1] = {0}; +uint32_t InkFillingUpdate(POWER_OFF_STAGES_ENUM stage) +{ + uint32_t status = NOT_SUPPORTED; + MessageContainer responseContainer; + + StartInkFillingResponse response = START_INK_FILLING_RESPONSE__INIT; + Cartridge Cartridge = CARTRIDGE__INIT; + response.action = FILLING_ACTION__None; + response.has_action = true; + response.cartridge = LoadCartridgeData(CART_1,&Cartridge); + + response.cartridge = NULL; + response.has_progresspercentage = true; + response.progresspercentage = 0.0; + response.message = NULL; + + responseContainer = createContainer(MESSAGE_TYPE__StartInkFillingResponse, InkFillingToken, false, &response, &start_ink_filling_response__pack, &start_ink_filling_response__get_packed_size); + responseContainer.has_continuous = true; + responseContainer.continuous = true; + uint8_t* 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); + //USBCDCD_sendData(container_buffer, container_size,10); + + SendChars((char*)container_buffer, container_size); + //MessageContainer responseContainer; + + return status; +} + +uint32_t StartInkFillingRequestFunc(MessageContainer* requestContainer) +{ + uint32_t status = NOT_SUPPORTED; + //MessageContainer responseContainer; +// MachineUpdateInitParams InitParams; + + Report("StartInkFillingRequestFunc",__FILE__,__LINE__,(int)0,RpWarning,(int)0,0); + StartInkFillingRequest* request = start_ink_filling_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data); + ustrncpy (InkFillingToken, requestContainer->token,36); + + InkFillingUpdate(POWER_OFF_INIT); + start_ink_filling_request__free_unpacked(request,NULL); + return status; +// case MESSAGE_TYPE__StartWasteEmptyingRequest: + +} void ResponseDemo(int MidtankId) { inkAuthenticationPass = true; diff --git a/Software/Embedded_SW/Embedded/Modules/IFS/ifs.h b/Software/Embedded_SW/Embedded/Modules/IFS/ifs.h index 0f95fb2e2..dec1544ec 100644 --- a/Software/Embedded_SW/Embedded/Modules/IFS/ifs.h +++ b/Software/Embedded_SW/Embedded/Modules/IFS/ifs.h @@ -28,5 +28,6 @@ bool IFS_MidTankFilling(void); MidTank_t IFS_MidTankIsActive(void); bool IFS_CartridgeLowerPresent(); bool CartridgeValidationResponseFunc(MessageContainer* requestContainer); +uint32_t StartInkFillingRequestFunc(MessageContainer* requestContainer); #endif /* MODULES_IFS_IFS_H_ */ diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c index 6edc5b3f2..d0d2c1ef7 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c @@ -16,7 +16,7 @@ #include "Modules/Control/control.h" #include "Modules/General/process.h" #include "Modules/control/pidalgo.h" - +#include "Modules/AlarmHandling/AlarmHandling.h" #include "Modules/heaters/heaters_ex.h" #include "Modules/General/buttons.h" #include "StateMachines/Initialization/InitSequence.h" diff --git a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_ex.h b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_ex.h index 0a7534635..38e3236cc 100644 --- a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_ex.h +++ b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_ex.h @@ -47,6 +47,8 @@ bool WHS_IsEmptying(); uint32_t Waste_CheckState(void); uint32_t Waste_Prepare(void); bool WHS_IsVocPpmOverAlarmLimit(); +uint32_t StartWasteEmptyingRequestFunc(MessageContainer* requestContainer); + extern bool ReadingVocEverySec; diff --git a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c index 84609035a..6d338cbf7 100644 --- a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c +++ b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c @@ -6,13 +6,17 @@ #include "drivers/Valves/Valve.h" #include "Common/report/report.h" #include "Modules/Waste/Waste_ex.h" +#include "modules/heaters/heaters_ex.h" #include #include "Drivers/I2C_Communication/RFID_NFC/logi-tag/LT_RFID.h" #include #include "Drivers/I2C_Communication/RFID_NFC/NFC.h" -//#include +#include #include +#include "PMR/Diagnostics/FillingAction.pb-c.h" +#include "PMR/Diagnostics/StartWasteEmptyingRequest.pb-c.h" +#include "PMR/Diagnostics/StartWasteEmptyingResponse.pb-c.h" #include "Modules/AlarmHandling/AlarmHandling.h" #include "StateMachines/Initialization/PowerOffSequence.h" #include "drivers/I2C_Communication/ADC_MUX/ADC_MUX.h" @@ -500,6 +504,53 @@ void Waste_StateMachine(void) Report("wrong state", __FILE__, WasteTankState, 0, RpMessage, SelectedCard, 0); break; } +} +char WasteEmptyingToken[36+1] = {0}; +uint32_t WasteEmptyingUpdate(POWER_OFF_STAGES_ENUM stage) +{ + uint32_t status = NOT_SUPPORTED; + MessageContainer responseContainer; + + StartWasteEmptyingResponse response = START_WASTE_EMPTYING_RESPONSE__INIT; + response.action = FILLING_ACTION__None; + response.has_action = true; + //response.cartridge = LoadCartridgeData(); response.cartridge = LoadCartridgeData(); + + response.cartridge = NULL; + response.has_progresspercentage = true; + response.progresspercentage = 0.0; + response.message = NULL; + + responseContainer = createContainer(MESSAGE_TYPE__StartWasteEmptyingResponse, WasteEmptyingToken, false, &response, &start_waste_emptying_response__pack, &start_waste_emptying_response__get_packed_size); + responseContainer.has_continuous = true; + responseContainer.continuous = true; + uint8_t* 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); + //USBCDCD_sendData(container_buffer, container_size,10); + + SendChars((char*)container_buffer, container_size); + //MessageContainer responseContainer; + + return status; +} + +uint32_t StartWasteEmptyingRequestFunc(MessageContainer* requestContainer) +{ + uint32_t status = NOT_SUPPORTED; + //MessageContainer responseContainer; + +// MachineUpdateInitParams InitParams; + + Report("StartWasteEmptyingRequestFunc",__FILE__,__LINE__,(int)0,RpWarning,(int)0,0); + StartWasteEmptyingRequest* request = start_waste_emptying_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data); + ustrncpy (WasteEmptyingToken, requestContainer->token,36); + + WasteEmptyingUpdate(POWER_OFF_INIT); + start_waste_emptying_request__free_unpacked(request,NULL); + return status; +// case MESSAGE_TYPE__StartWasteEmptyingRequest: + } uint32_t Waste_CheckState(void) { @@ -572,6 +623,7 @@ uint32_t Waste_PrepareCallbak(uint32_t IfIndex, uint32_t ReadValue) PrepareReady(Module_Waste,ModuleDone); } Report("Module waste prepare", __FILE__, __LINE__, headready, RpMessage, whsready, 0); + return OK; } uint32_t Waste_Prepare(void) { @@ -581,6 +633,7 @@ uint32_t Waste_Prepare(void) //check that blowers are within 10% of designated flow: WHS, head blowers WasteReadyControlId = AddControlCallback("Cartridge Cover Door", Waste_PrepareCallbak, eOneSecond, TemplateDataReadCBFunction, 0, 0, 0); Report("Module waste prepare", __FILE__, __LINE__, Head_Type, RpMessage, WHS_Type, 0); + return OK; } bool WHS_IsVocPpmOverAlarmLimit() diff --git a/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerOffSequence.c b/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerOffSequence.c index 0a980159d..8f6f2a781 100644 --- a/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerOffSequence.c +++ b/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerOffSequence.c @@ -41,6 +41,7 @@ #include "InitSequence.h" #include "PowerOffSequence.h" #include "modules/waste/waste_ex.h" +#include "modules/ifs/ifs.h" /* typedef enum { diff --git a/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c b/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c index 86c8ef7da..235854b7a 100644 --- a/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c +++ b/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c @@ -55,6 +55,7 @@ #include "Modules/General/process.h" #include "modules/Diagnostics/Diagnostics.h" +#include "modules/waste/waste_ex.h" #include "PMR/Stubs/StubJobRequest.pb-c.h" #include "PMR/Stubs/StubJobResponse.pb-c.h" diff --git a/Software/PMR/Messages/Common/MessageType.proto b/Software/PMR/Messages/Common/MessageType.proto index 4f2147b02..593dcf547 100644 --- a/Software/PMR/Messages/Common/MessageType.proto +++ b/Software/PMR/Messages/Common/MessageType.proto @@ -123,6 +123,8 @@ enum MessageType StubMainCardEEpromReadResponse = 110; StubMainCardEEpromWriteRequest = 111; StubMainCardEEpromWriteResponse = 112; + StubHeadEEpromRequest = 113; + StubHeadEEpromResponse = 114; //------------------------------------ @@ -198,7 +200,10 @@ enum MessageType StopCartridgesUpdateResponse = 2043; CartridgeValidationRequest = 2044; CartridgeValidationResponse = 2045; - + StartWasteEmptyingRequest = 2046; + StartWasteEmptyingResponse = 2047; + StartInkFillingRequest = 2048; + StartInkFillingResponse = 2049; //Printing JobRequest = 3000; diff --git a/Software/PMR/Messages/Diagnostics/StartInkFillingRequest.proto b/Software/PMR/Messages/Diagnostics/StartInkFillingRequest.proto index ddb174ca4..9e574bf7f 100644 --- a/Software/PMR/Messages/Diagnostics/StartInkFillingRequest.proto +++ b/Software/PMR/Messages/Diagnostics/StartInkFillingRequest.proto @@ -4,6 +4,6 @@ syntax = "proto3"; package Tango.PMR.Diagnostics; option java_package = "com.twine.tango.pmr.diagnostics"; -message InkFillingRequest +message StartInkFillingRequest { } \ No newline at end of file diff --git a/Software/PMR/Messages/Diagnostics/StartInkFillingResponse.proto b/Software/PMR/Messages/Diagnostics/StartInkFillingResponse.proto index 877d82036..735275bdd 100644 --- a/Software/PMR/Messages/Diagnostics/StartInkFillingResponse.proto +++ b/Software/PMR/Messages/Diagnostics/StartInkFillingResponse.proto @@ -6,7 +6,7 @@ import "FillingAction.proto"; package Tango.PMR.Diagnostics; option java_package = "com.twine.tango.pmr.diagnostics"; -message FillingActionResponse +message StartInkFillingResponse { Cartridge Cartridge = 1; FillingAction Action = 2; diff --git a/Software/PMR/Messages/Diagnostics/StartWasteEmptyingRequest.proto b/Software/PMR/Messages/Diagnostics/StartWasteEmptyingRequest.proto index 18b366e7c..e33afd08d 100644 --- a/Software/PMR/Messages/Diagnostics/StartWasteEmptyingRequest.proto +++ b/Software/PMR/Messages/Diagnostics/StartWasteEmptyingRequest.proto @@ -3,6 +3,6 @@ syntax = "proto3"; package Tango.PMR.Diagnostics; option java_package = "com.twine.tango.pmr.diagnostics"; -message WasteEmptyingRequest +message StartWasteEmptyingRequest { } \ No newline at end of file diff --git a/Software/PMR/Messages/Diagnostics/StartWasteEmptyingResponse.proto b/Software/PMR/Messages/Diagnostics/StartWasteEmptyingResponse.proto index 877d82036..caa7b0a4f 100644 --- a/Software/PMR/Messages/Diagnostics/StartWasteEmptyingResponse.proto +++ b/Software/PMR/Messages/Diagnostics/StartWasteEmptyingResponse.proto @@ -6,7 +6,7 @@ import "FillingAction.proto"; package Tango.PMR.Diagnostics; option java_package = "com.twine.tango.pmr.diagnostics"; -message FillingActionResponse +message StartWasteEmptyingResponse { Cartridge Cartridge = 1; FillingAction Action = 2; -- cgit v1.3.1 From b981f0a430bc1ddf7bc93e3649ca0a9078c924e3 Mon Sep 17 00:00:00 2001 From: Shlomo Hecht Date: Sun, 11 Oct 2020 09:02:47 +0300 Subject: suspend waste_prepare until tested --- Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Software/Embedded_SW') diff --git a/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c b/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c index 235854b7a..e74054a3c 100644 --- a/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c +++ b/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c @@ -212,7 +212,7 @@ static ReturnCode PrepareState(void *JobDetails) } if (Configured[Module_Waste]) { - PrepareWaiting[Module_Waste] = ModuleWaiting; + // PrepareWaiting[Module_Waste] = ModuleWaiting; } if (Configured[Module_Winder]) { @@ -246,8 +246,8 @@ static ReturnCode PrepareState(void *JobDetails) SendJobProgress(0.0, 0, false, "Winder prepare failed !!!!"); } } - if (Configured[Module_Waste]) - Waste_Prepare(); + //if (Configured[Module_Waste]) + // Waste_Prepare(); return retcode; } -- cgit v1.3.1 From 680282cefdf9c1eb39b9e80ca94bffc0cd6b5c45 Mon Sep 17 00:00:00 2001 From: Ronen Sberlo Date: Sun, 11 Oct 2020 12:38:19 +0300 Subject: blower max temp controler tunnel pt100 fix --- .../Embedded/Modules/Heaters/Heaters_print.c | 23 +++++----------------- 1 file changed, 5 insertions(+), 18 deletions(-) (limited to 'Software/Embedded_SW') diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c index 1568e51c5..2b26c32c5 100644 --- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c +++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c @@ -1142,7 +1142,7 @@ uint32_t HeaterBlowerMaxTempCBFunction(uint32_t IfIndex, uint32_t readValue) } } - if ((BlowerPt100Read >= HeaterControl[index].sensormaxvalue) || (BlowerPt100Read > 25500)) + if (BlowerPt100Read > 25500) { if(OverHeatCounter[index]++ >= Overheat_Count_Limit) { @@ -1186,25 +1186,11 @@ uint32_t HeaterBlowerMaxTempCBFunction(uint32_t IfIndex, uint32_t readValue) //ReportWithPackageFilter(HeatersFilter,(MinreadValue/100), "Heater Over the max temperature, turned off"); return OK; } - if (BlowerPt100Read <= (HeaterControl[index].sensormaxvalue-HeaterControl[index].sensorminvalue)) //was MinreadValue + if (BlowerPt100Read <= 25000) //was MinreadValue { - if (HeaterControl[index].sensorminvalue > 0) - { - if (HeaterMaxTempFlag[index] == true) - { - /* ActivateHeater(HEATER_TYPE__DryerMainHeater); - if (HeaterReady[HEATER_TYPE__DryerAirHeater]==false) - { - ActivateHeater(HEATER_TYPE__DryerSecondaryHeater); - }*/ - //ReportWithPackageFilter(HeatersFilter, "Heater Cooled Off max temperature, turned on",__FILE__,__LINE__,(MinreadValue/100),RpError, 0,0); - } - HeaterMaxTempFlag[index] = false; - } + HeaterMaxTempFlag[index] = false; return OK; } - - return ERROR; } uint32_t DcHeaterMaxTempCBFunction(uint32_t IfIndex, uint32_t readValue) @@ -1605,7 +1591,8 @@ uint32_t DCHeaterControlCBFunction(uint32_t IfIndex, uint32_t readValue) } if (readValue < ((HeaterCmd[index].targettemperatue * (100-HeaterControl[index].outputproportionalband))/100)) { - ActivateHeater(index); + if (HeaterMaxTempFlag[index] == false) + ActivateHeater(index); //HeaterRecalculateHeaterParams(index, 100); //Heaters OFF until coming into the proportional band //ReportWithPackageFilter(HeatersFilter,"DC HEATER Under temperature ", __FILE__,__LINE__,index, RpMessage, readValue, 0); -- cgit v1.3.1 From 93af278a3cdcace222539930e2dfb063a1bebedb Mon Sep 17 00:00:00 2001 From: Ronen Sberlo Date: Sun, 11 Oct 2020 15:02:55 +0300 Subject: blower max temp --- Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Software/Embedded_SW') diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c index 2b26c32c5..534d35efa 100644 --- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c +++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c @@ -1186,7 +1186,7 @@ uint32_t HeaterBlowerMaxTempCBFunction(uint32_t IfIndex, uint32_t readValue) //ReportWithPackageFilter(HeatersFilter,(MinreadValue/100), "Heater Over the max temperature, turned off"); return OK; } - if (BlowerPt100Read <= 25000) //was MinreadValue + if (BlowerPt100Read <= 25300) //was MinreadValue { HeaterMaxTempFlag[index] = false; return OK; -- cgit v1.3.1 From 7cbd39a81c78dd0483d3c62318af90948077896e Mon Sep 17 00:00:00 2001 From: Shlomo Hecht Date: Sun, 11 Oct 2020 15:41:25 +0300 Subject: release notes updated --- Software/Embedded_SW/Embedded/Common/report/reportInit.c | 8 ++++++++ Software/Embedded_SW/Embedded/Drivers/Valves/Valve.c | 7 ++++--- .../Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c | 2 ++ Software/Embedded_SW/Embedded/Software Release Notes.txt | 14 ++++++++++++++ 4 files changed, 28 insertions(+), 3 deletions(-) (limited to 'Software/Embedded_SW') diff --git a/Software/Embedded_SW/Embedded/Common/report/reportInit.c b/Software/Embedded_SW/Embedded/Common/report/reportInit.c index d466432b1..82c8b8099 100644 --- a/Software/Embedded_SW/Embedded/Common/report/reportInit.c +++ b/Software/Embedded_SW/Embedded/Common/report/reportInit.c @@ -64,6 +64,10 @@ PackageHandle FPGAFilter; PackageHandle LoadFilter; PackageHandle InitFilter; PackageHandle MaintFilter; +PackageHandle IFSFilter; +PackageHandle FilesFilter; +PackageHandle I2CFilter; +PackageHandle MotorFilter; char LogPath[50] = "0://ErrFile.txt"; @@ -498,6 +502,10 @@ STATUS ReportInit(ReportInitParams InitParams) LoadFilter = ReportAddFilterPackage("Load"); InitFilter = ReportAddFilterPackage("Init"); MaintFilter = ReportAddFilterPackage("Maint"); + IFSFilter = ReportAddFilterPackage("IFS"); + FilesFilter = ReportAddFilterPackage("Files"); + I2CFilter = ReportAddFilterPackage("I2C"); + MotorFilter = ReportAddFilterPackage("Motor"); // Filter = ReportAddFilterPackage(""); ReportSwitchPackageFilter(IDSFilter,REPORT_OFF); ReportSwitchPackageFilter(WasteFilter,REPORT_OFF); diff --git a/Software/Embedded_SW/Embedded/Drivers/Valves/Valve.c b/Software/Embedded_SW/Embedded/Drivers/Valves/Valve.c index 841a8d1da..80f8280e0 100644 --- a/Software/Embedded_SW/Embedded/Drivers/Valves/Valve.c +++ b/Software/Embedded_SW/Embedded/Drivers/Valves/Valve.c @@ -111,7 +111,7 @@ bool Validate_Valve(Valves_t Valve_Id) return true; } bool IgnoreMidTank = false; - +#ifdef 0 bool MidTankMitigation = false; int MidTankMitigationOn = 20,MidTankMitigationOff = 10; uint32_t MidtankMitigationControlId[NUM_OF_VALVES] = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF}; @@ -150,7 +150,7 @@ uint32_t ValveCallback(uint32_t deviceID, uint32_t ReadValue) } return OK; } - +#endif void Valve_Command(Valves_t Valve_Id) //1 - OPEN, 0 - CLOSE { if (Validate_Valve(Valve_Id) == false) @@ -422,6 +422,7 @@ void Valve_Set(Valves_t Valve_Id, bool Direction) Report("Mid Tank Valve command ignored - bypass",__FILE__,__LINE__,(int)Valve_Id,RpWarning,Direction,0); return; } +#ifdef 0 if (MidTankMitigation == true) { Report("Mid Tank Valve command mitigation",__FILE__,Valve_Id,(int)Valve_Id,RpWarning,Direction,0); @@ -440,7 +441,7 @@ void Valve_Set(Valves_t Valve_Id, bool Direction) } } } - +#endif ValveRequest[Valve_Id].Direction = Direction; Valve_Command( Valve_Id); #endif diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c index a81cfff52..ed5f5e560 100644 --- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c +++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c @@ -1241,6 +1241,7 @@ void Stub_ProgressRequest(MessageContainer* requestContainer) response.progress = request->delay; response.has_progress = true; } +#ifdef 0 else if(request->amount == 0xC12) { @@ -1268,6 +1269,7 @@ void Stub_ProgressRequest(MessageContainer* requestContainer) response.progress = request->delay; response.has_progress = true; } +#endif else if((request->amount == 0xDF) && (request->delay == 0xDF)) //Power off { diff --git a/Software/Embedded_SW/Embedded/Software Release Notes.txt b/Software/Embedded_SW/Embedded/Software Release Notes.txt index 8a41d40de..88acb776c 100644 --- a/Software/Embedded_SW/Embedded/Software Release Notes.txt +++ b/Software/Embedded_SW/Embedded/Software Release Notes.txt @@ -1,5 +1,19 @@ Embedded SW Release note - Version 1.5.0.1 - Pack 3 ============================================================= +ARC head: Identification, Initialization, Configuration, Heaters, Blowers, temperature and air flow control, cleaning, Alarm handling +RFID: readers connection, Initialization, Configuration, tags Identfication, reading, writing, system handling in Waste and Ink modules, PPC interface, Alarm handling +Logs - log file while report is disconnected. additional filters. +Machine status - cartridges state. improved machine temperature +Keepalive handling MCU==>PPC +Winder calibration moves to MCU +4 winders option +VOC sensor - Initialization, Configuration, Alarm handling +*New* improved drier arm reset (thread loading) +Shinko reading +Waste module job prepare - air flow of WHS, Arc head tunnel. read WHS flow sensor 2 +Working with open valves when not in a job + + Embedded SW Release note - Version 1.4.6.44 - Pack Mid alpha ============================================================= IDS - running dispensers up at prepare stage - improved -- cgit v1.3.1 From 6e01dab40eef661b1bb7066ba40272c76ab54f78 Mon Sep 17 00:00:00 2001 From: Ronen Sberlo Date: Sun, 11 Oct 2020 16:53:00 +0300 Subject: HeaterBlowerMaxTempCBFunction --- .../Embedded/Modules/Heaters/Heaters_print.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'Software/Embedded_SW') diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c index 534d35efa..194ae7bc8 100644 --- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c +++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c @@ -1185,13 +1185,20 @@ uint32_t HeaterBlowerMaxTempCBFunction(uint32_t IfIndex, uint32_t readValue) HeaterMaxTempFlag[index] = true; //ReportWithPackageFilter(HeatersFilter,(MinreadValue/100), "Heater Over the max temperature, turned off"); return OK; - } - if (BlowerPt100Read <= 25300) //was MinreadValue - { - HeaterMaxTempFlag[index] = false; + } else { + if (OverHeatCounter[index]) + { + if (BlowerPt100Read <= 25300) + { + OverHeatCounter[index]--; + if (OverHeatCounter[index]==0) + { + HeaterMaxTempFlag[index] = false; + } + } + } return OK; } - return ERROR; } uint32_t DcHeaterMaxTempCBFunction(uint32_t IfIndex, uint32_t readValue) { -- cgit v1.3.1 From 848b9edfa4db5daaf385e3fcd46fbfb4f44c39b4 Mon Sep 17 00:00:00 2001 From: Shlomo Hecht Date: Mon, 12 Oct 2020 10:01:24 +0300 Subject: prepare working with open valves --- Software/Embedded_SW/Embedded/DataDef.h | 2 +- .../Modules/Diagnostics/DiagnosticsHoming.c | 8 +++ .../Embedded_SW/Embedded/Modules/IDS/IDS_maint.c | 12 ++++ .../Embedded_SW/Embedded/Modules/IDS/IDS_print.c | 66 +++++++++++++--------- Software/Embedded_SW/Embedded/Modules/IFS/ifs.c | 3 +- .../Embedded/Software Release Notes.txt | 2 +- 6 files changed, 64 insertions(+), 29 deletions(-) (limited to 'Software/Embedded_SW') diff --git a/Software/Embedded_SW/Embedded/DataDef.h b/Software/Embedded_SW/Embedded/DataDef.h index dcf0ad217..99798cf3b 100644 --- a/Software/Embedded_SW/Embedded/DataDef.h +++ b/Software/Embedded_SW/Embedded/DataDef.h @@ -31,7 +31,7 @@ //#define EMC_FORCE_MOT_CLOCK_INTERNAL //#define VAC_TEST - +//#define DISPENSER_VALVES_OPEN //#define USE_TUNNEL_PT100 //#define SPECIAL_DISPENSERS diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c index 71343c78f..091df1a3f 100644 --- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c +++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c @@ -578,6 +578,13 @@ uint32_t Diagnostics_Dryer_MovetoEncoderPosition_Callback(uint32_t MotorId, uint { MessageContainer responseContainer; MotorHomingResponse response = MOTOR_HOMING_RESPONSE__INIT; + ReportWithPackageFilter(DiagnosticsFilter,"Diagnostics_Dryer_MovetoEncoderPosition_Callback time",__FILE__,__LINE__,msec_millisecondCounter,RpMessage,0,0); + if (HomingControlId[MotorId] != 0xff) + { + ReportWithPackageFilter(DiagnosticsFilter,"MotorHomingProgressReport stopped",__FILE__,__LINE__,MotorId,RpMessage,HomingCounter[MotorId],0); + RemoveControlCallback(HomingControlId[MotorId],MotorHomingProgressReport); + HomingControlId[MotorId] = 0xff; + } ReportWithPackageFilter(DiagnosticsFilter,"Store angle of arm drier - ended",__FILE__,__LINE__,(int)(Calculate_Arm_Angle(Drier_Center_read,ReadValue)*360),RpMessage,D_numberOfCycles,0); //ReportWithPackageFilter(DiagnosticsFilter,"Diagnostics_Dryer_MovetoEncoderPosition_Callback",__FILE__,__LINE__,0,RpMessage,CallbackCounter,0); @@ -624,6 +631,7 @@ uint32_t Diagnostics_Dryer_Loading_Callback(uint32_t MotorId, uint32_t ReadValue ReportWithPackageFilter(DiagnosticsFilter,"Loading drier - halted",__FILE__,__LINE__,D_numberOfCycles,RpMessage,LoadArmRounds,0); ReportWithPackageFilter(DiagnosticsFilter,"Store angle of arm drier - halted",__FILE__,__LINE__,(int)(Calculate_Arm_Angle(Drier_Center_read,ReadValue)*360),RpMessage,D_numberOfCycles,0); MotorSetMaxSpeed (HARDWARE_MOTOR_TYPE__MOTO_DRYER_LOADARM, 200); + Diagnostics_Dryer_MovetoEncoderPosition_Callback(HARDWARE_MOTOR_TYPE__MOTO_DRYER_LOADARM,0); } return OK; } diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_maint.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_maint.c index c55f10277..991f4ecc0 100644 --- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_maint.c +++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_maint.c @@ -217,6 +217,10 @@ uint32_t IDS_HomeDispenserCallback(uint32_t motorId, uint32_t ReadValue) HomingActive[DispenserId]= false; PrimingActive[DispenserId]= false; Control_TCA9534ByPass(DispenserId,DISABLE);// use ENABLE or DISABLE +#ifdef DISPENSER_VALVES_OPEN + if (JobIsActive()==false) + Control3WayValvesWithCallback (DispenserId, Dispenser_Mixer, NULL); //direction: MidTank_Dispenser or Dispenser_Mixer +#endif //close dry air valve in the dispenser Valve_Set(IDS_Id_to_AirValve[DispenserId], Atm_MidTank_OFF); @@ -336,6 +340,10 @@ uint32_t IDS_StopHomeDispenser (uint32_t DispenserId) HomingActive[DispenserId] = false; PrimingActive[DispenserId] = false; Control_TCA9534ByPass(DispenserId,DISABLE);// use ENABLE or DISABLE +#ifdef DISPENSER_VALVES_OPEN + if (JobIsActive()==false) + Control3WayValvesWithCallback (DispenserId, Dispenser_Mixer, NULL); //direction: MidTank_Dispenser or Dispenser_Mixer +#endif if (Extended_Motor_Param[MotorId] == true) Power_Step_01_Dispenser_Mode(DispenserId,Voltage); //MotorSetMicroStep(MotorId, KeepMicrostep[DispenserId]); @@ -564,7 +572,11 @@ void IDS_Dispenser_Init(uint8_t DispenserId) HomingActive[DispenserId]= false; PrimingActive[DispenserId]= false; Valve_Set(IDS_Id_to_AirValve[DispenserId], Atm_MidTank_OFF); +#ifdef DISPENSER_VALVES_OPEN + Control3WayValvesWithCallback (DispenserId, Dispenser_Mixer, NULL); //direction: MidTank_Dispenser or Dispenser_Mixer +#else Control3WayValvesWithCallback ((Valves_t)DispenserId, MidTank_Dispenser, NULL); //direction: MidTank_Dispenser or Dispenser_Mixer +#endif //if (Special_Dispensers == true) { if (ControlIdtoInactiveDispenserId[DispenserId] == 0xFF) diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c index b52f8b908..2ad8db9d6 100644 --- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c +++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c @@ -142,7 +142,7 @@ void IDS_Dispenser_SetPreSegmentWFCFValues(double dispenserpresegmentwfcf, doubl uint32_t IDS_DispenserPidRequestMessage(HardwarePidControl* request) { - int Dispenser_i,i; + /*int Dispenser_i,i; //int temp; for (i=0;i Date: Mon, 12 Oct 2020 13:04:15 +0300 Subject: merge fix --- .../Embedded/Modules/Heaters/Heaters_print.c | 89 +++++++++++++++------- 1 file changed, 61 insertions(+), 28 deletions(-) (limited to 'Software/Embedded_SW') diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c index 194ae7bc8..8e78d7e7f 100644 --- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c +++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c @@ -107,6 +107,7 @@ HeaterCommand HeaterCmd[HEATER_TYPE_MAX_HEATERS]; uint32_t ControlIdtoHeaterId [HEATER_TYPE_MAX_HEATERS] = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF}; uint32_t ControlIdtoMaxHeaterId [HEATER_TYPE_MAX_HEATERS] = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF}; uint32_t OverHeatCounter [HEATER_TYPE_MAX_HEATERS] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; +uint32_t BlowerOverHeatCounter[HEATER_TYPE_MAX_HEATERS] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; uint32_t UnderHeatCounter [HEATER_TYPE_MAX_HEATERS] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; uint32_t MainDryerHeaterMaxTempControl = 0xFF; uint32_t SecondDryerHeaterMaxTempControl = 0xFF; @@ -1110,6 +1111,7 @@ uint32_t HeaterMaxTempCBFunction(uint32_t IfIndex, uint32_t readValue) } return ERROR; } + uint32_t HeaterBlowerMaxTempCBFunction(uint32_t IfIndex, uint32_t readValue) { uint32_t BlowerPt100Read = 0; @@ -1144,32 +1146,17 @@ uint32_t HeaterBlowerMaxTempCBFunction(uint32_t IfIndex, uint32_t readValue) if (BlowerPt100Read > 25500) { - if(OverHeatCounter[index]++ >= Overheat_Count_Limit) + if(BlowerOverHeatCounter[index]++ >= Overheat_Count_Limit) { - OverHeatCounter[index] = Overheat_Count_Limit; - //?????HeaterReady[index] = false; - if (JobIsActive()&&(HeaterReady[index]==true)) + BlowerOverHeatCounter[index] = Overheat_Count_Limit; + + if ((HeaterReady[index]==false)&&(HeaterPreviousRead[index]>HeaterCmd[index].targettemperatue)) { - JobEndReason = JOB_TEMPERATURE_ALARM; - SendJobProgress(0.0,0,false, "Temperature Error"); - AbortJob("Over Temperature Error"); - //SegmentReady(Module_Heaters,ModuleFail); - ReportWithPackageFilter(HeatersFilter, "Temperature Error",__FILE__,__LINE__,index,RpError, 0,0); - return OK; + ReportWithPackageFilter(HeatersFilter,"DC Heater Over the max temperature, cooling off",__FILE__,index,HeaterPreviousRead[index],RpWarning, HeaterCmd[index].targettemperatue,0); } - //if (getIdleState() == false) - //not idle, not cooling to temp + else { - if ((HeaterReady[index]==false)&&(HeaterPreviousRead[index]>HeaterCmd[index].targettemperatue)) - { - ReportWithPackageFilter(HeatersFilter,"DC Heater Over the max temperature, cooling off",__FILE__,index,HeaterPreviousRead[index],RpWarning, HeaterCmd[index].targettemperatue,0); - } - else - { - ReportWithPackageFilter(HeatersFilter,"DC Heater Over the max temperature, turned off",__FILE__,index,HeaterPreviousRead[index],RpWarning, HeaterReady[index],0); - ReportWithPackageFilter(HeatersFilter,"Heater over the max temperature",__FILE__,index,OverHeatCounter[index],RpWarning,HeaterControl[index].sensormaxvalue, 0); - AlarmHandlingSetAlarm(HeaterEventType[index], true); - } + ReportWithPackageFilter(HeatersFilter,"DC Heater Over the max temperature, turned off",__FILE__,index,HeaterPreviousRead[index],RpWarning, HeaterReady[index],0); } } if (index == HEATER_TYPE__HeadCoverHeater1) @@ -1183,15 +1170,14 @@ uint32_t HeaterBlowerMaxTempCBFunction(uint32_t IfIndex, uint32_t readValue) HeaterRecalculateHeaterParams(HEATER_TYPE__HeadCoverHeater2,0); } HeaterMaxTempFlag[index] = true; - //ReportWithPackageFilter(HeatersFilter,(MinreadValue/100), "Heater Over the max temperature, turned off"); return OK; } else { - if (OverHeatCounter[index]) + if (BlowerOverHeatCounter[index]) { if (BlowerPt100Read <= 25300) { - OverHeatCounter[index]--; - if (OverHeatCounter[index]==0) + BlowerOverHeatCounter[index]--; + if (BlowerOverHeatCounter[index]==0) { HeaterMaxTempFlag[index] = false; } @@ -1200,10 +1186,10 @@ uint32_t HeaterBlowerMaxTempCBFunction(uint32_t IfIndex, uint32_t readValue) return OK; } } + uint32_t DcHeaterMaxTempCBFunction(uint32_t IfIndex, uint32_t readValue) { int index=HEATER_TYPE_MAX_HEATERS; - if (IfIndex>>8 != IfTypeHeaters) { ReportWithPackageFilter(HeatersFilter, "Wrong Interface type",__FILE__,__LINE__,IfIndex,RpError, 0,0); @@ -1213,7 +1199,53 @@ uint32_t DcHeaterMaxTempCBFunction(uint32_t IfIndex, uint32_t readValue) //int32_t readValue = MillisecGetTemperatures(HeaterId2PT100Id[index]); if (HeaterControl[index].sensormaxvalue == 0) return OK; - if ((HeaterPreviousRead[index]) < (HeaterControl[index].sensorminvalue)) + if ((HeaterPreviousRead[index]) >= HeaterControl[index].sensormaxvalue) + { + if(OverHeatCounter[index]++ >=Overheat_Count_Limit) + { + OverHeatCounter[index] = Overheat_Count_Limit; + //?????HeaterReady[index] = false; + if (JobIsActive()&&(HeaterReady[index]==true)) + { + JobEndReason = JOB_TEMPERATURE_ALARM; + SendJobProgress(0.0,0,false, "Temperature Error"); + AbortJob("Over Temperature Error"); + //SegmentReady(Module_Heaters,ModuleFail); + ReportWithPackageFilter(HeatersFilter, "Temperature Error",__FILE__,__LINE__,index,RpError, 0,0); + return OK; + } + //if (getIdleState() == false) + //not idle, not cooling to temp + { + if ((HeaterReady[index]==false)&&(HeaterPreviousRead[index]>HeaterCmd[index].targettemperatue)) + { + ReportWithPackageFilter(HeatersFilter,"DC Heater Over the max temperature, cooling off",__FILE__,index,HeaterPreviousRead[index],RpWarning, HeaterCmd[index].targettemperatue,0); + } + else + { + ReportWithPackageFilter(HeatersFilter,"DC Heater Over the max temperature, turned off",__FILE__,index,HeaterPreviousRead[index],RpWarning, HeaterReady[index],0); + ReportWithPackageFilter(HeatersFilter,"Heater over the max temperature",__FILE__,index,OverHeatCounter[index],RpWarning,HeaterControl[index].sensormaxvalue, 0); + AlarmHandlingSetAlarm(HeaterEventType[index], true); + } + } + } + if (index == HEATER_TYPE__DryerAirHeater) + { + DeActivateHeater(HEATER_TYPE__DryerMainHeater); + HeaterRecalculateSharedHeatersParams(HEATER_TYPE__DryerMainHeater,0); + DeActivateHeater(HEATER_TYPE__DryerSecondaryHeater); + HeaterRecalculateSharedHeatersParams(HEATER_TYPE__DryerSecondaryHeater,0); + } + else + { + DeActivateHeater(index); + HeaterRecalculateHeaterParams(index, 0); + } + HeaterMaxTempFlag[index] = true; + //ReportWithPackageFilter(HeatersFilter,(MinreadValue/100), "Heater Over the max temperature, turned off"); + return OK; + } + else if ((HeaterPreviousRead[index]) < (HeaterControl[index].sensorminvalue)) { if (HeaterReady[index]==true) { @@ -1268,6 +1300,7 @@ uint32_t DcHeaterMaxTempCBFunction(uint32_t IfIndex, uint32_t readValue) } return ERROR; } + bool IncreaseBlower = false; uint32_t HeaterControlCBFunction(uint32_t IfIndex, uint32_t readValue) { -- cgit v1.3.1 From 123d1d766d137bedea32608f013b3fd498fd77d8 Mon Sep 17 00:00:00 2001 From: Shlomo Hecht Date: Mon, 12 Oct 2020 15:15:32 +0300 Subject: Initial application of cartridge state protobuf --- .../Embedded_SW/Embedded/Communication/Container.c | 13 +- .../Communication/PMR/Common/MessageType.pb-c.c | 192 ++++++++++----------- .../Communication/PMR/Common/MessageType.pb-c.h | 12 +- .../PMR/Diagnostics/FillingAction.pb-c.c | 45 ----- .../PMR/Diagnostics/FillingAction.pb-c.h | 47 ----- .../StartCartridgesUpdateRequest.pb-c.c | 72 -------- .../StartCartridgesUpdateRequest.pb-c.h | 70 -------- .../StartCartridgesUpdateResponse.pb-c.c | 105 ----------- .../StartCartridgesUpdateResponse.pb-c.h | 75 -------- .../PMR/Diagnostics/StartInkFillingRequest.pb-c.c | 72 -------- .../PMR/Diagnostics/StartInkFillingRequest.pb-c.h | 70 -------- .../PMR/Diagnostics/StartInkFillingResponse.pb-c.c | 131 -------------- .../PMR/Diagnostics/StartInkFillingResponse.pb-c.h | 78 --------- .../Diagnostics/StartWasteEmptyingRequest.pb-c.c | 72 -------- .../Diagnostics/StartWasteEmptyingRequest.pb-c.h | 70 -------- .../Diagnostics/StartWasteEmptyingResponse.pb-c.c | 131 -------------- .../Diagnostics/StartWasteEmptyingResponse.pb-c.h | 78 --------- .../Diagnostics/StopCartridgesUpdateRequest.pb-c.c | 72 -------- .../Diagnostics/StopCartridgesUpdateRequest.pb-c.h | 70 -------- .../StopCartridgesUpdateResponse.pb-c.c | 72 -------- .../StopCartridgesUpdateResponse.pb-c.h | 70 -------- .../Communication/PMR/IFS/CartridgeState.pb-c.c | 55 ++++++ .../Communication/PMR/IFS/CartridgeState.pb-c.h | 52 ++++++ .../Communication/PMR/IFS/CartridgeStatus.pb-c.c | 131 ++++++++++++++ .../Communication/PMR/IFS/CartridgeStatus.pb-c.h | 78 +++++++++ .../Communication/PMR/IFS/InkFillingStatus.pb-c.c | 92 ++++++++++ .../Communication/PMR/IFS/InkFillingStatus.pb-c.h | 73 ++++++++ .../PMR/IFS/StartInkFillingStatusRequest.pb-c.c | 72 ++++++++ .../PMR/IFS/StartInkFillingStatusRequest.pb-c.h | 70 ++++++++ .../PMR/IFS/StartInkFillingStatusResponse.pb-c.c | 92 ++++++++++ .../PMR/IFS/StartInkFillingStatusResponse.pb-c.h | 72 ++++++++ .../PMR/MachineStatus/MachineStatus.pb-c.c | 32 +--- .../PMR/MachineStatus/MachineStatus.pb-c.h | 7 +- .../PMR/MachineStatus/WasteCartridgeState.pb-c.c | 43 ----- .../PMR/MachineStatus/WasteCartridgeState.pb-c.h | 46 ----- .../Communication/PMR/Stubs/ProgressRequest.pb-c.c | 45 +---- .../Communication/PMR/Stubs/ProgressRequest.pb-c.h | 8 +- .../PMR/Stubs/ProgressResponse.pb-c.c | 19 +- .../PMR/Stubs/ProgressResponse.pb-c.h | 4 +- .../Embedded_SW/Embedded/Drivers/Valves/Valve.c | 2 +- .../Embedded/Modules/General/MachineStatus.c | 41 ----- Software/Embedded_SW/Embedded/Modules/IFS/ifs.c | 51 ------ Software/Embedded_SW/Embedded/Modules/IFS/ifs.h | 1 - .../Embedded_SW/Embedded/Modules/Waste/Waste_ex.h | 2 +- .../Embedded/Modules/Waste/Waste_maint.c | 27 +-- .../Messages/Debugging/StartDebugLogResponse.proto | 2 +- .../SideChains/WebRtc.NET/WebRtc.NET.vcxproj | 12 +- 47 files changed, 917 insertions(+), 1829 deletions(-) delete mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/FillingAction.pb-c.c delete mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/FillingAction.pb-c.h delete mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartCartridgesUpdateRequest.pb-c.c delete mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartCartridgesUpdateRequest.pb-c.h delete mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartCartridgesUpdateResponse.pb-c.c delete mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartCartridgesUpdateResponse.pb-c.h delete mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartInkFillingRequest.pb-c.c delete mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartInkFillingRequest.pb-c.h delete mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartInkFillingResponse.pb-c.c delete mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartInkFillingResponse.pb-c.h delete mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartWasteEmptyingRequest.pb-c.c delete mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartWasteEmptyingRequest.pb-c.h delete mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartWasteEmptyingResponse.pb-c.c delete mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartWasteEmptyingResponse.pb-c.h delete mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StopCartridgesUpdateRequest.pb-c.c delete mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StopCartridgesUpdateRequest.pb-c.h delete mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StopCartridgesUpdateResponse.pb-c.c delete mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StopCartridgesUpdateResponse.pb-c.h create mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/IFS/CartridgeState.pb-c.c create mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/IFS/CartridgeState.pb-c.h create mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/IFS/CartridgeStatus.pb-c.c create mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/IFS/CartridgeStatus.pb-c.h create mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/IFS/InkFillingStatus.pb-c.c create mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/IFS/InkFillingStatus.pb-c.h create mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/IFS/StartInkFillingStatusRequest.pb-c.c create mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/IFS/StartInkFillingStatusRequest.pb-c.h create mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/IFS/StartInkFillingStatusResponse.pb-c.c create mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/IFS/StartInkFillingStatusResponse.pb-c.h delete mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/WasteCartridgeState.pb-c.c delete mode 100644 Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/WasteCartridgeState.pb-c.h (limited to 'Software/Embedded_SW') diff --git a/Software/Embedded_SW/Embedded/Communication/Container.c b/Software/Embedded_SW/Embedded/Communication/Container.c index 546f4bb58..aa7807d1b 100644 --- a/Software/Embedded_SW/Embedded/Communication/Container.c +++ b/Software/Embedded_SW/Embedded/Communication/Container.c @@ -461,20 +461,11 @@ void receive_callback(char* buffer, size_t length) case MESSAGE_TYPE__DispenserDataRequest: DispenserDataRequestFunc(requestContainer); break; - case MESSAGE_TYPE__StartCartridgesUpdateRequest: - LOG_ERROR (requestContainer->type,"MESSAGE_TYPE__StartCartridgesUpdateRequest"); - break; - case MESSAGE_TYPE__StopCartridgesUpdateRequest: - LOG_ERROR (requestContainer->type,"MESSAGE_TYPE__StopCartridgesUpdateRequest"); - break; case MESSAGE_TYPE__CartridgeValidationResponse: CartridgeValidationResponseFunc(requestContainer); break; - case MESSAGE_TYPE__StartWasteEmptyingRequest: - StartWasteEmptyingRequestFunc(requestContainer); - break; - case MESSAGE_TYPE__StartInkFillingRequest: - StartInkFillingRequestFunc(requestContainer); + case MESSAGE_TYPE__StartInkFillingStatusRequest: + StartInkFillingStatusRequestFunc(requestContainer); break; case MESSAGE_TYPE__MidTankDataSetupRequest: MidTankDataSetupFunc(requestContainer); diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Common/MessageType.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Common/MessageType.pb-c.c index a59dccb97..fc3d91279 100644 --- a/Software/Embedded_SW/Embedded/Communication/PMR/Common/MessageType.pb-c.c +++ b/Software/Embedded_SW/Embedded/Communication/PMR/Common/MessageType.pb-c.c @@ -7,7 +7,7 @@ #endif #include "MessageType.pb-c.h" -static const ProtobufCEnumValue message_type__enum_values_by_number[269] = +static const ProtobufCEnumValue message_type__enum_values_by_number[263] = { { "", "", 0 }, { "", "", 1 }, @@ -184,16 +184,8 @@ static const ProtobufCEnumValue message_type__enum_values_by_number[269] = { "", "", 2037 }, { "", "", 2038 }, { "", "", 2039 }, - { "", "", 2040 }, - { "", "", 2041 }, - { "", "", 2042 }, - { "", "", 2043 }, { "", "", 2044 }, { "", "", 2045 }, - { "", "", 2046 }, - { "", "", 2047 }, - { "", "", 2048 }, - { "", "", 2049 }, { "", "", 3000 }, { "", "", 3001 }, { "", "", 3002 }, @@ -278,88 +270,90 @@ static const ProtobufCEnumValue message_type__enum_values_by_number[269] = { "", "", 11005 }, { "", "", 11006 }, { "", "", 11007 }, + { "", "", 12000 }, + { "", "", 12001 }, }; static const ProtobufCIntRange message_type__value_ranges[] = { -{0, 0},{3, 2},{1000, 114},{2000, 135},{3000, 185},{4000, 199},{5000, 207},{6000, 211},{7000, 217},{8000, 241},{9000, 249},{10000, 253},{11000, 261},{0, 269} +{0, 0},{3, 2},{1000, 114},{2000, 135},{2044, 175},{3000, 177},{4000, 191},{5000, 199},{6000, 203},{7000, 209},{8000, 233},{9000, 241},{10000, 245},{11000, 253},{12000, 261},{0, 263} }; -static const ProtobufCEnumValueIndex message_type__enum_values_by_name[269] = +static const ProtobufCEnumValueIndex message_type__enum_values_by_name[263] = { - { "", 197 }, - { "", 198 }, - { "", 187 }, - { "", 188 }, - { "", 255 }, - { "", 256 }, - { "", 259 }, - { "", 260 }, - { "", 239 }, - { "", 240 }, - { "", 2 }, - { "", 3 }, + { "", 189 }, + { "", 190 }, { "", 179 }, { "", 180 }, + { "", 247 }, + { "", 248 }, + { "", 251 }, + { "", 252 }, + { "", 231 }, + { "", 232 }, + { "", 2 }, + { "", 3 }, + { "", 175 }, + { "", 176 }, { "", 127 }, { "", 128 }, { "", 133 }, { "", 134 }, - { "", 213 }, - { "", 214 }, - { "", 263 }, - { "", 264 }, - { "", 225 }, - { "", 226 }, - { "", 191 }, - { "", 192 }, - { "", 227 }, - { "", 228 }, + { "", 205 }, + { "", 206 }, + { "", 255 }, + { "", 256 }, + { "", 217 }, + { "", 218 }, + { "", 183 }, + { "", 184 }, + { "", 219 }, + { "", 220 }, { "", 119 }, { "", 120 }, - { "", 215 }, - { "", 216 }, + { "", 207 }, + { "", 208 }, { "", 145 }, { "", 146 }, { "", 151 }, { "", 152 }, - { "", 241 }, - { "", 242 }, + { "", 233 }, + { "", 234 }, { "", 147 }, { "", 148 }, { "", 149 }, { "", 150 }, { "", 1 }, - { "", 221 }, - { "", 222 }, + { "", 213 }, + { "", 214 }, { "", 115 }, { "", 116 }, { "", 117 }, { "", 118 }, { "", 114 }, - { "", 235 }, - { "", 236 }, - { "", 219 }, - { "", 220 }, - { "", 233 }, - { "", 234 }, - { "", 217 }, - { "", 218 }, - { "", 131 }, - { "", 132 }, - { "", 231 }, - { "", 232 }, - { "", 229 }, - { "", 230 }, - { "", 185 }, - { "", 186 }, + { "", 227 }, + { "", 228 }, { "", 211 }, { "", 212 }, + { "", 225 }, + { "", 226 }, + { "", 209 }, + { "", 210 }, + { "", 131 }, + { "", 132 }, { "", 223 }, { "", 224 }, - { "", 245 }, - { "", 246 }, - { "", 247 }, - { "", 248 }, - { "", 243 }, - { "", 244 }, + { "", 221 }, + { "", 222 }, + { "", 177 }, + { "", 178 }, + { "", 203 }, + { "", 204 }, + { "", 215 }, + { "", 216 }, + { "", 237 }, + { "", 238 }, + { "", 239 }, + { "", 240 }, + { "", 235 }, + { "", 236 }, { "", 137 }, { "", 138 }, { "", 143 }, @@ -375,60 +369,54 @@ static const ProtobufCEnumValueIndex message_type__enum_values_by_name[269] = { "", 5 }, { "", 161 }, { "", 162 }, - { "", 193 }, - { "", 194 }, + { "", 185 }, + { "", 186 }, { "", 171 }, { "", 172 }, { "", 159 }, { "", 160 }, - { "", 203 }, - { "", 204 }, + { "", 195 }, + { "", 196 }, { "", 153 }, { "", 154 }, { "", 169 }, { "", 170 }, { "", 173 }, { "", 174 }, - { "", 205 }, - { "", 206 }, + { "", 197 }, + { "", 198 }, { "", 123 }, { "", 124 }, - { "", 175 }, - { "", 176 }, - { "", 199 }, - { "", 200 }, + { "", 191 }, + { "", 192 }, { "", 135 }, { "", 136 }, { "", 165 }, { "", 166 }, - { "", 195 }, - { "", 196 }, - { "", 183 }, - { "", 184 }, + { "", 187 }, + { "", 188 }, + { "", 261 }, + { "", 262 }, + { "", 241 }, + { "", 242 }, + { "", 245 }, + { "", 246 }, { "", 249 }, { "", 250 }, { "", 253 }, { "", 254 }, - { "", 257 }, - { "", 258 }, - { "", 261 }, - { "", 262 }, - { "", 181 }, - { "", 182 }, { "", 125 }, { "", 126 }, - { "", 177 }, - { "", 178 }, - { "", 201 }, - { "", 202 }, + { "", 193 }, + { "", 194 }, { "", 163 }, { "", 164 }, { "", 167 }, { "", 168 }, - { "", 251 }, - { "", 252 }, - { "", 265 }, - { "", 266 }, + { "", 243 }, + { "", 244 }, + { "", 257 }, + { "", 258 }, { "", 100 }, { "", 101 }, { "", 6 }, @@ -537,22 +525,22 @@ static const ProtobufCEnumValueIndex message_type__enum_values_by_name[269] = { "", 31 }, { "", 106 }, { "", 107 }, - { "", 209 }, - { "", 210 }, + { "", 201 }, + { "", 202 }, { "", 157 }, { "", 158 }, { "", 155 }, { "", 156 }, - { "", 267 }, - { "", 268 }, + { "", 259 }, + { "", 260 }, { "", 129 }, { "", 130 }, - { "", 207 }, - { "", 208 }, - { "", 189 }, - { "", 190 }, - { "", 237 }, - { "", 238 }, + { "", 199 }, + { "", 200 }, + { "", 181 }, + { "", 182 }, + { "", 229 }, + { "", 230 }, }; const ProtobufCEnumDescriptor message_type__descriptor = { @@ -561,11 +549,11 @@ const ProtobufCEnumDescriptor message_type__descriptor = "", "", "", - 269, + 263, message_type__enum_values_by_number, - 269, + 263, message_type__enum_values_by_name, - 13, + 15, message_type__value_ranges, NULL,NULL,NULL,NULL /* reserved[1234] */ }; diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Common/MessageType.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Common/MessageType.pb-c.h index 6df8fa5f9..a9dd51ca9 100644 --- a/Software/Embedded_SW/Embedded/Communication/PMR/Common/MessageType.pb-c.h +++ b/Software/Embedded_SW/Embedded/Communication/PMR/Common/MessageType.pb-c.h @@ -195,16 +195,8 @@ typedef enum _MessageType { MESSAGE_TYPE__SetBlowerStateResponse = 2037, MESSAGE_TYPE__SetValveStateRequest = 2038, MESSAGE_TYPE__SetValveStateResponse = 2039, - MESSAGE_TYPE__StartCartridgesUpdateRequest = 2040, - MESSAGE_TYPE__StartCartridgesUpdateResponse = 2041, - MESSAGE_TYPE__StopCartridgesUpdateRequest = 2042, - MESSAGE_TYPE__StopCartridgesUpdateResponse = 2043, MESSAGE_TYPE__CartridgeValidationRequest = 2044, MESSAGE_TYPE__CartridgeValidationResponse = 2045, - MESSAGE_TYPE__StartWasteEmptyingRequest = 2046, - MESSAGE_TYPE__StartWasteEmptyingResponse = 2047, - MESSAGE_TYPE__StartInkFillingRequest = 2048, - MESSAGE_TYPE__StartInkFillingResponse = 2049, MESSAGE_TYPE__JobRequest = 3000, MESSAGE_TYPE__JobResponse = 3001, MESSAGE_TYPE__AbortJobRequest = 3002, @@ -288,7 +280,9 @@ typedef enum _MessageType { MESSAGE_TYPE__StopThreadLoadingRequest = 11004, MESSAGE_TYPE__StopThreadLoadingResponse = 11005, MESSAGE_TYPE__TryThreadLoadingRequest = 11006, - MESSAGE_TYPE__TryThreadLoadingResponse = 11007 + MESSAGE_TYPE__TryThreadLoadingResponse = 11007, + MESSAGE_TYPE__StartInkFillingStatusRequest = 12000, + MESSAGE_TYPE__StartInkFillingStatusResponse = 12001 PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(MESSAGE_TYPE) } MessageType; diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/FillingAction.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/FillingAction.pb-c.c deleted file mode 100644 index 686c3c58f..000000000 --- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/FillingAction.pb-c.c +++ /dev/null @@ -1,45 +0,0 @@ -/* Generated by the protocol buffer compiler. DO NOT EDIT! */ -/* Generated from: FillingAction.proto */ - -/* Do not generate deprecated warnings for self */ -#ifndef PROTOBUF_C__NO_DEPRECATED -#define PROTOBUF_C__NO_DEPRECATED -#endif - -#include "FillingAction.pb-c.h" -static const ProtobufCEnumValue filling_action__enum_values_by_number[6] = -{ - { "", "", 0 }, - { "", "", 1 }, - { "", "", 2 }, - { "", "", 3 }, - { "", "", 4 }, - { "", "", 5 }, -}; -static const ProtobufCIntRange filling_action__value_ranges[] = { -{0, 0},{0, 6} -}; -static const ProtobufCEnumValueIndex filling_action__enum_values_by_name[6] = -{ - { "", 5 }, - { "", 3 }, - { "", 4 }, - { "", 2 }, - { "", 1 }, - { "", 0 }, -}; -const ProtobufCEnumDescriptor filling_action__descriptor = -{ - PROTOBUF_C__ENUM_DESCRIPTOR_MAGIC, - "", - "", - "", - "", - 6, - filling_action__enum_values_by_number, - 6, - filling_action__enum_values_by_name, - 1, - filling_action__value_ranges, - NULL,NULL,NULL,NULL /* reserved[1234] */ -}; diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/FillingAction.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/FillingAction.pb-c.h deleted file mode 100644 index e48f99397..000000000 --- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/FillingAction.pb-c.h +++ /dev/null @@ -1,47 +0,0 @@ -/* Generated by the protocol buffer compiler. DO NOT EDIT! */ -/* Generated from: FillingAction.proto */ - -#ifndef PROTOBUF_C_FillingAction_2eproto__INCLUDED -#define PROTOBUF_C_FillingAction_2eproto__INCLUDED - -#include - -PROTOBUF_C__BEGIN_DECLS - -#if PROTOBUF_C_VERSION_NUMBER < 1003000 -# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers. -#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION -# error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c. -#endif - - - - -/* --- enums --- */ - -typedef enum _FillingAction { - FILLING_ACTION__None = 0, - FILLING_ACTION__Inserted = 1, - FILLING_ACTION__Filling = 2, - FILLING_ACTION__End = 3, - FILLING_ACTION__Error = 4, - FILLING_ACTION__Ejected = 5 - PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(FILLING_ACTION) -} FillingAction; - -/* --- messages --- */ - -/* --- per-message closures --- */ - - -/* --- services --- */ - - -/* --- descriptors --- */ - -extern const ProtobufCEnumDescriptor filling_action__descriptor; - -PROTOBUF_C__END_DECLS - - -#endif /* PROTOBUF_C_FillingAction_2eproto__INCLUDED */ diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartCartridgesUpdateRequest.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartCartridgesUpdateRequest.pb-c.c deleted file mode 100644 index f6b0cfdee..000000000 --- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartCartridgesUpdateRequest.pb-c.c +++ /dev/null @@ -1,72 +0,0 @@ -/* Generated by the protocol buffer compiler. DO NOT EDIT! */ -/* Generated from: StartCartridgesUpdateRequest.proto */ - -/* Do not generate deprecated warnings for self */ -#ifndef PROTOBUF_C__NO_DEPRECATED -#define PROTOBUF_C__NO_DEPRECATED -#endif - -#include "StartCartridgesUpdateRequest.pb-c.h" -void start_cartridges_update_request__init - (StartCartridgesUpdateRequest *message) -{ - static const StartCartridgesUpdateRequest init_value = START_CARTRIDGES_UPDATE_REQUEST__INIT; - *message = init_value; -} -size_t start_cartridges_update_request__get_packed_size - (const StartCartridgesUpdateRequest *message) -{ - assert(message->base.descriptor == &start_cartridges_update_request__descriptor); - return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message)); -} -size_t start_cartridges_update_request__pack - (const StartCartridgesUpdateRequest *message, - uint8_t *out) -{ - assert(message->base.descriptor == &start_cartridges_update_request__descriptor); - return protobuf_c_message_pack ((const ProtobufCMessage*)message, out); -} -size_t start_cartridges_update_request__pack_to_buffer - (const StartCartridgesUpdateRequest *message, - ProtobufCBuffer *buffer) -{ - assert(message->base.descriptor == &start_cartridges_update_request__descriptor); - return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer); -} -StartCartridgesUpdateRequest * - start_cartridges_update_request__unpack - (ProtobufCAllocator *allocator, - size_t len, - const uint8_t *data) -{ - return (StartCartridgesUpdateRequest *) - protobuf_c_message_unpack (&start_cartridges_update_request__descriptor, - allocator, len, data); -} -void start_cartridges_update_request__free_unpacked - (StartCartridgesUpdateRequest *message, - ProtobufCAllocator *allocator) -{ - if(!message) - return; - assert(message->base.descriptor == &start_cartridges_update_request__descriptor); - protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator); -} -#define start_cartridges_update_request__field_descriptors NULL -#define start_cartridges_update_request__field_indices_by_name NULL -#define start_cartridges_update_request__number_ranges NULL -const ProtobufCMessageDescriptor start_cartridges_update_request__descriptor = -{ - PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC, - "", - "", - "", - "", - sizeof(StartCartridgesUpdateRequest), - 0, - start_cartridges_update_request__field_descriptors, - start_cartridges_update_request__field_indices_by_name, - 0, start_cartridges_update_request__number_ranges, - (ProtobufCMessageInit) start_cartridges_update_request__init, - NULL,NULL,NULL /* reserved[123] */ -}; diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartCartridgesUpdateRequest.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartCartridgesUpdateRequest.pb-c.h deleted file mode 100644 index f8f2dcf3b..000000000 --- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartCartridgesUpdateRequest.pb-c.h +++ /dev/null @@ -1,70 +0,0 @@ -/* Generated by the protocol buffer compiler. DO NOT EDIT! */ -/* Generated from: StartCartridgesUpdateRequest.proto */ - -#ifndef PROTOBUF_C_StartCartridgesUpdateRequest_2eproto__INCLUDED -#define PROTOBUF_C_StartCartridgesUpdateRequest_2eproto__INCLUDED - -#include - -PROTOBUF_C__BEGIN_DECLS - -#if PROTOBUF_C_VERSION_NUMBER < 1003000 -# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers. -#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION -# error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c. -#endif - - -typedef struct _StartCartridgesUpdateRequest StartCartridgesUpdateRequest; - - -/* --- enums --- */ - - -/* --- messages --- */ - -struct _StartCartridgesUpdateRequest -{ - ProtobufCMessage base; -}; -#define START_CARTRIDGES_UPDATE_REQUEST__INIT \ - { PROTOBUF_C_MESSAGE_INIT (&start_cartridges_update_request__descriptor) \ - } - - -/* StartCartridgesUpdateRequest methods */ -void start_cartridges_update_request__init - (StartCartridgesUpdateRequest *message); -size_t start_cartridges_update_request__get_packed_size - (const StartCartridgesUpdateRequest *message); -size_t start_cartridges_update_request__pack - (const StartCartridgesUpdateRequest *message, - uint8_t *out); -size_t start_cartridges_update_request__pack_to_buffer - (const StartCartridgesUpdateRequest *message, - ProtobufCBuffer *buffer); -StartCartridgesUpdateRequest * - start_cartridges_update_request__unpack - (ProtobufCAllocator *allocator, - size_t len, - const uint8_t *data); -void start_cartridges_update_request__free_unpacked - (StartCartridgesUpdateRequest *message, - ProtobufCAllocator *allocator); -/* --- per-message closures --- */ - -typedef void (*StartCartridgesUpdateRequest_Closure) - (const StartCartridgesUpdateRequest *message, - void *closure_data); - -/* --- services --- */ - - -/* --- descriptors --- */ - -extern const ProtobufCMessageDescriptor start_cartridges_update_request__descriptor; - -PROTOBUF_C__END_DECLS - - -#endif /* PROTOBUF_C_StartCartridgesUpdateRequest_2eproto__INCLUDED */ diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartCartridgesUpdateResponse.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartCartridgesUpdateResponse.pb-c.c deleted file mode 100644 index 0aa54e7ab..000000000 --- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartCartridgesUpdateResponse.pb-c.c +++ /dev/null @@ -1,105 +0,0 @@ -/* Generated by the protocol buffer compiler. DO NOT EDIT! */ -/* Generated from: StartCartridgesUpdateResponse.proto */ - -/* Do not generate deprecated warnings for self */ -#ifndef PROTOBUF_C__NO_DEPRECATED -#define PROTOBUF_C__NO_DEPRECATED -#endif - -#include "StartCartridgesUpdateResponse.pb-c.h" -void start_cartridges_update_response__init - (StartCartridgesUpdateResponse *message) -{ - static const StartCartridgesUpdateResponse init_value = START_CARTRIDGES_UPDATE_RESPONSE__INIT; - *message = init_value; -} -size_t start_cartridges_update_response__get_packed_size - (const StartCartridgesUpdateResponse *message) -{ - assert(message->base.descriptor == &start_cartridges_update_response__descriptor); - return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message)); -} -size_t start_cartridges_update_response__pack - (const StartCartridgesUpdateResponse *message, - uint8_t *out) -{ - assert(message->base.descriptor == &start_cartridges_update_response__descriptor); - return protobuf_c_message_pack ((const ProtobufCMessage*)message, out); -} -size_t start_cartridges_update_response__pack_to_buffer - (const StartCartridgesUpdateResponse *message, - ProtobufCBuffer *buffer) -{ - assert(message->base.descriptor == &start_cartridges_update_response__descriptor); - return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer); -} -StartCartridgesUpdateResponse * - start_cartridges_update_response__unpack - (ProtobufCAllocator *allocator, - size_t len, - const uint8_t *data) -{ - return (StartCartridgesUpdateResponse *) - protobuf_c_message_unpack (&start_cartridges_update_response__descriptor, - allocator, len, data); -} -void start_cartridges_update_response__free_unpacked - (StartCartridgesUpdateResponse *message, - ProtobufCAllocator *allocator) -{ - if(!message) - return; - assert(message->base.descriptor == &start_cartridges_update_response__descriptor); - protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator); -} -static const ProtobufCFieldDescriptor start_cartridges_update_response__field_descriptors[2] = -{ - { - "", - 1, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_MESSAGE, - 0, /* quantifier_offset */ - offsetof(StartCartridgesUpdateResponse, cartridge), - &cartridge__descriptor, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 2, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_ENUM, - offsetof(StartCartridgesUpdateResponse, has_action), - offsetof(StartCartridgesUpdateResponse, action), - &cartridge_action__descriptor, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, -}; -static const unsigned start_cartridges_update_response__field_indices_by_name[] = { - 1, /* field[1] = Action */ - 0, /* field[0] = Cartridge */ -}; -static const ProtobufCIntRange start_cartridges_update_response__number_ranges[1 + 1] = -{ - { 1, 0 }, - { 0, 2 } -}; -const ProtobufCMessageDescriptor start_cartridges_update_response__descriptor = -{ - PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC, - "", - "", - "", - "", - sizeof(StartCartridgesUpdateResponse), - 2, - start_cartridges_update_response__field_descriptors, - start_cartridges_update_response__field_indices_by_name, - 1, start_cartridges_update_response__number_ranges, - (ProtobufCMessageInit) start_cartridges_update_response__init, - NULL,NULL,NULL /* reserved[123] */ -}; diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartCartridgesUpdateResponse.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartCartridgesUpdateResponse.pb-c.h deleted file mode 100644 index 409c8ff3f..000000000 --- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartCartridgesUpdateResponse.pb-c.h +++ /dev/null @@ -1,75 +0,0 @@ -/* Generated by the protocol buffer compiler. DO NOT EDIT! */ -/* Generated from: StartCartridgesUpdateResponse.proto */ - -#ifndef PROTOBUF_C_StartCartridgesUpdateResponse_2eproto__INCLUDED -#define PROTOBUF_C_StartCartridgesUpdateResponse_2eproto__INCLUDED - -#include - -PROTOBUF_C__BEGIN_DECLS - -#if PROTOBUF_C_VERSION_NUMBER < 1003000 -# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers. -#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION -# error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c. -#endif - -#include "Cartridge.pb-c.h" -#include "CartridgeAction.pb-c.h" - -typedef struct _StartCartridgesUpdateResponse StartCartridgesUpdateResponse; - - -/* --- enums --- */ - - -/* --- messages --- */ - -struct _StartCartridgesUpdateResponse -{ - ProtobufCMessage base; - Cartridge *cartridge; - protobuf_c_boolean has_action; - CartridgeAction action; -}; -#define START_CARTRIDGES_UPDATE_RESPONSE__INIT \ - { PROTOBUF_C_MESSAGE_INIT (&start_cartridges_update_response__descriptor) \ - , NULL, 0, CARTRIDGE_ACTION__Inserted } - - -/* StartCartridgesUpdateResponse methods */ -void start_cartridges_update_response__init - (StartCartridgesUpdateResponse *message); -size_t start_cartridges_update_response__get_packed_size - (const StartCartridgesUpdateResponse *message); -size_t start_cartridges_update_response__pack - (const StartCartridgesUpdateResponse *message, - uint8_t *out); -size_t start_cartridges_update_response__pack_to_buffer - (const StartCartridgesUpdateResponse *message, - ProtobufCBuffer *buffer); -StartCartridgesUpdateResponse * - start_cartridges_update_response__unpack - (ProtobufCAllocator *allocator, - size_t len, - const uint8_t *data); -void start_cartridges_update_response__free_unpacked - (StartCartridgesUpdateResponse *message, - ProtobufCAllocator *allocator); -/* --- per-message closures --- */ - -typedef void (*StartCartridgesUpdateResponse_Closure) - (const StartCartridgesUpdateResponse *message, - void *closure_data); - -/* --- services --- */ - - -/* --- descriptors --- */ - -extern const ProtobufCMessageDescriptor start_cartridges_update_response__descriptor; - -PROTOBUF_C__END_DECLS - - -#endif /* PROTOBUF_C_StartCartridgesUpdateResponse_2eproto__INCLUDED */ diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartInkFillingRequest.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartInkFillingRequest.pb-c.c deleted file mode 100644 index b56884185..000000000 --- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartInkFillingRequest.pb-c.c +++ /dev/null @@ -1,72 +0,0 @@ -/* Generated by the protocol buffer compiler. DO NOT EDIT! */ -/* Generated from: StartInkFillingRequest.proto */ - -/* Do not generate deprecated warnings for self */ -#ifndef PROTOBUF_C__NO_DEPRECATED -#define PROTOBUF_C__NO_DEPRECATED -#endif - -#include "StartInkFillingRequest.pb-c.h" -void start_ink_filling_request__init - (StartInkFillingRequest *message) -{ - static const StartInkFillingRequest init_value = START_INK_FILLING_REQUEST__INIT; - *message = init_value; -} -size_t start_ink_filling_request__get_packed_size - (const StartInkFillingRequest *message) -{ - assert(message->base.descriptor == &start_ink_filling_request__descriptor); - return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message)); -} -size_t start_ink_filling_request__pack - (const StartInkFillingRequest *message, - uint8_t *out) -{ - assert(message->base.descriptor == &start_ink_filling_request__descriptor); - return protobuf_c_message_pack ((const ProtobufCMessage*)message, out); -} -size_t start_ink_filling_request__pack_to_buffer - (const StartInkFillingRequest *message, - ProtobufCBuffer *buffer) -{ - assert(message->base.descriptor == &start_ink_filling_request__descriptor); - return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer); -} -StartInkFillingRequest * - start_ink_filling_request__unpack - (ProtobufCAllocator *allocator, - size_t len, - const uint8_t *data) -{ - return (StartInkFillingRequest *) - protobuf_c_message_unpack (&start_ink_filling_request__descriptor, - allocator, len, data); -} -void start_ink_filling_request__free_unpacked - (StartInkFillingRequest *message, - ProtobufCAllocator *allocator) -{ - if(!message) - return; - assert(message->base.descriptor == &start_ink_filling_request__descriptor); - protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator); -} -#define start_ink_filling_request__field_descriptors NULL -#define start_ink_filling_request__field_indices_by_name NULL -#define start_ink_filling_request__number_ranges NULL -const ProtobufCMessageDescriptor start_ink_filling_request__descriptor = -{ - PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC, - "", - "", - "", - "", - sizeof(StartInkFillingRequest), - 0, - start_ink_filling_request__field_descriptors, - start_ink_filling_request__field_indices_by_name, - 0, start_ink_filling_request__number_ranges, - (ProtobufCMessageInit) start_ink_filling_request__init, - NULL,NULL,NULL /* reserved[123] */ -}; diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartInkFillingRequest.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartInkFillingRequest.pb-c.h deleted file mode 100644 index bda7b4229..000000000 --- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartInkFillingRequest.pb-c.h +++ /dev/null @@ -1,70 +0,0 @@ -/* Generated by the protocol buffer compiler. DO NOT EDIT! */ -/* Generated from: StartInkFillingRequest.proto */ - -#ifndef PROTOBUF_C_StartInkFillingRequest_2eproto__INCLUDED -#define PROTOBUF_C_StartInkFillingRequest_2eproto__INCLUDED - -#include - -PROTOBUF_C__BEGIN_DECLS - -#if PROTOBUF_C_VERSION_NUMBER < 1003000 -# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers. -#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION -# error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c. -#endif - - -typedef struct _StartInkFillingRequest StartInkFillingRequest; - - -/* --- enums --- */ - - -/* --- messages --- */ - -struct _StartInkFillingRequest -{ - ProtobufCMessage base; -}; -#define START_INK_FILLING_REQUEST__INIT \ - { PROTOBUF_C_MESSAGE_INIT (&start_ink_filling_request__descriptor) \ - } - - -/* StartInkFillingRequest methods */ -void start_ink_filling_request__init - (StartInkFillingRequest *message); -size_t start_ink_filling_request__get_packed_size - (const StartInkFillingRequest *message); -size_t start_ink_filling_request__pack - (const StartInkFillingRequest *message, - uint8_t *out); -size_t start_ink_filling_request__pack_to_buffer - (const StartInkFillingRequest *message, - ProtobufCBuffer *buffer); -StartInkFillingRequest * - start_ink_filling_request__unpack - (ProtobufCAllocator *allocator, - size_t len, - const uint8_t *data); -void start_ink_filling_request__free_unpacked - (StartInkFillingRequest *message, - ProtobufCAllocator *allocator); -/* --- per-message closures --- */ - -typedef void (*StartInkFillingRequest_Closure) - (const StartInkFillingRequest *message, - void *closure_data); - -/* --- services --- */ - - -/* --- descriptors --- */ - -extern const ProtobufCMessageDescriptor start_ink_filling_request__descriptor; - -PROTOBUF_C__END_DECLS - - -#endif /* PROTOBUF_C_StartInkFillingRequest_2eproto__INCLUDED */ diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartInkFillingResponse.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartInkFillingResponse.pb-c.c deleted file mode 100644 index d68ad33e7..000000000 --- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartInkFillingResponse.pb-c.c +++ /dev/null @@ -1,131 +0,0 @@ -/* Generated by the protocol buffer compiler. DO NOT EDIT! */ -/* Generated from: StartInkFillingResponse.proto */ - -/* Do not generate deprecated warnings for self */ -#ifndef PROTOBUF_C__NO_DEPRECATED -#define PROTOBUF_C__NO_DEPRECATED -#endif - -#include "StartInkFillingResponse.pb-c.h" -void start_ink_filling_response__init - (StartInkFillingResponse *message) -{ - static const StartInkFillingResponse init_value = START_INK_FILLING_RESPONSE__INIT; - *message = init_value; -} -size_t start_ink_filling_response__get_packed_size - (const StartInkFillingResponse *message) -{ - assert(message->base.descriptor == &start_ink_filling_response__descriptor); - return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message)); -} -size_t start_ink_filling_response__pack - (const StartInkFillingResponse *message, - uint8_t *out) -{ - assert(message->base.descriptor == &start_ink_filling_response__descriptor); - return protobuf_c_message_pack ((const ProtobufCMessage*)message, out); -} -size_t start_ink_filling_response__pack_to_buffer - (const StartInkFillingResponse *message, - ProtobufCBuffer *buffer) -{ - assert(message->base.descriptor == &start_ink_filling_response__descriptor); - return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer); -} -StartInkFillingResponse * - start_ink_filling_response__unpack - (ProtobufCAllocator *allocator, - size_t len, - const uint8_t *data) -{ - return (StartInkFillingResponse *) - protobuf_c_message_unpack (&start_ink_filling_response__descriptor, - allocator, len, data); -} -void start_ink_filling_response__free_unpacked - (StartInkFillingResponse *message, - ProtobufCAllocator *allocator) -{ - if(!message) - return; - assert(message->base.descriptor == &start_ink_filling_response__descriptor); - protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator); -} -static const ProtobufCFieldDescriptor start_ink_filling_response__field_descriptors[4] = -{ - { - "", - 1, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_MESSAGE, - 0, /* quantifier_offset */ - offsetof(StartInkFillingResponse, cartridge), - &cartridge__descriptor, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 2, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_ENUM, - offsetof(StartInkFillingResponse, has_action), - offsetof(StartInkFillingResponse, action), - &filling_action__descriptor, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 3, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_DOUBLE, - offsetof(StartInkFillingResponse, has_progresspercentage), - offsetof(StartInkFillingResponse, progresspercentage), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 4, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_STRING, - 0, /* quantifier_offset */ - offsetof(StartInkFillingResponse, message), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, -}; -static const unsigned start_ink_filling_response__field_indices_by_name[] = { - 1, /* field[1] = Action */ - 0, /* field[0] = Cartridge */ - 3, /* field[3] = Message */ - 2, /* field[2] = ProgressPercentage */ -}; -static const ProtobufCIntRange start_ink_filling_response__number_ranges[1 + 1] = -{ - { 1, 0 }, - { 0, 4 } -}; -const ProtobufCMessageDescriptor start_ink_filling_response__descriptor = -{ - PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC, - "", - "", - "", - "", - sizeof(StartInkFillingResponse), - 4, - start_ink_filling_response__field_descriptors, - start_ink_filling_response__field_indices_by_name, - 1, start_ink_filling_response__number_ranges, - (ProtobufCMessageInit) start_ink_filling_response__init, - NULL,NULL,NULL /* reserved[123] */ -}; diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartInkFillingResponse.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartInkFillingResponse.pb-c.h deleted file mode 100644 index 5c1c7ddb2..000000000 --- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartInkFillingResponse.pb-c.h +++ /dev/null @@ -1,78 +0,0 @@ -/* Generated by the protocol buffer compiler. DO NOT EDIT! */ -/* Generated from: StartInkFillingResponse.proto */ - -#ifndef PROTOBUF_C_StartInkFillingResponse_2eproto__INCLUDED -#define PROTOBUF_C_StartInkFillingResponse_2eproto__INCLUDED - -#include - -PROTOBUF_C__BEGIN_DECLS - -#if PROTOBUF_C_VERSION_NUMBER < 1003000 -# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers. -#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION -# error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c. -#endif - -#include "Cartridge.pb-c.h" -#include "FillingAction.pb-c.h" - -typedef struct _StartInkFillingResponse StartInkFillingResponse; - - -/* --- enums --- */ - - -/* --- messages --- */ - -struct _StartInkFillingResponse -{ - ProtobufCMessage base; - Cartridge *cartridge; - protobuf_c_boolean has_action; - FillingAction action; - protobuf_c_boolean has_progresspercentage; - double progresspercentage; - char *message; -}; -#define START_INK_FILLING_RESPONSE__INIT \ - { PROTOBUF_C_MESSAGE_INIT (&start_ink_filling_response__descriptor) \ - , NULL, 0, FILLING_ACTION__None, 0, 0, NULL } - - -/* StartInkFillingResponse methods */ -void start_ink_filling_response__init - (StartInkFillingResponse *message); -size_t start_ink_filling_response__get_packed_size - (const StartInkFillingResponse *message); -size_t start_ink_filling_response__pack - (const StartInkFillingResponse *message, - uint8_t *out); -size_t start_ink_filling_response__pack_to_buffer - (const StartInkFillingResponse *message, - ProtobufCBuffer *buffer); -StartInkFillingResponse * - start_ink_filling_response__unpack - (ProtobufCAllocator *allocator, - size_t len, - const uint8_t *data); -void start_ink_filling_response__free_unpacked - (StartInkFillingResponse *message, - ProtobufCAllocator *allocator); -/* --- per-message closures --- */ - -typedef void (*StartInkFillingResponse_Closure) - (const StartInkFillingResponse *message, - void *closure_data); - -/* --- services --- */ - - -/* --- descriptors --- */ - -extern const ProtobufCMessageDescriptor start_ink_filling_response__descriptor; - -PROTOBUF_C__END_DECLS - - -#endif /* PROTOBUF_C_StartInkFillingResponse_2eproto__INCLUDED */ diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartWasteEmptyingRequest.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartWasteEmptyingRequest.pb-c.c deleted file mode 100644 index 1b9c856fa..000000000 --- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartWasteEmptyingRequest.pb-c.c +++ /dev/null @@ -1,72 +0,0 @@ -/* Generated by the protocol buffer compiler. DO NOT EDIT! */ -/* Generated from: StartWasteEmptyingRequest.proto */ - -/* Do not generate deprecated warnings for self */ -#ifndef PROTOBUF_C__NO_DEPRECATED -#define PROTOBUF_C__NO_DEPRECATED -#endif - -#include "StartWasteEmptyingRequest.pb-c.h" -void start_waste_emptying_request__init - (StartWasteEmptyingRequest *message) -{ - static const StartWasteEmptyingRequest init_value = START_WASTE_EMPTYING_REQUEST__INIT; - *message = init_value; -} -size_t start_waste_emptying_request__get_packed_size - (const StartWasteEmptyingRequest *message) -{ - assert(message->base.descriptor == &start_waste_emptying_request__descriptor); - return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message)); -} -size_t start_waste_emptying_request__pack - (const StartWasteEmptyingRequest *message, - uint8_t *out) -{ - assert(message->base.descriptor == &start_waste_emptying_request__descriptor); - return protobuf_c_message_pack ((const ProtobufCMessage*)message, out); -} -size_t start_waste_emptying_request__pack_to_buffer - (const StartWasteEmptyingRequest *message, - ProtobufCBuffer *buffer) -{ - assert(message->base.descriptor == &start_waste_emptying_request__descriptor); - return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer); -} -StartWasteEmptyingRequest * - start_waste_emptying_request__unpack - (ProtobufCAllocator *allocator, - size_t len, - const uint8_t *data) -{ - return (StartWasteEmptyingRequest *) - protobuf_c_message_unpack (&start_waste_emptying_request__descriptor, - allocator, len, data); -} -void start_waste_emptying_request__free_unpacked - (StartWasteEmptyingRequest *message, - ProtobufCAllocator *allocator) -{ - if(!message) - return; - assert(message->base.descriptor == &start_waste_emptying_request__descriptor); - protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator); -} -#define start_waste_emptying_request__field_descriptors NULL -#define start_waste_emptying_request__field_indices_by_name NULL -#define start_waste_emptying_request__number_ranges NULL -const ProtobufCMessageDescriptor start_waste_emptying_request__descriptor = -{ - PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC, - "", - "", - "", - "", - sizeof(StartWasteEmptyingRequest), - 0, - start_waste_emptying_request__field_descriptors, - start_waste_emptying_request__field_indices_by_name, - 0, start_waste_emptying_request__number_ranges, - (ProtobufCMessageInit) start_waste_emptying_request__init, - NULL,NULL,NULL /* reserved[123] */ -}; diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartWasteEmptyingRequest.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartWasteEmptyingRequest.pb-c.h deleted file mode 100644 index 44a104321..000000000 --- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartWasteEmptyingRequest.pb-c.h +++ /dev/null @@ -1,70 +0,0 @@ -/* Generated by the protocol buffer compiler. DO NOT EDIT! */ -/* Generated from: StartWasteEmptyingRequest.proto */ - -#ifndef PROTOBUF_C_StartWasteEmptyingRequest_2eproto__INCLUDED -#define PROTOBUF_C_StartWasteEmptyingRequest_2eproto__INCLUDED - -#include - -PROTOBUF_C__BEGIN_DECLS - -#if PROTOBUF_C_VERSION_NUMBER < 1003000 -# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers. -#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION -# error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c. -#endif - - -typedef struct _StartWasteEmptyingRequest StartWasteEmptyingRequest; - - -/* --- enums --- */ - - -/* --- messages --- */ - -struct _StartWasteEmptyingRequest -{ - ProtobufCMessage base; -}; -#define START_WASTE_EMPTYING_REQUEST__INIT \ - { PROTOBUF_C_MESSAGE_INIT (&start_waste_emptying_request__descriptor) \ - } - - -/* StartWasteEmptyingRequest methods */ -void start_waste_emptying_request__init - (StartWasteEmptyingRequest *message); -size_t start_waste_emptying_request__get_packed_size - (const StartWasteEmptyingRequest *message); -size_t start_waste_emptying_request__pack - (const StartWasteEmptyingRequest *message, - uint8_t *out); -size_t start_waste_emptying_request__pack_to_buffer - (const StartWasteEmptyingRequest *message, - ProtobufCBuffer *buffer); -StartWasteEmptyingRequest * - start_waste_emptying_request__unpack - (ProtobufCAllocator *allocator, - size_t len, - const uint8_t *data); -void start_waste_emptying_request__free_unpacked - (StartWasteEmptyingRequest *message, - ProtobufCAllocator *allocator); -/* --- per-message closures --- */ - -typedef void (*StartWasteEmptyingRequest_Closure) - (const StartWasteEmptyingRequest *message, - void *closure_data); - -/* --- services --- */ - - -/* --- descriptors --- */ - -extern const ProtobufCMessageDescriptor start_waste_emptying_request__descriptor; - -PROTOBUF_C__END_DECLS - - -#endif /* PROTOBUF_C_StartWasteEmptyingRequest_2eproto__INCLUDED */ diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartWasteEmptyingResponse.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartWasteEmptyingResponse.pb-c.c deleted file mode 100644 index 55ca27102..000000000 --- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartWasteEmptyingResponse.pb-c.c +++ /dev/null @@ -1,131 +0,0 @@ -/* Generated by the protocol buffer compiler. DO NOT EDIT! */ -/* Generated from: StartWasteEmptyingResponse.proto */ - -/* Do not generate deprecated warnings for self */ -#ifndef PROTOBUF_C__NO_DEPRECATED -#define PROTOBUF_C__NO_DEPRECATED -#endif - -#include "StartWasteEmptyingResponse.pb-c.h" -void start_waste_emptying_response__init - (StartWasteEmptyingResponse *message) -{ - static const StartWasteEmptyingResponse init_value = START_WASTE_EMPTYING_RESPONSE__INIT; - *message = init_value; -} -size_t start_waste_emptying_response__get_packed_size - (const StartWasteEmptyingResponse *message) -{ - assert(message->base.descriptor == &start_waste_emptying_response__descriptor); - return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message)); -} -size_t start_waste_emptying_response__pack - (const StartWasteEmptyingResponse *message, - uint8_t *out) -{ - assert(message->base.descriptor == &start_waste_emptying_response__descriptor); - return protobuf_c_message_pack ((const ProtobufCMessage*)message, out); -} -size_t start_waste_emptying_response__pack_to_buffer - (const StartWasteEmptyingResponse *message, - ProtobufCBuffer *buffer) -{ - assert(message->base.descriptor == &start_waste_emptying_response__descriptor); - return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer); -} -StartWasteEmptyingResponse * - start_waste_emptying_response__unpack - (ProtobufCAllocator *allocator, - size_t len, - const uint8_t *data) -{ - return (StartWasteEmptyingResponse *) - protobuf_c_message_unpack (&start_waste_emptying_response__descriptor, - allocator, len, data); -} -void start_waste_emptying_response__free_unpacked - (StartWasteEmptyingResponse *message, - ProtobufCAllocator *allocator) -{ - if(!message) - return; - assert(message->base.descriptor == &start_waste_emptying_response__descriptor); - protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator); -} -static const ProtobufCFieldDescriptor start_waste_emptying_response__field_descriptors[4] = -{ - { - "", - 1, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_MESSAGE, - 0, /* quantifier_offset */ - offsetof(StartWasteEmptyingResponse, cartridge), - &cartridge__descriptor, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 2, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_ENUM, - offsetof(StartWasteEmptyingResponse, has_action), - offsetof(StartWasteEmptyingResponse, action), - &filling_action__descriptor, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 3, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_DOUBLE, - offsetof(StartWasteEmptyingResponse, has_progresspercentage), - offsetof(StartWasteEmptyingResponse, progresspercentage), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 4, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_STRING, - 0, /* quantifier_offset */ - offsetof(StartWasteEmptyingResponse, message), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, -}; -static const unsigned start_waste_emptying_response__field_indices_by_name[] = { - 1, /* field[1] = Action */ - 0, /* field[0] = Cartridge */ - 3, /* field[3] = Message */ - 2, /* field[2] = ProgressPercentage */ -}; -static const ProtobufCIntRange start_waste_emptying_response__number_ranges[1 + 1] = -{ - { 1, 0 }, - { 0, 4 } -}; -const ProtobufCMessageDescriptor start_waste_emptying_response__descriptor = -{ - PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC, - "", - "", - "", - "", - sizeof(StartWasteEmptyingResponse), - 4, - start_waste_emptying_response__field_descriptors, - start_waste_emptying_response__field_indices_by_name, - 1, start_waste_emptying_response__number_ranges, - (ProtobufCMessageInit) start_waste_emptying_response__init, - NULL,NULL,NULL /* reserved[123] */ -}; diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartWasteEmptyingResponse.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartWasteEmptyingResponse.pb-c.h deleted file mode 100644 index 11254b220..000000000 --- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartWasteEmptyingResponse.pb-c.h +++ /dev/null @@ -1,78 +0,0 @@ -/* Generated by the protocol buffer compiler. DO NOT EDIT! */ -/* Generated from: StartWasteEmptyingResponse.proto */ - -#ifndef PROTOBUF_C_StartWasteEmptyingResponse_2eproto__INCLUDED -#define PROTOBUF_C_StartWasteEmptyingResponse_2eproto__INCLUDED - -#include - -PROTOBUF_C__BEGIN_DECLS - -#if PROTOBUF_C_VERSION_NUMBER < 1003000 -# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers. -#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION -# error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c. -#endif - -#include "Cartridge.pb-c.h" -#include "FillingAction.pb-c.h" - -typedef struct _StartWasteEmptyingResponse StartWasteEmptyingResponse; - - -/* --- enums --- */ - - -/* --- messages --- */ - -struct _StartWasteEmptyingResponse -{ - ProtobufCMessage base; - Cartridge *cartridge; - protobuf_c_boolean has_action; - FillingAction action; - protobuf_c_boolean has_progresspercentage; - double progresspercentage; - char *message; -}; -#define START_WASTE_EMPTYING_RESPONSE__INIT \ - { PROTOBUF_C_MESSAGE_INIT (&start_waste_emptying_response__descriptor) \ - , NULL, 0, FILLING_ACTION__None, 0, 0, NULL } - - -/* StartWasteEmptyingResponse methods */ -void start_waste_emptying_response__init - (StartWasteEmptyingResponse *message); -size_t start_waste_emptying_response__get_packed_size - (const StartWasteEmptyingResponse *message); -size_t start_waste_emptying_response__pack - (const StartWasteEmptyingResponse *message, - uint8_t *out); -size_t start_waste_emptying_response__pack_to_buffer - (const StartWasteEmptyingResponse *message, - ProtobufCBuffer *buffer); -StartWasteEmptyingResponse * - start_waste_emptying_response__unpack - (ProtobufCAllocator *allocator, - size_t len, - const uint8_t *data); -void start_waste_emptying_response__free_unpacked - (StartWasteEmptyingResponse *message, - ProtobufCAllocator *allocator); -/* --- per-message closures --- */ - -typedef void (*StartWasteEmptyingResponse_Closure) - (const StartWasteEmptyingResponse *message, - void *closure_data); - -/* --- services --- */ - - -/* --- descriptors --- */ - -extern const ProtobufCMessageDescriptor start_waste_emptying_response__descriptor; - -PROTOBUF_C__END_DECLS - - -#endif /* PROTOBUF_C_StartWasteEmptyingResponse_2eproto__INCLUDED */ diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StopCartridgesUpdateRequest.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StopCartridgesUpdateRequest.pb-c.c deleted file mode 100644 index 729dd6298..000000000 --- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StopCartridgesUpdateRequest.pb-c.c +++ /dev/null @@ -1,72 +0,0 @@ -/* Generated by the protocol buffer compiler. DO NOT EDIT! */ -/* Generated from: StopCartridgesUpdateRequest.proto */ - -/* Do not generate deprecated warnings for self */ -#ifndef PROTOBUF_C__NO_DEPRECATED -#define PROTOBUF_C__NO_DEPRECATED -#endif - -#include "StopCartridgesUpdateRequest.pb-c.h" -void stop_cartridges_update_request__init - (StopCartridgesUpdateRequest *message) -{ - static const StopCartridgesUpdateRequest init_value = STOP_CARTRIDGES_UPDATE_REQUEST__INIT; - *message = init_value; -} -size_t stop_cartridges_update_request__get_packed_size - (const StopCartridgesUpdateRequest *message) -{ - assert(message->base.descriptor == &stop_cartridges_update_request__descriptor); - return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message)); -} -size_t stop_cartridges_update_request__pack - (const StopCartridgesUpdateRequest *message, - uint8_t *out) -{ - assert(message->base.descriptor == &stop_cartridges_update_request__descriptor); - return protobuf_c_message_pack ((const ProtobufCMessage*)message, out); -} -size_t stop_cartridges_update_request__pack_to_buffer - (const StopCartridgesUpdateRequest *message, - ProtobufCBuffer *buffer) -{ - assert(message->base.descriptor == &stop_cartridges_update_request__descriptor); - return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer); -} -StopCartridgesUpdateRequest * - stop_cartridges_update_request__unpack - (ProtobufCAllocator *allocator, - size_t len, - const uint8_t *data) -{ - return (StopCartridgesUpdateRequest *) - protobuf_c_message_unpack (&stop_cartridges_update_request__descriptor, - allocator, len, data); -} -void stop_cartridges_update_request__free_unpacked - (StopCartridgesUpdateRequest *message, - ProtobufCAllocator *allocator) -{ - if(!message) - return; - assert(message->base.descriptor == &stop_cartridges_update_request__descriptor); - protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator); -} -#define stop_cartridges_update_request__field_descriptors NULL -#define stop_cartridges_update_request__field_indices_by_name NULL -#define stop_cartridges_update_request__number_ranges NULL -const ProtobufCMessageDescriptor stop_cartridges_update_request__descriptor = -{ - PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC, - "", - "", - "", - "", - sizeof(StopCartridgesUpdateRequest), - 0, - stop_cartridges_update_request__field_descriptors, - stop_cartridges_update_request__field_indices_by_name, - 0, stop_cartridges_update_request__number_ranges, - (ProtobufCMessageInit) stop_cartridges_update_request__init, - NULL,NULL,NULL /* reserved[123] */ -}; diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StopCartridgesUpdateRequest.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StopCartridgesUpdateRequest.pb-c.h deleted file mode 100644 index 5a1b486c9..000000000 --- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StopCartridgesUpdateRequest.pb-c.h +++ /dev/null @@ -1,70 +0,0 @@ -/* Generated by the protocol buffer compiler. DO NOT EDIT! */ -/* Generated from: StopCartridgesUpdateRequest.proto */ - -#ifndef PROTOBUF_C_StopCartridgesUpdateRequest_2eproto__INCLUDED -#define PROTOBUF_C_StopCartridgesUpdateRequest_2eproto__INCLUDED - -#include - -PROTOBUF_C__BEGIN_DECLS - -#if PROTOBUF_C_VERSION_NUMBER < 1003000 -# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers. -#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION -# error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c. -#endif - - -typedef struct _StopCartridgesUpdateRequest StopCartridgesUpdateRequest; - - -/* --- enums --- */ - - -/* --- messages --- */ - -struct _StopCartridgesUpdateRequest -{ - ProtobufCMessage base; -}; -#define STOP_CARTRIDGES_UPDATE_REQUEST__INIT \ - { PROTOBUF_C_MESSAGE_INIT (&stop_cartridges_update_request__descriptor) \ - } - - -/* StopCartridgesUpdateRequest methods */ -void stop_cartridges_update_request__init - (StopCartridgesUpdateRequest *message); -size_t stop_cartridges_update_request__get_packed_size - (const StopCartridgesUpdateRequest *message); -size_t stop_cartridges_update_request__pack - (const StopCartridgesUpdateRequest *message, - uint8_t *out); -size_t stop_cartridges_update_request__pack_to_buffer - (const StopCartridgesUpdateRequest *message, - ProtobufCBuffer *buffer); -StopCartridgesUpdateRequest * - stop_cartridges_update_request__unpack - (ProtobufCAllocator *allocator, - size_t len, - const uint8_t *data); -void stop_cartridges_update_request__free_unpacked - (StopCartridgesUpdateRequest *message, - ProtobufCAllocator *allocator); -/* --- per-message closures --- */ - -typedef void (*StopCartridgesUpdateRequest_Closure) - (const StopCartridgesUpdateRequest *message, - void *closure_data); - -/* --- services --- */ - - -/* --- descriptors --- */ - -extern const ProtobufCMessageDescriptor stop_cartridges_update_request__descriptor; - -PROTOBUF_C__END_DECLS - - -#endif /* PROTOBUF_C_StopCartridgesUpdateRequest_2eproto__INCLUDED */ diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StopCartridgesUpdateResponse.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StopCartridgesUpdateResponse.pb-c.c deleted file mode 100644 index fc499aa79..000000000 --- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StopCartridgesUpdateResponse.pb-c.c +++ /dev/null @@ -1,72 +0,0 @@ -/* Generated by the protocol buffer compiler. DO NOT EDIT! */ -/* Generated from: StopCartridgesUpdateResponse.proto */ - -/* Do not generate deprecated warnings for self */ -#ifndef PROTOBUF_C__NO_DEPRECATED -#define PROTOBUF_C__NO_DEPRECATED -#endif - -#include "StopCartridgesUpdateResponse.pb-c.h" -void stop_cartridges_update_response__init - (StopCartridgesUpdateResponse *message) -{ - static const StopCartridgesUpdateResponse init_value = STOP_CARTRIDGES_UPDATE_RESPONSE__INIT; - *message = init_value; -} -size_t stop_cartridges_update_response__get_packed_size - (const StopCartridgesUpdateResponse *message) -{ - assert(message->base.descriptor == &stop_cartridges_update_response__descriptor); - return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message)); -} -size_t stop_cartridges_update_response__pack - (const StopCartridgesUpdateResponse *message, - uint8_t *out) -{ - assert(message->base.descriptor == &stop_cartridges_update_response__descriptor); - return protobuf_c_message_pack ((const ProtobufCMessage*)message, out); -} -size_t stop_cartridges_update_response__pack_to_buffer - (const StopCartridgesUpdateResponse *message, - ProtobufCBuffer *buffer) -{ - assert(message->base.descriptor == &stop_cartridges_update_response__descriptor); - return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer); -} -StopCartridgesUpdateResponse * - stop_cartridges_update_response__unpack - (ProtobufCAllocator *allocator, - size_t len, - const uint8_t *data) -{ - return (StopCartridgesUpdateResponse *) - protobuf_c_message_unpack (&stop_cartridges_update_response__descriptor, - allocator, len, data); -} -void stop_cartridges_update_response__free_unpacked - (StopCartridgesUpdateResponse *message, - ProtobufCAllocator *allocator) -{ - if(!message) - return; - assert(message->base.descriptor == &stop_cartridges_update_response__descriptor); - protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator); -} -#define stop_cartridges_update_response__field_descriptors NULL -#define stop_cartridges_update_response__field_indices_by_name NULL -#define stop_cartridges_update_response__number_ranges NULL -const ProtobufCMessageDescriptor stop_cartridges_update_response__descriptor = -{ - PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC, - "", - "", - "", - "", - sizeof(StopCartridgesUpdateResponse), - 0, - stop_cartridges_update_response__field_descriptors, - stop_cartridges_update_response__field_indices_by_name, - 0, stop_cartridges_update_response__number_ranges, - (ProtobufCMessageInit) stop_cartridges_update_response__init, - NULL,NULL,NULL /* reserved[123] */ -}; diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StopCartridgesUpdateResponse.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StopCartridgesUpdateResponse.pb-c.h deleted file mode 100644 index f173eaa69..000000000 --- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StopCartridgesUpdateResponse.pb-c.h +++ /dev/null @@ -1,70 +0,0 @@ -/* Generated by the protocol buffer compiler. DO NOT EDIT! */ -/* Generated from: StopCartridgesUpdateResponse.proto */ - -#ifndef PROTOBUF_C_StopCartridgesUpdateResponse_2eproto__INCLUDED -#define PROTOBUF_C_StopCartridgesUpdateResponse_2eproto__INCLUDED - -#include - -PROTOBUF_C__BEGIN_DECLS - -#if PROTOBUF_C_VERSION_NUMBER < 1003000 -# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers. -#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION -# error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c. -#endif - - -typedef struct _StopCartridgesUpdateResponse StopCartridgesUpdateResponse; - - -/* --- enums --- */ - - -/* --- messages --- */ - -struct _StopCartridgesUpdateResponse -{ - ProtobufCMessage base; -}; -#define STOP_CARTRIDGES_UPDATE_RESPONSE__INIT \ - { PROTOBUF_C_MESSAGE_INIT (&stop_cartridges_update_response__descriptor) \ - } - - -/* StopCartridgesUpdateResponse methods */ -void stop_cartridges_update_response__init - (StopCartridgesUpdateResponse *message); -size_t stop_cartridges_update_response__get_packed_size - (const StopCartridgesUpdateResponse *message); -size_t stop_cartridges_update_response__pack - (const StopCartridgesUpdateResponse *message, - uint8_t *out); -size_t stop_cartridges_update_response__pack_to_buffer - (const StopCartridgesUpdateResponse *message, - ProtobufCBuffer *buffer); -StopCartridgesUpdateResponse * - stop_cartridges_update_response__unpack - (ProtobufCAllocator *allocator, - size_t len, - const uint8_t *data); -void stop_cartridges_update_response__free_unpacked - (StopCartridgesUpdateResponse *message, - ProtobufCAllocator *allocator); -/* --- per-message closures --- */ - -typedef void (*StopCartridgesUpdateResponse_Closure) - (const StopCartridgesUpdateResponse *message, - void *closure_data); - -/* --- services --- */ - - -/* --- descriptors --- */ - -extern const ProtobufCMessageDescriptor stop_cartridges_update_response__descriptor; - -PROTOBUF_C__END_DECLS - - -#endif /* PROTOBUF_C_StopCartridgesUpdateResponse_2eproto__INCLUDED */ diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/IFS/CartridgeState.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/IFS/CartridgeState.pb-c.c new file mode 100644 index 000000000..3c228ede9 --- /dev/null +++ b/Software/Embedded_SW/Embedded/Communication/PMR/IFS/CartridgeState.pb-c.c @@ -0,0 +1,55 @@ +/* Generated by the protocol buffer compiler. DO NOT EDIT! */ +/* Generated from: CartridgeState.proto */ + +/* Do not generate deprecated warnings for self */ +#ifndef PROTOBUF_C__NO_DEPRECATED +#define PROTOBUF_C__NO_DEPRECATED +#endif + +#include "CartridgeState.pb-c.h" +static const ProtobufCEnumValue cartridge_state__enum_values_by_number[11] = +{ + { "", "", 0 }, + { "", "", 1 }, + { "", "", 2 }, + { "", "", 3 }, + { "", "", 4 }, + { "", "", 5 }, + { "", "", 6 }, + { "", "", 7 }, + { "", "", 8 }, + { "", "", 9 }, + { "", "", 10 }, +}; +static const ProtobufCIntRange cartridge_state__value_ranges[] = { +{0, 0},{0, 11} +}; +static const ProtobufCEnumValueIndex cartridge_state__enum_values_by_name[11] = +{ + { "", 1 }, + { "", 8 }, + { "", 6 }, + { "", 7 }, + { "", 10 }, + { "", 2 }, + { "", 4 }, + { "", 5 }, + { "", 9 }, + { "", 3 }, + { "", 0 }, +}; +const ProtobufCEnumDescriptor cartridge_state__descriptor = +{ + PROTOBUF_C__ENUM_DESCRIPTOR_MAGIC, + "", + "", + "", + "", + 11, + cartridge_state__enum_values_by_number, + 11, + cartridge_state__enum_values_by_name, + 1, + cartridge_state__value_ranges, + NULL,NULL,NULL,NULL /* reserved[1234] */ +}; diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/IFS/CartridgeState.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/IFS/CartridgeState.pb-c.h new file mode 100644 index 000000000..5d3cd4bb5 --- /dev/null +++ b/Software/Embedded_SW/Embedded/Communication/PMR/IFS/CartridgeState.pb-c.h @@ -0,0 +1,52 @@ +/* Generated by the protocol buffer compiler. DO NOT EDIT! */ +/* Generated from: CartridgeState.proto */ + +#ifndef PROTOBUF_C_CartridgeState_2eproto__INCLUDED +#define PROTOBUF_C_CartridgeState_2eproto__INCLUDED + +#include + +PROTOBUF_C__BEGIN_DECLS + +#if PROTOBUF_C_VERSION_NUMBER < 1003000 +# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers. +#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION +# error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c. +#endif + + + + +/* --- enums --- */ + +typedef enum _CartridgeState { + CARTRIDGE_STATE__None = 0, + CARTRIDGE_STATE__Absent = 1, + CARTRIDGE_STATE__Exists = 2, + CARTRIDGE_STATE__Inserted = 3, + CARTRIDGE_STATE__Filling = 4, + CARTRIDGE_STATE__FillingCompleted = 5, + CARTRIDGE_STATE__Emptying = 6, + CARTRIDGE_STATE__EmptyingCompleted = 7, + CARTRIDGE_STATE__Empty = 8, + CARTRIDGE_STATE__Full = 9, + CARTRIDGE_STATE__Error = 10 + PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(CARTRIDGE_STATE) +} CartridgeState; + +/* --- messages --- */ + +/* --- per-message closures --- */ + + +/* --- services --- */ + + +/* --- descriptors --- */ + +extern const ProtobufCEnumDescriptor cartridge_state__descriptor; + +PROTOBUF_C__END_DECLS + + +#endif /* PROTOBUF_C_CartridgeState_2eproto__INCLUDED */ diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/IFS/CartridgeStatus.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/IFS/CartridgeStatus.pb-c.c new file mode 100644 index 000000000..4c4e67fb6 --- /dev/null +++ b/Software/Embedded_SW/Embedded/Communication/PMR/IFS/CartridgeStatus.pb-c.c @@ -0,0 +1,131 @@ +/* Generated by the protocol buffer compiler. DO NOT EDIT! */ +/* Generated from: CartridgeStatus.proto */ + +/* Do not generate deprecated warnings for self */ +#ifndef PROTOBUF_C__NO_DEPRECATED +#define PROTOBUF_C__NO_DEPRECATED +#endif + +#include "CartridgeStatus.pb-c.h" +void cartridge_status__init + (CartridgeStatus *message) +{ + static const CartridgeStatus init_value = CARTRIDGE_STATUS__INIT; + *message = init_value; +} +size_t cartridge_status__get_packed_size + (const CartridgeStatus *message) +{ + assert(message->base.descriptor == &cartridge_status__descriptor); + return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message)); +} +size_t cartridge_status__pack + (const CartridgeStatus *message, + uint8_t *out) +{ + assert(message->base.descriptor == &cartridge_status__descriptor); + return protobuf_c_message_pack ((const ProtobufCMessage*)message, out); +} +size_t cartridge_status__pack_to_buffer + (const CartridgeStatus *message, + ProtobufCBuffer *buffer) +{ + assert(message->base.descriptor == &cartridge_status__descriptor); + return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer); +} +CartridgeStatus * + cartridge_status__unpack + (ProtobufCAllocator *allocator, + size_t len, + const uint8_t *data) +{ + return (CartridgeStatus *) + protobuf_c_message_unpack (&cartridge_status__descriptor, + allocator, len, data); +} +void cartridge_status__free_unpacked + (CartridgeStatus *message, + ProtobufCAllocator *allocator) +{ + if(!message) + return; + assert(message->base.descriptor == &cartridge_status__descriptor); + protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator); +} +static const ProtobufCFieldDescriptor cartridge_status__field_descriptors[4] = +{ + { + "", + 1, + PROTOBUF_C_LABEL_OPTIONAL, + PROTOBUF_C_TYPE_MESSAGE, + 0, /* quantifier_offset */ + offsetof(CartridgeStatus, cartridge), + &cartridge__descriptor, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, + { + "", + 2, + PROTOBUF_C_LABEL_OPTIONAL, + PROTOBUF_C_TYPE_ENUM, + offsetof(CartridgeStatus, has_state), + offsetof(CartridgeStatus, state), + &cartridge_state__descriptor, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, + { + "", + 3, + PROTOBUF_C_LABEL_OPTIONAL, + PROTOBUF_C_TYPE_DOUBLE, + offsetof(CartridgeStatus, has_progresspercentage), + offsetof(CartridgeStatus, progresspercentage), + NULL, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, + { + "", + 4, + PROTOBUF_C_LABEL_OPTIONAL, + PROTOBUF_C_TYPE_STRING, + 0, /* quantifier_offset */ + offsetof(CartridgeStatus, message), + NULL, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, +}; +static const unsigned cartridge_status__field_indices_by_name[] = { + 0, /* field[0] = Cartridge */ + 3, /* field[3] = Message */ + 2, /* field[2] = ProgressPercentage */ + 1, /* field[1] = State */ +}; +static const ProtobufCIntRange cartridge_status__number_ranges[1 + 1] = +{ + { 1, 0 }, + { 0, 4 } +}; +const ProtobufCMessageDescriptor cartridge_status__descriptor = +{ + PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC, + "", + "", + "", + "", + sizeof(CartridgeStatus), + 4, + cartridge_status__field_descriptors, + cartridge_status__field_indices_by_name, + 1, cartridge_status__number_ranges, + (ProtobufCMessageInit) cartridge_status__init, + NULL,NULL,NULL /* reserved[123] */ +}; diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/IFS/CartridgeStatus.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/IFS/CartridgeStatus.pb-c.h new file mode 100644 index 000000000..e3e511e13 --- /dev/null +++ b/Software/Embedded_SW/Embedded/Communication/PMR/IFS/CartridgeStatus.pb-c.h @@ -0,0 +1,78 @@ +/* Generated by the protocol buffer compiler. DO NOT EDIT! */ +/* Generated from: CartridgeStatus.proto */ + +#ifndef PROTOBUF_C_CartridgeStatus_2eproto__INCLUDED +#define PROTOBUF_C_CartridgeStatus_2eproto__INCLUDED + +#include + +PROTOBUF_C__BEGIN_DECLS + +#if PROTOBUF_C_VERSION_NUMBER < 1003000 +# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers. +#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION +# error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c. +#endif + +#include "Cartridge.pb-c.h" +#include "CartridgeState.pb-c.h" + +typedef struct _CartridgeStatus CartridgeStatus; + + +/* --- enums --- */ + + +/* --- messages --- */ + +struct _CartridgeStatus +{ + ProtobufCMessage base; + Cartridge *cartridge; + protobuf_c_boolean has_state; + CartridgeState state; + protobuf_c_boolean has_progresspercentage; + double progresspercentage; + char *message; +}; +#define CARTRIDGE_STATUS__INIT \ + { PROTOBUF_C_MESSAGE_INIT (&cartridge_status__descriptor) \ + , NULL, 0, CARTRIDGE_STATE__None, 0, 0, NULL } + + +/* CartridgeStatus methods */ +void cartridge_status__init + (CartridgeStatus *message); +size_t cartridge_status__get_packed_size + (const CartridgeStatus *message); +size_t cartridge_status__pack + (const CartridgeStatus *message, + uint8_t *out); +size_t cartridge_status__pack_to_buffer + (const CartridgeStatus *message, + ProtobufCBuffer *buffer); +CartridgeStatus * + cartridge_status__unpack + (ProtobufCAllocator *allocator, + size_t len, + const uint8_t *data); +void cartridge_status__free_unpacked + (CartridgeStatus *message, + ProtobufCAllocator *allocator); +/* --- per-message closures --- */ + +typedef void (*CartridgeStatus_Closure) + (const CartridgeStatus *message, + void *closure_data); + +/* --- services --- */ + + +/* --- descriptors --- */ + +extern const ProtobufCMessageDescriptor cartridge_status__descriptor; + +PROTOBUF_C__END_DECLS + + +#endif /* PROTOBUF_C_CartridgeStatus_2eproto__INCLUDED */ diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/IFS/InkFillingStatus.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/IFS/InkFillingStatus.pb-c.c new file mode 100644 index 000000000..0054a4146 --- /dev/null +++ b/Software/Embedded_SW/Embedded/Communication/PMR/IFS/InkFillingStatus.pb-c.c @@ -0,0 +1,92 @@ +/* Generated by the protocol buffer compiler. DO NOT EDIT! */ +/* Generated from: InkFillingStatus.proto */ + +/* Do not generate deprecated warnings for self */ +#ifndef PROTOBUF_C__NO_DEPRECATED +#define PROTOBUF_C__NO_DEPRECATED +#endif + +#include "InkFillingStatus.pb-c.h" +void ink_filling_status__init + (InkFillingStatus *message) +{ + static const InkFillingStatus init_value = INK_FILLING_STATUS__INIT; + *message = init_value; +} +size_t ink_filling_status__get_packed_size + (const InkFillingStatus *message) +{ + assert(message->base.descriptor == &ink_filling_status__descriptor); + return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message)); +} +size_t ink_filling_status__pack + (const InkFillingStatus *message, + uint8_t *out) +{ + assert(message->base.descriptor == &ink_filling_status__descriptor); + return protobuf_c_message_pack ((const ProtobufCMessage*)message, out); +} +size_t ink_filling_status__pack_to_buffer + (const InkFillingStatus *message, + ProtobufCBuffer *buffer) +{ + assert(message->base.descriptor == &ink_filling_status__descriptor); + return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer); +} +InkFillingStatus * + ink_filling_status__unpack + (ProtobufCAllocator *allocator, + size_t len, + const uint8_t *data) +{ + return (InkFillingStatus *) + protobuf_c_message_unpack (&ink_filling_status__descriptor, + allocator, len, data); +} +void ink_filling_status__free_unpacked + (InkFillingStatus *message, + ProtobufCAllocator *allocator) +{ + if(!message) + return; + assert(message->base.descriptor == &ink_filling_status__descriptor); + protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator); +} +static const ProtobufCFieldDescriptor ink_filling_status__field_descriptors[1] = +{ + { + "", + 1, + PROTOBUF_C_LABEL_REPEATED, + PROTOBUF_C_TYPE_MESSAGE, + offsetof(InkFillingStatus, n_cartridgesstatuses), + offsetof(InkFillingStatus, cartridgesstatuses), + &cartridge_status__descriptor, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, +}; +static const unsigned ink_filling_status__field_indices_by_name[] = { + 0, /* field[0] = CartridgesStatuses */ +}; +static const ProtobufCIntRange ink_filling_status__number_ranges[1 + 1] = +{ + { 1, 0 }, + { 0, 1 } +}; +const ProtobufCMessageDescriptor ink_filling_status__descriptor = +{ + PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC, + "", + "", + "", + "", + sizeof(InkFillingStatus), + 1, + ink_filling_status__field_descriptors, + ink_filling_status__field_indices_by_name, + 1, ink_filling_status__number_ranges, + (ProtobufCMessageInit) ink_filling_status__init, + NULL,NULL,NULL /* reserved[123] */ +}; diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/IFS/InkFillingStatus.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/IFS/InkFillingStatus.pb-c.h new file mode 100644 index 000000000..61e9317a5 --- /dev/null +++ b/Software/Embedded_SW/Embedded/Communication/PMR/IFS/InkFillingStatus.pb-c.h @@ -0,0 +1,73 @@ +/* Generated by the protocol buffer compiler. DO NOT EDIT! */ +/* Generated from: InkFillingStatus.proto */ + +#ifndef PROTOBUF_C_InkFillingStatus_2eproto__INCLUDED +#define PROTOBUF_C_InkFillingStatus_2eproto__INCLUDED + +#include + +PROTOBUF_C__BEGIN_DECLS + +#if PROTOBUF_C_VERSION_NUMBER < 1003000 +# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers. +#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION +# error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c. +#endif + +#include "CartridgeStatus.pb-c.h" + +typedef struct _InkFillingStatus InkFillingStatus; + + +/* --- enums --- */ + + +/* --- messages --- */ + +struct _InkFillingStatus +{ + ProtobufCMessage base; + size_t n_cartridgesstatuses; + CartridgeStatus **cartridgesstatuses; +}; +#define INK_FILLING_STATUS__INIT \ + { PROTOBUF_C_MESSAGE_INIT (&ink_filling_status__descriptor) \ + , 0,NULL } + + +/* InkFillingStatus methods */ +void ink_filling_status__init + (InkFillingStatus *message); +size_t ink_filling_status__get_packed_size + (const InkFillingStatus *message); +size_t ink_filling_status__pack + (const InkFillingStatus *message, + uint8_t *out); +size_t ink_filling_status__pack_to_buffer + (const InkFillingStatus *message, + ProtobufCBuffer *buffer); +InkFillingStatus * + ink_filling_status__unpack + (ProtobufCAllocator *allocator, + size_t len, + const uint8_t *data); +void ink_filling_status__free_unpacked + (InkFillingStatus *message, + ProtobufCAllocator *allocator); +/* --- per-message closures --- */ + +typedef void (*InkFillingStatus_Closure) + (const InkFillingStatus *message, + void *closure_data); + +/* --- services --- */ + + +/* --- descriptors --- */ + +extern const ProtobufCMessageDescriptor ink_filling_status__descriptor; + +PROTOBUF_C__END_DECLS + + +#endif /* PROTOBUF_C_InkFillingStatus_2eproto__INCLUDED */ diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/IFS/StartInkFillingStatusRequest.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/IFS/StartInkFillingStatusRequest.pb-c.c new file mode 100644 index 000000000..f0d651073 --- /dev/null +++ b/Software/Embedded_SW/Embedded/Communication/PMR/IFS/StartInkFillingStatusRequest.pb-c.c @@ -0,0 +1,72 @@ +/* Generated by the protocol buffer compiler. DO NOT EDIT! */ +/* Generated from: StartInkFillingStatusRequest.proto */ + +/* Do not generate deprecated warnings for self */ +#ifndef PROTOBUF_C__NO_DEPRECATED +#define PROTOBUF_C__NO_DEPRECATED +#endif + +#include "StartInkFillingStatusRequest.pb-c.h" +void start_ink_filling_status_request__init + (StartInkFillingStatusRequest *message) +{ + static const StartInkFillingStatusRequest init_value = START_INK_FILLING_STATUS_REQUEST__INIT; + *message = init_value; +} +size_t start_ink_filling_status_request__get_packed_size + (const StartInkFillingStatusRequest *message) +{ + assert(message->base.descriptor == &start_ink_filling_status_request__descriptor); + return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message)); +} +size_t start_ink_filling_status_request__pack + (const StartInkFillingStatusRequest *message, + uint8_t *out) +{ + assert(message->base.descriptor == &start_ink_filling_status_request__descriptor); + return protobuf_c_message_pack ((const ProtobufCMessage*)message, out); +} +size_t start_ink_filling_status_request__pack_to_buffer + (const StartInkFillingStatusRequest *message, + ProtobufCBuffer *buffer) +{ + assert(message->base.descriptor == &start_ink_filling_status_request__descriptor); + return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer); +} +StartInkFillingStatusRequest * + start_ink_filling_status_request__unpack + (ProtobufCAllocator *allocator, + size_t len, + const uint8_t *data) +{ + return (StartInkFillingStatusRequest *) + protobuf_c_message_unpack (&start_ink_filling_status_request__descriptor, + allocator, len, data); +} +void start_ink_filling_status_request__free_unpacked + (StartInkFillingStatusRequest *message, + ProtobufCAllocator *allocator) +{ + if(!message) + return; + assert(message->base.descriptor == &start_ink_filling_status_request__descriptor); + protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator); +} +#define start_ink_filling_status_request__field_descriptors NULL +#define start_ink_filling_status_request__field_indices_by_name NULL +#define start_ink_filling_status_request__number_ranges NULL +const ProtobufCMessageDescriptor start_ink_filling_status_request__descriptor = +{ + PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC, + "", + "", + "", + "", + sizeof(StartInkFillingStatusRequest), + 0, + start_ink_filling_status_request__field_descriptors, + start_ink_filling_status_request__field_indices_by_name, + 0, start_ink_filling_status_request__number_ranges, + (ProtobufCMessageInit) start_ink_filling_status_request__init, + NULL,NULL,NULL /* reserved[123] */ +}; diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/IFS/StartInkFillingStatusRequest.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/IFS/StartInkFillingStatusRequest.pb-c.h new file mode 100644 index 000000000..863a8df2f --- /dev/null +++ b/Software/Embedded_SW/Embedded/Communication/PMR/IFS/StartInkFillingStatusRequest.pb-c.h @@ -0,0 +1,70 @@ +/* Generated by the protocol buffer compiler. DO NOT EDIT! */ +/* Generated from: StartInkFillingStatusRequest.proto */ + +#ifndef PROTOBUF_C_StartInkFillingStatusRequest_2eproto__INCLUDED +#define PROTOBUF_C_StartInkFillingStatusRequest_2eproto__INCLUDED + +#include + +PROTOBUF_C__BEGIN_DECLS + +#if PROTOBUF_C_VERSION_NUMBER < 1003000 +# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers. +#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION +# error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c. +#endif + + +typedef struct _StartInkFillingStatusRequest StartInkFillingStatusRequest; + + +/* --- enums --- */ + + +/* --- messages --- */ + +struct _StartInkFillingStatusRequest +{ + ProtobufCMessage base; +}; +#define START_INK_FILLING_STATUS_REQUEST__INIT \ + { PROTOBUF_C_MESSAGE_INIT (&start_ink_filling_status_request__descriptor) \ + } + + +/* StartInkFillingStatusRequest methods */ +void start_ink_filling_status_request__init + (StartInkFillingStatusRequest *message); +size_t start_ink_filling_status_request__get_packed_size + (const StartInkFillingStatusRequest *message); +size_t start_ink_filling_status_request__pack + (const StartInkFillingStatusRequest *message, + uint8_t *out); +size_t start_ink_filling_status_request__pack_to_buffer + (const StartInkFillingStatusRequest *message, + ProtobufCBuffer *buffer); +StartInkFillingStatusRequest * + start_ink_filling_status_request__unpack + (ProtobufCAllocator *allocator, + size_t len, + const uint8_t *data); +void start_ink_filling_status_request__free_unpacked + (StartInkFillingStatusRequest *message, + ProtobufCAllocator *allocator); +/* --- per-message closures --- */ + +typedef void (*StartInkFillingStatusRequest_Closure) + (const StartInkFillingStatusRequest *message, + void *closure_data); + +/* --- services --- */ + + +/* --- descriptors --- */ + +extern const ProtobufCMessageDescriptor start_ink_filling_status_request__descriptor; + +PROTOBUF_C__END_DECLS + + +#endif /* PROTOBUF_C_StartInkFillingStatusRequest_2eproto__INCLUDED */ diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/IFS/StartInkFillingStatusResponse.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/IFS/StartInkFillingStatusResponse.pb-c.c new file mode 100644 index 000000000..e5d5c2303 --- /dev/null +++ b/Software/Embedded_SW/Embedded/Communication/PMR/IFS/StartInkFillingStatusResponse.pb-c.c @@ -0,0 +1,92 @@ +/* Generated by the protocol buffer compiler. DO NOT EDIT! */ +/* Generated from: StartInkFillingStatusResponse.proto */ + +/* Do not generate deprecated warnings for self */ +#ifndef PROTOBUF_C__NO_DEPRECATED +#define PROTOBUF_C__NO_DEPRECATED +#endif + +#include "StartInkFillingStatusResponse.pb-c.h" +void start_ink_filling_status_response__init + (StartInkFillingStatusResponse *message) +{ + static const StartInkFillingStatusResponse init_value = START_INK_FILLING_STATUS_RESPONSE__INIT; + *message = init_value; +} +size_t start_ink_filling_status_response__get_packed_size + (const StartInkFillingStatusResponse *message) +{ + assert(message->base.descriptor == &start_ink_filling_status_response__descriptor); + return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message)); +} +size_t start_ink_filling_status_response__pack + (const StartInkFillingStatusResponse *message, + uint8_t *out) +{ + assert(message->base.descriptor == &start_ink_filling_status_response__descriptor); + return protobuf_c_message_pack ((const ProtobufCMessage*)message, out); +} +size_t start_ink_filling_status_response__pack_to_buffer + (const StartInkFillingStatusResponse *message, + ProtobufCBuffer *buffer) +{ + assert(message->base.descriptor == &start_ink_filling_status_response__descriptor); + return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer); +} +StartInkFillingStatusResponse * + start_ink_filling_status_response__unpack + (ProtobufCAllocator *allocator, + size_t len, + const uint8_t *data) +{ + return (StartInkFillingStatusResponse *) + protobuf_c_message_unpack (&start_ink_filling_status_response__descriptor, + allocator, len, data); +} +void start_ink_filling_status_response__free_unpacked + (StartInkFillingStatusResponse *message, + ProtobufCAllocator *allocator) +{ + if(!message) + return; + assert(message->base.descriptor == &start_ink_filling_status_response__descriptor); + protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator); +} +static const ProtobufCFieldDescriptor start_ink_filling_status_response__field_descriptors[1] = +{ + { + "", + 1, + PROTOBUF_C_LABEL_OPTIONAL, + PROTOBUF_C_TYPE_MESSAGE, + 0, /* quantifier_offset */ + offsetof(StartInkFillingStatusResponse, status), + &ink_filling_status__descriptor, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, +}; +static const unsigned start_ink_filling_status_response__field_indices_by_name[] = { + 0, /* field[0] = Status */ +}; +static const ProtobufCIntRange start_ink_filling_status_response__number_ranges[1 + 1] = +{ + { 1, 0 }, + { 0, 1 } +}; +const ProtobufCMessageDescriptor start_ink_filling_status_response__descriptor = +{ + PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC, + "", + "", + "", + "", + sizeof(StartInkFillingStatusResponse), + 1, + start_ink_filling_status_response__field_descriptors, + start_ink_filling_status_response__field_indices_by_name, + 1, start_ink_filling_status_response__number_ranges, + (ProtobufCMessageInit) start_ink_filling_status_response__init, + NULL,NULL,NULL /* reserved[123] */ +}; diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/IFS/StartInkFillingStatusResponse.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/IFS/StartInkFillingStatusResponse.pb-c.h new file mode 100644 index 000000000..f81547859 --- /dev/null +++ b/Software/Embedded_SW/Embedded/Communication/PMR/IFS/StartInkFillingStatusResponse.pb-c.h @@ -0,0 +1,72 @@ +/* Generated by the protocol buffer compiler. DO NOT EDIT! */ +/* Generated from: StartInkFillingStatusResponse.proto */ + +#ifndef PROTOBUF_C_StartInkFillingStatusResponse_2eproto__INCLUDED +#define PROTOBUF_C_StartInkFillingStatusResponse_2eproto__INCLUDED + +#include + +PROTOBUF_C__BEGIN_DECLS + +#if PROTOBUF_C_VERSION_NUMBER < 1003000 +# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers. +#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION +# error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c. +#endif + +#include "InkFillingStatus.pb-c.h" + +typedef struct _StartInkFillingStatusResponse StartInkFillingStatusResponse; + + +/* --- enums --- */ + + +/* --- messages --- */ + +struct _StartInkFillingStatusResponse +{ + ProtobufCMessage base; + InkFillingStatus *status; +}; +#define START_INK_FILLING_STATUS_RESPONSE__INIT \ + { PROTOBUF_C_MESSAGE_INIT (&start_ink_filling_status_response__descriptor) \ + , NULL } + + +/* StartInkFillingStatusResponse methods */ +void start_ink_filling_status_response__init + (StartInkFillingStatusResponse *message); +size_t start_ink_filling_status_response__get_packed_size + (const StartInkFillingStatusResponse *message); +size_t start_ink_filling_status_response__pack + (const StartInkFillingStatusResponse *message, + uint8_t *out); +size_t start_ink_filling_status_response__pack_to_buffer + (const StartInkFillingStatusResponse *message, + ProtobufCBuffer *buffer); +StartInkFillingStatusResponse * + start_ink_filling_status_response__unpack + (ProtobufCAllocator *allocator, + size_t len, + const uint8_t *data); +void start_ink_filling_status_response__free_unpacked + (StartInkFillingStatusResponse *message, + ProtobufCAllocator *allocator); +/* --- per-message closures --- */ + +typedef void (*StartInkFillingStatusResponse_Closure) + (const StartInkFillingStatusResponse *message, + void *closure_data); + +/* --- services --- */ + + +/* --- descriptors --- */ + +extern const ProtobufCMessageDescriptor start_ink_filling_status_response__descriptor; + +PROTOBUF_C__END_DECLS + + +#endif /* PROTOBUF_C_StartInkFillingStatusResponse_2eproto__INCLUDED */ diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/MachineStatus.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/MachineStatus.pb-c.c index 7b73b08b9..ad257ca79 100644 --- a/Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/MachineStatus.pb-c.c +++ b/Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/MachineStatus.pb-c.c @@ -52,7 +52,7 @@ void machine_status__free_unpacked assert(message->base.descriptor == &machine_status__descriptor); protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator); } -static const ProtobufCFieldDescriptor machine_status__field_descriptors[6] = +static const ProtobufCFieldDescriptor machine_status__field_descriptors[4] = { { "", @@ -102,35 +102,9 @@ static const ProtobufCFieldDescriptor machine_status__field_descriptors[6] = 0, /* flags */ 0,NULL,NULL /* reserved1,reserved2, etc */ }, - { - "", - 5, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_ENUM, - offsetof(MachineStatus, has_middlecartridgestate), - offsetof(MachineStatus, middlecartridgestate), - &waste_cartridge_state__descriptor, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 6, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_ENUM, - offsetof(MachineStatus, has_lowercartridgestate), - offsetof(MachineStatus, lowercartridgestate), - &waste_cartridge_state__descriptor, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, }; static const unsigned machine_status__field_indices_by_name[] = { 1, /* field[1] = IDSPacksLevels */ - 5, /* field[5] = LowerCartridgeState */ - 4, /* field[4] = MiddleCartridgeState */ 2, /* field[2] = OverallTemperature */ 3, /* field[3] = SpoolState */ 0, /* field[0] = State */ @@ -138,7 +112,7 @@ static const unsigned machine_status__field_indices_by_name[] = { static const ProtobufCIntRange machine_status__number_ranges[1 + 1] = { { 1, 0 }, - { 0, 6 } + { 0, 4 } }; const ProtobufCMessageDescriptor machine_status__descriptor = { @@ -148,7 +122,7 @@ const ProtobufCMessageDescriptor machine_status__descriptor = "", "", sizeof(MachineStatus), - 6, + 4, machine_status__field_descriptors, machine_status__field_indices_by_name, 1, machine_status__number_ranges, diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/MachineStatus.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/MachineStatus.pb-c.h index a8e12e87f..003fcd09c 100644 --- a/Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/MachineStatus.pb-c.h +++ b/Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/MachineStatus.pb-c.h @@ -17,7 +17,6 @@ PROTOBUF_C__BEGIN_DECLS #include "MachineState.pb-c.h" #include "IDSPackLevel.pb-c.h" #include "SpoolState.pb-c.h" -#include "WasteCartridgeState.pb-c.h" typedef struct _MachineStatus MachineStatus; @@ -38,14 +37,10 @@ struct _MachineStatus double overalltemperature; protobuf_c_boolean has_spoolstate; SpoolState spoolstate; - protobuf_c_boolean has_middlecartridgestate; - WasteCartridgeState middlecartridgestate; - protobuf_c_boolean has_lowercartridgestate; - WasteCartridgeState lowercartridgestate; }; #define MACHINE_STATUS__INIT \ { PROTOBUF_C_MESSAGE_INIT (&machine_status__descriptor) \ - , 0, MACHINE_STATE__PowerUp, 0,NULL, 0, 0, 0, SPOOL_STATE__Absent, 0, WASTE_CARTRIDGE_STATE__CartAbsent, 0, WASTE_CARTRIDGE_STATE__CartAbsent } + , 0, MACHINE_STATE__PowerUp, 0,NULL, 0, 0, 0, SPOOL_STATE__Absent } /* MachineStatus methods */ diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/WasteCartridgeState.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/WasteCartridgeState.pb-c.c deleted file mode 100644 index f179ce199..000000000 --- a/Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/WasteCartridgeState.pb-c.c +++ /dev/null @@ -1,43 +0,0 @@ -/* Generated by the protocol buffer compiler. DO NOT EDIT! */ -/* Generated from: WasteCartridgeState.proto */ - -/* Do not generate deprecated warnings for self */ -#ifndef PROTOBUF_C__NO_DEPRECATED -#define PROTOBUF_C__NO_DEPRECATED -#endif - -#include "WasteCartridgeState.pb-c.h" -static const ProtobufCEnumValue waste_cartridge_state__enum_values_by_number[5] = -{ - { "", "", 0 }, - { "", "", 1 }, - { "", "", 2 }, - { "", "", 3 }, - { "", "", 4 }, -}; -static const ProtobufCIntRange waste_cartridge_state__value_ranges[] = { -{0, 0},{0, 5} -}; -static const ProtobufCEnumValueIndex waste_cartridge_state__enum_values_by_name[5] = -{ - { "", 0 }, - { "", 1 }, - { "", 4 }, - { "", 2 }, - { "", 3 }, -}; -const ProtobufCEnumDescriptor waste_cartridge_state__descriptor = -{ - PROTOBUF_C__ENUM_DESCRIPTOR_MAGIC, - "", - "", - "", - "", - 5, - waste_cartridge_state__enum_values_by_number, - 5, - waste_cartridge_state__enum_values_by_name, - 1, - waste_cartridge_state__value_ranges, - NULL,NULL,NULL,NULL /* reserved[1234] */ -}; diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/WasteCartridgeState.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/WasteCartridgeState.pb-c.h deleted file mode 100644 index c100d36d8..000000000 --- a/Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/WasteCartridgeState.pb-c.h +++ /dev/null @@ -1,46 +0,0 @@ -/* Generated by the protocol buffer compiler. DO NOT EDIT! */ -/* Generated from: WasteCartridgeState.proto */ - -#ifndef PROTOBUF_C_WasteCartridgeState_2eproto__INCLUDED -#define PROTOBUF_C_WasteCartridgeState_2eproto__INCLUDED - -#include - -PROTOBUF_C__BEGIN_DECLS - -#if PROTOBUF_C_VERSION_NUMBER < 1003000 -# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers. -#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION -# error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c. -#endif - - - - -/* --- enums --- */ - -typedef enum _WasteCartridgeState { - WASTE_CARTRIDGE_STATE__CartAbsent = 0, - WASTE_CARTRIDGE_STATE__CartEmpty = 1, - WASTE_CARTRIDGE_STATE__CartFilling = 2, - WASTE_CARTRIDGE_STATE__CartFull = 3, - WASTE_CARTRIDGE_STATE__CartError = 4 - PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(WASTE_CARTRIDGE_STATE) -} WasteCartridgeState; - -/* --- messages --- */ - -/* --- per-message closures --- */ - - -/* --- services --- */ - - -/* --- descriptors --- */ - -extern const ProtobufCEnumDescriptor waste_cartridge_state__descriptor; - -PROTOBUF_C__END_DECLS - - -#endif /* PROTOBUF_C_WasteCartridgeState_2eproto__INCLUDED */ diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProgressRequest.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProgressRequest.pb-c.c index 3a3aadd3b..b151bea09 100644 --- a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProgressRequest.pb-c.c +++ b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProgressRequest.pb-c.c @@ -52,7 +52,7 @@ void progress_request__free_unpacked assert(message->base.descriptor == &progress_request__descriptor); protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator); } -static const ProtobufCFieldDescriptor progress_request__field_descriptors[5] = +static const ProtobufCFieldDescriptor progress_request__field_descriptors[2] = { { "", @@ -78,54 +78,15 @@ static const ProtobufCFieldDescriptor progress_request__field_descriptors[5] = 0, /* flags */ 0,NULL,NULL /* reserved1,reserved2, etc */ }, - { - "", - 3, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_UINT32, - offsetof(ProgressRequest, has_param1), - offsetof(ProgressRequest, param1), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 4, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_UINT32, - offsetof(ProgressRequest, has_param2), - offsetof(ProgressRequest, param2), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 5, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_UINT32, - offsetof(ProgressRequest, has_param3), - offsetof(ProgressRequest, param3), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, }; static const unsigned progress_request__field_indices_by_name[] = { 0, /* field[0] = Amount */ 1, /* field[1] = Delay */ - 2, /* field[2] = Param1 */ - 3, /* field[3] = Param2 */ - 4, /* field[4] = Param3 */ }; static const ProtobufCIntRange progress_request__number_ranges[1 + 1] = { { 1, 0 }, - { 0, 5 } + { 0, 2 } }; const ProtobufCMessageDescriptor progress_request__descriptor = { @@ -135,7 +96,7 @@ const ProtobufCMessageDescriptor progress_request__descriptor = "", "", sizeof(ProgressRequest), - 5, + 2, progress_request__field_descriptors, progress_request__field_indices_by_name, 1, progress_request__number_ranges, diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProgressRequest.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProgressRequest.pb-c.h index da8eac4f1..1ce2b6d6b 100644 --- a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProgressRequest.pb-c.h +++ b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProgressRequest.pb-c.h @@ -30,16 +30,10 @@ struct _ProgressRequest int32_t amount; protobuf_c_boolean has_delay; int32_t delay; - protobuf_c_boolean has_param1; - uint32_t param1; - protobuf_c_boolean has_param2; - uint32_t param2; - protobuf_c_boolean has_param3; - uint32_t param3; }; #define PROGRESS_REQUEST__INIT \ { PROTOBUF_C_MESSAGE_INIT (&progress_request__descriptor) \ - , 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } + , 0, 0, 0, 0 } /* ProgressRequest methods */ diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProgressResponse.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProgressResponse.pb-c.c index ff0667e61..537f8e763 100644 --- a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProgressResponse.pb-c.c +++ b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProgressResponse.pb-c.c @@ -52,7 +52,7 @@ void progress_response__free_unpacked assert(message->base.descriptor == &progress_response__descriptor); protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator); } -static const ProtobufCFieldDescriptor progress_response__field_descriptors[2] = +static const ProtobufCFieldDescriptor progress_response__field_descriptors[1] = { { "", @@ -66,27 +66,14 @@ static const ProtobufCFieldDescriptor progress_response__field_descriptors[2] = 0, /* flags */ 0,NULL,NULL /* reserved1,reserved2, etc */ }, - { - "", - 2, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_UINT32, - offsetof(ProgressResponse, has_info), - offsetof(ProgressResponse, info), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, }; static const unsigned progress_response__field_indices_by_name[] = { - 1, /* field[1] = Info */ 0, /* field[0] = Progress */ }; static const ProtobufCIntRange progress_response__number_ranges[1 + 1] = { { 1, 0 }, - { 0, 2 } + { 0, 1 } }; const ProtobufCMessageDescriptor progress_response__descriptor = { @@ -96,7 +83,7 @@ const ProtobufCMessageDescriptor progress_response__descriptor = "", "", sizeof(ProgressResponse), - 2, + 1, progress_response__field_descriptors, progress_response__field_indices_by_name, 1, progress_response__number_ranges, diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProgressResponse.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProgressResponse.pb-c.h index bd1a3141a..de5201ee5 100644 --- a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProgressResponse.pb-c.h +++ b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProgressResponse.pb-c.h @@ -28,12 +28,10 @@ struct _ProgressResponse ProtobufCMessage base; protobuf_c_boolean has_progress; double progress; - protobuf_c_boolean has_info; - uint32_t info; }; #define PROGRESS_RESPONSE__INIT \ { PROTOBUF_C_MESSAGE_INIT (&progress_response__descriptor) \ - , 0, 0, 0, 0 } + , 0, 0 } /* ProgressResponse methods */ diff --git a/Software/Embedded_SW/Embedded/Drivers/Valves/Valve.c b/Software/Embedded_SW/Embedded/Drivers/Valves/Valve.c index 80f8280e0..f5c9c09b5 100644 --- a/Software/Embedded_SW/Embedded/Drivers/Valves/Valve.c +++ b/Software/Embedded_SW/Embedded/Drivers/Valves/Valve.c @@ -440,8 +440,8 @@ void Valve_Set(Valves_t Valve_Id, bool Direction) MidtankMitigationControlId[Valve_Id] = 0xFF; } } - } #endif + } ValveRequest[Valve_Id].Direction = Direction; Valve_Command( Valve_Id); #endif diff --git a/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c b/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c index b9bcc1624..ef6482a4f 100644 --- a/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c +++ b/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c @@ -138,47 +138,6 @@ int MachineUpdateResponseFunc(void) } else return ERROR; - MachineStatus.has_middlecartridgestate = true; - switch (cartGetState(WasteCartridge_middle)) - { - case CartridgeStateOUT: - MachineStatus.middlecartridgestate = WASTE_CARTRIDGE_STATE__CartAbsent; - break; - case CartridgeStateIN: - case CartridgeStateSELECTED: - MachineStatus.middlecartridgestate = WASTE_CARTRIDGE_STATE__CartEmpty; - break; - case CartridgeStateACTIVE: - MachineStatus.middlecartridgestate = WASTE_CARTRIDGE_STATE__CartFilling; - break; - case CartridgeStateFULL: - MachineStatus.middlecartridgestate = WASTE_CARTRIDGE_STATE__CartFull; - break; - default: - MachineStatus.middlecartridgestate = WASTE_CARTRIDGE_STATE__CartAbsent; - break; - } - MachineStatus.has_lowercartridgestate = true; - MachineStatus.lowercartridgestate = WASTE_CARTRIDGE_STATE__CartAbsent; - switch (cartGetState(WasteCartridge_lower)) - { - case CartridgeStateOUT: - MachineStatus.lowercartridgestate = WASTE_CARTRIDGE_STATE__CartAbsent; - break; - case CartridgeStateIN: - case CartridgeStateSELECTED: - MachineStatus.lowercartridgestate = WASTE_CARTRIDGE_STATE__CartEmpty; - break; - case CartridgeStateACTIVE: - MachineStatus.lowercartridgestate = WASTE_CARTRIDGE_STATE__CartFilling; - break; - case CartridgeStateFULL: - MachineStatus.lowercartridgestate = WASTE_CARTRIDGE_STATE__CartFull; - break; - default: - MachineStatus.lowercartridgestate = WASTE_CARTRIDGE_STATE__CartAbsent; - break; - } responseContainer = /*MachineUpdate*/createContainer(MESSAGE_TYPE__StartMachineStatusUpdateResponse, MachineUpdateToken, false, &response, &start_machine_status_update_response__pack, &start_machine_status_update_response__get_packed_size); diff --git a/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c b/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c index abad051cb..387d48d2b 100644 --- a/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c +++ b/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c @@ -11,9 +11,6 @@ #include #include "PMR/Diagnostics/CartridgeSlot.pb-c.h" #include "PMR/Diagnostics/CartridgeTagContent.pb-c.h" -#include "PMR/Diagnostics/StartInkFillingRequest.pb-c.h" -#include "PMR/Diagnostics/StartInkFillingResponse.pb-c.h" -#include "PMR/Diagnostics/FillingAction.pb-c.h" #include #include "drivers/FPGA/FPGA_GPIO/FPGA_GPIO.h"//#include "FPGA_GPIO.h" // use for FPGA IO #include "drivers/I2C_Communication/ADC_MUX/ADC_MUX.h" @@ -232,54 +229,6 @@ bool CartridgeValidationResponseFunc(MessageContainer* requestContainer) inkAuthenticationPass = false; } return OK; -} -char InkFillingToken[36+1] = {0}; -uint32_t InkFillingUpdate(POWER_OFF_STAGES_ENUM stage) -{ - uint32_t status = NOT_SUPPORTED; - MessageContainer responseContainer; - - StartInkFillingResponse response = START_INK_FILLING_RESPONSE__INIT; - Cartridge Cartridge = CARTRIDGE__INIT; - response.action = FILLING_ACTION__None; - response.has_action = true; - response.cartridge = LoadCartridgeData(CART_1,&Cartridge); - - response.cartridge = NULL; - response.has_progresspercentage = true; - response.progresspercentage = 0.0; - response.message = NULL; - - responseContainer = createContainer(MESSAGE_TYPE__StartInkFillingResponse, InkFillingToken, false, &response, &start_ink_filling_response__pack, &start_ink_filling_response__get_packed_size); - responseContainer.has_continuous = true; - responseContainer.continuous = true; - uint8_t* 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); - //USBCDCD_sendData(container_buffer, container_size,10); - - SendChars((char*)container_buffer, container_size); - //MessageContainer responseContainer; - - return status; -} - -uint32_t StartInkFillingRequestFunc(MessageContainer* requestContainer) -{ - uint32_t status = NOT_SUPPORTED; - //MessageContainer responseContainer; - -// MachineUpdateInitParams InitParams; - - Report("StartInkFillingRequestFunc",__FILE__,__LINE__,(int)0,RpWarning,(int)0,0); - StartInkFillingRequest* request = start_ink_filling_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data); - ustrncpy (InkFillingToken, requestContainer->token,36); - - InkFillingUpdate(POWER_OFF_INIT); - start_ink_filling_request__free_unpacked(request,NULL); - return status; -// case MESSAGE_TYPE__StartWasteEmptyingRequest: - } void ResponseDemo(int MidtankId) { diff --git a/Software/Embedded_SW/Embedded/Modules/IFS/ifs.h b/Software/Embedded_SW/Embedded/Modules/IFS/ifs.h index dec1544ec..0f95fb2e2 100644 --- a/Software/Embedded_SW/Embedded/Modules/IFS/ifs.h +++ b/Software/Embedded_SW/Embedded/Modules/IFS/ifs.h @@ -28,6 +28,5 @@ bool IFS_MidTankFilling(void); MidTank_t IFS_MidTankIsActive(void); bool IFS_CartridgeLowerPresent(); bool CartridgeValidationResponseFunc(MessageContainer* requestContainer); -uint32_t StartInkFillingRequestFunc(MessageContainer* requestContainer); #endif /* MODULES_IFS_IFS_H_ */ diff --git a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_ex.h b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_ex.h index 38e3236cc..603e63ccc 100644 --- a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_ex.h +++ b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_ex.h @@ -47,7 +47,7 @@ bool WHS_IsEmptying(); uint32_t Waste_CheckState(void); uint32_t Waste_Prepare(void); bool WHS_IsVocPpmOverAlarmLimit(); -uint32_t StartWasteEmptyingRequestFunc(MessageContainer* requestContainer); +uint32_t StartInkFillingStatusRequestFunc(MessageContainer* requestContainer); extern bool ReadingVocEverySec; diff --git a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c index 6d338cbf7..1a4403f32 100644 --- a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c +++ b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c @@ -14,9 +14,10 @@ #include #include -#include "PMR/Diagnostics/FillingAction.pb-c.h" -#include "PMR/Diagnostics/StartWasteEmptyingRequest.pb-c.h" -#include "PMR/Diagnostics/StartWasteEmptyingResponse.pb-c.h" +#include "PMR/IFS/CartridgeStatus.pb-c.h" +#include "PMR/IFS/InkFillingStatus.pb-c.h" +#include "PMR/IFS/StartInkFillingStatusRequest.pb-c.h" +#include "PMR/IFS/StartInkFillingStatusResponse.pb-c.h" #include "Modules/AlarmHandling/AlarmHandling.h" #include "StateMachines/Initialization/PowerOffSequence.h" #include "drivers/I2C_Communication/ADC_MUX/ADC_MUX.h" @@ -506,22 +507,22 @@ void Waste_StateMachine(void) } } char WasteEmptyingToken[36+1] = {0}; -uint32_t WasteEmptyingUpdate(POWER_OFF_STAGES_ENUM stage) +uint32_t WasteEmptyingUpdate(void) { uint32_t status = NOT_SUPPORTED; MessageContainer responseContainer; - StartWasteEmptyingResponse response = START_WASTE_EMPTYING_RESPONSE__INIT; - response.action = FILLING_ACTION__None; + StartInkFillingStatusResponse response = START_INK_FILLING_STATUS_RESPONSE__INIT; + /*response.action = FILLING_ACTION__None; response.has_action = true; //response.cartridge = LoadCartridgeData(); response.cartridge = LoadCartridgeData(); response.cartridge = NULL; response.has_progresspercentage = true; response.progresspercentage = 0.0; - response.message = NULL; + response.message = NULL;*/ - responseContainer = createContainer(MESSAGE_TYPE__StartWasteEmptyingResponse, WasteEmptyingToken, false, &response, &start_waste_emptying_response__pack, &start_waste_emptying_response__get_packed_size); + responseContainer = createContainer(MESSAGE_TYPE__StartInkFillingStatusResponse, WasteEmptyingToken, false, &response, &start_ink_filling_status_response__pack, &start_ink_filling_status_response__get_packed_size); responseContainer.has_continuous = true; responseContainer.continuous = true; uint8_t* container_buffer = my_malloc(message_container__get_packed_size(&responseContainer)); @@ -535,19 +536,19 @@ uint32_t WasteEmptyingUpdate(POWER_OFF_STAGES_ENUM stage) return status; } -uint32_t StartWasteEmptyingRequestFunc(MessageContainer* requestContainer) +uint32_t StartInkFillingStatusRequestFunc(MessageContainer* requestContainer) { uint32_t status = NOT_SUPPORTED; //MessageContainer responseContainer; // MachineUpdateInitParams InitParams; - Report("StartWasteEmptyingRequestFunc",__FILE__,__LINE__,(int)0,RpWarning,(int)0,0); - StartWasteEmptyingRequest* request = start_waste_emptying_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data); + Report("StartInkFillingStatusRequestFunc",__FILE__,__LINE__,(int)0,RpWarning,(int)0,0); + StartInkFillingStatusRequest* request = start_ink_filling_status_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data); ustrncpy (WasteEmptyingToken, requestContainer->token,36); - WasteEmptyingUpdate(POWER_OFF_INIT); - start_waste_emptying_request__free_unpacked(request,NULL); + WasteEmptyingUpdate(); + start_ink_filling_status_request__free_unpacked(request,NULL); return status; // case MESSAGE_TYPE__StartWasteEmptyingRequest: diff --git a/Software/PMR/Messages/Debugging/StartDebugLogResponse.proto b/Software/PMR/Messages/Debugging/StartDebugLogResponse.proto index 3375b8887..b8aa1a3f1 100644 --- a/Software/PMR/Messages/Debugging/StartDebugLogResponse.proto +++ b/Software/PMR/Messages/Debugging/StartDebugLogResponse.proto @@ -12,6 +12,6 @@ message StartDebugLogResponse int32 LineNumber = 3; int32 Filter = 4; string Message = 5; - int32 ModuleId = 6; + int32 ModuleId = 6; int32 Parameter = 7; } \ No newline at end of file diff --git a/Software/Visual_Studio/SideChains/WebRtc.NET/WebRtc.NET.vcxproj b/Software/Visual_Studio/SideChains/WebRtc.NET/WebRtc.NET.vcxproj index 661997d3f..609613a91 100644 --- a/Software/Visual_Studio/SideChains/WebRtc.NET/WebRtc.NET.vcxproj +++ b/Software/Visual_Studio/SideChains/WebRtc.NET/WebRtc.NET.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,33 +22,33 @@ {A07E6CB4-0132-4EB1-9A38-C8C057884DC2} Win32Proj WebRtcLibDemo - 8.1 + 10.0.17763.0 WebRtc.NET DynamicLibrary true - v140 + v141 Unicode DynamicLibrary false - v140 + v141 true Unicode DynamicLibrary true - v140 + v141 Unicode DynamicLibrary false - v140 + v141 true Unicode -- cgit v1.3.1 From a24721751785a8e99023ae85814f5126845d3c5f Mon Sep 17 00:00:00 2001 From: Shlomo Hecht Date: Mon, 12 Oct 2020 23:27:51 +0300 Subject: cartridges status --- Software/Embedded_SW/Embedded/DataDef.h | 6 +- .../Embedded/Modules/General/MachineStatus.c | 145 +++++++++++++++++++++ .../Embedded/Modules/General/MachineStatus.h | 1 + .../Embedded/Modules/Heaters/Heaters_print.c | 2 + Software/Embedded_SW/Embedded/Modules/IFS/ifs.c | 13 +- .../Embedded/Modules/Thread/Thread_print.c | 16 +-- .../Embedded_SW/Embedded/Modules/Waste/Waste_ex.h | 1 - .../Embedded/Modules/Waste/Waste_maint.c | 55 +------- 8 files changed, 176 insertions(+), 63 deletions(-) (limited to 'Software/Embedded_SW') diff --git a/Software/Embedded_SW/Embedded/DataDef.h b/Software/Embedded_SW/Embedded/DataDef.h index 99798cf3b..864df2aee 100644 --- a/Software/Embedded_SW/Embedded/DataDef.h +++ b/Software/Embedded_SW/Embedded/DataDef.h @@ -24,8 +24,10 @@ //#define DISPESER_TEST //#define FPGA_WATCHDOG_DISABLE -//#define FOUR_WINDERS - +#define FOUR_WINDERS +#ifdef FOUR_WINDERS +#define BTSR_NO_TFU +#endif //#define USE_POWERSTEP01 -NA //#define EMC_FORCE_MOT_CLOCK_INTERNAL diff --git a/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c b/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c index ef6482a4f..5c0e48054 100644 --- a/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c +++ b/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c @@ -20,6 +20,11 @@ #include "PMR/MachineStatus/MachineState.pb-c.h" #include "PMR/MachineStatus/IDSPackLevel.pb-c.h" +#include "PMR/IFS/CartridgeStatus.pb-c.h" +#include "PMR/IFS/InkFillingStatus.pb-c.h" +#include "PMR/IFS/StartInkFillingStatusRequest.pb-c.h" +#include "PMR/IFS/StartInkFillingStatusResponse.pb-c.h" + #include "drivers/I2C_Communication/ADC_MUX/ADC_MUX.h" #include "Drivers/Heater/TemperatureSensor.h" #include "drivers/Motors/Motor.h" @@ -31,6 +36,7 @@ #include "Modules/Control/MillisecTask.h" #include "modules/waste/waste_ex.h" #include "modules/ids/ids_ex.h" +#include "modules/ifs/ifs.h" MachineState StoredMachineStatus = MACHINE_STATE__PowerUp; bool SetMAchineStateProblem = false; @@ -104,6 +110,7 @@ int MachineUpdateResponseFunc(void) else if ((int1valid == false)&&(int2valid == true)) usetemp = internaltemp2/100; } + MachineStatus.overalltemperature = usetemp; @@ -208,4 +215,142 @@ uint32_t StopMachineUpdateFunc(MessageContainer* requestContainer) return OK; } +typedef enum +{ + IFS_Cartridge, + Middle_Waste_Cartridge, + Lower_Waste_Cartridge +}; +extern CartridgeState IFS_State; +extern CartridgeState Middle_Cartridge_State; +extern CartridgeState Lower_Cartridge_State; + +char WasteEmptyingToken[36+1] = {0}; +uint32_t WasteEmptyingUpdate(void) +{ + uint32_t status = NOT_SUPPORTED,i; + MessageContainer responseContainer; + CartridgeStatus Cartridges[MAX_CARTRIDGES+1]; + StartInkFillingStatusResponse response = START_INK_FILLING_STATUS_RESPONSE__INIT; + response.status->n_cartridgesstatuses = MAX_CARTRIDGES; + for (i = 0;icartridgesstatuses[i] = &Cartridges[i]; + } + if (IFS_CartridgeLowerPresent()) + { + Cartridges[IFS_Cartridge].has_state = true; + Cartridges[IFS_Cartridge].state = IFS_State; + } + if (WHS_WasteCartridgeMiddlePresent()) + { + Cartridges[Middle_Waste_Cartridge].has_state = true; + switch (cartGetState(WasteCartridge_middle)) + { + case CartridgeStateOUT: + Cartridges[Middle_Waste_Cartridge].state = CARTRIDGE_STATE__Absent; + break; + case CartridgeStateIN: + Cartridges[Middle_Waste_Cartridge].state = CARTRIDGE_STATE__Inserted; + break; + case CartridgeStateSELECTED: + Cartridges[Middle_Waste_Cartridge].state = CARTRIDGE_STATE__Exists; + break; + case CartridgeStateACTIVE: + Cartridges[Middle_Waste_Cartridge].state = CARTRIDGE_STATE__Emptying; + break; + case CartridgeStateFULL: + Cartridges[Middle_Waste_Cartridge].state = CARTRIDGE_STATE__EmptyingCompleted; + break; + default: + break; + } + } + if (WHS_WasteCartridgeLowerPresent()) + { + Cartridges[Lower_Waste_Cartridge].has_state = true; + switch (cartGetState(WasteCartridge_lower)) + { + case CartridgeStateOUT: + Cartridges[Lower_Waste_Cartridge].state = CARTRIDGE_STATE__Absent; + break; + case CartridgeStateIN: + Cartridges[Lower_Waste_Cartridge].state = CARTRIDGE_STATE__Inserted; + break; + case CartridgeStateSELECTED: + Cartridges[Lower_Waste_Cartridge].state = CARTRIDGE_STATE__Exists; + break; + case CartridgeStateACTIVE: + Cartridges[Lower_Waste_Cartridge].state = CARTRIDGE_STATE__Emptying; + break; + case CartridgeStateFULL: + Cartridges[Lower_Waste_Cartridge].state = CARTRIDGE_STATE__EmptyingCompleted; + break; + default: + break; + } + } + + + /* +struct _CartridgeStatus +{ + ProtobufCMessage base; + Cartridge *cartridge; + protobuf_c_boolean has_state; + CartridgeState state; + protobuf_c_boolean has_progresspercentage; + double progresspercentage; + char *message; +}; + size_t n_cartridgesstatuses; + CartridgeStatus **cartridgesstatuses; +typedef enum _CartridgeState { + CARTRIDGE_STATE__None = 0, + CARTRIDGE_STATE__Absent = 1, + CARTRIDGE_STATE__Exists = 2, + CARTRIDGE_STATE__Inserted = 3, + CARTRIDGE_STATE__Filling = 4, + CARTRIDGE_STATE__FillingCompleted = 5, + CARTRIDGE_STATE__Emptying = 6, + CARTRIDGE_STATE__EmptyingCompleted = 7, + CARTRIDGE_STATE__Empty = 8, + CARTRIDGE_STATE__Full = 9, + CARTRIDGE_STATE__Error = 10 + PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(CARTRIDGE_STATE) +} CartridgeState; + */ + + responseContainer = createContainer(MESSAGE_TYPE__StartInkFillingStatusResponse, WasteEmptyingToken, false, &response, &start_ink_filling_status_response__pack, &start_ink_filling_status_response__get_packed_size); + responseContainer.has_continuous = true; + responseContainer.continuous = true; + uint8_t* 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); + //USBCDCD_sendData(container_buffer, container_size,10); + + SendChars((char*)container_buffer, container_size); + //MessageContainer responseContainer; + + return status; +} + +uint32_t StartInkFillingStatusRequestFunc(MessageContainer* requestContainer) +{ + uint32_t status = NOT_SUPPORTED; + //MessageContainer responseContainer; + +// MachineUpdateInitParams InitParams; + + Report("StartInkFillingStatusRequestFunc",__FILE__,__LINE__,(int)0,RpWarning,(int)0,0); + StartInkFillingStatusRequest* request = start_ink_filling_status_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data); + ustrncpy (WasteEmptyingToken, requestContainer->token,36); + + WasteEmptyingUpdate(); + start_ink_filling_status_request__free_unpacked(request,NULL); + return status; +// case MESSAGE_TYPE__StartWasteEmptyingRequest: + +} diff --git a/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.h b/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.h index 489a8f638..a7c55ad9b 100644 --- a/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.h +++ b/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.h @@ -14,6 +14,7 @@ uint32_t MachineUpdateInitFunc(MessageContainer* requestContainer); uint32_t StopMachineUpdateFunc(MessageContainer* requestContainer); void SetMachineStatus (MachineState State); int MachineUpdateResponseFunc(void); +uint32_t StartInkFillingStatusRequestFunc(MessageContainer* requestContainer); diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c index 8e78d7e7f..6c1dcb279 100644 --- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c +++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c @@ -2121,10 +2121,12 @@ uint32_t HeadBlowerPidFunc(double setParam,double measuredParam, int blowerId) HeadBlowersCloseLoopTime[blowerId] = HeadBlowerControl[blowerId].m_params.dt; if (calculatedPwm < MIN_ALLOWED_PWM) { + ReportWithPackageFilter(HeatersFilter,"calculatedPwm < MIN_ALLOWED_PWM",__FILE__,__LINE__,calculatedPwm,RpError, MIN_ALLOWED_PWM,0); HeadBlowerControl[blowerId].m_integral = 0; calculatedPwm = MIN_ALLOWED_PWM; } if (calculatedPwm > MAX_ALLOWED_PWM) { + ReportWithPackageFilter(HeatersFilter,"calculatedPwm > MAX_ALLOWED_PWM",__FILE__,__LINE__,calculatedPwm,RpError, MAX_ALLOWED_PWM,0); HeadBlowerControl[blowerId].m_integral = 0; calculatedPwm = MAX_ALLOWED_PWM; } diff --git a/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c b/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c index 387d48d2b..fd8d2f9e0 100644 --- a/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c +++ b/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c @@ -11,6 +11,8 @@ #include #include "PMR/Diagnostics/CartridgeSlot.pb-c.h" #include "PMR/Diagnostics/CartridgeTagContent.pb-c.h" +#include +#include "PMR/IFS/CartridgeState.pb-c.h" #include #include "drivers/FPGA/FPGA_GPIO/FPGA_GPIO.h"//#include "FPGA_GPIO.h" // use for FPGA IO #include "drivers/I2C_Communication/ADC_MUX/ADC_MUX.h" @@ -23,7 +25,6 @@ #include "Modules/AlarmHandling/AlarmHandling.h" #include "CartridgeValidationRequest.pb-c.h" #include "CartridgeValidationResponse.pb-c.h" -#include #include "drivers/Valves/Valve.h" #include "../control/control.h" #include "Modules/General/buttons.h" @@ -46,6 +47,7 @@ uint32_t midTankTimeoutCounter = 0; double MidTankEmptyLimit = MidTank_Pressure_EMPTY; MidTankStateEnum midTankState = 0; +CartridgeState IFS_State = CARTRIDGE_STATE__None; char CartridgeRequestToken[36+1]; int CartridgeRequestId = 0x01010101; @@ -146,6 +148,7 @@ bool CartridgeInkFull() //currently sensor work properly only until 1.6 - 1.8 Liter (TBD) Report("DetectIfCartridgeFinished", __FILE__,__LINE__,int_MidTank_Pressure_1000, RpMessage, int_MidTank_Pressure_1000, 0); //return true; + IFS_State = CARTRIDGE_STATE__FillingCompleted; } } return false; @@ -274,6 +277,7 @@ void midTankStateMachine(void) break; } //check RFID? (TBD) + IFS_State = CARTRIDGE_STATE__Inserted; // send request for validation to ppc inkAuthenticationPass = 2; //not defined @@ -295,11 +299,13 @@ void midTankStateMachine(void) Report("MidTank Cartridge authentication wait...", __FILE__, __LINE__, authenticationTimeOutCounter, RpMessage, 0, 0); if (authenticationTimeOutCounter > 60) { midTankState = MidTankStateIdle; + IFS_State = CARTRIDGE_STATE__Error; } break; } if (inkAuthenticationPass == false) { Report("MidTank Cartridge authentication fail", __FILE__, __LINE__, 0, RpMessage, 0, 0); + IFS_State = CARTRIDGE_STATE__Error; midTankState = MidTankStateIdle; break; } @@ -311,11 +317,13 @@ void midTankStateMachine(void) cart1.color = fastBILNK; Report("Mid-tank not empty", __FILE__, __LINE__, midTankCapacity, RpMessage, MidTankEmptyLimit, 0); midTankState = MidTankStateIdle; + IFS_State = CARTRIDGE_STATE__Exists; break; } Report("Mid-tank filling in process", __FILE__,__LINE__,(int)(MidTankEmptyLimit*1000), RpMessage, (int)(midTankCapacity*1000), 0); Pannel_Leds(CART_1, MODE_ON); cart1.color = BLINK; + IFS_State = CARTRIDGE_STATE__Filling; if (midTankCartColor == MIDTANK_8) { @@ -340,6 +348,7 @@ void midTankStateMachine(void) Report("Cartridge extracted during filling!!!", __FILE__, __LINE__, midTankState, RpMessage, 0, 0); Report("Mid-tank # filling fail", __FILE__, __LINE__, midTankState, RpMessage, 0, 0); midTankState = MidTankStateIdle; + IFS_State = CARTRIDGE_STATE__Absent; } // if time out or emptying done - idle if (midTankTimeoutCounter++ > CartridgeInkTimeout) { @@ -349,6 +358,7 @@ void midTankStateMachine(void) MidTankValvesAction(Cartridge_MidTank_OFF); Report("Mid-tank # filling fail", __FILE__, __LINE__, midTankState, RpMessage, 0, 0); Report("Call customer support", __FILE__, __LINE__, midTankState, RpMessage, 0, 0); + IFS_State = CARTRIDGE_STATE__Error; midTankState = MidTankStateIdle; } else if (CartridgeInkFull()) { midTankTimeoutCounter = 0; @@ -357,6 +367,7 @@ void midTankStateMachine(void) MidTankValvesAction(Cartridge_MidTank_OFF); Report("Mid-tank # filling done", __FILE__, __LINE__, midTankState, RpMessage, 0, 0); midTankState = MidTankStateIdle; + IFS_State = CARTRIDGE_STATE__FillingCompleted; } break; default: diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c index f13f76cfb..25f322b2e 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c @@ -337,7 +337,7 @@ uint32_t PoolerThreadLengthCBFunction(uint32_t IfIndex, uint32_t ReadValue) }**/ //} -#ifdef FOUR_WINDERS +#ifdef BTSR_NO_TFU if (CurrentControlledSpeed[WINDER_MOTOR]>100) length = dyeingspeed/10; #endif @@ -914,7 +914,7 @@ uint32_t Release_Right_TFU_TensionCallback(uint32_t deviceID, uint32_t BusyFlag) uint32_t Release_Right_TFU_Tension() { uint32_t status = OK; -#ifndef FOUR_WINDERS +#ifndef BTSR_NO_TFU if (RTFU_Up == true) { Report("Release_Right_TFU_Tension",__FILE__,__LINE__,HARDWARE_MOTOR_TYPE__MOTO_RDANCER,RpMessage,MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_RDANCER].pulseperround/4,0); @@ -928,7 +928,7 @@ int SecondFeederCorrection = 4; int PrepareWaitCount = 0; uint32_t Adjust_Right_TFU_Tension_2nd_Callback(uint32_t MotorId, uint32_t ReadValue) { -#ifndef FOUR_WINDERS +#ifndef BTSR_NO_TFU MotorStop (HARDWARE_MOTOR_TYPE__MOTO_RDANCER,Soft_Stop); //per L6470 errata between mov and run commands Report("Adjust_Right_TFU_Tension_2ndCallback x more steps",__FILE__,__LINE__,MotorId,RpMessage,SecondFeederCorrection,0); if (JobIsActive()==false) @@ -952,7 +952,7 @@ uint32_t Adjust_Right_TFU_Tension_2nd_Callback(uint32_t MotorId, uint32_t ReadVa } uint32_t Adjust_Right_TFU_Tension_Callback(uint32_t MotorId, uint32_t ReadValue) { -#ifndef FOUR_WINDERS +#ifndef BTSR_NO_TFU Report("Adjust_Right_TFU_Tension_Callback",__FILE__,__LINE__,MotorId,RpMessage,0,0); MotorMoveWithCallback(HARDWARE_MOTOR_TYPE__MOTO_RDANCER, 1-MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_RDANCER].directionthreadwize,SecondFeederCorrection* MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_RDANCER].microstep, Adjust_Right_TFU_Tension_2nd_Callback,1000); RTFU_Up = true; @@ -963,7 +963,7 @@ uint32_t Adjust_Right_TFU_Tension_Callback(uint32_t MotorId, uint32_t ReadValue) uint32_t Adjust_Right_TFU_Tension(double tension) { uint32_t status = OK; -#ifndef FOUR_WINDERS +#ifndef BTSR_NO_TFU if (tension > 0.5) //0 = lower position, 1 = high position { if (FPGA_Read_limit_Switches(GPI_LS_RDANCER_UP) == NO_LIMIT) @@ -1090,7 +1090,7 @@ uint32_t ThreadPrepareState(void *JobDetails) IntersegmentLength = JobTicket->intersegmentlength; PrepareWaitCount = 0; -#ifndef FOUR_WINDERS +#ifndef BTSR_NO_TFU status = ThreadPrepare_Tension (HARDWARE_DANCER_TYPE__LeftDancer, windertension); ReportWithPackageFilter(ThreadFilter,"ThreadPrepare_Tension Winder",__FILE__,HARDWARE_DANCER_TYPE__LeftDancer,PrepareWaitCount,RpWarning,(int)windertension,0); status = ThreadPrepare_Tension (HARDWARE_DANCER_TYPE__MiddleDancer, pullertension); @@ -1212,7 +1212,7 @@ uint32_t ThreadPrepareState(void *JobDetails) ///////////////////////////////////////////////////// MotorSetDirection((TimerMotors_t)HW_Motor_Id,MotorsCfg[HW_Motor_Id].directionthreadwize); -#ifndef FOUR_WINDERS +#ifndef BTSR_NO_TFU if (Motor_i == FEEDER_MOTOR) // dryer motor is speed controlled. later a speed sensor will be utilized, but for now it will not be controlled { ReportWithPackageFilter(ThreadFilter,"Feeder Control",__FILE__,Motor_i,MotorControlConfig[Motor_i].m_params.Kp,RpWarning,MotorControlConfig[Motor_i].m_params.Ki,0); @@ -1239,7 +1239,7 @@ uint32_t ThreadPrepareState(void *JobDetails) PoolerLengthCalculationMultiplier = (MotorsCfg[ThreadMotorIdToMotorId[Motor_i]].pulleyradius*2*PI)/(MotorsCfg[ThreadMotorIdToMotorId[Motor_i]].pulseperround*MotorsCfg[ThreadMotorIdToMotorId[Motor_i]].microstep); PoolerSpeedControlId = AddControlCallback(NULL,PoolerThreadLengthCBFunction, eHundredMillisecond,MotorGetPositionFromFPGA,(IfTypeThread*0x100+Motor_i),ThreadMotorIdToMotorId[Motor_i],Motor_i); } -#ifndef FOUR_WINDERS +#ifndef BTSR_NO_TFU if (Motor_i == FEEDER_MOTOR) // dryer motor is speed controlled. later a speed sensor will be utilized, but for now it will not be controlled { if (ControlIdtoMotorId[Motor_i] != 0xFF) diff --git a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_ex.h b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_ex.h index 603e63ccc..cebfba762 100644 --- a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_ex.h +++ b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_ex.h @@ -47,7 +47,6 @@ bool WHS_IsEmptying(); uint32_t Waste_CheckState(void); uint32_t Waste_Prepare(void); bool WHS_IsVocPpmOverAlarmLimit(); -uint32_t StartInkFillingStatusRequestFunc(MessageContainer* requestContainer); extern bool ReadingVocEverySec; diff --git a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c index 1a4403f32..e1e2efa04 100644 --- a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c +++ b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c @@ -12,12 +12,9 @@ #include #include "Drivers/I2C_Communication/RFID_NFC/NFC.h" #include +#include "PMR/IFS/CartridgeState.pb-c.h" #include -#include "PMR/IFS/CartridgeStatus.pb-c.h" -#include "PMR/IFS/InkFillingStatus.pb-c.h" -#include "PMR/IFS/StartInkFillingStatusRequest.pb-c.h" -#include "PMR/IFS/StartInkFillingStatusResponse.pb-c.h" #include "Modules/AlarmHandling/AlarmHandling.h" #include "StateMachines/Initialization/PowerOffSequence.h" #include "drivers/I2C_Communication/ADC_MUX/ADC_MUX.h" @@ -44,6 +41,9 @@ uint32_t Cartridge_Cover_Control; button *CartLed[MaxWasteCartridges] = {0, &cart2, &cart3}; WasteTankStateEnum WasteTankState = WasteTankStateIdle; +CartridgeState Middle_Cartridge_State = CARTRIDGE_STATE__None; +CartridgeState Lower_Cartridge_State = CARTRIDGE_STATE__None; + int init = 1; bool setWasteValve (WasteCartridgeEnum WasteCartridge); @@ -505,53 +505,6 @@ void Waste_StateMachine(void) Report("wrong state", __FILE__, WasteTankState, 0, RpMessage, SelectedCard, 0); break; } -} -char WasteEmptyingToken[36+1] = {0}; -uint32_t WasteEmptyingUpdate(void) -{ - uint32_t status = NOT_SUPPORTED; - MessageContainer responseContainer; - - StartInkFillingStatusResponse response = START_INK_FILLING_STATUS_RESPONSE__INIT; - /*response.action = FILLING_ACTION__None; - response.has_action = true; - //response.cartridge = LoadCartridgeData(); response.cartridge = LoadCartridgeData(); - - response.cartridge = NULL; - response.has_progresspercentage = true; - response.progresspercentage = 0.0; - response.message = NULL;*/ - - responseContainer = createContainer(MESSAGE_TYPE__StartInkFillingStatusResponse, WasteEmptyingToken, false, &response, &start_ink_filling_status_response__pack, &start_ink_filling_status_response__get_packed_size); - responseContainer.has_continuous = true; - responseContainer.continuous = true; - uint8_t* 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); - //USBCDCD_sendData(container_buffer, container_size,10); - - SendChars((char*)container_buffer, container_size); - //MessageContainer responseContainer; - - return status; -} - -uint32_t StartInkFillingStatusRequestFunc(MessageContainer* requestContainer) -{ - uint32_t status = NOT_SUPPORTED; - //MessageContainer responseContainer; - -// MachineUpdateInitParams InitParams; - - Report("StartInkFillingStatusRequestFunc",__FILE__,__LINE__,(int)0,RpWarning,(int)0,0); - StartInkFillingStatusRequest* request = start_ink_filling_status_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data); - ustrncpy (WasteEmptyingToken, requestContainer->token,36); - - WasteEmptyingUpdate(); - start_ink_filling_status_request__free_unpacked(request,NULL); - return status; -// case MESSAGE_TYPE__StartWasteEmptyingRequest: - } uint32_t Waste_CheckState(void) { -- cgit v1.3.1 From b624ccf2c3bf8c16774a03d06f1d49a726934c1b Mon Sep 17 00:00:00 2001 From: Ronen Sberlo Date: Tue, 13 Oct 2020 10:55:55 +0300 Subject: alarms in blowersmaxtempcb --- .../Embedded/Modules/Heaters/Heaters_print.c | 80 +++++++++++++++++++++- 1 file changed, 78 insertions(+), 2 deletions(-) (limited to 'Software/Embedded_SW') diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c index 6c1dcb279..c59ef6086 100644 --- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c +++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c @@ -1170,7 +1170,6 @@ uint32_t HeaterBlowerMaxTempCBFunction(uint32_t IfIndex, uint32_t readValue) HeaterRecalculateHeaterParams(HEATER_TYPE__HeadCoverHeater2,0); } HeaterMaxTempFlag[index] = true; - return OK; } else { if (BlowerOverHeatCounter[index]) { @@ -1183,8 +1182,85 @@ uint32_t HeaterBlowerMaxTempCBFunction(uint32_t IfIndex, uint32_t readValue) } } } - return OK; } + + // alarm handling + if ((HeaterPreviousRead[index]) >= HeaterControl[index].sensormaxvalue) + { + if(OverHeatCounter[index]++ >=Overheat_Count_Limit) + { + OverHeatCounter[index] = Overheat_Count_Limit; + if (JobIsActive()&&(HeaterReady[index]==true)) + { + JobEndReason = JOB_TEMPERATURE_ALARM; + SendJobProgress(0.0,0,false, "Temperature Error"); + AbortJob("Over Temperature Error"); + ReportWithPackageFilter(HeatersFilter, "Temperature Error",__FILE__,__LINE__,index,RpError, 0,0); + return OK; + } + + if ((HeaterReady[index]==false)&&(HeaterPreviousRead[index]>HeaterCmd[index].targettemperatue)) + { + ReportWithPackageFilter(HeatersFilter,"DC Heater Over the max temperature, cooling off",__FILE__,index,HeaterPreviousRead[index],RpWarning, HeaterCmd[index].targettemperatue,0); + } + else + { + ReportWithPackageFilter(HeatersFilter,"DC Heater Over the max temperature, turned off",__FILE__,index,HeaterPreviousRead[index],RpWarning, HeaterReady[index],0); + ReportWithPackageFilter(HeatersFilter,"Heater over the max temperature",__FILE__,index,OverHeatCounter[index],RpWarning,HeaterControl[index].sensormaxvalue, 0); + AlarmHandlingSetAlarm(HeaterEventType[index], true); + } + } + } + else if ((HeaterPreviousRead[index]) < (HeaterControl[index].sensorminvalue)) + { + if (HeaterReady[index]==true) + { + ReportWithPackageFilter(HeatersFilter,"Heater under the min temperature",__FILE__,index,UnderHeatCounter[index],RpWarning,HeaterControl[index].sensorminvalue, 0); + ReportWithPackageFilter(HeatersFilter,"Heater under the min temperature more info",__FILE__,HeaterReady[index],GetHeaterState(index),RpWarning,HeaterPreviousRead[index], 0); + } + if(UnderHeatCounter[index]++ >= Underheat_Count_Limit) + { + UnderHeatCounter[index] = Underheat_Count_Limit; + if (JobIsActive()&&(HeaterReady[index]==true)) + { + JobEndReason = JOB_TEMPERATURE_ALARM; + SendJobProgress(0.0,0,false, "Temperature Error"); + AbortJob("Under Temperature Error"); + ReportWithPackageFilter(HeatersFilter, "Temperature Error",__FILE__,__LINE__,index,RpError, 0,0); + return OK; + } + if (HeaterReady[index]==false) + AlarmHandlingSetAlarm(HeaterUnderEventType[index], true); + else + AlarmHandlingSetAlarm(HeaterUnderEventType_B[index], true); + } + } + else //temperature within limits + { + if(UnderHeatCounter[index] ) + { + UnderHeatCounter[index]--; + if (UnderHeatCounter[index]==0) + { + if (HeaterReady[index]==false) + AlarmHandlingSetAlarm(HeaterUnderEventType[index], false); + else + AlarmHandlingSetAlarm(HeaterUnderEventType_B[index], false); + } + } + if(OverHeatCounter[index] ) + { + if ((HeaterPreviousRead[index]) <= (HeaterControl[index].sensormaxvalue-2)) + { + OverHeatCounter[index]--; + if (OverHeatCounter[index]==0) + { + AlarmHandlingSetAlarm(HeaterEventType[index], false); + } + } + } + } + return OK; } uint32_t DcHeaterMaxTempCBFunction(uint32_t IfIndex, uint32_t readValue) -- cgit v1.3.1 From bf2a042718b901a7ed25e1296008d598678b2ad7 Mon Sep 17 00:00:00 2001 From: Shlomo Hecht Date: Tue, 13 Oct 2020 11:45:56 +0300 Subject: Cartridge state update --- .../Communication/PMR/IFS/CartridgeState.pb-c.c | 32 ++++---- .../Communication/PMR/IFS/CartridgeState.pb-c.h | 18 ++-- .../PMR/Printing/ProcessParameters.pb-c.c | 19 ++++- .../PMR/Printing/ProcessParameters.pb-c.h | 4 +- Software/Embedded_SW/Embedded/DataDef.h | 2 +- .../Embedded/Modules/General/MachineStatus.c | 96 +++++++--------------- .../Embedded/Modules/General/MachineStatus.h | 4 + .../Embedded_SW/Embedded/Modules/General/process.c | 3 + .../Embedded_SW/Embedded/Modules/General/process.h | 1 + .../Embedded/Modules/IDS/IDS_Cleaning.c | 8 +- Software/Embedded_SW/Embedded/Modules/IFS/ifs.c | 19 ++--- .../Embedded/Modules/Waste/Waste_maint.c | 3 - 12 files changed, 99 insertions(+), 110 deletions(-) (limited to 'Software/Embedded_SW') diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/IFS/CartridgeState.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/IFS/CartridgeState.pb-c.c index 3c228ede9..2c68013f3 100644 --- a/Software/Embedded_SW/Embedded/Communication/PMR/IFS/CartridgeState.pb-c.c +++ b/Software/Embedded_SW/Embedded/Communication/PMR/IFS/CartridgeState.pb-c.c @@ -7,7 +7,7 @@ #endif #include "CartridgeState.pb-c.h" -static const ProtobufCEnumValue cartridge_state__enum_values_by_number[11] = +static const ProtobufCEnumValue cartridge_state__enum_values_by_number[13] = { { "", "", 0 }, { "", "", 1 }, @@ -16,27 +16,31 @@ static const ProtobufCEnumValue cartridge_state__enum_values_by_number[11] = { "", "", 4 }, { "", "", 5 }, { "", "", 6 }, - { "", "", 7 }, - { "", "", 8 }, - { "", "", 9 }, { "", "", 10 }, + { "", "", 11 }, + { "", "", 12 }, + { "", "", 20 }, + { "", "", 21 }, + { "", "", 22 }, }; static const ProtobufCIntRange cartridge_state__value_ranges[] = { -{0, 0},{0, 11} +{0, 0},{10, 7},{20, 10},{0, 13} }; -static const ProtobufCEnumValueIndex cartridge_state__enum_values_by_name[11] = +static const ProtobufCEnumValueIndex cartridge_state__enum_values_by_name[13] = { { "", 1 }, - { "", 8 }, + { "", 4 }, + { "", 10 }, + { "", 11 }, + { "", 12 }, { "", 6 }, { "", 7 }, - { "", 10 }, - { "", 2 }, - { "", 4 }, - { "", 5 }, + { "", 8 }, { "", 9 }, + { "", 5 }, { "", 3 }, { "", 0 }, + { "", 2 }, }; const ProtobufCEnumDescriptor cartridge_state__descriptor = { @@ -45,11 +49,11 @@ const ProtobufCEnumDescriptor cartridge_state__descriptor = "", "", "", - 11, + 13, cartridge_state__enum_values_by_number, - 11, + 13, cartridge_state__enum_values_by_name, - 1, + 3, cartridge_state__value_ranges, NULL,NULL,NULL,NULL /* reserved[1234] */ }; diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/IFS/CartridgeState.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/IFS/CartridgeState.pb-c.h index 5d3cd4bb5..381762161 100644 --- a/Software/Embedded_SW/Embedded/Communication/PMR/IFS/CartridgeState.pb-c.h +++ b/Software/Embedded_SW/Embedded/Communication/PMR/IFS/CartridgeState.pb-c.h @@ -22,15 +22,17 @@ PROTOBUF_C__BEGIN_DECLS typedef enum _CartridgeState { CARTRIDGE_STATE__None = 0, CARTRIDGE_STATE__Absent = 1, - CARTRIDGE_STATE__Exists = 2, + CARTRIDGE_STATE__Present = 2, CARTRIDGE_STATE__Inserted = 3, - CARTRIDGE_STATE__Filling = 4, - CARTRIDGE_STATE__FillingCompleted = 5, - CARTRIDGE_STATE__Emptying = 6, - CARTRIDGE_STATE__EmptyingCompleted = 7, - CARTRIDGE_STATE__Empty = 8, - CARTRIDGE_STATE__Full = 9, - CARTRIDGE_STATE__Error = 10 + CARTRIDGE_STATE__Empty = 4, + CARTRIDGE_STATE__Full = 5, + CARTRIDGE_STATE__Error = 6, + CARTRIDGE_STATE__Filling = 10, + CARTRIDGE_STATE__FillingCompleted = 11, + CARTRIDGE_STATE__FillingFailed = 12, + CARTRIDGE_STATE__Emptying = 20, + CARTRIDGE_STATE__EmptyingCompleted = 21, + CARTRIDGE_STATE__EmpyingFailed = 22 PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(CARTRIDGE_STATE) } CartridgeState; diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Printing/ProcessParameters.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Printing/ProcessParameters.pb-c.c index a27a2202e..44acaa3ad 100644 --- a/Software/Embedded_SW/Embedded/Communication/PMR/Printing/ProcessParameters.pb-c.c +++ b/Software/Embedded_SW/Embedded/Communication/PMR/Printing/ProcessParameters.pb-c.c @@ -52,7 +52,7 @@ void process_parameters__free_unpacked assert(message->base.descriptor == &process_parameters__descriptor); protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator); } -static const ProtobufCFieldDescriptor process_parameters__field_descriptors[31] = +static const ProtobufCFieldDescriptor process_parameters__field_descriptors[32] = { { "", @@ -426,8 +426,21 @@ static const ProtobufCFieldDescriptor process_parameters__field_descriptors[31] 0, /* flags */ 0,NULL,NULL /* reserved1,reserved2, etc */ }, + { + "", + 32, + PROTOBUF_C_LABEL_OPTIONAL, + PROTOBUF_C_TYPE_DOUBLE, + offsetof(ProcessParameters, has_archeadcleaningmotorspeed), + offsetof(ProcessParameters, archeadcleaningmotorspeed), + NULL, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, }; static const unsigned process_parameters__field_indices_by_name[] = { + 31, /* field[31] = ArcHeadCleaningMotorSpeed */ 13, /* field[13] = DryerAirFlow */ 17, /* field[17] = DryerBufferLength */ 14, /* field[14] = DryerZone1Temp */ @@ -463,7 +476,7 @@ static const unsigned process_parameters__field_indices_by_name[] = { static const ProtobufCIntRange process_parameters__number_ranges[1 + 1] = { { 1, 0 }, - { 0, 31 } + { 0, 32 } }; const ProtobufCMessageDescriptor process_parameters__descriptor = { @@ -473,7 +486,7 @@ const ProtobufCMessageDescriptor process_parameters__descriptor = "", "", sizeof(ProcessParameters), - 31, + 32, process_parameters__field_descriptors, process_parameters__field_indices_by_name, 1, process_parameters__number_ranges, diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Printing/ProcessParameters.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Printing/ProcessParameters.pb-c.h index 9a6453221..aa762a3d6 100644 --- a/Software/Embedded_SW/Embedded/Communication/PMR/Printing/ProcessParameters.pb-c.h +++ b/Software/Embedded_SW/Embedded/Communication/PMR/Printing/ProcessParameters.pb-c.h @@ -88,10 +88,12 @@ struct _ProcessParameters double lblowertemp; protobuf_c_boolean has_pressurebuildup; double pressurebuildup; + protobuf_c_boolean has_archeadcleaningmotorspeed; + double archeadcleaningmotorspeed; }; #define PROCESS_PARAMETERS__INIT \ { PROTOBUF_C_MESSAGE_INIT (&process_parameters__descriptor) \ - , 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } + , 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } /* ProcessParameters methods */ diff --git a/Software/Embedded_SW/Embedded/DataDef.h b/Software/Embedded_SW/Embedded/DataDef.h index 864df2aee..e8410aaa6 100644 --- a/Software/Embedded_SW/Embedded/DataDef.h +++ b/Software/Embedded_SW/Embedded/DataDef.h @@ -24,7 +24,7 @@ //#define DISPESER_TEST //#define FPGA_WATCHDOG_DISABLE -#define FOUR_WINDERS +//#define FOUR_WINDERS #ifdef FOUR_WINDERS #define BTSR_NO_TFU #endif diff --git a/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c b/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c index 5c0e48054..9e5b75c83 100644 --- a/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c +++ b/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c @@ -215,82 +215,40 @@ uint32_t StopMachineUpdateFunc(MessageContainer* requestContainer) return OK; } -typedef enum +/*struct _Cartridge { - IFS_Cartridge, - Middle_Waste_Cartridge, - Lower_Waste_Cartridge + ProtobufCMessage base; + protobuf_c_boolean has_slot; + CartridgeSlot slot; + CartridgeTagContent *tag; + protobuf_c_boolean has_index; + int32_t index; }; -extern CartridgeState IFS_State; -extern CartridgeState Middle_Cartridge_State; -extern CartridgeState Lower_Cartridge_State; + typedef enum _CartridgeSlot { + CARTRIDGE_SLOT__Ink = 0, + CARTRIDGE_SLOT__WasteMiddle = 1, + CARTRIDGE_SLOT__WasteLower = 2 + PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(CARTRIDGE_SLOT) +} CartridgeSlot; + * */ char WasteEmptyingToken[36+1] = {0}; -uint32_t WasteEmptyingUpdate(void) +uint32_t CartridgeStateUpdate(CartridgeSlot Slot,CartridgeState State) { uint32_t status = NOT_SUPPORTED,i; MessageContainer responseContainer; - CartridgeStatus Cartridges[MAX_CARTRIDGES+1]; + CartridgeStatus CartridgeStatus = CARTRIDGE_STATUS__INIT; + Cartridge CartData = CARTRIDGE__INIT; StartInkFillingStatusResponse response = START_INK_FILLING_STATUS_RESPONSE__INIT; response.status->n_cartridgesstatuses = MAX_CARTRIDGES; - for (i = 0;icartridgesstatuses[i] = &Cartridges[i]; - } - if (IFS_CartridgeLowerPresent()) - { - Cartridges[IFS_Cartridge].has_state = true; - Cartridges[IFS_Cartridge].state = IFS_State; - } - if (WHS_WasteCartridgeMiddlePresent()) - { - Cartridges[Middle_Waste_Cartridge].has_state = true; - switch (cartGetState(WasteCartridge_middle)) - { - case CartridgeStateOUT: - Cartridges[Middle_Waste_Cartridge].state = CARTRIDGE_STATE__Absent; - break; - case CartridgeStateIN: - Cartridges[Middle_Waste_Cartridge].state = CARTRIDGE_STATE__Inserted; - break; - case CartridgeStateSELECTED: - Cartridges[Middle_Waste_Cartridge].state = CARTRIDGE_STATE__Exists; - break; - case CartridgeStateACTIVE: - Cartridges[Middle_Waste_Cartridge].state = CARTRIDGE_STATE__Emptying; - break; - case CartridgeStateFULL: - Cartridges[Middle_Waste_Cartridge].state = CARTRIDGE_STATE__EmptyingCompleted; - break; - default: - break; - } - } - if (WHS_WasteCartridgeLowerPresent()) - { - Cartridges[Lower_Waste_Cartridge].has_state = true; - switch (cartGetState(WasteCartridge_lower)) - { - case CartridgeStateOUT: - Cartridges[Lower_Waste_Cartridge].state = CARTRIDGE_STATE__Absent; - break; - case CartridgeStateIN: - Cartridges[Lower_Waste_Cartridge].state = CARTRIDGE_STATE__Inserted; - break; - case CartridgeStateSELECTED: - Cartridges[Lower_Waste_Cartridge].state = CARTRIDGE_STATE__Exists; - break; - case CartridgeStateACTIVE: - Cartridges[Lower_Waste_Cartridge].state = CARTRIDGE_STATE__Emptying; - break; - case CartridgeStateFULL: - Cartridges[Lower_Waste_Cartridge].state = CARTRIDGE_STATE__EmptyingCompleted; - break; - default: - break; - } - } + response.status->cartridgesstatuses[0] = &CartridgeStatus; + CartridgeStatus.has_state = true; + CartridgeStatus.state = State; + CartridgeStatus.cartridge = &CartData; + CartData.has_slot = true; + CartData.slot = Slot; + + /* @@ -347,7 +305,9 @@ uint32_t StartInkFillingStatusRequestFunc(MessageContainer* requestContainer) StartInkFillingStatusRequest* request = start_ink_filling_status_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data); ustrncpy (WasteEmptyingToken, requestContainer->token,36); - WasteEmptyingUpdate(); + CartridgeStateUpdate(CARTRIDGE_SLOT__Ink,CARTRIDGE_STATE__None); + CartridgeStateUpdate(CARTRIDGE_SLOT__WasteMiddle,CARTRIDGE_STATE__None); + CartridgeStateUpdate(CARTRIDGE_SLOT__WasteLower,CARTRIDGE_STATE__None); start_ink_filling_status_request__free_unpacked(request,NULL); return status; // case MESSAGE_TYPE__StartWasteEmptyingRequest: diff --git a/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.h b/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.h index a7c55ad9b..b421785cc 100644 --- a/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.h +++ b/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.h @@ -9,6 +9,8 @@ #define MODULES_GENERAL_MACHINESTATUS_H_ #include #include "PMR/MachineStatus/MachineState.pb-c.h" +#include "PMR/IFS/CartridgeState.pb-c.h" +#include "PMR/Diagnostics/CartridgeSlot.pb-c.h" uint32_t MachineUpdateInitFunc(MessageContainer* requestContainer); uint32_t StopMachineUpdateFunc(MessageContainer* requestContainer); @@ -16,6 +18,8 @@ void SetMachineStatus (MachineState State); int MachineUpdateResponseFunc(void); uint32_t StartInkFillingStatusRequestFunc(MessageContainer* requestContainer); +uint32_t CartridgeStateUpdate(CartridgeSlot Slot,CartridgeState State); + diff --git a/Software/Embedded_SW/Embedded/Modules/General/process.c b/Software/Embedded_SW/Embedded/Modules/General/process.c index e5595a965..4538d0336 100644 --- a/Software/Embedded_SW/Embedded/Modules/General/process.c +++ b/Software/Embedded_SW/Embedded/Modules/General/process.c @@ -42,6 +42,7 @@ double pressurebuildup = 0; double dryerzone1temp = 0; int32_t tableindex = 0; double headBlowersFlow[2] = {1.0,1.0}; +double ArcCleaningMotorSpeed = 0.0; double dryerbufferMeters = 0; double dryerbufferCentimeters = 0; @@ -149,6 +150,7 @@ uint32_t HandleProcessParameters(ProcessParameters* ProcessParams,bool saveData) dryerbufferCentimeters = dryerbufferlength*76+90; + mininkuptake = ProcessParams->mininkuptake; feedertension = ProcessParams->feedertension; pullertension = ProcessParams->pullertension; @@ -157,6 +159,7 @@ uint32_t HandleProcessParameters(ProcessParameters* ProcessParams,bool saveData) dryerairflow = ProcessParams->dryerairflow; pressurebuildup = ProcessParams->pressurebuildup; dryerzone1temp = ProcessParams->dryerzone1temp; + ArcCleaningMotorSpeed = ProcessParams->archeadcleaningmotorspeed; if (MachineReadyForHeating == false) { diff --git a/Software/Embedded_SW/Embedded/Modules/General/process.h b/Software/Embedded_SW/Embedded/Modules/General/process.h index f7f16d11e..4a1583aa8 100644 --- a/Software/Embedded_SW/Embedded/Modules/General/process.h +++ b/Software/Embedded_SW/Embedded/Modules/General/process.h @@ -20,6 +20,7 @@ extern double dryerairflow; extern double pressurebuildup; extern double dryerzone1temp; extern double headBlowersFlow[2]; +extern double ArcCleaningMotorSpeed; extern int32_t tableindex; diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_Cleaning.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_Cleaning.c index c06e79311..2e3d61f0c 100644 --- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_Cleaning.c +++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_Cleaning.c @@ -8,6 +8,7 @@ #include "ids.h" #include "ids_ex.h" #include "../control/control.h" +#include "modules/General/process.h" #include "../control/pidalgo.h" #include "../thread/thread.h" #include "PMR/Hardware/Hardwaremotor.pb-c.h" @@ -96,8 +97,11 @@ uint32_t IDS_Cleaning_Move_Actuators() } } else { //arc if (CleaningStageCounter == 0) { - MotorSetSpeed(MotorId, 750); - ReportWithPackageFilter(IDSFilter,"IDS_Cleaning_Motor_Run", __FILE__, __LINE__, 1, RpWarning, CleaningStageCounter, 0); + if (ArcCleaningMotorSpeed>1) + MotorSetSpeed(MotorId, ArcCleaningMotorSpeed); + else + MotorSetSpeed(MotorId, 750); + ReportWithPackageFilter(IDSFilter,"IDS_Cleaning_Motor_Run", __FILE__, __LINE__, 750, RpWarning, (int)ArcCleaningMotorSpeed, 0); } } CleaningStageCounter++; diff --git a/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c b/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c index fd8d2f9e0..d62ad3a43 100644 --- a/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c +++ b/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c @@ -47,7 +47,6 @@ uint32_t midTankTimeoutCounter = 0; double MidTankEmptyLimit = MidTank_Pressure_EMPTY; MidTankStateEnum midTankState = 0; -CartridgeState IFS_State = CARTRIDGE_STATE__None; char CartridgeRequestToken[36+1]; int CartridgeRequestId = 0x01010101; @@ -148,7 +147,7 @@ bool CartridgeInkFull() //currently sensor work properly only until 1.6 - 1.8 Liter (TBD) Report("DetectIfCartridgeFinished", __FILE__,__LINE__,int_MidTank_Pressure_1000, RpMessage, int_MidTank_Pressure_1000, 0); //return true; - IFS_State = CARTRIDGE_STATE__FillingCompleted; + //IFS_State = CARTRIDGE_STATE__FillingCompleted; } } return false; @@ -277,7 +276,7 @@ void midTankStateMachine(void) break; } //check RFID? (TBD) - IFS_State = CARTRIDGE_STATE__Inserted; + //IFS_State = CARTRIDGE_STATE__Inserted; // send request for validation to ppc inkAuthenticationPass = 2; //not defined @@ -299,13 +298,13 @@ void midTankStateMachine(void) Report("MidTank Cartridge authentication wait...", __FILE__, __LINE__, authenticationTimeOutCounter, RpMessage, 0, 0); if (authenticationTimeOutCounter > 60) { midTankState = MidTankStateIdle; - IFS_State = CARTRIDGE_STATE__Error; + //IFS_State = CARTRIDGE_STATE__Error; } break; } if (inkAuthenticationPass == false) { Report("MidTank Cartridge authentication fail", __FILE__, __LINE__, 0, RpMessage, 0, 0); - IFS_State = CARTRIDGE_STATE__Error; + //IFS_State = CARTRIDGE_STATE__Error; midTankState = MidTankStateIdle; break; } @@ -317,13 +316,13 @@ void midTankStateMachine(void) cart1.color = fastBILNK; Report("Mid-tank not empty", __FILE__, __LINE__, midTankCapacity, RpMessage, MidTankEmptyLimit, 0); midTankState = MidTankStateIdle; - IFS_State = CARTRIDGE_STATE__Exists; + //IFS_State = CARTRIDGE_STATE__Exists; break; } Report("Mid-tank filling in process", __FILE__,__LINE__,(int)(MidTankEmptyLimit*1000), RpMessage, (int)(midTankCapacity*1000), 0); Pannel_Leds(CART_1, MODE_ON); cart1.color = BLINK; - IFS_State = CARTRIDGE_STATE__Filling; + //IFS_State = CARTRIDGE_STATE__Filling; if (midTankCartColor == MIDTANK_8) { @@ -348,7 +347,7 @@ void midTankStateMachine(void) Report("Cartridge extracted during filling!!!", __FILE__, __LINE__, midTankState, RpMessage, 0, 0); Report("Mid-tank # filling fail", __FILE__, __LINE__, midTankState, RpMessage, 0, 0); midTankState = MidTankStateIdle; - IFS_State = CARTRIDGE_STATE__Absent; + //IFS_State = CARTRIDGE_STATE__Absent; } // if time out or emptying done - idle if (midTankTimeoutCounter++ > CartridgeInkTimeout) { @@ -358,7 +357,7 @@ void midTankStateMachine(void) MidTankValvesAction(Cartridge_MidTank_OFF); Report("Mid-tank # filling fail", __FILE__, __LINE__, midTankState, RpMessage, 0, 0); Report("Call customer support", __FILE__, __LINE__, midTankState, RpMessage, 0, 0); - IFS_State = CARTRIDGE_STATE__Error; + //IFS_State = CARTRIDGE_STATE__Error; midTankState = MidTankStateIdle; } else if (CartridgeInkFull()) { midTankTimeoutCounter = 0; @@ -367,7 +366,7 @@ void midTankStateMachine(void) MidTankValvesAction(Cartridge_MidTank_OFF); Report("Mid-tank # filling done", __FILE__, __LINE__, midTankState, RpMessage, 0, 0); midTankState = MidTankStateIdle; - IFS_State = CARTRIDGE_STATE__FillingCompleted; + //IFS_State = CARTRIDGE_STATE__FillingCompleted; } break; default: diff --git a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c index e1e2efa04..267a4e7be 100644 --- a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c +++ b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c @@ -41,9 +41,6 @@ uint32_t Cartridge_Cover_Control; button *CartLed[MaxWasteCartridges] = {0, &cart2, &cart3}; WasteTankStateEnum WasteTankState = WasteTankStateIdle; -CartridgeState Middle_Cartridge_State = CARTRIDGE_STATE__None; -CartridgeState Lower_Cartridge_State = CARTRIDGE_STATE__None; - int init = 1; bool setWasteValve (WasteCartridgeEnum WasteCartridge); -- cgit v1.3.1 From 7e83c1a8c4d78a6a53825bed9bb2c40e00926bbf Mon Sep 17 00:00:00 2001 From: Ronen Sberlo Date: Tue, 13 Oct 2020 12:37:38 +0300 Subject: blower alarm fix --- .../Embedded/Modules/Heaters/Heaters_print.c | 41 ++++++++++++---------- 1 file changed, 22 insertions(+), 19 deletions(-) (limited to 'Software/Embedded_SW') diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c index c59ef6086..58a3402ee 100644 --- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c +++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c @@ -1185,29 +1185,32 @@ uint32_t HeaterBlowerMaxTempCBFunction(uint32_t IfIndex, uint32_t readValue) } // alarm handling - if ((HeaterPreviousRead[index]) >= HeaterControl[index].sensormaxvalue) + if (HeaterPreviousRead[index] >= HeaterControl[index].sensormaxvalue) { - if(OverHeatCounter[index]++ >=Overheat_Count_Limit) + if (HeaterCmd[index].targettemperatue) { - OverHeatCounter[index] = Overheat_Count_Limit; - if (JobIsActive()&&(HeaterReady[index]==true)) + if(OverHeatCounter[index]++ >=Overheat_Count_Limit) { - JobEndReason = JOB_TEMPERATURE_ALARM; - SendJobProgress(0.0,0,false, "Temperature Error"); - AbortJob("Over Temperature Error"); - ReportWithPackageFilter(HeatersFilter, "Temperature Error",__FILE__,__LINE__,index,RpError, 0,0); - return OK; - } + OverHeatCounter[index] = Overheat_Count_Limit; + if (JobIsActive()&&(HeaterReady[index]==true)) + { + JobEndReason = JOB_TEMPERATURE_ALARM; + SendJobProgress(0.0,0,false, "Temperature Error"); + AbortJob("Over Temperature Error"); + ReportWithPackageFilter(HeatersFilter, "Temperature Error",__FILE__,__LINE__,index,RpError, 0,0); + return OK; + } - if ((HeaterReady[index]==false)&&(HeaterPreviousRead[index]>HeaterCmd[index].targettemperatue)) - { - ReportWithPackageFilter(HeatersFilter,"DC Heater Over the max temperature, cooling off",__FILE__,index,HeaterPreviousRead[index],RpWarning, HeaterCmd[index].targettemperatue,0); - } - else - { - ReportWithPackageFilter(HeatersFilter,"DC Heater Over the max temperature, turned off",__FILE__,index,HeaterPreviousRead[index],RpWarning, HeaterReady[index],0); - ReportWithPackageFilter(HeatersFilter,"Heater over the max temperature",__FILE__,index,OverHeatCounter[index],RpWarning,HeaterControl[index].sensormaxvalue, 0); - AlarmHandlingSetAlarm(HeaterEventType[index], true); + if ((HeaterReady[index]==false)&&(HeaterPreviousRead[index]>HeaterCmd[index].targettemperatue)) + { + ReportWithPackageFilter(HeatersFilter,"DC Heater Over the max temperature, cooling off",__FILE__,index,HeaterPreviousRead[index],RpWarning, HeaterCmd[index].targettemperatue,0); + } + else + { + ReportWithPackageFilter(HeatersFilter,"DC Heater Over the max temperature, turned off",__FILE__,index,HeaterPreviousRead[index],RpWarning, HeaterReady[index],0); + ReportWithPackageFilter(HeatersFilter,"Heater over the max temperature",__FILE__,index,OverHeatCounter[index],RpWarning,HeaterControl[index].sensormaxvalue, 0); + AlarmHandlingSetAlarm(HeaterEventType[index], true); + } } } } -- cgit v1.3.1 From fbcbb53bf8a04a5d487bf0a2cc497f69490f4bdb Mon Sep 17 00:00:00 2001 From: Ronen Sberlo Date: Tue, 13 Oct 2020 16:23:31 +0300 Subject: blower alarm fix --- .../Embedded/Modules/Heaters/Heaters_print.c | 49 ++++++++++++---------- 1 file changed, 27 insertions(+), 22 deletions(-) (limited to 'Software/Embedded_SW') diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c index 58a3402ee..93548683f 100644 --- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c +++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c @@ -1185,33 +1185,38 @@ uint32_t HeaterBlowerMaxTempCBFunction(uint32_t IfIndex, uint32_t readValue) } // alarm handling - if (HeaterPreviousRead[index] >= HeaterControl[index].sensormaxvalue) + if ((HeaterPreviousRead[index] >= HeaterControl[index].sensormaxvalue) && (HeaterCmd[index].targettemperatue)) { - if (HeaterCmd[index].targettemperatue) + if(OverHeatCounter[index]++ >=Overheat_Count_Limit) { - if(OverHeatCounter[index]++ >=Overheat_Count_Limit) + OverHeatCounter[index] = Overheat_Count_Limit; + if (JobIsActive()&&(HeaterReady[index]==true)) { - OverHeatCounter[index] = Overheat_Count_Limit; - if (JobIsActive()&&(HeaterReady[index]==true)) - { - JobEndReason = JOB_TEMPERATURE_ALARM; - SendJobProgress(0.0,0,false, "Temperature Error"); - AbortJob("Over Temperature Error"); - ReportWithPackageFilter(HeatersFilter, "Temperature Error",__FILE__,__LINE__,index,RpError, 0,0); - return OK; - } + JobEndReason = JOB_TEMPERATURE_ALARM; + SendJobProgress(0.0,0,false, "Temperature Error"); + AbortJob("Over Temperature Error"); + ReportWithPackageFilter(HeatersFilter, "Temperature Error",__FILE__,__LINE__,index,RpError, 0,0); + return OK; + } - if ((HeaterReady[index]==false)&&(HeaterPreviousRead[index]>HeaterCmd[index].targettemperatue)) - { - ReportWithPackageFilter(HeatersFilter,"DC Heater Over the max temperature, cooling off",__FILE__,index,HeaterPreviousRead[index],RpWarning, HeaterCmd[index].targettemperatue,0); - } - else - { - ReportWithPackageFilter(HeatersFilter,"DC Heater Over the max temperature, turned off",__FILE__,index,HeaterPreviousRead[index],RpWarning, HeaterReady[index],0); - ReportWithPackageFilter(HeatersFilter,"Heater over the max temperature",__FILE__,index,OverHeatCounter[index],RpWarning,HeaterControl[index].sensormaxvalue, 0); - AlarmHandlingSetAlarm(HeaterEventType[index], true); - } + if ((HeaterReady[index]==false)&&(HeaterPreviousRead[index]>HeaterCmd[index].targettemperatue)) + { + ReportWithPackageFilter(HeatersFilter,"DC Heater Over the max temperature, cooling off",__FILE__,index,HeaterPreviousRead[index],RpWarning, HeaterCmd[index].targettemperatue,0); } + else + { + ReportWithPackageFilter(HeatersFilter,"DC Heater Over the max temperature, turned off",__FILE__,index,HeaterPreviousRead[index],RpWarning, HeaterReady[index],0); + ReportWithPackageFilter(HeatersFilter,"Heater over the max temperature",__FILE__,index,OverHeatCounter[index],RpWarning,HeaterControl[index].sensormaxvalue, 0); + AlarmHandlingSetAlarm(HeaterEventType[index], true); + } + } + } + else if ((HeaterPreviousRead[index] < HeaterControl[index].sensormaxvalue) && (!HeaterCmd[index].targettemperatue)) + { + if(OverHeatCounter[index]++ >=Overheat_Count_Limit) + { + OverHeatCounter[index] = Overheat_Count_Limit; + AlarmHandlingSetAlarm(HeaterEventType[index], false); } } else if ((HeaterPreviousRead[index]) < (HeaterControl[index].sensorminvalue)) -- cgit v1.3.1 From 24de6b5327fc26a47964e2e39ce764eb555bae8c Mon Sep 17 00:00:00 2001 From: Shlomo Hecht Date: Wed, 14 Oct 2020 00:01:30 +0300 Subject: heaters prepare - cancel heater ready, LFN test --- Software/Embedded_SW/Embedded/.cproject | 2 +- .../Embedded/Common/Utilities/RFIDTagHandling.c | 104 ++++++++++----------- Software/Embedded_SW/Embedded/DataDef.h | 12 ++- .../Embedded/Drivers/Flash_Memory/FATFS/ff.c | 8 +- .../I2C_Communication/RFID_NFC/RFIDTagInfo.h | 97 ++++++++++++------- Software/Embedded_SW/Embedded/Embedded.cfg | 2 +- .../Embedded/Modules/AlarmHandling/AlarmHandling.c | 3 +- .../Embedded/Modules/General/MachineStatus.c | 2 + .../Embedded/Modules/Heaters/Heaters_print.c | 35 +++---- .../Embedded/Software Release Notes.txt | 32 ++++--- 10 files changed, 171 insertions(+), 126 deletions(-) (limited to 'Software/Embedded_SW') diff --git a/Software/Embedded_SW/Embedded/.cproject b/Software/Embedded_SW/Embedded/.cproject index 88f4e5215..ecfc74bc3 100644 --- a/Software/Embedded_SW/Embedded/.cproject +++ b/Software/Embedded_SW/Embedded/.cproject @@ -288,7 +288,7 @@ - +