diff --git a/Configuration.h b/Configuration.h index dbc9e6b..be5abd8 100644 --- a/Configuration.h +++ b/Configuration.h @@ -24,7 +24,7 @@ Licence: GPL #define CONFIGURATION_H #define NAME "RepRapFirmware" -#define VERSION "0.56" +#define VERSION "0.57" #define DATE "2014-01-13" #define LAST_AUTHOR "reprappro.com" diff --git a/GCodes.cpp b/GCodes.cpp index 297ef92..f07508a 100644 --- a/GCodes.cpp +++ b/GCodes.cpp @@ -1651,16 +1651,16 @@ bool GCodes::ActOnGcode(GCodeBuffer *gb) } break; - case 876: // TEMPORARY - this will go away... - if(gb->Seen('P')) - { - iValue = gb->GetIValue(); - if(iValue != 1) - platform->SetHeatOn(0); - else - platform->SetHeatOn(1); - } - break; +// case 876: // TEMPORARY - this will go away... +// if(gb->Seen('P')) +// { +// iValue = gb->GetIValue(); +// if(iValue != 1) +// platform->SetHeatOn(0); +// else +// platform->SetHeatOn(1); +// } +// break; case 900: result = DoFileCannedCycles("homex.g"); diff --git a/Platform.cpp b/Platform.cpp index 653ee53..e4012d5 100644 --- a/Platform.cpp +++ b/Platform.cpp @@ -129,7 +129,7 @@ void Platform::Init() standbyTemperatures = STANDBY_TEMPERATURES; activeTemperatures = ACTIVE_TEMPERATURES; coolingFanPin = COOLING_FAN_PIN; - turnHeatOn = HEAT_ON; + //turnHeatOn = HEAT_ON; webDir = WEB_DIR; gcodeDir = GCODE_DIR; @@ -334,7 +334,7 @@ void Platform::SetHeater(int8_t heater, const float& power) return; byte p = (byte)(255.0*fmin(1.0, fmax(0.0, power))); - if(turnHeatOn == 0) + if(HEAT_ON == 0) p = 255 - p; if(heater == 0) analogWrite(heatOnPins[heater], p); diff --git a/Platform.h b/Platform.h index 470fb53..e8d2572 100644 --- a/Platform.h +++ b/Platform.h @@ -499,7 +499,7 @@ class Platform bool UsePID(int8_t heater); float HeatSampleTime(); void CoolingFan(float speed); - void SetHeatOn(int8_t ho); //TEMPORARY - this will go away... + //void SetHeatOn(int8_t ho); //TEMPORARY - this will go away... //------------------------------------------------------------------------------------------------------- protected: @@ -578,7 +578,7 @@ class Platform float standbyTemperatures[HEATERS]; float activeTemperatures[HEATERS]; int8_t coolingFanPin; - int8_t turnHeatOn; + //int8_t turnHeatOn; // Serial/USB @@ -914,10 +914,10 @@ inline void Platform::CoolingFan(float speed) analogWrite(coolingFanPin, (uint8_t)(speed*255.0)); } -inline void Platform::SetHeatOn(int8_t ho) -{ - turnHeatOn = ho; -} +//inline void Platform::SetHeatOn(int8_t ho) +//{ +// turnHeatOn = ho; +//} //********************************************************************************************************* diff --git a/Release/RepRapFirmware-055-13-01-2014.bin b/Release/RepRapFirmware-057-13-01-2014.bin similarity index 72% rename from Release/RepRapFirmware-055-13-01-2014.bin rename to Release/RepRapFirmware-057-13-01-2014.bin index c18a27e..86d17b5 100755 Binary files a/Release/RepRapFirmware-055-13-01-2014.bin and b/Release/RepRapFirmware-057-13-01-2014.bin differ diff --git a/RepRapFirmware.cpp b/RepRapFirmware.cpp index 9aa41b1..4c120bc 100644 --- a/RepRapFirmware.cpp +++ b/RepRapFirmware.cpp @@ -186,12 +186,8 @@ void RepRap::Init() platform->Message(HOST_MESSAGE, platform->GetConfigFile()); platform->Message(HOST_MESSAGE, "...\n\n"); - platform->PushMessageIndent(); - while(gCodes->RunConfigurationGCodes()); // Wait till the file is finished - platform->PopMessageIndent(); - platform->Message(HOST_MESSAGE, "\nStarting network...\n"); platform->StartNetwork(); // Need to do this here, as the configuration GCodes may set IP address etc.