diff options
| author | David Crocker <dcrocker@eschertech.com> | 2020-01-13 15:15:19 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2020-01-13 15:15:19 +0300 |
| commit | 36a72fd1cbc274a6f932294f184133e08d681858 (patch) | |
| tree | b6a8c1dd2f05d3f54710de9e20960c3a16932e5b /src/DuetM | |
| parent | 13084f6566c536df08430cce6c584f5e5c06b5a8 (diff) | |
More work on object model
Changed all object model names to use camelCase
Added # operator to return the number of elements in an array or the
length of a string
Replaced M408 P1 by M409 and added flags parameter
Added rr_model to do the same as M409 directly via http
Removed default fan and Z probe assignments in Duet 2 builds
Diffstat (limited to 'src/DuetM')
| -rw-r--r-- | src/DuetM/Pins_DuetM.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/DuetM/Pins_DuetM.h b/src/DuetM/Pins_DuetM.h index f96bb74a..68c10949 100644 --- a/src/DuetM/Pins_DuetM.h +++ b/src/DuetM/Pins_DuetM.h @@ -55,7 +55,7 @@ constexpr uint32_t IAP_IMAGE_END = 0x0047FFFF; // we allow a full 64K on #define SUPPORT_FTP 1 #define SUPPORT_TELNET 1 #define SUPPORT_ASYNC_MOVES 1 -#define ALLOCATE_DEFAULT_PORTS 1 +#define ALLOCATE_DEFAULT_PORTS 0 // The physical capabilities of the machine @@ -265,15 +265,19 @@ constexpr PinEntry PinTable[] = constexpr unsigned int NumNamedPins = ARRAY_SIZE(PinTable); -// Function to look up a pin name pass back the corresponding index into the pin table +// Function to look up a pin name and pass back the corresponding index into the pin table bool LookupPinName(const char *pn, LogicalPin& lpin, bool& hardwareInverted) noexcept; +#if ALLOCATE_DEFAULT_PORTS + // Default pin allocations constexpr const char *DefaultEndstopPinNames[] = { "xstop", "ystop", "zstop" }; constexpr const char *DefaultZProbePinNames = "^zprobe.in+zprobe.mod"; constexpr const char *DefaultFanPinNames[] = { "fan0", "fan1", "fan2" }; constexpr PwmFrequency DefaultFanPwmFrequencies[] = { DefaultFanPwmFreq }; +#endif + // Duet pin numbers to control the W5500 interface constexpr Pin W5500ResetPin = PortCPin(13); // Low on this in holds the W5500 in reset constexpr Pin W5500SsPin = PortAPin(11); // SPI NPCS pin to W5500 |