From d317fdb0c737e6b1994da3f01c39937292c1e56f Mon Sep 17 00:00:00 2001 From: Trygve Laugstøl Date: Sat, 25 Jul 2015 05:12:59 +0200 Subject: o Adding a Debug class that delegates to Serial to control where the debug output goes. --- app.cpp | 138 +++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 71 insertions(+), 67 deletions(-) (limited to 'app.cpp') diff --git a/app.cpp b/app.cpp index d4f880d..bb5ad9c 100644 --- a/app.cpp +++ b/app.cpp @@ -1,4 +1,5 @@ #include "app.h" +#include "Debug.h" #include @@ -61,7 +62,10 @@ void sm_setup() { pinMode(LED_PIN, OUTPUT); - Serial.println("sm_setup: done"); + pinMode(2, OUTPUT); + digitalWrite(2, HIGH); + + Debug::println("sm_setup: done"); } void sm_on_connect() { @@ -114,12 +118,12 @@ void sm_loop() { s.value = (uint16_t) analogRead(s.a_pin); if (count++ > 0) { - Serial.print(", "); + Debug::print(", "); } - Serial.print("#"); - Serial.print(i, DEC); - Serial.print(" = "); - Serial.print(s.value, DEC); + Debug::print("#"); + Debug::print(i, DEC); + Debug::print(" = "); + Debug::print(s.value, DEC); struct sm_res res; res.code = SM_CMD_GET_VALUE; @@ -130,7 +134,7 @@ void sm_loop() { } if (count > 0) { - Serial.println(); + Debug::println(); } } @@ -138,110 +142,110 @@ void sm_loop() { static void write_name(uint8_t const* name, uint8_t len) { for(int i = 0; i < len; i++) { - Serial.print((char)name[i]); + Debug::print((char)name[i]); } } void write_req(struct sm_req const& req) { - Serial.print(">> "); + Debug::print(">> "); switch(req.code) { case SM_CMD_GET_SENSOR_COUNT: - Serial.print("SM_CMD_GET_SENSOR_COUNT"); + Debug::print("SM_CMD_GET_SENSOR_COUNT"); break; case SM_CMD_GET_VALUE: - Serial.print("SM_CMD_GET_VALUE"); - Serial.print(": sensor="); - Serial.print(req.get_value.sensor, DEC); + Debug::print("SM_CMD_GET_VALUE"); + Debug::print(": sensor="); + Debug::print(req.get_value.sensor, DEC); break; case SM_CMD_SET_WARNING_VALUE: - Serial.print("SM_CMD_SET_WARNING_VALUE"); - Serial.print(": sensor="); - Serial.print(req.set_warning_value.sensor, DEC); - Serial.print(", warning_value="); - Serial.print(req.set_warning_value.warning_value, DEC); + 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: - Serial.print("SM_CMD_GET_WARNING_VALUE"); - Serial.print(": sensor="); - Serial.print(req.get_warning_value.sensor, DEC); + 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: - Serial.print("SM_CMD_SET_SENSOR_NAME"); - Serial.print(": sensor="); - Serial.print(req.set_sensor_name.sensor, DEC); - Serial.print(", 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: - Serial.print("SM_CMD_GET_SENSOR_NAME"); + Debug::print("SM_CMD_GET_SENSOR_NAME"); break; case SM_CMD_SET_UPDATE_INTERVAL: - Serial.print("SM_CMD_SET_UPDATE_INTERVAL"); - Serial.print(": interval_in_seconds="); - Serial.print(req.set_update_interval.interval_in_seconds, DEC); + Debug::print("SM_CMD_SET_UPDATE_INTERVAL"); + Debug::print(": interval_in_seconds="); + Debug::print(req.set_update_interval.interval_in_seconds, DEC); break; default: - Serial.print("Unknown command: "); - Serial.print(req.code); + Debug::print("Unknown command: "); + Debug::print(req.code); } - Serial.println(); + Debug::println(); } void write_res(struct sm_res const& res) { - Serial.print("<< "); + Debug::print("<< "); switch(res.code) { case SM_CMD_GET_SENSOR_COUNT: - Serial.print("SM_CMD_GET_SENSOR_COUNT"); - Serial.print(": count="); - Serial.print(res.get_sensor_count.count, DEC); + Debug::print("SM_CMD_GET_SENSOR_COUNT"); + Debug::print(": count="); + Debug::print(res.get_sensor_count.count, DEC); break; case SM_CMD_GET_VALUE: - Serial.print("SM_CMD_GET_VALUE"); - Serial.print(": sensor="); - Serial.print(res.get_value.sensor, DEC); - Serial.print(", value="); - Serial.print(res.get_value.value, DEC); + 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: - Serial.print("SM_CMD_SET_WARNING_VALUE"); + Debug::print("SM_CMD_SET_WARNING_VALUE"); break; case SM_CMD_GET_WARNING_VALUE: - Serial.print("SM_CMD_GET_WARNING_VALUE"); - Serial.print(": warning_value="); - Serial.print(res.get_warning_value.warning_value, DEC); + 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: - Serial.print("SM_CMD_SET_SENSOR_NAME"); + Debug::print("SM_CMD_SET_SENSOR_NAME"); break; case SM_CMD_GET_SENSOR_NAME: - Serial.print("SM_CMD_GET_SENSOR_NAME"); - Serial.print(": 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: - Serial.print("SM_CMD_SET_UPDATE_INTERVAL"); + Debug::print("SM_CMD_SET_UPDATE_INTERVAL"); break; default: - Serial.print("Unknown command: "); - Serial.print(res.code); + Debug::print("Unknown command: "); + Debug::print(res.code); } - Serial.println(); + Debug::println(); } #endif // SM_DEBUG @@ -414,38 +418,38 @@ static void store_settings() { index += store_string(index, s.name_length, s.name); } - Serial.println("Settings saved"); + Debug::println("Settings saved"); } static void setup_settings() { if (!load_settings()) { - Serial.println("Could not load settings, storing defaults"); + Debug::println("Could not load settings, storing defaults"); store_settings(); } else { - Serial.println("Settings loaded"); + Debug::println("Settings loaded"); } for (int i = 0; i < SENSOR_COUNT; i++) { - Serial.print("Sensor #"); - Serial.print(i, DEC); + Debug::print("Sensor #"); + Debug::print(i, DEC); struct sm_sensor& s = sensors[i]; -// Serial.print(", name len="); -// Serial.print(s.name_length, DEC); -// Serial.print(": ->"); +// Debug::print(", name len="); +// Debug::print(s.name_length, DEC); +// Debug::print(": ->"); // Serial.write((const uint8_t*) s.name, s.name_length); -// Serial.print("<-"); +// Debug::print("<-"); - Serial.print(": update_interval="); - Serial.print(s.update_interval, DEC); - Serial.print(", warning_value="); - Serial.print(s.warning_value, DEC); + Debug::print(": update_interval="); + Debug::print(s.update_interval, DEC); + Debug::print(", warning_value="); + Debug::print(s.warning_value, DEC); - Serial.println(); + Debug::println(); } - Serial.println("setup_settings: done"); + Debug::println("setup_settings: done"); } #else static void setup_settings() {} -- cgit v1.2.3