diff options
| author | David Crocker <dcrocker@eschertech.com> | 2019-12-29 13:40:35 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2019-12-29 13:40:35 +0300 |
| commit | 3eb4e4cdeda9ba8e6c2d94b956196ebde233e619 (patch) | |
| tree | 523b110872a453f9e83722e7bc09826785bea81f /src/Duet3_V06 | |
| parent | 2dd08992a5f98a292660f27f2f4cd78154ab44ca (diff) | |
Merged changes from upstream
Diffstat (limited to 'src/Duet3_V06')
| -rw-r--r-- | src/Duet3_V06/Pins_Duet3_V06.h | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/Duet3_V06/Pins_Duet3_V06.h b/src/Duet3_V06/Pins_Duet3_V06.h index af228213..95feee45 100644 --- a/src/Duet3_V06/Pins_Duet3_V06.h +++ b/src/Duet3_V06/Pins_Duet3_V06.h @@ -61,6 +61,8 @@ constexpr uint32_t IAP_IMAGE_END = 0x004FFFFF; // The physical capabilities of the machine +#include <Duet3Limits.h> // this file is in the CANlib project because both main and expansion boards need it + constexpr size_t NumDirectDrivers = 6; // The maximum number of drives supported by the electronics inc. direct expansion constexpr size_t MaxSmartDrivers = 6; // The maximum number of direct smart drivers constexpr size_t MaxCanDrivers = 18; @@ -68,22 +70,13 @@ constexpr size_t MaxCanBoards = 18; constexpr float MaxTmc5160Current = 6300.0; // The maximum current we allow the TMC5160/5161 drivers to be set to -constexpr size_t MaxSensors = 64; - -constexpr size_t MaxHeaters = 12; -constexpr size_t MaxExtraHeaterProtections = 8; // The number of extra heater protection instances - constexpr size_t MaxBedHeaters = 9; constexpr size_t MaxChamberHeaters = 4; -constexpr int8_t DefaultBedHeater = 0; constexpr int8_t DefaultE0Heater = 1; // Index of the default first extruder heater, used only for the legacy status response constexpr size_t NumThermistorInputs = 4; constexpr size_t NumTmcDriversSenseChannels = 1; -constexpr size_t MaxZProbes = 4; -constexpr size_t MaxGpioPorts = 16; - constexpr size_t MinAxes = 3; // The minimum and default number of axes constexpr size_t MaxAxes = 10; // The maximum number of movement axes in the machine constexpr size_t MaxDriversPerAxis = 5; // The maximum number of stepper drivers assigned to one axis @@ -96,7 +89,7 @@ constexpr size_t MaxAxesPlusExtruders = 20; // May be <= MaxAxes + MaxExtruder constexpr size_t MaxHeatersPerTool = 4; constexpr size_t MaxExtrudersPerTool = 6; -constexpr size_t MaxFans = 16; +constexpr unsigned int MaxTriggers = 32; // Must be <= 32 because we store a bitmap of pending triggers in a uint32_t constexpr size_t NUM_SERIAL_CHANNELS = 2; // The number of serial IO channels not counting the WiFi serial connection (USB and one auxiliary UART) #define SERIAL_MAIN_DEVICE SerialUSB |