diff options
author | David Crocker <dcrocker@eschertech.com> | 2022-05-03 11:29:41 +0300 |
---|---|---|
committer | David Crocker <dcrocker@eschertech.com> | 2022-05-03 11:29:41 +0300 |
commit | f644c77d62cb59e162313f01ef48643127341a84 (patch) | |
tree | 8147c233e9229642ff2ca4979322b78012f71a37 | |
parent | dfdca829a063033685134e2df23b38ef5bb74208 (diff) |
Increase number of output buffers in Duet 2 builds, version 3.4.1rc13.4.1rc1
Also removed SAM3XA code
-rw-r--r-- | src/Config/Configuration.h | 6 | ||||
-rw-r--r-- | src/Hardware/SoftwareReset.h | 4 | ||||
-rw-r--r-- | src/Platform/Platform.cpp | 6 | ||||
-rw-r--r-- | src/Platform/RepRap.cpp | 4 | ||||
-rw-r--r-- | src/Version.h | 2 |
5 files changed, 3 insertions, 19 deletions
diff --git a/src/Config/Configuration.h b/src/Config/Configuration.h index 70a0ca48..1d216b43 100644 --- a/src/Config/Configuration.h +++ b/src/Config/Configuration.h @@ -187,12 +187,8 @@ constexpr size_t OUTPUT_BUFFER_COUNT = 40; // How many OutputBuffer instances constexpr size_t RESERVED_OUTPUT_BUFFERS = 4; // Number of reserved output buffers after long responses, enough to hold a status response #elif SAM4E || SAM4S constexpr size_t OUTPUT_BUFFER_SIZE = 256; // How many bytes does each OutputBuffer hold? -constexpr size_t OUTPUT_BUFFER_COUNT = 24; // How many OutputBuffer instances do we have? +constexpr size_t OUTPUT_BUFFER_COUNT = 26; // How many OutputBuffer instances do we have? constexpr size_t RESERVED_OUTPUT_BUFFERS = 4; // Number of reserved output buffers after long responses, enough to hold a status response -#elif SAM3XA -constexpr size_t OUTPUT_BUFFER_SIZE = 256; // How many bytes does each OutputBuffer hold? -constexpr size_t OUTPUT_BUFFER_COUNT = 16; // How many OutputBuffer instances do we have? -constexpr size_t RESERVED_OUTPUT_BUFFERS = 2; // Number of reserved output buffers after long responses #elif __LPC17xx__ constexpr uint16_t OUTPUT_BUFFER_SIZE = 256; // How many bytes does each OutputBuffer hold? constexpr size_t OUTPUT_BUFFER_COUNT = 16; // How many OutputBuffer instances do we have? diff --git a/src/Hardware/SoftwareReset.h b/src/Hardware/SoftwareReset.h index 3e080611..15cfa878 100644 --- a/src/Hardware/SoftwareReset.h +++ b/src/Hardware/SoftwareReset.h @@ -10,10 +10,6 @@ #include <RepRapFirmware.h> -#if SAM3XA -# include <DueFlashStorage.h> -#endif - // Enumeration describing the reasons for a software reset. // The spin state gets or'ed into this, so keep the lower 5 bits unused. // IMPORTANT! When changing this, also update table SoftwareResetReasonText diff --git a/src/Platform/Platform.cpp b/src/Platform/Platform.cpp index ff1e6db6..1e6a0855 100644 --- a/src/Platform/Platform.cpp +++ b/src/Platform/Platform.cpp @@ -797,9 +797,7 @@ void Platform::Init() noexcept // If MISO from a MAX31856 board breaks after initialising the MAX31856 then if MISO floats low and reads as all zeros, this looks like a temperature of 0C and no error. // Enable the pullup resistor, with luck this will make it float high instead. -#if SAM3XA - pinMode(APIN_SHARED_SPI_MISO, INPUT_PULLUP); -#elif defined(__LPC17xx__) || SAME5x +#if defined(__LPC17xx__) || SAME5x // nothing to do here #else pinMode(APIN_USART_SSPI_MISO, INPUT_PULLUP); @@ -1504,8 +1502,6 @@ float Platform::GetCpuTemperature() const noexcept const float voltage = (float)adcFilters[CpuTempFilterIndex].GetSum() * (3.3/(float)((1u << AdcBits) * ThermistorAverageReadings)); # if SAM4E || SAM4S return (voltage - 1.44) * (1000.0/4.7) + 27.0 + mcuTemperatureAdjust; // accuracy at 27C is +/-13C -# elif SAM3XA - return (voltage - 0.8) * (1000.0/2.65) + 27.0 + mcuTemperatureAdjust; // accuracy at 27C is +/-45C # elif SAME70 return (voltage - 0.72) * (1000.0/2.33) + 25.0 + mcuTemperatureAdjust; // accuracy at 25C is +/-34C # else diff --git a/src/Platform/RepRap.cpp b/src/Platform/RepRap.cpp index 286e63a8..ae951908 100644 --- a/src/Platform/RepRap.cpp +++ b/src/Platform/RepRap.cpp @@ -2896,8 +2896,6 @@ bool RepRap::CheckFirmwareUpdatePrerequisites(const StringRef& reply, const Stri if (!ok || firstDword != #if SAME5x HSRAM_ADDR + HSRAM_SIZE -#elif SAM3XA - IRAM1_ADDR + IRAM1_SIZE #else IRAM_ADDR + IRAM_SIZE #endif @@ -3036,8 +3034,6 @@ void RepRap::StartIap(const char *filename) noexcept if (topOfStack + firmwareFileLocation.strlen() + 1 <= # if SAME5x HSRAM_ADDR + HSRAM_SIZE -# elif SAM3XA - IRAM1_ADDR + IRAM1_SIZE # else IRAM_ADDR + IRAM_SIZE # endif diff --git a/src/Version.h b/src/Version.h index 474912db..8a6cdf11 100644 --- a/src/Version.h +++ b/src/Version.h @@ -10,7 +10,7 @@ #ifndef VERSION // Note: the complete VERSION string must be in standard version number format and must not contain spaces! This is so that DWC can parse it. -# define MAIN_VERSION "3.4.0+1" +# define MAIN_VERSION "3.4.1rc1" # ifdef USE_CAN0 # define VERSION_SUFFIX "(CAN0)" # else |