diff options
| author | Christian Hammacher <bmasterc@gmail.com> | 2018-09-03 17:31:52 +0300 |
|---|---|---|
| committer | Christian Hammacher <bmasterc@gmail.com> | 2018-09-03 17:31:52 +0300 |
| commit | f9d3f2b46405096c6e18fe2f9e3759057609a35a (patch) | |
| tree | 29f19ba793f4a940ea9bac418d51c02857490da4 /.settings | |
| parent | d1410632b020992d4cf9463a1c6210cac04f7b2c (diff) | |
| parent | a9ac37f4ab515e3fea12cecb7850eedf362b253e (diff) | |
Merge remote-tracking branch 'origin/v2-dev' into v2-chrishamm
Diffstat (limited to '.settings')
| -rw-r--r-- | .settings/language.settings.xml | 24 | ||||
| -rw-r--r-- | .settings/org.eclipse.core.resources.prefs | 4 | ||||
| -rw-r--r-- | .settings/org.eclipse.ltk.core.refactoring.prefs | 2 |
3 files changed, 29 insertions, 1 deletions
diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml index f6440b45..8d0b543b 100644 --- a/.settings/language.settings.xml +++ b/.settings/language.settings.xml @@ -111,7 +111,7 @@ </configuration> - <configuration id="cdt.managedbuild.config.gnu.cross.exe.release.516195201.976458850.241502451.1275216290.274082366.1645191116.1852610203" name="SAME70_RTOS"> + <configuration id="cdt.managedbuild.config.gnu.cross.exe.release.516195201.976458850.241502451.1275216290.274082366.1645191116.1852610203" name="Duet3"> <extension point="org.eclipse.cdt.core.LanguageSettingsProvider"> @@ -154,5 +154,27 @@ </extension> </configuration> + + <configuration id="cdt.managedbuild.config.gnu.cross.exe.release.516195201.976458850.241502451.170574622.649587786.1798324396.239853003" name="PCCB_X5"> + + <extension point="org.eclipse.cdt.core.LanguageSettingsProvider"> + + <provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/> + + <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/> + + <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/> + + <provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-1426937548715061090" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD "${INPUTS}"" prefer-non-shared="true"> + + <language-scope id="org.eclipse.cdt.core.gcc"/> + + <language-scope id="org.eclipse.cdt.core.g++"/> + + </provider> + + </extension> + + </configuration> </project> diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 00000000..6ebe5254 --- /dev/null +++ b/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,4 @@ +eclipse.preferences.version=1 +encoding//src/Display/ST7920/glcd11x14.cpp=UTF-8 +encoding//src/Display/ST7920/glcd7x11.cpp=UTF-8 +encoding//src/Movement/StepperDrivers/TMC51xx.cpp=UTF-8 diff --git a/.settings/org.eclipse.ltk.core.refactoring.prefs b/.settings/org.eclipse.ltk.core.refactoring.prefs new file mode 100644 index 00000000..b196c64a --- /dev/null +++ b/.settings/org.eclipse.ltk.core.refactoring.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false |