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

Merge branch 'devel' into RazorsEdge

Browse Source
This commit is contained in:
Paul Guenette
2019-06-03 00:30:25 +02:00
parent 0f7337743c b7a830d53f
commit e8a6698fa5
22 changed files with 207 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Firmware/MotorControl/axis.cpp
+4 -2
View File
@@ -7,7 +7,8 @@
#include "utils.h"
#include "communication/interface_can.hpp"
Axis::Axis(const AxisHardwareConfig_t& hw_config,
Axis::Axis(int axis_num,
const AxisHardwareConfig_t& hw_config,
Config_t& config,
Encoder& encoder,
SensorlessEstimator& sensorless_estimator,
@@ -16,7 +17,8 @@ Axis::Axis(const AxisHardwareConfig_t& hw_config,
TrapezoidalTrajectory& trap,
Endstop& min_endstop,
Endstop& max_endstop)
: hw_config_(hw_config),
: axis_num_(axis_num),
hw_config_(hw_config),
config_(config),
encoder_(encoder),
sensorless_estimator_(sensorless_estimator),