From fd9d9b6ef8f7aa66841ae3ecd383ee2e0e8c045b Mon Sep 17 00:00:00 2001
From: Baptiste Toussaint <baptiste.toussaint@polymtl.ca>
Date: Fri, 20 Mar 2020 14:02:54 -0400
Subject: [PATCH] fix bug merge
---
Device/motor.c | 18 ------------------
1 file changed, 18 deletions(-)
diff --git a/Device/motor.c b/Device/motor.c
index 108c608..629aa68 100644
--- a/Device/motor.c
+++ b/Device/motor.c
@@ -130,30 +130,12 @@ void set_motor_speed(motor_t *motor)
float target = motor->target;
switch(motor->type){
case M3508:
-<<<<<<< HEAD
-<<<<<<< HEAD
- if ((target < 150) && (target > -100)){
- run_motor_from_command(motor, motor->pid_speed, target, motor->info.M3508_info.speed);
- }
- else{
- run_motor_from_command(motor, motor->pid_pos, target, motor->info.M3508_info.angle);
- }
-=======
if ((target < 100.0) && (target > -100.0)){
run_motor_from_command(motor, motor->pid_pos, target, motor->info.M3508_info.angle);
}
else{
run_motor_from_command(motor, motor->pid_speed, target, motor->info.M3508_info.speed);
}
->>>>>>> 623e9ad5906292f23a358f1ea43fd89ee37f30d3
-=======
- if ((target < 100) && (target > -100)){
- run_motor_from_command(motor, motor->pid_pos, target, motor->info.M3508_info.angle);
- }
- else{
- run_motor_from_command(motor, motor->pid_speed, target, motor->info.M3508_info.speed);
- }
->>>>>>> position_M3508_BSP
case GM6020:
run_motor_from_command(motor, motor->pid_speed, target, motor->info.GM6020_info.speed);
case M2006:
--
GitLab