diff options
| author | Shai Frieder <Shai.Frieder@twine-s.com> | 2019-05-08 11:58:29 +0300 |
|---|---|---|
| committer | Shai Frieder <Shai.Frieder@twine-s.com> | 2019-05-08 11:58:29 +0300 |
| commit | 4d2d05e80dc56983ec86eb622cf5230498cfd5d6 (patch) | |
| tree | 26d4e550bc6c384320382a14ca2e64c86ca7091c /Software/Embedded_SW/Embedded/Modules | |
| parent | 7b804781aef0f9dbc26d53d4445a23a323811b19 (diff) | |
| parent | 0503a28d97982f9dcaa29a1c1d10b1583b7f53cc (diff) | |
| download | Tango-4d2d05e80dc56983ec86eb622cf5230498cfd5d6.tar.gz Tango-4d2d05e80dc56983ec86eb622cf5230498cfd5d6.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c | 2 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c index e6b643903..f0edc56ab 100644 --- a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c +++ b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c @@ -129,7 +129,7 @@ void LoadConfigurationParameters(ConfigurationParameters *Params) EmbeddedParameters.has_openvalvetimeout = true; EmbeddedParameters.openvalvetimeout = 250; EmbeddedParameters.has_initialdispenserpressure = true; - EmbeddedParameters.initialdispenserpressure = 0.08; + EmbeddedParameters.initialdispenserpressure = 1.08; EmbeddedParameters.has_initialdispensertimeout = true; EmbeddedParameters.initialdispensertimeout = 60000; EmbeddedParameters.has_initialdispensertimelag = true; diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c index af2ca0a13..75542744f 100644 --- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c +++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c @@ -214,7 +214,7 @@ void FreeBrushStopFileData(JobDescriptionFileBrushStop *BrushStop); DispenserUsedInJob[CLEANER_DISPENSER] = true; if (JobTicket->enablelubrication == true) { - DispenserUsedInJob[LUBRICANT_DISPENSER] = true; + //DispenserUsedInJob[LUBRICANT_DISPENSER] = true; lookForLubrication = true; } @@ -329,7 +329,7 @@ c. Go to step 2.a x Segment.BrushStopsCount. DispenserUsedInJob[CLEANER_DISPENSER] = true; if (JobTicket->enablelubrication == true) { - DispenserUsedInJob[LUBRICANT_DISPENSER] = true; + //DispenserUsedInJob[LUBRICANT_DISPENSER] = true; lookForLubrication = true; } if (JobTicket->uploadstrategy == JOB_UPLOAD_STRATEGY__JobDescriptionFile) |