Version 1.22.1

Send F0 0F as well as M112 when emergency stop buttin pressed, for RepRapFirmware 2.02 and later
For dimming control, treat printer state Off the same as Idle
Error message popups no longer time out, they have to be closed manually
Bug fix: Extrusion rates didn't match the buttons
Bug fix: babystepping sent M290 M290 S0.02 instead of just M290 S0.02
Bug fix: couldn't cancel a message popup that appears on top of a smaller popup
Bug fix: serial I/O JSON parameter buffer was too short to handle long responses e.g. from M591 D0

Author: dc42

src/Bugs.txt

@@ -58,6 +58,15 @@
 [not done, image load is much faster now] Allow image load to be cancelled by touch, unless it is now much faster
 [fixed buffer overflow, test before release] Test extrusion factors are working, we have a report that they get reset to 100 on T3
 
+Bugs in 1.22, to be fixed in 1.22.1:
+- [done, test] Extrusion rates don't match the buttons, only 1 of 2 tables was updated
+- [done] for dimming, treat printer Off the same as Idle
+- [done, ok] babystepping sends M290 M290 S0.02
+- [done, ok] can't cancel a message popup that appears on top of a babystepping popup
+- [done, ok] don't timeout error messages
+- [done, ok] handle longer responses in Console window e.g. from M591
+- [done, ok] Send F0 0F on emergency stop
+
 Remaining:
 
 Display IP address in top bar?

src/Display.cpp

@@ -182,8 +182,8 @@ bool Window::Visible(const DisplayField *p) const
 // Get the field that has been touched, or nullptr if we can't find one
 ButtonPress Window::FindEvent(PixelNumber x, PixelNumber y)
 {
-	return (x < Xpos() || y < Ypos()) ? ButtonPress()
-			: (next != nullptr) ? next->FindEvent(x, y) 
+	return (next != nullptr) ? next->FindEvent(x, y)
+			: (x < Xpos() || y < Ypos()) ? ButtonPress()
 				: DisplayField::FindEvent(x - Xpos(), y - Ypos(), root);
 }
 

src/Hardware/SerialIo.cpp

@@ -205,7 +205,7 @@ namespace SerialIo
 
 	// fieldId is the name of the field being received. A '^' character indicates the position of an array index, and a ':' character indicates a field separator.
 	String<50> fieldId;
-	String<160> fieldVal;	// long enough for about 3 lines of message
+	String<300> fieldVal;	// long enough for about 6 lines of message
 	size_t arrayIndices[MaxArrayNesting];
 	size_t arrayDepth = 0;
 

src/MessageLog.cpp

