SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/pip@617 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

Browse Source
This commit is contained in:
Бычков Андрей
2018-05-15 12:22:47 +00:00
parent 24650d00b0
commit ee75b26a4b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src_main/io/pican.cpp
View File

@@ -120,7 +120,7 @@ int PICAN::CANID() const {
PIString PICAN::constructFullPathDevice() const { PIString PICAN::constructFullPathDevice() const {
PIString ret; PIString ret;
ret << path() << ":" << CANID(); ret << path() << ":" << PIString::fromNumber(CANID(),16);
return ret; return ret;
} }
@@ -131,7 +131,7 @@ void PICAN::configureFromFullPathDevice(const PIString & full_path) {
PIString p(pl[i]); PIString p(pl[i]);
switch (i) { switch (i) {
case 0: setPath(p); break; case 0: setPath(p); break;
case 1: setCANID(p.toInt()); break; case 1: setCANID(p.toInt(16)); break;
default: break; default: break;
} }
} }