From 77e261f12089bd7db854d21fc81a42eaa60e0b67 Mon Sep 17 00:00:00 2001 From: Trygve Laugstøl Date: Sat, 25 Jul 2015 17:35:57 +0200 Subject: o Even better debug code. --- app.cpp | 136 ++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 68 insertions(+), 68 deletions(-) (limited to 'app.cpp') diff --git a/app.cpp b/app.cpp index 76d2653..e347b46 100644 --- a/app.cpp +++ b/app.cpp @@ -65,7 +65,7 @@ void sm_setup() { pinMode(2, OUTPUT); digitalWrite(2, HIGH); - Debug::println("sm_setup: done"); + debug.println("sm_setup: done"); } void sm_on_connect() { @@ -118,12 +118,12 @@ void sm_loop() { s.value = (uint16_t) analogRead(s.a_pin); if (count++ > 0) { - Debug::print(", "); + debug.print(", "); } - Debug::print("#"); - Debug::print(i, DEC); - Debug::print(" = "); - Debug::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; @@ -134,7 +134,7 @@ void sm_loop() { } if (count > 0) { - Debug::println(); + debug.println(); } } @@ -142,110 +142,110 @@ void sm_loop() { static void write_name(uint8_t const* name, uint8_t len) { for (int i = 0; i < len; i++) { - Debug::print((char)name[i]); + debug.print((char)name[i]); } } void write_req(struct sm_req const &req) { - Debug::print(">> "); + debug.print(">> "); switch (req.code) { case SM_CMD_GET_SENSOR_COUNT: - Debug::print("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); + 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); + 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); + 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="); + 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"); + 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); + 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.print("Unknown command: "); + debug.print(req.code); } - Debug::println(); + debug.println(); } void write_res(struct sm_res const &res) { - Debug::print("<< "); + 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); + 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); + 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"); + 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); + 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"); + debug.print("SM_CMD_SET_SENSOR_NAME"); break; case SM_CMD_GET_SENSOR_NAME: - Debug::print("SM_CMD_GET_SENSOR_NAME"); - Debug::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: - Debug::print("SM_CMD_SET_UPDATE_INTERVAL"); + debug.print("SM_CMD_SET_UPDATE_INTERVAL"); break; default: - Debug::print("Unknown command: "); - Debug::print(res.code); + debug.print("Unknown command: "); + debug.print(res.code); } - Debug::println(); + debug.println(); } #endif // SM_DEBUG @@ -418,38 +418,38 @@ static void store_settings() { index += store_string(index, s.name_length, s.name); } - Debug::println("Settings saved"); + debug.println("Settings saved"); } static void setup_settings() { if (!load_settings()) { - Debug::println("Could not load settings, storing defaults"); + debug.println("Could not load settings, storing defaults"); store_settings(); } else { - Debug::println("Settings loaded"); + debug.println("Settings loaded"); } for (int i = 0; i < SENSOR_COUNT; i++) { - Debug::print("Sensor #"); - Debug::print(i, DEC); + debug.print("Sensor #"); + debug.print(i, DEC); struct sm_sensor &s = sensors[i]; -// Debug::print(", name len="); -// Debug::print(s.name_length, DEC); -// Debug::print(": ->"); -// Serial.write((const uint8_t*) s.name, s.name_length); -// Debug::print("<-"); +// debug.print(", name len="); +// debug.print(s.name_length, DEC); +// debug.print(": ->"); +// debug.write((const uint8_t*) s.name, s.name_length); +// debug.print("<-"); - Debug::print(": update_interval="); - Debug::print(s.update_interval, DEC); - Debug::print(", warning_value="); - Debug::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); - Debug::println(); + debug.println(); } - Debug::println("setup_settings: done"); + debug.println("setup_settings: done"); } #else static void setup_settings() { -- cgit v1.2.3