diff options
author | Trygve Laugstøl <trygvis@inamo.no> | 2018-11-23 09:40:48 +0100 |
---|---|---|
committer | Trygve Laugstøl <trygvis@inamo.no> | 2018-11-23 09:40:48 +0100 |
commit | 2034b1bb10720a2f0e6cc97427346f2320c115bc (patch) | |
tree | c382c6e404d48078aac71e2fd3f7f34587b99e7b /apps/SoilMoisture.cpp | |
parent | 0e2228fae626ec617a6a1f042ceb6dbdbd774558 (diff) | |
download | ble-toys-2034b1bb10720a2f0e6cc97427346f2320c115bc.tar.gz ble-toys-2034b1bb10720a2f0e6cc97427346f2320c115bc.tar.bz2 ble-toys-2034b1bb10720a2f0e6cc97427346f2320c115bc.tar.xz ble-toys-2034b1bb10720a2f0e6cc97427346f2320c115bc.zip |
o Starting to handle notifications and indications
Cleaning up:
o Using more of the shared_ptr typedefs.
o Adding code styles used by CLion.
Diffstat (limited to 'apps/SoilMoisture.cpp')
-rw-r--r-- | apps/SoilMoisture.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/apps/SoilMoisture.cpp b/apps/SoilMoisture.cpp index 3129564..fcf81bd 100644 --- a/apps/SoilMoisture.cpp +++ b/apps/SoilMoisture.cpp @@ -62,18 +62,18 @@ void createSetUpdateInterval(ByteBuffer buffer, uint8_t sensor, uint8_t interval .write8(interval_in_seconds); } -SoilMoisture SoilMoisture::create(shared_ptr<BluetoothGatt> gatt) { +SoilMoisture SoilMoisture::create(BluetoothGattPtr gatt) { gatt->discoverServices(); - o<shared_ptr<BluetoothGattService>> s = gatt->findService(soil_moisture_service); + auto s = gatt->findService(soil_moisture_service); if (!s) { throw runtime_error("The device is missing the soil moisture service"); } - shared_ptr<BluetoothGattService> &service = *s; + auto &service = *s; - o<shared_ptr<BluetoothGattCharacteristic>> c = service->findCharacteristic(soil_moisture_characteristic); + auto c = service->findCharacteristic(soil_moisture_characteristic); if (!c) { throw runtime_error("The device is missing the soil moisture characteristic"); @@ -86,8 +86,8 @@ SoilMoisture SoilMoisture::create(shared_ptr<BluetoothGatt> gatt) { return SoilMoisture(gatt, service, c.operator*(), temperature, light); } -SoilMoisture::SoilMoisture(const shared_ptr<BluetoothGatt> &gatt, - const shared_ptr<BluetoothGattService> &s, +SoilMoisture::SoilMoisture(const BluetoothGattPtr &gatt, + const BluetoothGattServicePtr &s, const BluetoothGattCharacteristicPtr &soilMoistureCharacteristic, const o<BluetoothGattCharacteristicPtr> temperatureCharacteristic, const o<BluetoothGattCharacteristicPtr> lightCharacteristic) @@ -192,5 +192,5 @@ void SoilMoisture::setLight(uint8_t light, uint8_t value) { bitset<8> b0 = responseBytes.read8(); } -} -} +} // namespace sensor +} // namespace trygvis |