tschwery/reprapfirmware-dc42
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed legacy support for Duet v0.4 heaters. Last commit before changes to max velocity code.

Browse source
This commit is contained in:
Adrian Bowyer 2014-01-13 15:04:00 +00:00
parent 98466d14d8
commit 14b247053f
6 changed files with 19 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Configuration.h
View file

@ -24,7 +24,7 @@ Licence: GPL
#define CONFIGURATION_H #define CONFIGURATION_H
#define NAME "RepRapFirmware" #define NAME "RepRapFirmware"
#define VERSION "0.56" #define VERSION "0.57"
#define DATE "2014-01-13" #define DATE "2014-01-13"
#define LAST_AUTHOR "reprappro.com" #define LAST_AUTHOR "reprappro.com"

20
GCodes.cpp
View file

@ -1651,16 +1651,16 @@ bool GCodes::ActOnGcode(GCodeBuffer *gb)
} }
break; break;
case 876: // TEMPORARY - this will go away... // case 876: // TEMPORARY - this will go away...
if(gb->Seen('P')) // if(gb->Seen('P'))
{ // {
iValue = gb->GetIValue(); // iValue = gb->GetIValue();
if(iValue != 1) // if(iValue != 1)
platform->SetHeatOn(0); // platform->SetHeatOn(0);
else // else
platform->SetHeatOn(1); // platform->SetHeatOn(1);
} // }
break; // break;
case 900: case 900:
result = DoFileCannedCycles("homex.g"); result = DoFileCannedCycles("homex.g");

4
Platform.cpp
View file

@ -129,7 +129,7 @@ void Platform::Init()
standbyTemperatures = STANDBY_TEMPERATURES; standbyTemperatures = STANDBY_TEMPERATURES;
activeTemperatures = ACTIVE_TEMPERATURES; activeTemperatures = ACTIVE_TEMPERATURES;
coolingFanPin = COOLING_FAN_PIN; coolingFanPin = COOLING_FAN_PIN;
turnHeatOn = HEAT_ON; //turnHeatOn = HEAT_ON;
webDir = WEB_DIR; webDir = WEB_DIR;
gcodeDir = GCODE_DIR; gcodeDir = GCODE_DIR;
@ -334,7 +334,7 @@ void Platform::SetHeater(int8_t heater, const float& power)
return; return;
byte p = (byte)(255.0*fmin(1.0, fmax(0.0, power))); byte p = (byte)(255.0*fmin(1.0, fmax(0.0, power)));
if(turnHeatOn == 0) if(HEAT_ON == 0)
p = 255 - p; p = 255 - p;
if(heater == 0) if(heater == 0)
analogWrite(heatOnPins[heater], p); analogWrite(heatOnPins[heater], p);

12
Platform.h
View file

@ -499,7 +499,7 @@ class Platform
bool UsePID(int8_t heater); bool UsePID(int8_t heater);
float HeatSampleTime(); float HeatSampleTime();
void CoolingFan(float speed); 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: protected:
@ -578,7 +578,7 @@ class Platform
float standbyTemperatures[HEATERS]; float standbyTemperatures[HEATERS];
float activeTemperatures[HEATERS]; float activeTemperatures[HEATERS];
int8_t coolingFanPin; int8_t coolingFanPin;
int8_t turnHeatOn; //int8_t turnHeatOn;
// Serial/USB // Serial/USB
@ -914,10 +914,10 @@ inline void Platform::CoolingFan(float speed)
analogWrite(coolingFanPin, (uint8_t)(speed*255.0)); analogWrite(coolingFanPin, (uint8_t)(speed*255.0));
} }
inline void Platform::SetHeatOn(int8_t ho) //inline void Platform::SetHeatOn(int8_t ho)
{ //{
turnHeatOn = ho; // turnHeatOn = ho;
} //}
//********************************************************************************************************* //*********************************************************************************************************

BIN
Release/RepRapFirmware-055-13-01-2014.bin → Release/RepRapFirmware-057-13-01-2014.bin
View file

Binary file not shown.

4
RepRapFirmware.cpp
View file

@ -186,12 +186,8 @@ void RepRap::Init()
platform->Message(HOST_MESSAGE, platform->GetConfigFile()); platform->Message(HOST_MESSAGE, platform->GetConfigFile());
platform->Message(HOST_MESSAGE, "...\n\n"); platform->Message(HOST_MESSAGE, "...\n\n");
platform->PushMessageIndent();
while(gCodes->RunConfigurationGCodes()); // Wait till the file is finished while(gCodes->RunConfigurationGCodes()); // Wait till the file is finished
platform->PopMessageIndent();
platform->Message(HOST_MESSAGE, "\nStarting network...\n"); platform->Message(HOST_MESSAGE, "\nStarting network...\n");
platform->StartNetwork(); // Need to do this here, as the configuration GCodes may set IP address etc. platform->StartNetwork(); // Need to do this here, as the configuration GCodes may set IP address etc.