diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2019-10-13 10:38:32 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2019-10-13 10:38:32 +0300 |
| commit | 4063ac0a97167f7026947ac164a0c8ea8ebfe71d (patch) | |
| tree | 23d5e04933bfda3fe0297cba738c9db5aff86006 | |
| parent | dc3772b6cfba694595a05067adde86660a4f77f9 (diff) | |
| parent | 055d197e2b7d34b3ce1b571fe2637bddefa92686 (diff) | |
| download | Tango-4063ac0a97167f7026947ac164a0c8ea8ebfe71d.tar.gz Tango-4063ac0a97167f7026947ac164a0c8ea8ebfe71d.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
| -rw-r--r-- | Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c | 4 | ||||
| -rw-r--r-- | Software/Stubs Collection/stubs/embeddedparametersbuild.cs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c b/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c index f2dafd1b3..f45206f24 100644 --- a/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c +++ b/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c @@ -166,7 +166,7 @@ uint32_t InitSequenceMidTankCallBackFunction(uint32_t IfIndex, uint32_t BusyFlag portId = (MidTankOperationCounter - MidTankCloseAir) ; //0-7 Disable_MidTank_Pressure_Reading(portId); Valve_Set(IDS_Id_to_AirValve[portId], Atm_MidTank_OFF ); //Atm_MidTank_OFF/ON - Control3WayValvesWithCallback ((Valves_t)portId, MidTank_Dispenser, NULL); //direction: MidTank_Dispenser or Dispenser_Mixer + //Control3WayValvesWithCallback ((Valves_t)portId, MidTank_Dispenser, NULL); //direction: MidTank_Dispenser or Dispenser_Mixer } else if (MidTankOperationCounter >= MidTankReadPressure) @@ -183,7 +183,7 @@ uint32_t InitSequenceMidTankCallBackFunction(uint32_t IfIndex, uint32_t BusyFlag portId = (MidTankOperationCounter - MidTankOpenAir) ; //0-7 Enable_MidTank_Pressure_Reading(portId); Valve_Set(IDS_Id_to_AirValve[portId], Atm_MidTank_ON ); //Atm_MidTank_OFF/ON - Control3WayValvesWithCallback ((Valves_t)portId, Dispenser_Mixer, NULL); //direction: MidTank_Dispenser or Dispenser_Mixer + //Control3WayValvesWithCallback ((Valves_t)portId, Dispenser_Mixer, NULL); //direction: MidTank_Dispenser or Dispenser_Mixer } MidTankOperationCounter++; return OK; diff --git a/Software/Stubs Collection/stubs/embeddedparametersbuild.cs b/Software/Stubs Collection/stubs/embeddedparametersbuild.cs index c3d5c9c75..50af48f35 100644 --- a/Software/Stubs Collection/stubs/embeddedparametersbuild.cs +++ b/Software/Stubs Collection/stubs/embeddedparametersbuild.cs @@ -116,7 +116,7 @@ configurationParameters.GeneralParameters.Add(DispenserInitialPressureSpeed); /*7*/ Double SetDiagnosticMode = new Double(); -SetDiagnosticMode = 1.0; +SetDiagnosticMode =3.0; configurationParameters.GeneralParameters.Add(SetDiagnosticMode); /*8*/ |