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

1 files changed, 10 insertions, 4 deletions

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 deb5cbf75..fef551748 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Motor.c
+++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Motor.c
@@ -179,8 +179,6 @@ void Stub_MotorRunRequest(MessageContainer* requestContainer)
 {
     //uint32_t status = FAILED;
 
-    uint32_t read_status;
-
     MessageContainer responseContainer;
 
     StubMotorRunRequest* request = stub_motor_run_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data);
@@ -212,6 +210,9 @@ void Stub_MotorRunRequest(MessageContainer* requestContainer)
     response.motor_id = request->motor_id;
     response.has_motor_id = true;
 #ifdef EVALUATION_BOARD
+
+    uint32_t read_status;
+
     read_status = Get_and_Clear_Status();
 
     response.speed = (double)(CurrentSpdCalc(Get_Param(x_SPEED)));
@@ -261,7 +262,7 @@ void Stub_MotorRunRequest(MessageContainer* requestContainer)
 
 void Stub_MotorStopRequest(MessageContainer* requestContainer)
 {
-    uint32_t read_status;
+
     //uint32_t status = FAILED;
 
     MessageContainer responseContainer;
@@ -300,6 +301,9 @@ void Stub_MotorStopRequest(MessageContainer* requestContainer)
     response.motor_id = request->motor_id;
     response.has_motor_id = true;
 #ifdef EVALUATION_BOARD
+
+    uint32_t read_status;
+
     read_status = Get_and_Clear_Status();
 
     response.mot_status = ((read_status & x_STATUS_MOT_STATUS)>>5);
@@ -537,7 +541,6 @@ void Stub_MotorPositionRequest(MessageContainer* requestContainer)
 
 void Stub_MotorMovRequest(MessageContainer* requestContainer)
 {
-    uint32_t read_status;
 
     MessageContainer responseContainer;
 
@@ -560,6 +563,9 @@ void Stub_MotorMovRequest(MessageContainer* requestContainer)
     response.has_motor_id = true;
 
     #ifdef EVALUATION_BOARD
+
+        uint32_t read_status;
+
         response.position = Get_Param(x_ABS_POS);
         response.has_position = true;