From ffa313e80a27005405334db6491075442f6e1abd Mon Sep 17 00:00:00 2001 From: Trygve Laugstøl Date: Thu, 20 Dec 2018 08:35:51 +0100 Subject: Mac: o Using more natural byte ordering in the code. No external effect. o Using global ==, != and < operators instead of in-class operators for better compatibility with STL. ByteBuffer: o Renaming setPosition() to setCursor(). --- apps/SoilMoisture.cpp | 2 +- apps/ble-scan.cpp | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'apps') diff --git a/apps/SoilMoisture.cpp b/apps/SoilMoisture.cpp index fcf81bd..3de85d2 100644 --- a/apps/SoilMoisture.cpp +++ b/apps/SoilMoisture.cpp @@ -95,7 +95,7 @@ SoilMoisture::SoilMoisture(const BluetoothGattPtr &gatt, temperatureCharacteristic(temperatureCharacteristic), lightCharacteristic(lightCharacteristic) {} void SoilMoisture::writeAndRead(const BluetoothGattCharacteristicPtr &c, ByteBuffer &buffer) { - buffer.setPosition(0); + buffer.setCursor(0); uint8_t expectedCode = buffer.peek8(0); diff --git a/apps/ble-scan.cpp b/apps/ble-scan.cpp index b148752..6d271da 100644 --- a/apps/ble-scan.cpp +++ b/apps/ble-scan.cpp @@ -64,7 +64,11 @@ public: cout << "Stopped. Found " << seen_devices.size() << " devices." << endl; - for_each(begin(seen_devices), end(seen_devices), [&](auto mac) { cout << mac.str() << endl; }); + vector devices(seen_devices.cbegin(), seen_devices.cend()); + std::sort(devices.begin(), devices.end(), [](const Mac& a, const Mac& b) { + return a < b; + }); + for_each(begin(devices), end(devices), [&](auto mac) { cout << " " << mac.str() << endl; }); return EXIT_SUCCESS; } catch (std::runtime_error &ex) { -- cgit v1.2.3