Skip to content

Commit 0e72601

Browse files
committed
Fix warnings: no more warnings when compiling.
Fix warnings Remove warnings. Fix formatting Finish fixing warnings.
1 parent 52be2c2 commit 0e72601

File tree

4 files changed

+16
-12
lines changed

4 files changed

+16
-12
lines changed

ethercat_generic_plugins/ethercat_generic_slave/src/generic_ec_slave.cpp

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ size_t type2bytes(std::string type)
3030
} else if (type == "int64" || type == "uint64") {
3131
return 8;
3232
}
33+
return 0;
3334
}
3435

3536
namespace ethercat_generic_plugins
@@ -67,20 +68,20 @@ void GenericEcSlave::setup_syncs()
6768
if (sm_configs_.size() == 0) {
6869
syncs_.push_back({0, EC_DIR_OUTPUT, 0, NULL, EC_WD_DISABLE});
6970
syncs_.push_back({1, EC_DIR_INPUT, 0, NULL, EC_WD_DISABLE});
70-
syncs_.push_back({2, EC_DIR_OUTPUT, rpdos_.size(), rpdos_.data(), EC_WD_ENABLE});
71-
syncs_.push_back({3, EC_DIR_INPUT, tpdos_.size(), tpdos_.data(), EC_WD_DISABLE});
71+
syncs_.push_back({2, EC_DIR_OUTPUT, (unsigned int)(rpdos_.size()), rpdos_.data(), EC_WD_ENABLE});
72+
syncs_.push_back({3, EC_DIR_INPUT, (unsigned int)(tpdos_.size()), tpdos_.data(), EC_WD_DISABLE});
7273
} else {
7374
for (auto & sm : sm_configs_) {
7475
if (sm.pdo_name == "null") {
7576
syncs_.push_back({sm.index, sm.type, 0, NULL, sm.watchdog});
7677
} else if (sm.pdo_name == "rpdo") {
77-
syncs_.push_back({sm.index, sm.type, rpdos_.size(), rpdos_.data(), sm.watchdog});
78+
syncs_.push_back({sm.index, sm.type, (unsigned int)(rpdos_.size()), rpdos_.data(), sm.watchdog});
7879
} else if (sm.pdo_name == "tpdo") {
79-
syncs_.push_back({sm.index, sm.type, tpdos_.size(), tpdos_.data(), sm.watchdog});
80+
syncs_.push_back({sm.index, sm.type, (unsigned int)(tpdos_.size()), tpdos_.data(), sm.watchdog});
8081
}
8182
}
8283
}
83-
syncs_.push_back({0xff});
84+
syncs_.push_back({0xff, EC_DIR_INVALID, 0, nullptr, EC_WD_DISABLE});
8485
}
8586

8687
bool GenericEcSlave::setupSlave(
@@ -173,7 +174,7 @@ bool GenericEcSlave::setup_from_config(YAML::Node slave_config)
173174
rpdos_.push_back(
174175
{
175176
slave_config["rpdo"][i]["index"].as<uint16_t>(),
176-
rpdo_channels_size,
177+
(unsigned int)(rpdo_channels_size),
177178
all_channels_.data() + channels_nbr
178179
}
179180
);
@@ -195,7 +196,7 @@ bool GenericEcSlave::setup_from_config(YAML::Node slave_config)
195196
tpdos_.push_back(
196197
{
197198
slave_config["tpdo"][i]["index"].as<uint16_t>(),
198-
tpdo_channels_size,
199+
(unsigned int)(tpdo_channels_size),
199200
all_channels_.data() + channels_nbr
200201
}
201202
);

ethercat_interface/include/ethercat_interface/ec_master.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ class EcMaster
157157
{
158158
EcSlave * slave = NULL;
159159
ec_slave_config_t * config = NULL;
160-
ec_slave_config_state_t config_state = {0};
160+
ec_slave_config_state_t config_state = {0, 0, 0};
161161
};
162162

163163
std::vector<SlaveInfo> slave_info_;

ethercat_interface/include/ethercat_interface/ec_sdo_manager.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ class SdoConfigEntry
110110
} else if (type == "int64" || type == "uint64") {
111111
return 8;
112112
}
113+
return 0;
113114
}
114115
};
115116

ethercat_interface/src/ec_master.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ EcMaster::DomainInfo::DomainInfo(ec_master_t * master)
4040
return;
4141
}
4242

43-
const ec_pdo_entry_reg_t empty = {0};
43+
const ec_pdo_entry_reg_t empty = {0, 0, 0, 0, 0, 0, nullptr, nullptr};
4444
domain_regs.push_back(empty);
4545
}
4646

@@ -66,9 +66,11 @@ EcMaster::EcMaster(const int master)
6666

6767
EcMaster::~EcMaster()
6868
{
69+
/*
6970
for (SlaveInfo & slave : slave_info_) {
70-
//
71+
//TODO verify what this piece of code was here for
7172
}
73+
*/
7274
for (auto & domain : domain_info_) {
7375
if (domain.second != NULL) {
7476
delete domain.second;
@@ -211,7 +213,7 @@ void EcMaster::registerPDOInDomain(
211213
}
212214

213215
// set the last element to null
214-
ec_pdo_entry_reg_t empty = {0};
216+
ec_pdo_entry_reg_t empty = {0, 0, 0, 0, 0, 0, nullptr, nullptr};
215217
domain_info->domain_regs.back() = empty;
216218
}
217219

@@ -441,7 +443,7 @@ void EcMaster::setThreadRealTime()
441443
/* Pre-fault our stack
442444
8*1024 is the maximum stack size
443445
which is guaranteed safe to access without faulting */
444-
int MAX_SAFE_STACK = 8 * 1024;
446+
constexpr unsigned int MAX_SAFE_STACK = 8 * 1024;
445447
unsigned char dummy[MAX_SAFE_STACK];
446448
memset(dummy, 0, MAX_SAFE_STACK);
447449
}

0 commit comments

Comments
 (0)