From b09789958501538373b1f1cbad6112fdc1d149d4 Mon Sep 17 00:00:00 2001 From: Trygve Laugstøl Date: Sat, 25 Jul 2015 06:06:57 +0200 Subject: o Reformatting with uncrustify. --- app.cpp | 363 ++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 182 insertions(+), 181 deletions(-) (limited to 'app.cpp') diff --git a/app.cpp b/app.cpp index bb5ad9c..76d2653 100644 --- a/app.cpp +++ b/app.cpp @@ -76,8 +76,8 @@ void sm_on_connect() { next_update[i] = now + sensors[i].update_interval; } - connected = true; - blink = true; + connected = true; + blink = true; digitalWrite(LED_PIN, HIGH); last_blink = millis(); } @@ -126,9 +126,9 @@ void sm_loop() { Debug::print(s.value, DEC); struct sm_res res; - res.code = SM_CMD_GET_VALUE; + res.code = SM_CMD_GET_VALUE; res.get_value.sensor = i; - res.get_value.value = s.value; + res.get_value.value = s.value; notify_soil_moisture(res, sizeof(sm_get_value_res)); } @@ -141,109 +141,109 @@ void sm_loop() { #ifdef SM_DEBUG == 1 static void write_name(uint8_t const* name, uint8_t len) { - for(int i = 0; i < len; i++) { + for (int i = 0; i < len; i++) { Debug::print((char)name[i]); } } -void write_req(struct sm_req const& req) { +void write_req(struct sm_req const &req) { Debug::print(">> "); - switch(req.code) { - case SM_CMD_GET_SENSOR_COUNT: - Debug::print("SM_CMD_GET_SENSOR_COUNT"); - break; - - case SM_CMD_GET_VALUE: - Debug::print("SM_CMD_GET_VALUE"); - Debug::print(": sensor="); - Debug::print(req.get_value.sensor, DEC); - break; - - case SM_CMD_SET_WARNING_VALUE: - Debug::print("SM_CMD_SET_WARNING_VALUE"); - Debug::print(": sensor="); - Debug::print(req.set_warning_value.sensor, DEC); - Debug::print(", warning_value="); - Debug::print(req.set_warning_value.warning_value, DEC); - break; - - case SM_CMD_GET_WARNING_VALUE: - Debug::print("SM_CMD_GET_WARNING_VALUE"); - Debug::print(": sensor="); - Debug::print(req.get_warning_value.sensor, DEC); - break; - - case SM_CMD_SET_SENSOR_NAME: - Debug::print("SM_CMD_SET_SENSOR_NAME"); - Debug::print(": sensor="); - Debug::print(req.set_sensor_name.sensor, DEC); - Debug::print(", name="); - write_name(req.set_sensor_name.name, req.set_sensor_name.length); - break; - - case SM_CMD_GET_SENSOR_NAME: - Debug::print("SM_CMD_GET_SENSOR_NAME"); - break; - - case SM_CMD_SET_UPDATE_INTERVAL: - Debug::print("SM_CMD_SET_UPDATE_INTERVAL"); - Debug::print(": interval_in_seconds="); - Debug::print(req.set_update_interval.interval_in_seconds, DEC); - break; - - default: - Debug::print("Unknown command: "); - Debug::print(req.code); + switch (req.code) { + case SM_CMD_GET_SENSOR_COUNT: + Debug::print("SM_CMD_GET_SENSOR_COUNT"); + break; + + case SM_CMD_GET_VALUE: + Debug::print("SM_CMD_GET_VALUE"); + Debug::print(": sensor="); + Debug::print(req.get_value.sensor, DEC); + break; + + case SM_CMD_SET_WARNING_VALUE: + Debug::print("SM_CMD_SET_WARNING_VALUE"); + Debug::print(": sensor="); + Debug::print(req.set_warning_value.sensor, DEC); + Debug::print(", warning_value="); + Debug::print(req.set_warning_value.warning_value, DEC); + break; + + case SM_CMD_GET_WARNING_VALUE: + Debug::print("SM_CMD_GET_WARNING_VALUE"); + Debug::print(": sensor="); + Debug::print(req.get_warning_value.sensor, DEC); + break; + + case SM_CMD_SET_SENSOR_NAME: + Debug::print("SM_CMD_SET_SENSOR_NAME"); + Debug::print(": sensor="); + Debug::print(req.set_sensor_name.sensor, DEC); + Debug::print(", name="); + write_name(req.set_sensor_name.name, req.set_sensor_name.length); + break; + + case SM_CMD_GET_SENSOR_NAME: + Debug::print("SM_CMD_GET_SENSOR_NAME"); + break; + + case SM_CMD_SET_UPDATE_INTERVAL: + Debug::print("SM_CMD_SET_UPDATE_INTERVAL"); + Debug::print(": interval_in_seconds="); + Debug::print(req.set_update_interval.interval_in_seconds, DEC); + break; + + default: + Debug::print("Unknown command: "); + Debug::print(req.code); } Debug::println(); } -void write_res(struct sm_res const& res) { +void write_res(struct sm_res const &res) { Debug::print("<< "); - switch(res.code) { - case SM_CMD_GET_SENSOR_COUNT: - Debug::print("SM_CMD_GET_SENSOR_COUNT"); - Debug::print(": count="); - Debug::print(res.get_sensor_count.count, DEC); - break; - - case SM_CMD_GET_VALUE: - Debug::print("SM_CMD_GET_VALUE"); - Debug::print(": sensor="); - Debug::print(res.get_value.sensor, DEC); - Debug::print(", value="); - Debug::print(res.get_value.value, DEC); - break; - - case SM_CMD_SET_WARNING_VALUE: - Debug::print("SM_CMD_SET_WARNING_VALUE"); - break; - - case SM_CMD_GET_WARNING_VALUE: - Debug::print("SM_CMD_GET_WARNING_VALUE"); - Debug::print(": warning_value="); - Debug::print(res.get_warning_value.warning_value, DEC); - break; - - case SM_CMD_SET_SENSOR_NAME: - Debug::print("SM_CMD_SET_SENSOR_NAME"); - break; - - case SM_CMD_GET_SENSOR_NAME: - Debug::print("SM_CMD_GET_SENSOR_NAME"); - Debug::print(": name="); - write_name(res.get_sensor_name.name, res.get_sensor_name.length); - break; - - case SM_CMD_SET_UPDATE_INTERVAL: - Debug::print("SM_CMD_SET_UPDATE_INTERVAL"); - break; - - default: - Debug::print("Unknown command: "); - Debug::print(res.code); + switch (res.code) { + case SM_CMD_GET_SENSOR_COUNT: + Debug::print("SM_CMD_GET_SENSOR_COUNT"); + Debug::print(": count="); + Debug::print(res.get_sensor_count.count, DEC); + break; + + case SM_CMD_GET_VALUE: + Debug::print("SM_CMD_GET_VALUE"); + Debug::print(": sensor="); + Debug::print(res.get_value.sensor, DEC); + Debug::print(", value="); + Debug::print(res.get_value.value, DEC); + break; + + case SM_CMD_SET_WARNING_VALUE: + Debug::print("SM_CMD_SET_WARNING_VALUE"); + break; + + case SM_CMD_GET_WARNING_VALUE: + Debug::print("SM_CMD_GET_WARNING_VALUE"); + Debug::print(": warning_value="); + Debug::print(res.get_warning_value.warning_value, DEC); + break; + + case SM_CMD_SET_SENSOR_NAME: + Debug::print("SM_CMD_SET_SENSOR_NAME"); + break; + + case SM_CMD_GET_SENSOR_NAME: + Debug::print("SM_CMD_GET_SENSOR_NAME"); + Debug::print(": name="); + write_name(res.get_sensor_name.name, res.get_sensor_name.length); + break; + + case SM_CMD_SET_UPDATE_INTERVAL: + Debug::print("SM_CMD_SET_UPDATE_INTERVAL"); + break; + + default: + Debug::print("Unknown command: "); + Debug::print(res.code); } Debug::println(); } @@ -272,86 +272,86 @@ void on_soil_moisture_ctrl(uint8_t *data, uint8_t len) { res.code = SM_CMD_FAIL; // TODO: use len_op(len, sizeof(sm_XX_req)) to check that each request's size is ok. - 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; - - case SM_CMD_GET_VALUE: - body_len = sizeof(sm_get_value_res); - 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 { - res.code = SM_CMD_FAIL; - } - break; - - case SM_CMD_SET_WARNING_VALUE: - body_len = sizeof(sm_set_warning_value_res); - 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; - } - break; - - case SM_CMD_GET_WARNING_VALUE: - body_len = sizeof(sm_get_warning_value_res); - 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; - } - break; - - case SM_CMD_SET_SENSOR_NAME: - body_len = sizeof(sm_set_sensor_name_res); - 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 { - res.code = SM_CMD_FAIL; - } - break; - - case SM_CMD_GET_SENSOR_NAME: - body_len = sizeof(sm_get_sensor_name_res); - 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 { - res.code = SM_CMD_FAIL; - } - break; - - case SM_CMD_SET_UPDATE_INTERVAL: - body_len = sizeof(sm_set_update_interval_res); - sensor = req->set_update_interval.sensor; - - if (sensor < SENSOR_COUNT) { - sensors[sensor].update_interval = req->set_update_interval.interval_in_seconds; - } else { - res.code = SM_CMD_FAIL; - } - break; + 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; + + case SM_CMD_GET_VALUE: + body_len = sizeof(sm_get_value_res); + 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 { + res.code = SM_CMD_FAIL; + } + break; + + case SM_CMD_SET_WARNING_VALUE: + body_len = sizeof(sm_set_warning_value_res); + 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; + } + break; + + case SM_CMD_GET_WARNING_VALUE: + body_len = sizeof(sm_get_warning_value_res); + 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; + } + break; + + case SM_CMD_SET_SENSOR_NAME: + body_len = sizeof(sm_set_sensor_name_res); + 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 { + res.code = SM_CMD_FAIL; + } + break; + + case SM_CMD_GET_SENSOR_NAME: + body_len = sizeof(sm_get_sensor_name_res); + 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 { + res.code = SM_CMD_FAIL; + } + break; + + case SM_CMD_SET_UPDATE_INTERVAL: + body_len = sizeof(sm_set_update_interval_res); + sensor = req->set_update_interval.sensor; + + if (sensor < SENSOR_COUNT) { + sensors[sensor].update_interval = req->set_update_interval.interval_in_seconds; + } else { + res.code = SM_CMD_FAIL; + } + break; } if (res.code == SM_CMD_FAIL) { @@ -372,7 +372,7 @@ static int store_string(int index, uint8_t len, char *chars) { return 1 + len; } -static int load_string(int index, const uint8_t max_length, uint8_t& length, char *chars) { +static int load_string(int index, const uint8_t max_length, uint8_t &length, char *chars) { length = EEPROM.read(index++); uint8_t len = min(length, max_length); @@ -387,7 +387,7 @@ static int load_string(int index, const uint8_t max_length, uint8_t& length, cha * Returns true if the settings was successfully read. */ static boolean load_settings() { - int index = 0; + int index = 0; uint8_t magic = EEPROM.read(index++); // Check to see if the EEPROM contains a magic byte indicating if we have written anything before. @@ -398,9 +398,9 @@ static boolean load_settings() { for (int i = 0; i < SENSOR_COUNT; i++) { struct sm_sensor s = sensors[i]; - s.warning_value = EEPROM.read(index++); + s.warning_value = EEPROM.read(index++); s.warning_value += EEPROM.read(index++) << 8; - index += load_string(index, SENSOR_NAME_LEN, s.name_length, s.name); + index += load_string(index, SENSOR_NAME_LEN, s.name_length, s.name); } return true; @@ -433,7 +433,7 @@ static void setup_settings() { Debug::print("Sensor #"); Debug::print(i, DEC); - struct sm_sensor& s = sensors[i]; + struct sm_sensor &s = sensors[i]; // Debug::print(", name len="); // Debug::print(s.name_length, DEC); @@ -452,7 +452,8 @@ static void setup_settings() { Debug::println("setup_settings: done"); } #else -static void setup_settings() {} +static void setup_settings() { +} #endif // PERSISTENT_CONFIGURATION_SUPPORT // vim: set ft=arduino: -- cgit v1.2.3