diff options
author | David Crocker <dcrocker@eschertech.com> | 2021-08-11 19:32:26 +0300 |
---|---|---|
committer | David Crocker <dcrocker@eschertech.com> | 2021-08-11 19:32:26 +0300 |
commit | e83062d53c9056d16cbd02b54b80bc62254e6096 (patch) | |
tree | 1a16f50c62f0c6e41af2109ff9590a2e6c8732e4 /src/RepRapFirmware.h | |
parent | 73aa0ffdeec23d0af91ecb4db9ce71f912cdb8a0 (diff) |
Replaced MinMaxCurrent by MinCurMax for CAN message compatibility
Aso foxed a compile error for Duet 2 builds
Diffstat (limited to 'src/RepRapFirmware.h')
-rw-r--r-- | src/RepRapFirmware.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/RepRapFirmware.h b/src/RepRapFirmware.h index 2b96fba9..66441def 100644 --- a/src/RepRapFirmware.h +++ b/src/RepRapFirmware.h @@ -150,14 +150,18 @@ namespace CanInterface extern "C" [[noreturn]] void vAssertCalled(uint32_t line, const char *file) noexcept __attribute((naked)); #define RRF_ASSERT(_expr) do { if (!(_expr)) { vAssertCalled(__LINE__, __FILE__); } } while (false) -// Struct to hold min, max and current values -struct MinMaxCurrent +#if !SUPPORT_CAN_EXPANSION + +// Struct to hold min, max and current values. For Duet 3 systems this is defined in file Duet3Common.h instead of here. +struct MinCurMax { - float min; - float max; + float minimum; float current; + float maximum; }; +#endif + // Type of a driver identifier struct DriverId { |