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

Output (fixed-size) hex value before decimal value.

This commit is contained in:
Florian Pose 2009-04-09 10:18:27 +00:00
parent e3b1d8e573
commit f437426e45
2 changed files with 47 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
tool/CommandRegRead.cpp
View File

@ -167,29 +167,29 @@ void CommandRegRead::execute(MasterDevice &m, const StringVector &args)
if (dataType)
cout << endl;
} else if (dataType->name == "int8") {
int sval = *(int8_t *) data.data;
cout << sval << " 0x" << hex << setw(2) << sval << endl;
int val = (int) *data.data;
cout << "0x" << hex << setw(2) << val << " " << dec << val << endl;
} else if (dataType->name == "int16") {
int sval = le16_to_cpup(data.data);
cout << sval << " 0x" << hex << setw(4) << sval << endl;
int16_t val = le16_to_cpup(data.data);
cout << "0x" << hex << setw(4) << val << " " << dec << val << endl;
} else if (dataType->name == "int32") {
int sval = le32_to_cpup(data.data);
cout << sval << " 0x" << hex << setw(8) << sval << endl;
int32_t val = le32_to_cpup(data.data);
cout << "0x" << hex << setw(8) << val << " " << dec << val << endl;
} else if (dataType->name == "int64") {
long long int sval = le64_to_cpup(data.data);
cout << sval << " 0x" << hex << setw(16) << sval << endl;
int64_t val = le64_to_cpup(data.data);
cout << "0x" << hex << setw(16) << val << " " << dec << val << endl;
} else if (dataType->name == "uint8") {
unsigned int uval = (unsigned int) *(uint8_t *) data.data;
cout << uval << " 0x" << hex << setw(2) << uval << endl;
unsigned int val = (unsigned int) *data.data;
cout << "0x" << hex << setw(2) << val << " " << dec << val << endl;
} else if (dataType->name == "uint16") {
unsigned int uval = le16_to_cpup(data.data);
cout << uval << " 0x" << hex << setw(4) << uval << endl;
uint16_t val = le16_to_cpup(data.data);
cout << "0x" << hex << setw(4) << val << " " << dec << val << endl;
} else if (dataType->name == "uint32") {
unsigned int uval = le32_to_cpup(data.data);
cout << uval << " 0x" << hex << setw(8) << uval << endl;
uint32_t val = le32_to_cpup(data.data);
cout << "0x" << hex << setw(8) << val << " " << dec << val << endl;
} else if (dataType->name == "uint64") {
long long unsigned int uval = le64_to_cpup(data.data);
cout << uval << " 0x" << hex << setw(16) << uval << endl;
uint64_t val = le64_to_cpup(data.data);
cout << "0x" << hex << setw(16) << val << " " << dec << val << endl;
} else { // raw
uint8_t *d = data.data;
unsigned int size = data.length;

45
tool/CommandUpload.cpp
View File

@ -85,10 +85,9 @@ void CommandUpload::execute(MasterDevice &m, const StringVector &args)
{
SlaveList slaves;
stringstream err, strIndex, strSubIndex;
int sval;
ec_ioctl_slave_sdo_upload_t data;
unsigned int uval;
const DataType *dataType = NULL;
unsigned int uval;
if (args.size() != 2) {
err << "'" << getName() << "' takes two arguments!";
@ -178,28 +177,46 @@ void CommandUpload::execute(MasterDevice &m, const StringVector &args)
cout << setfill('0');
switch (dataType->coeCode) {
case 0x0002: // int8
sval = *(int8_t *) data.target;
cout << sval << " 0x" << hex << setw(2) << sval << endl;
{
int val = (int) *data.target;
cout << "0x" << hex << setw(2) << val
<< " " << dec << val << endl;
}
break;
case 0x0003: // int16
sval = le16_to_cpup(data.target);
cout << sval << " 0x" << hex << setw(4) << sval << endl;
{
int16_t val = le16_to_cpup(data.target);
cout << "0x" << hex << setw(4) << val
<< " " << dec << val << endl;
}
break;
case 0x0004: // int32
sval = le32_to_cpup(data.target);
cout << sval << " 0x" << hex << setw(8) << sval << endl;
{
int32_t val = le32_to_cpup(data.target);
cout << "0x" << hex << setw(8) << val
<< " " << dec << val << endl;
}
break;
case 0x0005: // uint8
uval = (unsigned int) *(uint8_t *) data.target;
cout << uval << " 0x" << hex << setw(2) << uval << endl;
{
unsigned int val = (unsigned int) *data.target;
cout << "0x" << hex << setw(2) << val
<< " " << dec << val << endl;
}
break;
case 0x0006: // uint16
uval = le16_to_cpup(data.target);
cout << uval << " 0x" << hex << setw(4) << uval << endl;
{
uint16_t val = le16_to_cpup(data.target);
cout << "0x" << hex << setw(4) << val
<< " " << dec << val << endl;
}
break;
case 0x0007: // uint32
uval = le32_to_cpup(data.target);
cout << uval << " 0x" << hex << setw(8) << uval << endl;
{
uint32_t val = le32_to_cpup(data.target);
cout << "0x" << hex << setw(8) << val
<< " " << dec << val << endl;
}
break;
case 0x0009: // string
cout << string((const char *) data.target, data.data_size)