diff options
| author | Avi Levkovich <avi@twine-s.com> | 2020-10-22 13:20:27 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2020-10-22 13:20:27 +0300 |
| commit | be590cb8631d480e904ca9685e616c8fd6c1d573 (patch) | |
| tree | 767285551281f7a8b46f8fba4f5fbbf61888c3c1 /Software/Embedded_SW/Embedded/Modules/Diagnostics | |
| parent | 7fc1b65544237cc84a6f92ccf00f51a4e77190a9 (diff) | |
| parent | 1c089e07b393722183acaee32b903df630b32862 (diff) | |
| download | Tango-be590cb8631d480e904ca9685e616c8fd6c1d573.tar.gz Tango-be590cb8631d480e904ca9685e616c8fd6c1d573.zip | |
merge conflicts
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Diagnostics')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c | 4 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsJogging.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c index 3cccbe463..ab1f5b4a7 100644 --- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c +++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c @@ -114,8 +114,8 @@ double dryerzone3temperature[DIAGNOSTICS_LIMIT+1];*/ double dispensermotorfrequency[MAX_SYSTEM_DISPENSERS][DIAGNOSTICS_LIMIT+1]; double dispenserspressure[MAX_SYSTEM_DISPENSERS][DIAGNOSTICS_LIMIT+1]; -double dispenserinklevel[MAX_SYSTEM_DISPENSERS][1]; -double midtankinklevel[MAX_SYSTEM_DISPENSERS][1]; +//double dispenserinklevel[MAX_SYSTEM_DISPENSERS][1]; +//double midtankinklevel[MAX_SYSTEM_DISPENSERS][1]; double MidTankpressure[MAX_SYSTEM_DISPENSERS][1]; double HeadFlowMeter,TotalFlowMeter; //double tempFlow = 0.0; diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsJogging.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsJogging.c index 0bb16c623..6d09e9f9e 100644 --- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsJogging.c +++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsJogging.c @@ -232,7 +232,7 @@ uint32_t DispenserAbortJoggingRequestFunc(MessageContainer* requestContainer) TimerMotors_t MotorId = (request->index)+HARDWARE_MOTOR_TYPE__MOTO_DISPENSER_1; MotorStop(MotorId,Hard_Hiz); CurrentDispenserSpeed[request->index] = 0; - Control3WayValvesWithCallback ((Valves_t) request->index, MidTank_Dispenser, NULL); //direction: MidTank_Dispenser or Dispenser_Mixer + Control3WayValvesWithCallback ((Valves_t) request->index, Dispenser_Mixer, NULL); //direction: MidTank_Dispenser or Dispenser_Mixer if (request->index == LUBRICANT_DISPENSER) { |