diff --git a/src/core/gcodecommands.h b/src/core/gcodecommands.h
--- a/src/core/gcodecommands.h
+++ b/src/core/gcodecommands.h
@@ -70,7 +70,7 @@
         M120, M121, M122, M123, M124, M126 = 126, M127, M128, M129,
         M130, M131, M132, M133, M134, M135, M136,
         M140 = 140, M141, M142, M143, M144, M146 = 146, M149 = 149,
-        M150 = 150,
+        M150 = 150, M155 = 155,
         M160 = 160, M163 = 163, M164 = 164,
         M190 = 190, M191,
         M200 = 200, M201, M202, M203, M204, M205, M206, M207, M208, M209,
diff --git a/src/core/gcodecommands.cpp b/src/core/gcodecommands.cpp
--- a/src/core/gcodecommands.cpp
+++ b/src/core/gcodecommands.cpp
@@ -251,6 +251,8 @@
         return QObject::tr("M144: Stand by your bed");
     case M150://Marlin
         return QObject::tr("M150: Set display color");
+    case M155: //Look for Cap:AUTOREPORT_TEMP:1 in M115 to check for support
+        return QObject::tr("M155: Set Temperature auto report");
     case M163://Repetier > 0.92
         return QObject::tr("M163: Set weight of mixed material");
     case M164://Repetier > 0.92
@@ -524,6 +526,7 @@
 
     case M109:
     case M140:
+    case M155:
     case M190:
     case M220:
     case M221:
diff --git a/unittests/gcodetests.h b/unittests/gcodetests.h
--- a/unittests/gcodetests.h
+++ b/unittests/gcodetests.h
@@ -58,6 +58,7 @@
     void command_M117();
     void command_M119();
     void command_M140();
+    void command_M155();
     void command_M190();
     void command_M220();
     void command_M221();
diff --git a/unittests/gcodetests.cpp b/unittests/gcodetests.cpp
--- a/unittests/gcodetests.cpp
+++ b/unittests/gcodetests.cpp
@@ -207,6 +207,12 @@
     QVERIFY(GCode::toCommand(GCode::M140, QStringLiteral("100")) == QStringLiteral("M140 S100"));
 }
 
+void GCodeTests::command_M155()
+{
+    QVERIFY(testMCodeNeedsArg(GCode::M155));
+    QVERIFY(GCode::toCommand(GCode::M155, QStringLiteral("1")) == QStringLiteral("M155 S1"));
+}
+
 void GCodeTests::command_M190()
 {
     QVERIFY(testMCodeNeedsArg(GCode::M190));