bkinnightskytw
/
ethercat
mirror of https://gitlab.com/bkinnightskytw/ethercat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Output watchdog configuration in ethercat config.

This commit is contained in:
Florian Pose 2009-08-04 12:52:12 +00:00
parent f864c10a72
commit 0663090dcc
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
master/cdev.c
View File

@ -1258,9 +1258,12 @@ int ec_cdev_ioctl_config(
data.product_code = sc->product_code;
for (i = 0; i < EC_MAX_SYNC_MANAGERS; i++) {
data.syncs[i].dir = sc->sync_configs[i].dir;
data.syncs[i].watchdog_mode = sc->sync_configs[i].watchdog_mode;
data.syncs[i].pdo_count =
ec_pdo_list_count(&sc->sync_configs[i].pdos);
}
data.watchdog_divider = sc->watchdog_divider;
data.watchdog_intervals = sc->watchdog_intervals;
data.sdo_count = ec_slave_config_sdo_count(sc);
data.slave_position = sc->slave ? sc->slave->ring_position : -1;
data.dc_assign_activate = sc->dc_assign_activate;

27
tool/CommandConfig.cpp
View File

@ -159,11 +159,34 @@ void CommandConfig::showDetailedConfigs(
cout << "none" << endl;
}
cout << "Watchdog Divider: ";
if (configIter->watchdog_divider) {
cout << dec << configIter->watchdog_divider;
} else {
cout << "default";
}
cout << endl
<< "Watchdog Intervals: ";
if (configIter->watchdog_intervals) {
cout << dec << configIter->watchdog_intervals;
} else {
cout << "default";
}
cout << endl;
for (j = 0; j < EC_MAX_SYNC_MANAGERS; j++) {
if (configIter->syncs[j].pdo_count) {
cout << "SM" << dec << j << " ("
cout << "SM" << dec << j << ", Dir: "
<< (configIter->syncs[j].dir == EC_DIR_INPUT
? "Input" : "Output") << ")" << endl;
? "Input" : "Output") << ", Watchdog: ";
switch (configIter->syncs[j].watchdog_mode) {
case EC_WD_DEFAULT: cout << "Default"; break;
case EC_WD_ENABLE: cout << "Enable"; break;
case EC_WD_DISABLE: cout << "Disable"; break;
default: cout << "???"; break;
}
cout << endl;
for (k = 0; k < configIter->syncs[j].pdo_count; k++) {
m.getConfigPdo(&pdo, configIter->config_index, j, k);