From ee75b26a4b657be73fa7027f8f7235b845f0e34c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?= =?UTF-8?q?=D1=80=D0=B5=D0=B9?= Date: Tue, 15 May 2018 12:22:47 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@617 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- src_main/io/pican.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src_main/io/pican.cpp b/src_main/io/pican.cpp index 7aaed715..8f22b80b 100644 --- a/src_main/io/pican.cpp +++ b/src_main/io/pican.cpp @@ -120,7 +120,7 @@ int PICAN::CANID() const { PIString PICAN::constructFullPathDevice() const { PIString ret; - ret << path() << ":" << CANID(); + ret << path() << ":" << PIString::fromNumber(CANID(),16); return ret; } @@ -131,7 +131,7 @@ void PICAN::configureFromFullPathDevice(const PIString & full_path) { PIString p(pl[i]); switch (i) { case 0: setPath(p); break; - case 1: setCANID(p.toInt()); break; + case 1: setCANID(p.toInt(16)); break; default: break; } }