X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Flayout.cpp;h=97297410c25d4188b7e54d6e13c5c7e77ee9d3ad;hb=4d33c389881ebdf0b3926343d53e7d1ece654e20;hp=e67fbc26ebc0443440900293bd72555184e439f0;hpb=e39a3bb041867d6b469bb26278ea0b05ebea0277;p=r2c2.git

diff --git a/source/libmarklin/layout.cpp b/source/libmarklin/layout.cpp
index e67fbc2..9729741 100644
--- a/source/libmarklin/layout.cpp
+++ b/source/libmarklin/layout.cpp
@@ -9,6 +9,7 @@ Distributed under the GPL
 #include <msp/core/refptr.h>
 #include <msp/datafile/parser.h>
 #include <msp/datafile/writer.h>
+#include <msp/io/print.h>
 #include <msp/time/utils.h>
 #include "block.h"
 #include "catalogue.h"
@@ -216,6 +217,7 @@ void Layout::emergency(const string &msg)
 {
 	if(driver)
 		driver->halt(true);
+	IO::print("Emergency: %s\n", msg);
 	signal_emergency.emit(msg);
 }
 
@@ -370,7 +372,7 @@ void Layout::sensor_event(unsigned addr, bool state)
 			if((*i)->get_sensor_id()==addr)
 			{
 				if(!(*i)->get_train())
-					emergency("Unreserved sensor triggered");
+					emergency(format("Unreserved sensor %d triggered", addr));
 				break;
 			}
 	}