aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Modules
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2018-06-19 15:24:55 +0300
committerShlomo Hecht <shlomo@twine-s.com>2018-06-19 15:24:55 +0300
commit8cfb005e1a103a15047c00e1fd63aa8408940985 (patch)
tree8bdaecb8bf1d319a6332daab486796cdab855156 /Software/Embedded_SW/Embedded/Modules
parent4685cbcaed7a5b7932648e8357d2a405f12ca44a (diff)
downloadTango-8cfb005e1a103a15047c00e1fd63aa8408940985.tar.gz
Tango-8cfb005e1a103a15047c00e1fd63aa8408940985.zip
compilation warnings
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules')
-rw-r--r--Software/Embedded_SW/Embedded/Modules/IDS/IDS_init.c2
-rw-r--r--Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c8
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Motor.c7
3 files changed, 9 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);