merge conflicts

6 files changed, 10 insertions, 6 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)
     {
diff --git a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
index 774fd105b..2073fbaf0 100644
--- a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
+++ b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
@@ -289,7 +289,7 @@ void LoadConfigurationParameters(ConfigurationParameters *Params)
             EmbeddedParameters->has_ids_presegment_wfcf_timebeforesegment = true;
             EmbeddedParameters->ids_presegment_wfcf_timebeforesegment = 20000;
             uint8_t* response_buffer = my_malloc(configuration_parameters__get_packed_size(EmbeddedParameters));
-            size_t response_size = 0;
+
             if (response_buffer)
             {
                 /*response_size = configuration_parameters__pack(EmbeddedParameters, response_buffer);
diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_maint.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_maint.c
index 991f4ecc0..4fe32e7cd 100644
--- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_maint.c
+++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_maint.c
@@ -572,11 +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
+/*#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
+#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 cd3feb624..1cf53fd07 100644
--- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
@@ -642,6 +642,7 @@ bool AdjustDispenserSpeedToPressure(int DispenserId, double RefMaxPressure,doubl
          {
              endOfPrepareWCF = true;
              result = ModuleFail;
+             JobEndReason = JOB_PRESSURE_ALARM;
              pressureReady = true;
              ReportWithPackageFilter(IDSFilter,"pressure timeout!",__FILE__,DispenserBuildTimeCounter,NumofReadyDispensers,RpWarning,(int)(DispenserPreparePressure*100),0);
              for (i = 0; i < MAX_DYE_DISPENSERS; i++)
diff --git a/Software/Embedded_SW/Embedded/Modules/Waste/newWHS_init.c b/Software/Embedded_SW/Embedded/Modules/Waste/newWHS_init.c
index 3a84a1bbd..b5dc7f3fe 100644
--- a/Software/Embedded_SW/Embedded/Modules/Waste/newWHS_init.c
+++ b/Software/Embedded_SW/Embedded/Modules/Waste/newWHS_init.c
@@ -86,6 +86,9 @@ bool newWHS_init(void)
     //Set_All_WHS_Fans(0xFF);
  //   delayms(4000);
     //Trigger_SetWHSBlowerVoltage (0x0C00);
+    Task_sleep(1);
+    InitConsole_WHS_UART3();//WHS Shinko communication
+
 
 
 return status;