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

X axis endstop now done with Z Probe (if it's activated).

Browse source
This commit is contained in:
Adrian Bowyer 2013-11-25 09:32:13 +00:00
parent 4c74c4eb30
commit d89b8bace0
5 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Configuration.h
View file

@ -24,8 +24,8 @@ Licence: GPL
#define CONFIGURATION_H
#define NAME "RepRapFirmware"
#define VERSION "0.1"
#define DATE "2012-11-18"
#define VERSION "0.21"
#define DATE "2013-11-25"
#define LAST_AUTHOR "reprappro.com"
// Other firmware that we might switch to be compatible with.

4
GCodes.cpp
View file

@ -127,7 +127,7 @@ void GCodes::Spin()
b = webserver->ReadGCode();
if(webGCode->Put(b))
{
if(webGCode->WritingFileDirectory())
if(webGCode->WritingFileDirectory() != NULL)
WriteGCodeToFile(webGCode);
else
webGCode->SetFinished(ActOnGcode(webGCode));
@ -155,7 +155,7 @@ void GCodes::Spin()
platform->GetLine()->Read(b);
if(serialGCode->Put(b))
{
if(serialGCode->WritingFileDirectory())
if(serialGCode->WritingFileDirectory() != NULL)
WriteGCodeToFile(serialGCode);
else
serialGCode->SetFinished(ActOnGcode(serialGCode));

4
Platform.cpp
View file

@ -360,8 +360,8 @@ inline void Platform::PollZHeight()
EndStopHit Platform::Stopped(int8_t drive)
{
if(zProbePin >= 0)
{
if(drive == Z_AXIS)
{ // Z probe is used for both X and Z.
if(drive != Y_AXIS)
{
if(ZProbe() > zProbeADValue)
return lowHit;

BIN
Release/RepRapFirmware.bin
View file

Binary file not shown.

7
RepRapFirmware.cpp
View file

@ -180,7 +180,12 @@ void RepRap::Init()
while(gCodes->PrintingAFile()) // Wait till the file is finished
Spin();
platform->StartNetwork(); // Need to do this here, as the configuration GCodes may set IP address etc.
platform->Message(HOST_MESSAGE, "RepRapPro RepRap Firmware (Re)Started\n");
platform->Message(HOST_MESSAGE, NAME);
platform->Message(HOST_MESSAGE, " version: ");
platform->Message(HOST_MESSAGE, VERSION);
platform->Message(HOST_MESSAGE, " dated: ");
platform->Message(HOST_MESSAGE, DATE);
platform->Message(HOST_MESSAGE, " Started\n");
}
void RepRap::Exit()