From: Joseph Coffland <joseph@cauldrondevelopment.com>
Date: Tue, 23 Aug 2016 07:10:53 +0000 (-0700)
Subject: Fixed error message
X-Git-Url: https://git.buildbotics.com/?a=commitdiff_plain;h=b8897867969049fcdce28dbbc9e0710576c9a19a;p=bbctrl-firmware

Fixed error message
---

diff --git a/src/machine.c b/src/machine.c
index 1162b6f..54afdbb 100644
--- a/src/machine.c
+++ b/src/machine.c
@@ -643,7 +643,7 @@ void machine_init() {
 
 /// Alarm state; send an exception report and stop processing input
 stat_t mach_alarm(const char *location, stat_t code) {
-  status_message_P(location, STAT_LEVEL_ERROR, code, "ALARM");
+  status_message_P(location, STAT_LEVEL_ERROR, code, 0);
   estop_trigger(ESTOP_ALARM);
   return code;
 }
diff --git a/src/status.c b/src/status.c
index 80ed0ec..2ec1e66 100644
--- a/src/status.c
+++ b/src/status.c
@@ -85,7 +85,7 @@ stat_t status_message_P(const char *location, status_level_t level,
   if (code) printf_P(PSTR(", \"code\": %d"), code);
 
   // Location
-  if (location) printf_P(PSTR(", \"location\": %S"), location);
+  if (location) printf_P(PSTR(", \"location\": \"%S\""), location);
 
   putchar('}');
   putchar('\n');