diff options
| author | David Crocker <dcrocker@eschertech.com> | 2021-10-31 12:37:33 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2021-10-31 12:37:33 +0300 |
| commit | c0b1908a673e62e8553264f31057843d11a27bc5 (patch) | |
| tree | b83657765ee39d6317c2a1420d0cafd1cd4550a2 /src/RepRapFirmware.h | |
| parent | 1f1c2b39cd57d8d9782685c595b005d6b7023c46 (diff) | |
Replaced ecv.h by ecv_duet3d.h with standard undefs for C++
Also other minor changes to facilitate static analysis
Diffstat (limited to 'src/RepRapFirmware.h')
| -rw-r--r-- | src/RepRapFirmware.h | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/src/RepRapFirmware.h b/src/RepRapFirmware.h index ef1420d6..0b8a0d25 100644 --- a/src/RepRapFirmware.h +++ b/src/RepRapFirmware.h @@ -22,6 +22,8 @@ Licence: GPL #ifndef REPRAPFIRMWARE_H #define REPRAPFIRMWARE_H +#include <ecv_duet3d.h> + #include <cstddef> // for size_t #include <cfloat> #include <cstdarg> @@ -32,20 +34,6 @@ Licence: GPL [[deprecated("use SafeStrptime instead")]] char * strptime (const char *buf, const char *format, struct tm *timeptr); const char *SafeStrptime(const char *buf, const char *format, struct tm *timeptr) noexcept; -#include "ecv.h" -#ifdef value -# undef value // needed because some files include include <optional> -#endif -#ifdef array -# undef array // needed because some files include <functional> -#endif -#ifdef assert -# undef assert -#endif -#ifdef result -# undef result -#endif - #include <Core.h> #ifndef SAMC21 @@ -79,7 +67,7 @@ constexpr unsigned int ApiLevel = 1; // Logical pins used for general output, servos, CCN and laser control typedef uint8_t LogicalPin; // type used to represent logical pin numbers constexpr LogicalPin NoLogicalPin = 0xFF; -constexpr const char *NoPinName = "nil"; +constexpr const char * _ecv_array NoPinName = "nil"; // Enumeration to describe what we want to do with a pin enum class PinAccess : int |