diff options
author | David Crocker <dcrocker@eschertech.com> | 2020-03-10 16:37:20 +0300 |
---|---|---|
committer | David Crocker <dcrocker@eschertech.com> | 2020-03-10 16:37:20 +0300 |
commit | 58b1f531d1f462e558e5940109b0157cc5fd5bad (patch) | |
tree | 73e1f06c2d8c8e9b8c95d391018c017a430865b3 /src | |
parent | 24f99490aa2be4fb14f7aeee454ede55e3dfb919 (diff) |
Bug fix to previous change
Also increased max # of CAN boards and drivers
Diffstat (limited to 'src')
-rw-r--r-- | src/CAN/CanInterface.cpp | 2 | ||||
-rw-r--r-- | src/Duet3_V06/Pins_Duet3_V06.h | 4 | ||||
-rw-r--r-- | src/GPIO/GpioPorts.cpp | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/CAN/CanInterface.cpp b/src/CAN/CanInterface.cpp index 4a600b13..a6a79ad8 100644 --- a/src/CAN/CanInterface.cpp +++ b/src/CAN/CanInterface.cpp @@ -28,7 +28,7 @@ #include <memory> -const unsigned int NumCanBuffers = 40; +const unsigned int NumCanBuffers = 2 * MaxCanBoards + 10; constexpr uint32_t MaxMotionSendWait = 20; // milliseconds constexpr uint32_t MaxUrgentSendWait = 20; // milliseconds diff --git a/src/Duet3_V06/Pins_Duet3_V06.h b/src/Duet3_V06/Pins_Duet3_V06.h index bde5f52b..1cf6c72b 100644 --- a/src/Duet3_V06/Pins_Duet3_V06.h +++ b/src/Duet3_V06/Pins_Duet3_V06.h @@ -55,8 +55,8 @@ constexpr uint32_t IAP_IMAGE_START = 0x20450000; // last 64kb of RAM 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; -constexpr size_t MaxCanBoards = 18; +constexpr size_t MaxCanDrivers = 20; +constexpr size_t MaxCanBoards = 20; constexpr float MaxTmc5160Current = 6300.0; // The maximum current we allow the TMC5160/5161 drivers to be set to diff --git a/src/GPIO/GpioPorts.cpp b/src/GPIO/GpioPorts.cpp index 708ae893..89440a23 100644 --- a/src/GPIO/GpioPorts.cpp +++ b/src/GPIO/GpioPorts.cpp @@ -108,6 +108,7 @@ GCodeResult GpInputPort::Configure(uint32_t gpinNumber, GCodeBuffer &gb, const S if (port.AssignPort(pinName.c_str(), reply, PinUsedBy::gpin, PinAccess::read)) { currentState = port.Read(); + rslt = GCodeResult::ok; } else { |