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

Group/Image/Order strings in slave ioctl; order number as text content 

in XML Type element.
This commit is contained in:
Florian Pose 2008-07-10 09:36:47 +00:00
parent 0a63897d3d
commit d8d0e4ec4e
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
master/cdev.c
View File

@ -196,6 +196,9 @@ int ec_cdev_ioctl_slave(
data.sync_count = slave->sii.sync_count;
data.sdo_count = ec_slave_sdo_count(slave);
data.sii_nwords = slave->sii_nwords;
ec_cdev_strcpy(data.group, slave->sii.group);
ec_cdev_strcpy(data.image, slave->sii.image);
ec_cdev_strcpy(data.order, slave->sii.order);
ec_cdev_strcpy(data.name, slave->sii.name);
up(&master->master_sem);

3
master/ioctl.h
View File

@ -120,6 +120,9 @@ typedef struct {
uint8_t sync_count;
uint16_t sdo_count;
uint32_t sii_nwords;
char group[EC_IOCTL_STRING_SIZE];
char image[EC_IOCTL_STRING_SIZE];
char order[EC_IOCTL_STRING_SIZE];
char name[EC_IOCTL_STRING_SIZE];
} ec_ioctl_slave_t;

7
tools/Master.cpp
View File

@ -1625,7 +1625,10 @@ void Master::showSlave(uint16_t slavePosition)
if (slave.has_general_category) {
cout << "General:" << endl
<< " Name: " << slave.name << endl;
<< " Group: " << slave.group << endl
<< " Image name: " << slave.image << endl
<< " Order number: " << slave.order << endl
<< " Device name: " << slave.name << endl;
if (slave.mailbox_protocols & EC_MBOX_COE) {
cout << " CoE details:" << endl
@ -1684,7 +1687,7 @@ void Master::generateSlaveXml(uint16_t slavePosition)
<< hex << setfill('0') << setw(8) << slave.product_code
<< "\" RevisionNo=\"#x"
<< hex << setfill('0') << setw(8) << slave.revision_number
<< "\"/>" << endl;
<< "\">" << slave.order << "</Type>" << endl;
if (strlen(slave.name)) {
cout