diff options
| author | David Crocker <dcrocker@eschertech.com> | 2019-12-16 11:40:00 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2019-12-16 11:40:00 +0300 |
| commit | 0175ccbe94780d94e94c64f0fb894f85881f9d3b (patch) | |
| tree | 5bd025863efdc6f7a13b1610439f2eac2fcc44f5 | |
| parent | 2bf288f682b319b316598f4e4007fff9cda9745e (diff) | |
Minor changes for 3.0RC1
| -rw-r--r-- | .cproject | 4 | ||||
| -rw-r--r-- | src/Linux/LinuxInterface.cpp | 14 | ||||
| -rw-r--r-- | src/Version.h | 2 |
3 files changed, 9 insertions, 11 deletions
@@ -1219,7 +1219,7 @@ <option id="gnu.cpp.compiler.option.optimization.level.1342318357" name="Optimization Level" superClass="gnu.cpp.compiler.option.optimization.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.optimization.level.more" valueType="enumerated"/> <option id="gnu.cpp.compiler.option.debugging.level.299293344" name="Debug Level" superClass="gnu.cpp.compiler.option.debugging.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.debugging.level.none" valueType="enumerated"/> <option id="gnu.cpp.compiler.option.other.verbose.913195266" name="Verbose (-v)" superClass="gnu.cpp.compiler.option.other.verbose" useByScannerDiscovery="false" value="false" valueType="boolean"/> - <option id="gnu.cpp.compiler.option.other.other.731452074" name="Other flags" superClass="gnu.cpp.compiler.option.other.other" useByScannerDiscovery="false" value="-c -mcpu=cortex-m4 -mthumb -ffunction-sections -fdata-sections -fno-threadsafe-statics -fno-rtti -fexceptions -nostdlib -Wundef -Wdouble-promotion -fsingle-precision-constant "-Wa,-ahl=$*.s"" valueType="string"/> + <option id="gnu.cpp.compiler.option.other.other.731452074" name="Other flags" superClass="gnu.cpp.compiler.option.other.other" useByScannerDiscovery="false" value="-c -mcpu=cortex-m4 -mthumb -ffunction-sections -fdata-sections -fno-threadsafe-statics -fno-rtti -fno-exceptions -nostdlib -Wundef -Wdouble-promotion -fsingle-precision-constant "-Wa,-ahl=$*.s"" valueType="string"/> <option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.compiler.option.include.paths.1319376517" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath"> <listOptionValue builtIn="false" value=""${workspace_loc:/${CoreName}/cores/arduino}""/> <listOptionValue builtIn="false" value=""${workspace_loc:/${CoreName}/libraries/Flash}""/> @@ -1388,7 +1388,7 @@ <option id="gnu.cpp.compiler.option.optimization.level.853356157" name="Optimization Level" superClass="gnu.cpp.compiler.option.optimization.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.optimization.level.more" valueType="enumerated"/> <option id="gnu.cpp.compiler.option.debugging.level.1666050145" name="Debug Level" superClass="gnu.cpp.compiler.option.debugging.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.debugging.level.none" valueType="enumerated"/> <option id="gnu.cpp.compiler.option.other.verbose.513668348" name="Verbose (-v)" superClass="gnu.cpp.compiler.option.other.verbose" useByScannerDiscovery="false" value="false" valueType="boolean"/> - <option id="gnu.cpp.compiler.option.other.other.1799333383" name="Other flags" superClass="gnu.cpp.compiler.option.other.other" useByScannerDiscovery="false" value="-c -mcpu=cortex-m7 -mthumb -mfpu=fpv5-d16 -mfloat-abi=hard -mno-unaligned-access -ffunction-sections -fdata-sections -fno-threadsafe-statics -fno-rtti -fexceptions -nostdlib -Wundef -Wdouble-promotion -fsingle-precision-constant "-Wa,-ahl=$*.s"" valueType="string"/> + <option id="gnu.cpp.compiler.option.other.other.1799333383" name="Other flags" superClass="gnu.cpp.compiler.option.other.other" useByScannerDiscovery="false" value="-c -mcpu=cortex-m7 -mthumb -mfpu=fpv5-d16 -mfloat-abi=hard -mno-unaligned-access -ffunction-sections -fdata-sections -fno-threadsafe-statics -fno-rtti -fno-exceptions -nostdlib -Wundef -Wdouble-promotion -fsingle-precision-constant "-Wa,-ahl=$*.s"" valueType="string"/> <option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.compiler.option.include.paths.1493725201" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath"> <listOptionValue builtIn="false" value=""${workspace_loc:/${CoreName}/cores/arduino}""/> <listOptionValue builtIn="false" value=""${workspace_loc:/${CoreName}/libraries/Flash}""/> diff --git a/src/Linux/LinuxInterface.cpp b/src/Linux/LinuxInterface.cpp index fb11db57..cd9a2343 100644 --- a/src/Linux/LinuxInterface.cpp +++ b/src/Linux/LinuxInterface.cpp @@ -212,8 +212,12 @@ void LinuxInterface::Spin() // Write another chunk of the IAP binary to the designated Flash area case LinuxRequest::WriteIap: +#if IAP_IN_RAM + memcpy(reinterpret_cast<char *>(iapWritePointer), transfer->ReadData(packet->length), packet->length); + iapWritePointer += packet->length; + break; +#else { -#if !IAP_IN_RAM if (iapWritePointer == IAP_IMAGE_START) { // The EWP command is not supported for non-8KByte sectors in the SAM4 and SAME70 series. @@ -221,13 +225,7 @@ void LinuxInterface::Spin() flash_unlock(IAP_IMAGE_START, IAP_IMAGE_END, nullptr, nullptr); flash_erase_sector(IAP_IMAGE_START); } -#endif const char *dataToWrite = transfer->ReadData(packet->length); - -#if IAP_IN_RAM - memcpy(reinterpret_cast<char *>(iapWritePointer), dataToWrite, packet->length); - iapWritePointer += packet->length; -#else size_t bytesWritten = 0; do { @@ -264,9 +262,9 @@ void LinuxInterface::Spin() dataToWrite += bytesToWrite; iapWritePointer += bytesToWrite; } while (bytesWritten != packet->length); -#endif break; } +#endif // Launch the IAP binary case LinuxRequest::StartIap: diff --git a/src/Version.h b/src/Version.h index 70e0c420..ddba517e 100644 --- a/src/Version.h +++ b/src/Version.h @@ -20,7 +20,7 @@ #endif #ifndef DATE -# define DATE "2019-12-14b5" +# define DATE "2019-12-16b1" #endif #define AUTHORS "reprappro, dc42, chrishamm, t3p3, dnewman, printm3d" |