@@ -18,8 +18,8 @@ namespace MessageLog
 {
 	const unsigned int MaxCharsPerRow = 80;
 
-	const unsigned int MaxCharsPerMessage = 400;
-	const unsigned int MaxNewMessageLines = 5;
+	const unsigned int MaxCharsPerMessage = 300;		// variable fieldVal in module SerialIO must also be large enough for this
+	const unsigned int MaxNewMessageLines = 6;
 
 	struct Message
 	{

src/PanelDue.cpp

@@ -506,7 +506,7 @@ extern void RestoreBrightness()
 extern void DimBrightness()
 {
 	if (   (GetDisplayDimmerType() == DisplayDimmerType::always)
-		|| (GetDisplayDimmerType() == DisplayDimmerType::onIdle && status == PrinterStatus::idle)
+		|| (GetDisplayDimmerType() == DisplayDimmerType::onIdle && (status == PrinterStatus::idle || status == PrinterStatus::off))
 	   )
 	{
 		Buzzer::SetBacklight(nvData.brightness/8);
@@ -1243,7 +1243,7 @@ int main(void)
 	if (rstc_get_reset_cause(RSTC) != RSTC_SOFTWARE_RESET && _esplash[0] == DISPLAY_X && _esplash[1] == DISPLAY_Y)
 	{
 		lcd.fillScr(black);
-		lcd.drawCompressedBitmapBottomToTop(0, 0, DISPLAY_X, DISPLAY_Y, _esplash  + 2);
+		lcd.drawCompressedBitmapBottomToTop(0, 0, DISPLAY_X, DISPLAY_Y, _esplash + 2);
 		const uint32_t now = SystemTick::GetTickCount();
 		do
 		{

src/UserInterface.cpp

@@ -422,7 +422,7 @@ void CreateExtrudePopup(const ColourScheme& colours)
 {
 	static const char * array extrudeAmountValues[] = { "100", "50", "20", "10", "5",  "1" };
 	static const char * array extrudeSpeedValues[] = { "50", "20", "10", "5", "2" };
-	static const char * array extrudeSpeedParams[] = { "3000", "2400", "1200", "600", "300" };
+	static const char * array extrudeSpeedParams[] = { "3000", "1200", "600", "300", "120" };		// must be extrudeSpeedValues * 60
 
 	extrudePopup = new StandardPopupWindow(extrudePopupHeight, extrudePopupWidth, colours.popupBackColour, colours.popupBorderColour, colours.popupTextColour, colours.buttonImageBackColour, strings->extrusionAmount);
 	PixelNumber ypos = popupTopMargin + buttonHeight + extrudeButtonRowSpacing;
@@ -666,15 +666,15 @@ void CreateKeyboardPopup(uint32_t language, ColourScheme colours)
 void CreateBabystepPopup(const ColourScheme& colours)
 {
 	static const char * array const babystepStrings[2] = { UP_ARROW " 0.02", DOWN_ARROW " 0.02" };
-	static const char * array const babystepCommands[2] = { "M290 S0.02", "M290 S-0.02" };
+	static const char * array const babystepAmounts[2] = { "0.02", "-0.02" };
 	babystepPopup = new StandardPopupWindow(babystepPopupHeight, babystepPopupWidth, colours.popupBackColour, colours.popupBorderColour, colours.popupTextColour, colours.buttonImageBackColour,
 			strings->babyStepping);
 	PixelNumber ypos = popupTopMargin + babystepRowSpacing;
 	DisplayField::SetDefaultColours(colours.popupTextColour, colours.popupBackColour);
 	babystepPopup->AddField(babystepOffsetField = new FloatField(ypos, popupSideMargin, babystepPopupWidth - 2 * popupSideMargin, TextAlignment::Left, 3, strings->currentZoffset, "mm"));
 	ypos += babystepRowSpacing;
 	DisplayField::SetDefaultColours(colours.popupTextColour, colours.buttonImageBackColour);
-	CreateStringButtonRow(babystepPopup, ypos, popupSideMargin, babystepPopupWidth - 2 * popupSideMargin, fieldSpacing, 2, babystepStrings, babystepCommands, evBabyStepAmount);
+	CreateStringButtonRow(babystepPopup, ypos, popupSideMargin, babystepPopupWidth - 2 * popupSideMargin, fieldSpacing, 2, babystepStrings, babystepAmounts, evBabyStepAmount);
 }
 
 // Create the grid of heater icons and temperatures
@@ -1493,14 +1493,14 @@ namespace UI
 	// Process a new response. This is treated like a simple alert except that it times out and isn't cleared by a "clear alert" command from the host.
 	void NewResponseReceived(const char* array text)
 	{
-		if (alertMode < 2 && (currentTab == tabControl || currentTab == tabPrint))		// if the current alert doesn't require acknowledgement
+		if (alertMode < 2 && (currentTab == tabControl || currentTab == tabPrint))	// if the current alert doesn't require acknowledgement
 		{
 			alertPopup->Set(strings->response, text, 1, 0);
 			mgr.SetPopup(alertPopup, AutoPlace, AutoPlace);
-			alertMode = -1;								// make sure that a call to ClearAlert doesn't clear us
+			alertMode = -1;															// make sure that a call to ClearAlert doesn't clear us
 			displayingResponse = true;
 			whenAlertReceived = SystemTick::GetTickCount();
-			alertTicks = 5000;							// timeout after 5 seconds
+			alertTicks = (stringStartsWith(text, "Error")) ? 0 : 5000;				// timeout after 5 seconds if it isn't an error message
 		}
 	}
 
@@ -1612,7 +1612,8 @@ namespace UI
 			{
 			case evEmergencyStop:
 				{
-					SerialIo::SendString("M112\n");
+					// We send M112 for the benefit of old firmware, and F0 0F (an invalid UTF8 sequence) for new firmware
+					SerialIo::SendString("M112 ;" "\xF0" "\x0F" "\n");
 					Delay(1000);
 					SerialIo::SendString("M999\n");
 					Reconnect();
@@ -1817,7 +1818,7 @@ namespace UI
 				break;
 
 			case evBabyStepAmount:
-				SerialIo::SendString("M290 ");
+				SerialIo::SendString("M290 Z");
 				SerialIo::SendString(bp.GetSParam());
 				SerialIo::SendChar('\n');
 				break;

src/Version.hpp

@@ -8,6 +8,6 @@
 #ifndef SRC_VERSION_HPP_
 #define SRC_VERSION_HPP_
 
-#define VERSION_TEXT		"1.22(19b1)"
+#define VERSION_TEXT		"1.22.1(28b1)"
 
 #endif /* SRC_VERSION_HPP_ */