diff options
| author | David Crocker <dcrocker@eschertech.com> | 2019-12-12 22:00:33 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2019-12-12 22:00:33 +0300 |
| commit | ebeaf0703a867f05d862ceede912987e368ffe44 (patch) | |
| tree | 0e64d448a08e847e7f31da7dd5d4b1b44e55a907 /src/Duet3_V06 | |
| parent | 576607487423909f49f41dd8de6849e8f61ee6b3 (diff) | |
3.0RC1 provisional
Implemented extruder stall detection for G1 H1 E moves
Fixed M119 crash when an axis had no endstop
Duet 3 build now loads IAP into RAM
Diffstat (limited to 'src/Duet3_V06')
| -rw-r--r-- | src/Duet3_V06/Pins_Duet3_V06.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/Duet3_V06/Pins_Duet3_V06.h b/src/Duet3_V06/Pins_Duet3_V06.h index 414d06a0..af228213 100644 --- a/src/Duet3_V06/Pins_Duet3_V06.h +++ b/src/Duet3_V06/Pins_Duet3_V06.h @@ -8,10 +8,10 @@ const size_t NumFirmwareUpdateModules = 1; #define IAP_FIRMWARE_FILE "Duet3Firmware_" BOARD_SHORT_NAME ".bin" -#define IAP_IN_RAM 0 +#define IAP_IN_RAM 1 #if IAP_IN_RAM -# define IAP_UPDATE_FILE "Duet3iap_sd_ram_" BOARD_SHORT_NAME ".bin" +# define IAP_UPDATE_FILE "Duet3_SDiap_" BOARD_SHORT_NAME ".bin" constexpr uint32_t IAP_IMAGE_START = 0x20450000; // last 64kb of RAM #else # define IAP_UPDATE_FILE "Duet3iap_sd_" BOARD_SHORT_NAME ".bin" @@ -23,7 +23,6 @@ constexpr uint32_t IAP_IMAGE_START = 0x004E0000; constexpr uint32_t IAP_IMAGE_END = 0x004FFFFF; #endif - // Features definition #define HAS_LWIP_NETWORKING 1 #define HAS_WIFI_NETWORKING 0 @@ -60,8 +59,6 @@ constexpr uint32_t IAP_IMAGE_END = 0x004FFFFF; #define USE_MPU 1 // Needed if USE_CACHE is set, so that we can have non-cacheable memory regions #define USE_CACHE 1 -#define NO_EXTRUDER_ENDSTOPS 1 // Temporary!!! - // The physical capabilities of the machine constexpr size_t NumDirectDrivers = 6; // The maximum number of drives supported by the electronics inc. direct expansion @@ -71,8 +68,7 @@ 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 MaxSensorsInSystem = 64; -typedef uint64_t SensorsBitmap; +constexpr size_t MaxSensors = 64; constexpr size_t MaxHeaters = 12; constexpr size_t MaxExtraHeaterProtections = 8; // The number of extra heater protection instances |