Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango

4 files changed, 12 insertions, 8 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_init.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_init.c
index 81efa5662..d3d549063 100644
--- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_init.c
+++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_init.c
@@ -18,7 +18,7 @@
 
 HardwareDispenser DispensersCfg[ MAX_SYSTEM_DISPENSERS];
 
-uint32_t DispenserIdToMotorId[MAX_SYSTEM_DISPENSERS] = {HARDWARE_MOTOR_TYPE__MOTO_DISPENSER_1,HARDWARE_MOTOR_TYPE__MOTO_DISPENSER_2,HARDWARE_MOTOR_TYPE__MOTO_DISPENSER_3,HARDWARE_MOTOR_TYPE__MOTO_DISPENSER_4,HARDWARE_MOTOR_TYPE__MOTO_DISPENSER_5,HARDWARE_MOTOR_TYPE__MOTO_DISPENSER_6,HARDWARE_MOTOR_TYPE__MOTO_DISPENSER_7,HARDWARE_MOTOR_TYPE__MOTO_DISPENSER_8};
+TimerMotors_t DispenserIdToMotorId[MAX_SYSTEM_DISPENSERS] = {HARDWARE_MOTOR_TYPE__MOTO_DISPENSER_1,HARDWARE_MOTOR_TYPE__MOTO_DISPENSER_2,HARDWARE_MOTOR_TYPE__MOTO_DISPENSER_3,HARDWARE_MOTOR_TYPE__MOTO_DISPENSER_4,HARDWARE_MOTOR_TYPE__MOTO_DISPENSER_5,HARDWARE_MOTOR_TYPE__MOTO_DISPENSER_6,HARDWARE_MOTOR_TYPE__MOTO_DISPENSER_7,HARDWARE_MOTOR_TYPE__MOTO_DISPENSER_8};
 
 float DispenserPressure[MAX_SYSTEM_DISPENSERS] = {0};
 
diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
index 0374cf639..f44f2d790 100644
--- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
@@ -49,7 +49,7 @@ int JobBrushStopId = 0;
 uint32_t IDS_DispenserPidRequestMessage(HardwarePidControl* request)
 {
     int Dispenser_i,i;
-    int temp;
+    //int temp;
     for (i=0;i<MAX_SYSTEM_DISPENSERS;i++)
     {
         if (ThreadDispenserIdToControlId[i] == request->hardwarepidcontroltype)
@@ -162,11 +162,11 @@ uint32_t IDS_DispenserPidRequestMessage(HardwarePidControl* request)
      {
          if (DispenserPreSegmentReady[i] == false)
          {
-             return; //not all configured heaters are ready
+             return OK; //not all configured heaters are ready
          }
      }
      PreSegmentReady(Module_IDS,ModuleDone);
-
+  return OK; // all configured heaters are ready
  }
 uint32_t IDSPreSegmentState(void *JobDetails, int SegmentId)
 {
@@ -174,8 +174,6 @@ uint32_t IDSPreSegmentState(void *JobDetails, int SegmentId)
     JobTicket* JobTicket = JobDetails;
     int Dispenser_i;
     TimerMotors_t HW_Motor_Id;
-    int segmentfirst_speed;
-    int CurrentSegment = 0;
 
     JobBrushStopId = 0;
 
diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Motor.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Motor.c
index ff545b516..81f147039 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Motor.c
+++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Motor.c
@@ -193,7 +193,9 @@ void Stub_MotorRunRequest(MessageContainer* requestContainer)
 {
     //uint32_t status = FAILED;
 
+#ifdef EVALUATION_BOARD
     uint32_t read_status;
+#endif
 
     MessageContainer responseContainer;
 
@@ -278,7 +280,7 @@ void Stub_MotorRunRequest(MessageContainer* requestContainer)
 
 void Stub_MotorStopRequest(MessageContainer* requestContainer)
 {
-    uint32_t read_status;
+    //uint32_t read_status;
     //uint32_t status = FAILED;
 
     MessageContainer responseContainer;
@@ -555,8 +557,9 @@ void Stub_MotorPositionRequest(MessageContainer* requestContainer)
 
 void Stub_MotorMovRequest(MessageContainer* requestContainer)
 {
+#ifdef EVALUATION_BOARD
     uint32_t read_status;
-
+#endif
     MessageContainer responseContainer;
 
     StubMotorMovRequest* request = stub_motor_mov_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data);
diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Valve.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Valve.c
index 35dab1c27..cd53c5208 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Valve.c
+++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Valve.c
@@ -39,6 +39,9 @@ void Stub_ValveRequest(MessageContainer* requestContainer)
     writeString(", ");
     writeFloat(request->valveon);
 
+    Control3WayValvesWithCallback (request->valveid, request->valveon, NULL);
+    //test_valve_3_way(request->valveid, request->valveon);
+
     StubValveResponse response =   STUB_VALVE_RESPONSE__INIT;
 
     status_response(status,&response.status, &response.statusword ,&response.has_statusword);