From 4f71ac509943235ec14ec4cbbd46aa87b4dc9173 Mon Sep 17 00:00:00 2001 From: Bjarne von Horn Date: Thu, 18 Jul 2024 14:14:32 +0200 Subject: [PATCH] Fix building without EoE Fixes #123 --- master/fsm_master.c | 4 ++++ master/fsm_slave_config.c | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/master/fsm_master.c b/master/fsm_master.c index 2290608b..d2c04c64 100644 --- a/master/fsm_master.c +++ b/master/fsm_master.c @@ -104,7 +104,9 @@ void ec_fsm_master_init( ec_fsm_coe_init(&fsm->fsm_coe); ec_fsm_soe_init(&fsm->fsm_soe); ec_fsm_pdo_init(&fsm->fsm_pdo, &fsm->fsm_coe); +#ifdef EC_EOE ec_fsm_eoe_init(&fsm->fsm_eoe); +#endif ec_fsm_change_init(&fsm->fsm_change, fsm->datagram); ec_fsm_slave_config_init(&fsm->fsm_slave_config, fsm->datagram, &fsm->fsm_change, &fsm->fsm_coe, &fsm->fsm_soe, &fsm->fsm_pdo, @@ -126,7 +128,9 @@ void ec_fsm_master_clear( ec_fsm_coe_clear(&fsm->fsm_coe); ec_fsm_soe_clear(&fsm->fsm_soe); ec_fsm_pdo_clear(&fsm->fsm_pdo); +#ifdef EC_EOE ec_fsm_eoe_clear(&fsm->fsm_eoe); +#endif ec_fsm_change_clear(&fsm->fsm_change); ec_fsm_slave_config_clear(&fsm->fsm_slave_config); ec_fsm_slave_scan_clear(&fsm->fsm_slave_scan); diff --git a/master/fsm_slave_config.c b/master/fsm_slave_config.c index 25887ad6..47e750f4 100644 --- a/master/fsm_slave_config.c +++ b/master/fsm_slave_config.c @@ -965,7 +965,7 @@ void ec_fsm_slave_config_enter_eoe_ip_param( ec_fsm_slave_config_t *fsm /**< slave state machine */ ) { -#if EC_EOE +#ifdef EC_EOE ec_slave_t *slave = fsm->slave; ec_eoe_request_t *request = &slave->config->eoe_ip_param_request; @@ -991,6 +991,7 @@ void ec_fsm_slave_config_state_eoe_ip_param( ec_fsm_slave_config_t *fsm /**< slave state machine */ ) { +#ifdef EC_EOE ec_slave_t *slave = fsm->slave; if (ec_fsm_eoe_exec(fsm->fsm_eoe, fsm->datagram)) { @@ -1003,7 +1004,7 @@ void ec_fsm_slave_config_state_eoe_ip_param( else { EC_SLAVE_ERR(slave, "Failed to set EoE IP parameters.\n"); } - +#endif ec_fsm_slave_config_enter_pdo_conf(fsm); }