Commit 05c5bd3f authored by Nathan Girard's avatar Nathan Girard
Browse files

maj BSP melodic

parent 1cce9e9e
......@@ -3615,9 +3615,9 @@
</Doc>
<Doc>
<Name>..\BSP\Device\motor.c</Name>
<ColumnNumber>28</ColumnNumber>
<TopLine>1</TopLine>
<CurrentLine>149</CurrentLine>
<ColumnNumber>32</ColumnNumber>
<TopLine>147</TopLine>
<CurrentLine>19</CurrentLine>
<Folding>1</Folding>
<ContractedFolders></ContractedFolders>
<PaneID>0</PaneID>
......
......@@ -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{
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:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment