Fixed hex display of slave position; thanks to Henry Bausley.

This commit is contained in:
Florian Pose 2014-05-05 13:55:00 +02:00
parent b6930dfa9b
commit bd048e8008
1 changed files with 6 additions and 4 deletions

View File

@ -2,7 +2,7 @@
*
* $Id$
*
* Copyright (C) 2006-2009 Florian Pose, Ingenieurgemeinschaft IgH
* Copyright (C) 2006-2014 Florian Pose, Ingenieurgemeinschaft IgH
*
* This file is part of the IgH EtherCAT Master.
*
@ -118,7 +118,7 @@ void CommandXml::generateSlaveXml(
cout
<< in << "<EtherCATInfo>" << endl
<< in << " <!-- Slave " << slave.position << " -->" << endl
<< in << " <!-- Slave " << dec << slave.position << " -->" << endl
<< in << " <Vendor>" << endl
<< in << " <Id>" << slave.vendor_id << "</Id>" << endl
<< in << " </Vendor>" << endl
@ -142,9 +142,11 @@ void CommandXml::generateSlaveXml(
m.getSync(&sync, slave.position, i);
cout
<< in << " <Sm Enable=\"" << dec << (unsigned int) sync.enable
<< in << " <Sm Enable=\""
<< dec << (unsigned int) sync.enable
<< "\" StartAddress=\"#x" << hex << sync.physical_start_address
<< "\" ControlByte=\"#x" << hex << (unsigned int) sync.control_register
<< "\" ControlByte=\"#x"
<< hex << (unsigned int) sync.control_register
<< "\" DefaultSize=\"" << dec << sync.default_size
<< "\" />" << endl;
}