From dea9cb49271631d4def70d21db42a85d1d58f269 Mon Sep 17 00:00:00 2001 From: Trygve Laugstøl Date: Thu, 23 Jul 2015 15:37:39 +0200 Subject: o Fixing a bug where the reponse code wasn't properly set. --- app.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'app.cpp') diff --git a/app.cpp b/app.cpp index cadcc30..d4f880d 100644 --- a/app.cpp +++ b/app.cpp @@ -134,7 +134,7 @@ void sm_loop() { } } -#ifdef SM_DEBUG +#ifdef SM_DEBUG == 1 static void write_name(uint8_t const* name, uint8_t len) { for(int i = 0; i < len; i++) { @@ -271,6 +271,7 @@ void on_soil_moisture_ctrl(uint8_t *data, uint8_t len) { switch(req->code) { case SM_CMD_GET_SENSOR_COUNT: body_len = sizeof(sm_get_sensor_count_res); + res.code = req->code; res.get_sensor_count.count = SENSOR_COUNT; break; @@ -279,6 +280,7 @@ void on_soil_moisture_ctrl(uint8_t *data, uint8_t len) { sensor = req->get_value.sensor; if (sensor < SENSOR_COUNT) { + res.code = req->code; // TODO: update the sensor's value res.get_value.value = sensors[sensor].value; } else { @@ -291,6 +293,7 @@ void on_soil_moisture_ctrl(uint8_t *data, uint8_t len) { sensor = req->set_warning_value.sensor; if (sensor < SENSOR_COUNT) { + res.code = req->code; sensors[sensor].warning_value = req->set_warning_value.warning_value; } else { res.code = SM_CMD_FAIL; @@ -302,6 +305,7 @@ void on_soil_moisture_ctrl(uint8_t *data, uint8_t len) { sensor = req->get_warning_value.sensor; if (sensor < SENSOR_COUNT) { + res.code = req->code; res.get_warning_value.warning_value = sensors[sensor].warning_value; } else { res.code = SM_CMD_FAIL; @@ -313,6 +317,7 @@ void on_soil_moisture_ctrl(uint8_t *data, uint8_t len) { sensor = req->set_sensor_name.sensor; if (sensor < SENSOR_COUNT) { + res.code = req->code; sensors[sensor].name_length = min(req->set_sensor_name.length, SENSOR_NAME_LEN); memcpy(sensors[sensor].name, req->set_sensor_name.name, sensors[sensor].name_length); } else { @@ -325,6 +330,7 @@ void on_soil_moisture_ctrl(uint8_t *data, uint8_t len) { sensor = req->get_sensor_name.sensor; if (sensor < SENSOR_COUNT) { + res.code = req->code; res.get_sensor_name.length = sensors[sensor].name_length; memcpy(res.get_sensor_name.name, sensors[sensor].name, SENSOR_NAME_LEN); } else { -- cgit v1.2.3