Bringing M24 Pronterface bug workround to master branch.

Configuration.h

@@ -24,8 +24,8 @@ Licence: GPL
 #define CONFIGURATION_H
 
 #define NAME "RepRapFirmware"
-#define VERSION "0.48"
-#define DATE "2013-12-27"
+#define VERSION "0.50"
+#define DATE "2013-12-30"
 #define LAST_AUTHOR "reprappro.com"
 
 // Other firmware that we might switch to be compatible with.

GCodes.cpp

@@ -1337,6 +1337,8 @@ bool GCodes::ActOnGcode(GCodeBuffer *gb)
       break;
       
     case 24: // Print/resume-printing the selected file
+      if(fileBeingPrinted != NULL)
+    	  break;
       fileBeingPrinted = fileToPrint;
       fileToPrint = NULL;
       break;
@@ -1645,7 +1647,10 @@ bool GCodes::ActOnGcode(GCodeBuffer *gb)
     	break;
 
     case 559: // Upload config.g
-       	str = platform->GetConfigFile();
+    	if(gb->Seen('P'))
+    		str = gb->GetString();
+    	else
+    		str = platform->GetConfigFile();
         OpenFileToWrite(platform->GetSysDir(), str, gb);
         snprintf(reply, STRING_LENGTH, "Writing to file: %s", str);
     	break;

Platform.cpp

@@ -342,18 +342,6 @@ void Platform::SetHeater(int8_t heater, const float& power)
 	  analogWriteNonDue(heatOnPins[heater], p);
 }
 
-inline void Platform::PollZHeight()
-{
-	if(zProbeCount >= 5)
-	{
-		zProbeValue = zProbeSum/5;
-		zProbeSum = 0;
-		zProbeCount = 0;
-	}
-	zProbeSum += GetRawZHeight();
-	zProbeCount++;
-}
-
 
 EndStopHit Platform::Stopped(int8_t drive)
 {

Platform.h

@@ -828,6 +828,18 @@ inline void Platform::SetZProbeType(int pt)
 		zProbePin = -1;
 }
 
+inline void Platform::PollZHeight()
+{
+	if(zProbeCount >= 5)
+	{
+		zProbeValue = zProbeSum/5;
+		zProbeSum = 0;
+		zProbeCount = 0;
+	}
+	zProbeSum += GetRawZHeight();
+	zProbeCount++;
+}
+
 
 //********************************************************************************************************
 

README

@@ -16,6 +16,8 @@ repository.  For details of how to flash it to a Duet see here:
 
   http://www.reprappro.com/documentation/RepRapPro_Firmware#Flashing_the_Firmware
 
+For details of how to compile the source code, see below.
+
 
 General design principles:
 
@@ -135,10 +137,55 @@ Spin() function more than once from RepRap.Spin().
 
 -------------
 
-Version 0.3n beta
+Compiling from Source
+
+
+RepRap Frimware was developed using the Eclipse IDE, which is much more powerful for big software projects than the Arduino IDE.
+
+We use Eclipse Juno, which is available here:
+
+   http://www.eclipse.org/downloads/packages/eclipse-ide-cc-developers/junosr1
+
+You will also need the Eclipse Arduino support:
+
+   http://www.baeyens.it/eclipse/Install.html
+
+And the Arduino IDE itself (make sure you get the one for the Due/Duet - version 1.5.5 at the time of writing):
+
+   http://arduino.cc/en/Main/Software
+
+Finally you will need our libraries for driving the periphearls:
+
+   https://github.com/jmgiacalone/Arduino-libraries
+
+Start by getting the Arduino IDE programming your Duet with a simple Hello World program that prints to the USB (SerialUSB.print("Hello World"); on the Due/Duet, not Serial.print("Hello World");... )
+
+Then install Eclipse and the Arduino plugin.
+
+Make temporary copise of RepRapFirmware.cpp and RepRapFirmware.h from your download in another folder (you will only need to do this once).
+
+Finally use Eclipse to open the Arduino project called RepRapFirmware in the folder where you have downloaded the RepRap Firmware code.  Tell Eclipse to use the Arduino-libraries files you downloaded as the local libraries.  Eclipse will complain that the project already exists (which it does - it is your download).  Ignore this and it will open the project anyway.  
+
+Annoyingly the first time it may also overwrite RepRapFirmware.cpp and RepRapFirmware.h.  So close the project, overwrite its overwrites with the two files you saved, open the project again and refresh it.  Everything should now be ship-shape.  Add the libraries 
+
+  Wire
+  EMAC
+  Lwip
+  MCP4461
+  SamNonDuePin
+  SD_HSMCI
+
+to your project.  Under no circumstances be tempted to add standard Arduino libraries for devices like Ethernet - these are for the Due, and will not work on the Duet.
+
+You should now be able to compile the code and upload the result to the Duet.
+
+
+-------------
+
+Version 0.mn beta
 
 Started: 2012-11-18
-This README dated: 2013-12-06
+This README dated: 2013-12-30
 
 Adrian Bowyer
 RepRap Professional Ltd