diff options
| author | David Crocker <dcrocker@eschertech.com> | 2020-04-07 17:14:32 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2020-04-07 17:14:32 +0300 |
| commit | ab5685b306a681915d6b842c2f1bd71afbc8d2ee (patch) | |
| tree | 3ae594807645de639bb405100210b4b333eea5e0 /src/RepRapFirmware.h | |
| parent | f545b211949a0993491d45e9eef16509b3d40e0f (diff) | |
Increment move.seq when speed or extrusion factor is changed
Speed factor is on longer live in object model
Rationalised exception specifications
Diffstat (limited to 'src/RepRapFirmware.h')
| -rw-r--r-- | src/RepRapFirmware.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/RepRapFirmware.h b/src/RepRapFirmware.h index 92320666..eb5042ba 100644 --- a/src/RepRapFirmware.h +++ b/src/RepRapFirmware.h @@ -31,8 +31,12 @@ Licence: GPL [[deprecated("use gmtime_r instead for thread-safety")]] tm* gmtime(const time_t* time); #include "ecv.h" -#undef value // needed because some files include include <optional> -#undef array // needed because some files include <functional> +#ifdef value +# undef value // needed because some files include include <optional> +#endif +#ifdef array +# undef array // needed because some files include <functional> +#endif #include "Core.h" @@ -107,7 +111,6 @@ static_assert(NumNamedPins <= 255 || sizeof(LogicalPin) > 1, "Need 16-bit logica #include "General/SafeVsnprintf.h" #define THROWS(...) // expands to nothing, for providing exception specifications -#define THROWS_GCODE_EXCEPTION THROWS(GCodeException) #define THROW_INTERNAL_ERROR throw GCodeException(-1, -1, "internal error at file " __FILE__ "(%d)", (int32_t)__LINE__) // Struct to hold min, max and current values |