From d89b8bace058ec11c373bb5fb1d49f6e74f46d9d Mon Sep 17 00:00:00 2001 From: Adrian Bowyer Date: Mon, 25 Nov 2013 09:32:13 +0000 Subject: [PATCH] X axis endstop now done with Z Probe (if it's activated). --- Configuration.h | 4 ++-- GCodes.cpp | 4 ++-- Platform.cpp | 4 ++-- Release/RepRapFirmware.bin | Bin 164916 -> 165012 bytes RepRapFirmware.cpp | 7 ++++++- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/Configuration.h b/Configuration.h index d1dd347..0a0ed2a 100644 --- a/Configuration.h +++ b/Configuration.h @@ -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. diff --git a/GCodes.cpp b/GCodes.cpp index c9d71d8..20c0051 100644 --- a/GCodes.cpp +++ b/GCodes.cpp @@ -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)); diff --git a/Platform.cpp b/Platform.cpp index 3932e9c..3da8fba 100644 --- a/Platform.cpp +++ b/Platform.cpp @@ -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; diff --git a/Release/RepRapFirmware.bin b/Release/RepRapFirmware.bin index be31f4c351aaedaf14e122600e7bd89eb19e5b69..3eacedacd7777c58a70678812c72fb9c992f3066 100755 GIT binary patch delta 18956 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 F{{!#&HwXX# delta 18868 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

(^Mr>f`|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()