Fixed error message
authorJoseph Coffland <joseph@cauldrondevelopment.com>
Tue, 23 Aug 2016 07:10:53 +0000 (00:10 -0700)
committerJoseph Coffland <joseph@cauldrondevelopment.com>
Tue, 23 Aug 2016 07:10:53 +0000 (00:10 -0700)
src/machine.c
src/status.c

index 1162b6f26f831e34a74b849b74c6891187e722b4..54afdbb56b306f355eb65a02aa1f2d6db0bac696 100644 (file)
@@ -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;
 }
index 80ed0ece94e94465dc833faa267a92246f858b55..2ec1e66192299bcf81370b5ea999f9a1e0ec51d7 100644 (file)
@@ -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');