# HG changeset patch # User Florian Pose <fp@igh-essen.com> # Date 1399290900 -7200 # Node ID 8dd49f6f6d325857557ccc8478b354f4179f6288 # Parent 1ddd186e9d2c5690887ef101b911c9d2c62c636a Fixed hex display of slave position; thanks to Henry Bausley. diff -r 1ddd186e9d2c -r 8dd49f6f6d32 tool/CommandXml.cpp --- a/tool/CommandXml.cpp Mon May 05 13:49:45 2014 +0200 +++ b/tool/CommandXml.cpp Mon May 05 13:55:00 2014 +0200 @@ -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 @@ 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 @@ 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; }