Merge remote-tracking branch 'origin/duet' into selected_head_changes

Conflicts:
	Platform.h

.gitignore

@@ -1,8 +1,8 @@
 *.d
 *.o
-.*
 Release/*
 !Release/RepRapFirmware*.bin
 *~
 *orig
 /Release
+

.gitignore.BACKUP.5284.gitignore

@@ -1,11 +0,0 @@
-*.d
-*.o
-Release/*
-<<<<<<< HEAD
-!Release/RepRapFirmware.bin
-=======
-!Release/RepRapFirmware*.bin
->>>>>>> duet
-*~
-*orig
-/Release

.gitignore.LOCAL.5284.gitignore

@@ -1,7 +0,0 @@
-*.d
-*.o
-Release/*
-!Release/RepRapFirmware.bin
-*~
-*orig
-/Release

.gitignore.REMOTE.5284.gitignore

@@ -1,7 +0,0 @@
-*.d
-*.o
-Release/*
-!Release/RepRapFirmware*.bin
-*~
-*orig
-/Release

Platform.cpp

@@ -202,6 +202,7 @@ void Platform::Init()
     	else
     		pinMode(heatOnPins[i], OUTPUT);
     thermistorInfRs[i] = ( thermistorInfRs[i]*exp(-thermistorBetas[i]/(25.0 - ABS_ZERO)) );
+    tempSum[i] = 0;
   }
 
   if(coolingFanPin >= 0)

Platform.h

@@ -150,6 +150,7 @@ Licence: GPL
 												// We hope that the compiler is clever enough to spot that division by this is a >> operation, but it doesn't really matter
 
 #define POLL_TIME 0.006                         // Poll the A to D converters this often (seconds)
+
 #define HOT_BED 0 	// The index of the heated bed; set to -1 if there is no heated bed
 #define E0_HEATER 1 //the index of the first extruder heater
 #define E1_HEATER 2 //the index of the first extruder heater

t

@@ -1 +0,0 @@
-Ormerod 3D Printer Kit without self-printed parts