Skip to content

Commit

Permalink
Version 1.20
Browse files Browse the repository at this point in the history 
Fixed invisible space bar on keyboard
Fixed issue when change the file or macro list to a subfolder with fewer
files than the parent
7.0i build now has a Duet3D logo
  • Loading branch information
@dc42
dc42 committed Mar 15, 2018
1 parent 56f4269 commit 91245fd
Show file tree
Hide file tree
Showing 14 changed files with 25 additions and 541 deletions.
10 changes: 5 additions & 5 deletions .cproject
View file
Expand Up @@ -1627,7 +1627,7 @@
</extensions>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<configuration artifactExtension="elf" artifactName="${ProjName}-v3-7.0" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.cross.exe.release.1006567109.965246615" name="Release-v3-7.0" parent="cdt.managedbuild.config.gnu.cross.exe.release" postannouncebuildStep="Generating binary" postbuildStep="arm-none-eabi-objcopy -O binary &quot;${ProjDirPath}/${ConfigName}/${BuildArtifactFileBaseName}.elf&quot; &quot;${ProjDirPath}/${ConfigName}/${BuildArtifactFileBaseName}-nologo.bin&quot; &amp; copy /B /Y &quot;${ProjDirPath}\\${ConfigName}\\${BuildArtifactFileBaseName}-nologo.bin&quot;+&quot;${ProjDirPath}\SplashScreens\SplashScreen-800x480.bin&quot; &quot;${ProjDirPath}\\${ConfigName}\\${BuildArtifactFileBaseName}.bin&quot;">
<configuration artifactExtension="elf" artifactName="${ProjName}-v3-7.0" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.cross.exe.release.1006567109.965246615" name="Release-v3-7.0" parent="cdt.managedbuild.config.gnu.cross.exe.release" postannouncebuildStep="Generating binary" postbuildStep="arm-none-eabi-objcopy -O binary &quot;${ProjDirPath}/${ConfigName}/${BuildArtifactFileBaseName}.elf&quot; &quot;${ProjDirPath}/${ConfigName}/${BuildArtifactFileBaseName}-nologo.bin&quot; &amp; copy /B /Y &quot;${ProjDirPath}\\${ConfigName}\\${BuildArtifactFileBaseName}-nologo.bin&quot;+&quot;${ProjDirPath}\SplashScreens\SplashScreen-Escher3D-800x480.bin&quot; &quot;${ProjDirPath}\\${ConfigName}\\${BuildArtifactFileBaseName}.bin&quot;">
<folderInfo id="cdt.managedbuild.config.gnu.cross.exe.release.1006567109.965246615." name="/" resourcePath="">
<toolChain id="cdt.managedbuild.toolchain.gnu.cross.exe.release.1721430850" name="Cross GCC" superClass="cdt.managedbuild.toolchain.gnu.cross.exe.release">
<option id="cdt.managedbuild.option.gnu.cross.prefix.526260949" name="Prefix" superClass="cdt.managedbuild.option.gnu.cross.prefix" useByScannerDiscovery="false" value="arm-none-eabi-" valueType="string"/>
Expand Down Expand Up @@ -1749,7 +1749,7 @@
</extensions>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<configuration artifactExtension="elf" artifactName="${ProjName}-v3-4.3" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.cross.exe.release.1006567109.373042016.44514639" name="Release-v3-4.3" parent="cdt.managedbuild.config.gnu.cross.exe.release" postannouncebuildStep="Generating binary" postbuildStep="arm-none-eabi-objcopy -O binary &quot;${ProjDirPath}/${ConfigName}/${BuildArtifactFileBaseName}.elf&quot; &quot;${ProjDirPath}/${ConfigName}/${BuildArtifactFileBaseName}-nologo.bin&quot; &amp; copy /B /Y &quot;${ProjDirPath}\\${ConfigName}\\${BuildArtifactFileBaseName}-nologo.bin&quot;+&quot;${ProjDirPath}\SplashScreens\SplashScreen-480x272.bin&quot; &quot;${ProjDirPath}\\${ConfigName}\\${BuildArtifactFileBaseName}.bin&quot;">
<configuration artifactExtension="elf" artifactName="${ProjName}-v3-4.3" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.cross.exe.release.1006567109.373042016.44514639" name="Release-v3-4.3" parent="cdt.managedbuild.config.gnu.cross.exe.release" postannouncebuildStep="Generating binary" postbuildStep="arm-none-eabi-objcopy -O binary &quot;${ProjDirPath}/${ConfigName}/${BuildArtifactFileBaseName}.elf&quot; &quot;${ProjDirPath}/${ConfigName}/${BuildArtifactFileBaseName}-nologo.bin&quot; &amp; copy /B /Y &quot;${ProjDirPath}\\${ConfigName}\\${BuildArtifactFileBaseName}-nologo.bin&quot;+&quot;${ProjDirPath}\SplashScreens\SplashScreen-Escher3D-480x272.bin&quot; &quot;${ProjDirPath}\\${ConfigName}\\${BuildArtifactFileBaseName}.bin&quot;">
<folderInfo id="cdt.managedbuild.config.gnu.cross.exe.release.1006567109.373042016.44514639." name="/" resourcePath="">
<toolChain id="cdt.managedbuild.toolchain.gnu.cross.exe.release.1418140448" name="Cross GCC" superClass="cdt.managedbuild.toolchain.gnu.cross.exe.release">
<option id="cdt.managedbuild.option.gnu.cross.prefix.639021415" name="Prefix" superClass="cdt.managedbuild.option.gnu.cross.prefix" value="arm-none-eabi-" valueType="string"/>
Expand Down Expand Up @@ -1871,7 +1871,7 @@
</extensions>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<configuration artifactExtension="elf" artifactName="${ProjName}-v3-5.0" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.cross.exe.release.1006567109.685339758" name="Release-v3-5.0" parent="cdt.managedbuild.config.gnu.cross.exe.release" postannouncebuildStep="Generating binary" postbuildStep="arm-none-eabi-objcopy -O binary &quot;${ProjDirPath}/${ConfigName}/${BuildArtifactFileBaseName}.elf&quot; &quot;${ProjDirPath}/${ConfigName}/${BuildArtifactFileBaseName}-nologo.bin&quot; &amp; copy /B /Y &quot;${ProjDirPath}\\${ConfigName}\\${BuildArtifactFileBaseName}-nologo.bin&quot;+&quot;${ProjDirPath}\SplashScreens\SplashScreen-800x480.bin&quot; &quot;${ProjDirPath}\\${ConfigName}\\${BuildArtifactFileBaseName}.bin&quot;">
<configuration artifactExtension="elf" artifactName="${ProjName}-v3-5.0" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.cross.exe.release.1006567109.685339758" name="Release-v3-5.0" parent="cdt.managedbuild.config.gnu.cross.exe.release" postannouncebuildStep="Generating binary" postbuildStep="arm-none-eabi-objcopy -O binary &quot;${ProjDirPath}/${ConfigName}/${BuildArtifactFileBaseName}.elf&quot; &quot;${ProjDirPath}/${ConfigName}/${BuildArtifactFileBaseName}-nologo.bin&quot; &amp; copy /B /Y &quot;${ProjDirPath}\\${ConfigName}\\${BuildArtifactFileBaseName}-nologo.bin&quot;+&quot;${ProjDirPath}\SplashScreens\SplashScreen-Escher3D-800x480.bin&quot; &quot;${ProjDirPath}\\${ConfigName}\\${BuildArtifactFileBaseName}.bin&quot;">
<folderInfo id="cdt.managedbuild.config.gnu.cross.exe.release.1006567109.685339758." name="/" resourcePath="">
<toolChain id="cdt.managedbuild.toolchain.gnu.cross.exe.release.1974946340" name="Cross GCC" nonInternalBuilderId="cdt.managedbuild.builder.gnu.cross" superClass="cdt.managedbuild.toolchain.gnu.cross.exe.release">
<option id="cdt.managedbuild.option.gnu.cross.prefix.1905228414" name="Prefix" superClass="cdt.managedbuild.option.gnu.cross.prefix" useByScannerDiscovery="false" value="arm-none-eabi-" valueType="string"/>
Expand Down Expand Up @@ -1993,7 +1993,7 @@
</extensions>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<configuration artifactExtension="elf" artifactName="${ProjName}-v3-7.0i" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.cross.exe.release.1006567109.410709849" name="Release-v3-7.0i" parent="cdt.managedbuild.config.gnu.cross.exe.release" postannouncebuildStep="Generating binary" postbuildStep="arm-none-eabi-objcopy -O binary &quot;${ProjDirPath}/${ConfigName}/${BuildArtifactFileBaseName}.elf&quot; &quot;${ProjDirPath}/${ConfigName}/${BuildArtifactFileBaseName}-nologo.bin&quot; &amp; copy /B /Y &quot;${ProjDirPath}\\${ConfigName}\\${BuildArtifactFileBaseName}-nologo.bin&quot;+&quot;${ProjDirPath}\SplashScreens\SplashScreen-800x480.bin&quot; &quot;${ProjDirPath}\\${ConfigName}\\${BuildArtifactFileBaseName}.bin&quot;">
<configuration artifactExtension="elf" artifactName="${ProjName}-v3-7.0i" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.cross.exe.release.1006567109.410709849" name="Release-v3-7.0i" parent="cdt.managedbuild.config.gnu.cross.exe.release" postannouncebuildStep="Generating binary" postbuildStep="arm-none-eabi-objcopy -O binary &quot;${ProjDirPath}/${ConfigName}/${BuildArtifactFileBaseName}.elf&quot; &quot;${ProjDirPath}/${ConfigName}/${BuildArtifactFileBaseName}-nologo.bin&quot; &amp; copy /B /Y &quot;${ProjDirPath}\\${ConfigName}\\${BuildArtifactFileBaseName}-nologo.bin&quot;+&quot;${ProjDirPath}\SplashScreens\SplashScreen-Duet3D-800x480.bin&quot; &quot;${ProjDirPath}\\${ConfigName}\\${BuildArtifactFileBaseName}.bin&quot;">
<folderInfo id="cdt.managedbuild.config.gnu.cross.exe.release.1006567109.410709849." name="/" resourcePath="">
<toolChain id="cdt.managedbuild.toolchain.gnu.cross.exe.release.1997335772" name="Cross GCC" superClass="cdt.managedbuild.toolchain.gnu.cross.exe.release">
<option id="cdt.managedbuild.option.gnu.cross.prefix.913753218" name="Prefix" superClass="cdt.managedbuild.option.gnu.cross.prefix" useByScannerDiscovery="false" value="arm-none-eabi-" valueType="string"/>
Expand Down Expand Up @@ -2609,7 +2609,7 @@
</extensions>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<configuration artifactExtension="elf" artifactName="${ProjName}-v3-7.0C" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.cross.exe.release.1006567109.965246615.639876779" name="Release-v3-7.0CPLD" parent="cdt.managedbuild.config.gnu.cross.exe.release" postannouncebuildStep="Generating binary" postbuildStep="arm-none-eabi-objcopy -O binary &quot;${ProjDirPath}/${ConfigName}/${BuildArtifactFileBaseName}.elf&quot; &quot;${ProjDirPath}/${ConfigName}/${BuildArtifactFileBaseName}-nologo.bin&quot; &amp; copy /B /Y &quot;${ProjDirPath}\\${ConfigName}\\${BuildArtifactFileBaseName}-nologo.bin&quot;+&quot;${ProjDirPath}\SplashScreens\SplashScreen-800x480.bin&quot; &quot;${ProjDirPath}\\${ConfigName}\\${BuildArtifactFileBaseName}.bin&quot;">
<configuration artifactExtension="elf" artifactName="${ProjName}-v3-7.0C" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.cross.exe.release.1006567109.965246615.639876779" name="Release-v3-7.0CPLD" parent="cdt.managedbuild.config.gnu.cross.exe.release" postannouncebuildStep="Generating binary" postbuildStep="arm-none-eabi-objcopy -O binary &quot;${ProjDirPath}/${ConfigName}/${BuildArtifactFileBaseName}.elf&quot; &quot;${ProjDirPath}/${ConfigName}/${BuildArtifactFileBaseName}-nologo.bin&quot; &amp; copy /B /Y &quot;${ProjDirPath}\\${ConfigName}\\${BuildArtifactFileBaseName}-nologo.bin&quot;+&quot;${ProjDirPath}\SplashScreens\SplashScreen-Escher3D-800x480.bin&quot; &quot;${ProjDirPath}\\${ConfigName}\\${BuildArtifactFileBaseName}.bin&quot;">
<folderInfo id="cdt.managedbuild.config.gnu.cross.exe.release.1006567109.965246615.639876779." name="/" resourcePath="">
<toolChain id="cdt.managedbuild.toolchain.gnu.cross.exe.release.1337319957" name="Cross GCC" superClass="cdt.managedbuild.toolchain.gnu.cross.exe.release">
<option id="cdt.managedbuild.option.gnu.cross.prefix.863596689" name="Prefix" superClass="cdt.managedbuild.option.gnu.cross.prefix" useByScannerDiscovery="false" value="arm-none-eabi-" valueType="string"/>
Expand Down
Binary file added SplashScreens/SplashScreen-Duet3d-800x480.bin
View file
Binary file not shown.
Binary file added SplashScreens/SplashScreen-Escher3D-480x272.bin
View file
Binary file not shown.
Binary file added SplashScreens/SplashScreen-Escher3D-800x480.bin
View file
Binary file not shown.
Binary file modified Tools/bmp2c/Release/bmp2c-escher3d.exe
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion Tools/bmp2c/bmp2c.cpp
View file
Expand Up @@ -226,7 +226,7 @@ try
{
if (argc < 2)
{
cout << "Usage: " << argv[0] << "input_file.bmp [output_file.cpp] [-b] [-c] [-p]" << endl;
cout << "Usage: " << argv[0] << " input_file.bmp [output_file.cpp] [-b] [-c] [-p]" << endl;
return 0;
}

Expand Down

0 comments on commit 91245fd

Please sign in to comment.