diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2019-09-01 17:09:06 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2019-09-01 17:09:06 +0300 |
| commit | 244715b9d82bcce33a6c444bebfa6753d2f8d1ad (patch) | |
| tree | 3383104b9331499c179081100ca982eccd851064 /Software/Embedded_SW/Embedded | |
| parent | a078a34e5f31d53c7766d526505c46977e085617 (diff) | |
| download | Tango-244715b9d82bcce33a6c444bebfa6753d2f8d1ad.tar.gz Tango-244715b9d82bcce33a6c444bebfa6753d2f8d1ad.zip | |
fix machine status and midtank reading
Diffstat (limited to 'Software/Embedded_SW/Embedded')
| -rw-r--r-- | Software/Embedded_SW/Embedded/.cproject | 2 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c | 1 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/IDS/IDS_maint.c | 10 |
3 files changed, 10 insertions, 3 deletions
diff --git a/Software/Embedded_SW/Embedded/.cproject b/Software/Embedded_SW/Embedded/.cproject index 10dda24b6..515fa0cca 100644 --- a/Software/Embedded_SW/Embedded/.cproject +++ b/Software/Embedded_SW/Embedded/.cproject @@ -441,7 +441,7 @@ </toolChain> </folderInfo> <sourceEntries> - <entry excluding="JigCommands.c|PWM.c|USBCDCD.c|Message.c|Pin_config.c|src|Configuration.c|SlowMotors.c|Timer.c|Communication.c|FastMotors.c|ADCUtils.c|Drivers/L6470|Pin.c|ADCLogger.c|Flashstore.c|Profile.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/> + <entry excluding="Drivers/Uart_Comm/Uart.c|JigCommands.c|PWM.c|USBCDCD.c|Message.c|Pin_config.c|src|Configuration.c|SlowMotors.c|Timer.c|Communication.c|FastMotors.c|ADCUtils.c|Drivers/L6470|Pin.c|ADCLogger.c|Flashstore.c|Profile.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/> </sourceEntries> </configuration> </storageModule> diff --git a/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c b/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c index 7949ee0c2..c630c2358 100644 --- a/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c +++ b/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c @@ -53,6 +53,7 @@ int MachineUpdateResponseFunc(void) { for (i = 0; i<MAX_SYSTEM_DISPENSERS;i++) { + idspack_level__init(&IDS_Level[i]); IDS_Level[i].has_index = true; IDS_Level[i].index = i; IDS_Level[i].has_dispenserlevel = true; diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_maint.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_maint.c index 0a2dff245..afd6d41e0 100644 --- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_maint.c +++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_maint.c @@ -148,6 +148,10 @@ uint32_t IDS_HomeDispenserBackMoveCallback(uint32_t motorId, uint32_t ReadValue) MotorSetMicroStep(motorId, KeepMicrostep[DispenserId]); HomingActive[DispenserId]= false; PrimingActive[DispenserId]= false; + //close dry air valve in the dispenser + Valve_Set(IDS_Id_to_AirValve[DispenserId], Atm_MidTank_OFF); + Disable_MidTank_Pressure_Reading(DispenserId); + Report("End backlash",__FILE__,millisecondCounter,(int)DispenserId,RpWarning,(int)DispenserHomingTime[DispenserId],0); if (SafeRemoveControlCallback(DispenserHomingControlId[DispenserId], IDS_HomeDispenserBackMoveCallback )==OK) DispenserHomingControlId[DispenserId] = 0xFF; @@ -167,8 +171,8 @@ uint32_t IDS_HomeDispenserCallback(uint32_t motorId, uint32_t ReadValue) Read_MidTank_Pressure_Sensor(DispenserId); //close dry air valve in the dispenser - Valve_Set(IDS_Id_to_AirValve[DispenserId], Atm_MidTank_OFF); - Disable_MidTank_Pressure_Reading(DispenserId); + //Valve_Set(IDS_Id_to_AirValve[DispenserId], Atm_MidTank_OFF); + //Disable_MidTank_Pressure_Reading(DispenserId); // MotorSetMicroStep(motorId, KeepMicrostep[DispenserId]); if (HomingRequestCallback[DispenserId]) { @@ -216,6 +220,8 @@ uint32_t IDS_HomeDispenser (uint32_t DispenserId, uint32_t speed , callback_fptr SysCtlDelay(180000); //open dry air valve in the dispenser Valve_Set(IDS_Id_to_AirValve[DispenserId], Atm_MidTank_ON); + Enable_MidTank_Pressure_Reading(DispenserId); + Read_MidTank_Pressure_Sensor(DispenserId); IDS_Dispenser_RefillStarted(DispenserId,1); MotorMovetoLimitSwitch (MotorId,1-MotorsCfg[MotorId].directionthreadwize, speed, Dispenser_Id_to_LS_Id[DispenserId], IDS_HomeDispenserCallback,0); |