diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2017-05-16 15:14:42 +0200 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2017-05-19 11:36:43 +0200 |
| commit | 452ab62dae573efc3a2d5a5d97c2f10fca5f502d (patch) | |
| tree | f19a21230fb54aa5c0d8e02f03af468afffbb01c /CAN-binder/low-can-binding/utils/config-parser.cpp | |
| parent | c4f11994a1540576563819508d4148a0500db4b9 (diff) | |
Be able to return index or can bus name.
Use a vector of string pair that map index on vector and pair map logical bus
name with linux device name.
Change-Id: I627e6f715f7466d835d8729e21d9e4198111c1fb
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'CAN-binder/low-can-binding/utils/config-parser.cpp')
| -rw-r--r-- | CAN-binder/low-can-binding/utils/config-parser.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/CAN-binder/low-can-binding/utils/config-parser.cpp b/CAN-binder/low-can-binding/utils/config-parser.cpp index 9c81afb0..6f699169 100644 --- a/CAN-binder/low-can-binding/utils/config-parser.cpp +++ b/CAN-binder/low-can-binding/utils/config-parser.cpp @@ -47,14 +47,14 @@ namespace utils /// have to test the returned value. /// /// @return A const vector with string of linux CAN devices. - const std::vector<std::string> config_parser_t::get_devices_name() + const std::vector<std::pair<std::string, std::string> > config_parser_t::get_devices_name() { - std::vector<std::string> devices_name; + std::vector<std::pair<std::string, std::string> > devices_name; std::map<std::string, std::string> bus_mapping = config_content_.get_keys("CANbus-mapping"); for(const auto& busIt : bus_mapping ) { - devices_name.push_back(busIt.second); + devices_name.push_back(std::make_pair(busIt.first, busIt.second)); } return devices_name; |