diff --git a/Configuration.h b/Configuration.h index 7358496..3eb847c 100644 --- a/Configuration.h +++ b/Configuration.h @@ -24,8 +24,8 @@ Licence: GPL #define CONFIGURATION_H #define NAME "RepRapFirmware" -#define VERSION "0.59" -#define DATE "2014-02-19" +#define VERSION "0.60" +#define DATE "2014-02-20" #define LAST_AUTHOR "reprappro" // Other firmware that we might switch to be compatible with. diff --git a/GCodes.h b/GCodes.h index 7c4026c..7e79bb5 100644 --- a/GCodes.h +++ b/GCodes.h @@ -80,7 +80,7 @@ class GCodes bool PrintingAFile() const; // Are we in the middle of printing a file? void Diagnostics(); // Send helpful information out bool HaveIncomingData() const; // Is there something that we have to do? - //bool GetAxisIsHomed(uint8_t axis) const { return axisIsHomed[axis]; } // Not needed on voyage? + bool GetAxisIsHomed(uint8_t axis) const { return axisIsHomed[axis]; } // Is the axis at 0? private: @@ -156,7 +156,7 @@ class GCodes bool homeX; // True to home the X axis this move bool homeY; // True to home the Y axis this move bool homeZ; // True to home the Z axis this move - //int8_t homeAxisMoveCount; // Not needed on voyage? + int8_t homeAxisMoveCount; // Counts homing moves float gFeedRate; // Store for the current feedrate int probeCount; // Counts multiple probe points int8_t cannedCycleMoveCount; // Counts through internal (i.e. not macro) canned cycle moves diff --git a/Release/RepRapFirmware-060-16-01-2014.bin b/Release/RepRapFirmware-060-16-01-2014.bin deleted file mode 100755 index 9cdaedb..0000000 Binary files a/Release/RepRapFirmware-060-16-01-2014.bin and /dev/null differ diff --git a/Release/RepRapFirmware-059-15-01-2014.bin b/Release/RepRapFirmware-060-20-02-2014.bin similarity index 55% rename from Release/RepRapFirmware-059-15-01-2014.bin rename to Release/RepRapFirmware-060-20-02-2014.bin index ba0f03f..e7f26fd 100755 Binary files a/Release/RepRapFirmware-059-15-01-2014.bin and b/Release/RepRapFirmware-060-20-02-2014.bin differ