Mirrors_Framework/ODrive
1
0
Fork 0
mirror of https://github.com/odriverobotics/ODrive.git synced 2026-09-23 09:03:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'devel' into Endstops

Browse Source
This commit is contained in:
Unknown
2018-12-06 23:37:04 -05:00
parent a2ebb7085c 414f84a2ce
commit e6dfa54d00
68 changed files with 952 additions and 7419 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Firmware/MotorControl/main.cpp
+2 -2
View File
@@ -73,6 +73,8 @@ void load_configuration(void) {
motor_configs[i] = Motor::Config_t();
trap_configs[i] = TrapezoidalTrajectory::Config_t();
axis_configs[i] = Axis::Config_t();
// Default step/dir pins are different, so we need to explicitly load them
Axis::load_default_step_dir_pin_config(hw_configs[i].axis_config, &axis_configs[i]);
min_endstop_configs[i] = Endstop::Config_t();
max_endstop_configs[i] = Endstop::Config_t();
}
@@ -190,8 +192,6 @@ int odrive_main(void) {
// TODO: make dynamically reconfigurable
#if HW_VERSION_MAJOR == 3 && HW_VERSION_MINOR >= 3
if (board_config.enable_uart) {
axes[0]->config_.enable_step_dir = false;
axes[0]->set_step_dir_enabled(false);
SetGPIO12toUART();
}
#endif