Assign different can_node_ids to each axis by default

This commit is contained in:
Paul Guenette
2019-03-08 21:53:02 +01:00
parent 1a58918eaa
commit 1296537582
3 changed files with 6 additions and 0 deletions
+4
View File
@@ -81,6 +81,10 @@ void Axis::load_default_step_dir_pin_config(
config->dir_gpio_pin = hw_config.dir_gpio_pin;
}
void Axis::load_default_can_id(const int& id, Config_t& config){
config.can_node_id = id;
}
void Axis::decode_step_dir_pins() {
step_port_ = get_gpio_port_by_pin(config_.step_gpio_pin);
step_pin_ = get_gpio_pin_by_pin(config_.step_gpio_pin);
+1
View File
@@ -97,6 +97,7 @@ public:
void decode_step_dir_pins();
static void load_default_step_dir_pin_config(
const AxisHardwareConfig_t& hw_config, Config_t* config);
static void load_default_can_id(const int& id, Config_t& config);
bool check_DRV_fault();
bool check_PSU_brownout();
+1
View File
@@ -74,6 +74,7 @@ void load_configuration(void) {
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]);
Axis::load_default_can_id(i, axis_configs[i]);
}
} else {
user_config_loaded_ = true;