# Conflicts: # APP/Device/Device_speed/speed_to_servoMotor.c # BSP/Driver/servoMotor/motorCommu.c 第一次合并 |
||
---|---|---|
.. | ||
Device_angle | ||
Device_rotate | ||
Device_speed | ||
Restore factory settings | ||
device_Other |
# Conflicts: # APP/Device/Device_speed/speed_to_servoMotor.c # BSP/Driver/servoMotor/motorCommu.c 第一次合并 |
||
---|---|---|
.. | ||
Device_angle | ||
Device_rotate | ||
Device_speed | ||
Restore factory settings | ||
device_Other |