aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTrygve Laugstøl <trygvis@inamo.no>2015-06-21 19:28:07 +0200
committerTrygve Laugstøl <trygvis@inamo.no>2015-06-21 19:28:07 +0200
commitaf63bd5688731b57551ac161c0dad26a0b4557d7 (patch)
tree0479ee6abae253b6c70b33934422d53cef9670fb
parent9042b87f32bcabcc671e393376d3fb96ad858caa (diff)
downloadble-toys-af63bd5688731b57551ac161c0dad26a0b4557d7.tar.gz
ble-toys-af63bd5688731b57551ac161c0dad26a0b4557d7.tar.bz2
ble-toys-af63bd5688731b57551ac161c0dad26a0b4557d7.tar.xz
ble-toys-af63bd5688731b57551ac161c0dad26a0b4557d7.zip
SoilMoisture:
o Updating for changed get_value struct.
-rw-r--r--apps/SoilMoisture.cpp5
-rw-r--r--apps/SoilMoisture.h2
2 files changed, 4 insertions, 3 deletions
diff --git a/apps/SoilMoisture.cpp b/apps/SoilMoisture.cpp
index 5edba0e..fea1ef9 100644
--- a/apps/SoilMoisture.cpp
+++ b/apps/SoilMoisture.cpp
@@ -113,10 +113,11 @@ uint8_t SoilMoisture::getSensorCount() {
uint16_t SoilMoisture::getValue(uint8_t sensor) {
auto req = createGetValue(sensor);
- return writeAndRead(req).read16le();
+ auto buffer = writeAndRead(req);
+ buffer.read8(); // sensor index
+ return buffer.read16le();
}
-
string SoilMoisture::getName(uint8_t sensor) {
auto req = createGetSensorName(sensor);
diff --git a/apps/SoilMoisture.h b/apps/SoilMoisture.h
index 45ba5d4..79e393f 100644
--- a/apps/SoilMoisture.h
+++ b/apps/SoilMoisture.h
@@ -10,7 +10,7 @@ using namespace trygvis::bluetooth;
enum class sm_cmd_code : uint8_t {
SM_CMD_GET_SENSOR_COUNT = 1,
- SM_CMD_GET_VALUE = 2,
+ SM_CMD_GET_VALUE = 8,
SM_CMD_SET_WARNING_VALUE = 3,
SM_CMD_GET_WARNING_VALUE = 4,
SM_CMD_SET_SENSOR_NAME = 5,