Skip to content

Commit dfe1cae

Browse files
sakoPOsakoPO
committed
Merge branch 'devel'
2 parents 3d1730f + 7e33636 commit dfe1cae

22 files changed

+1186
-270
lines changed

‎Jenkinsfile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,15 @@ pipeline {
1313
checkout scm
1414
}
1515
}
16-
stage('Check linux download') {
16+
stage('Check Linux download') {
1717
steps {
1818
sh 'linux/microide_install.sh --checkDownload'
1919
}
20+
}
21+
stage('Check Windows download') {
22+
steps {
23+
sh 'python inst.py --verifyWindowsDownload'
24+
}
2025
}
2126
}
2227
post {

‎README.md

Lines changed: 53 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,56 @@
11
## Microide is eclipse based IDE dedicated for embedded development.
22

3-
### Windows
3+
### Windows installation
44
To install microide on Windows operating system you should go to our Source Forge project site and download windows binary installer.
55

66
[![Download microHAL](https://a.fsdn.com/con/app/sf-download-button)](https://sourceforge.net/projects/microhal/files/latest/download)
7-
### Linux
7+
8+
Installing microide is simply but have one tricky part. You have put correct path into eclipse installation. Correct path will be shown in IMPORTANT NOTICE text. you should copy this path and pase it into eclipse installer.
9+
10+
![](images/microide_installer_important_notice.png)
11+
</br>
12+
You should copy this path and pase it into eclipse installer.
13+
14+
![](images/microide_installer_set_eclipse_installation_directory.png)
15+
16+
### Linux installation
817
To install microide on Linux operating system download <b>linux/microide_install.sh</b> file from this repository and run it in directory where you want to install microide.
918

1019
## Importing microhal examples
11-
Microhal is integrated with microide, to import microhal examples you should follow importing tutorial on our website:
12-
http://microhal.org/quickstartguide
20+
The best way to start exploring microHAL features is to download all examples and play with them. Examples can be divided into two categorys:
21+
- microHAL examples - these examples were introduced to show you the list of components included in microHAL library. Every component have at least one example to show you its API.
22+
- microHAL drivers - this is set of examples from microHAL subproject that provides drivers for popular and commonly used devices.
23+
24+
To download examples:
25+
- run microIDE,
26+
- open or create new workspace where examples should be stored,
27+
- click <b>File->Import...</b>
28+
- in newly open window please expand <b>Oomph</b> tree and select <b>Projects into Workspace</b> and click <b>next</b> button.
29+
30+
![](images/eclipse_file_import_wizard_oomph.png)
31+
</br>
32+
</br>
33+
When new window apear please find and expand <b>microHAL Projects</b> tree. You should see <b>microHAL examples</b> option, please double click on it, the text should change to bold.</br>
34+
Please keep clicking on <b>Next</b> button until you will see <b>Variables</b> tab.
35+
36+
![](images/eclipse_file_import_oomph_microHALProjects_examples.png)
37+
</br>
38+
In Variables tab please sellect <b>Show all variables</b> checkbox and form menu <b>Github Access</b> select <b>HTTPS(read-only, anonymous)</b>.
1339

14-
### About microide
40+
![](images/eclipse_file_import_github_settings_show_options.png)
41+
42+
Afterwards, please keep clicking <b>Next</b> button. Confirm all operations by clicking <b>Finish</b> button.</br>
43+
When first step of importing examples will finish you will see small icon with exclamation mark in right bottom corner of eclipse. Please click on it and when new window apear click Finish.
44+
45+
![](images/eclipse_file_import_restart_required.png)</br>
46+
47+
This will restart eclipse and next step of importing examples will start automatically.
48+
</br>
49+
It may take a while for all examples to download into your workspace, so please be patient. When all examples will be downloaded project explorer will become messy. To improve readability change display method in project explorer to <b>Working Sets</b>.
50+
51+
![](images/eclipse_projectExplorer_topLevelElements_workingSets.png)</br>
52+
53+
## About microide
1554
Microide is dedicated for embedded development, its integrate tools like:
1655
- Eclipse CDT for C/C++ development
1756
- ARM Toolchain
@@ -20,6 +59,14 @@ Microide is dedicated for embedded development, its integrate tools like:
2059
- OpenOCD Debbuger
2160
- Doxygen for generate documentation from code
2261
- Graphiz is component required by Doxygen
23-
- GNU ARM Eclipse plugin that can integrate eclipse with OpenOCD and ARM Toolchain
62+
- GNU MCU Eclipse plugin that can integrate eclipse with OpenOCD and ARM Toolchain
2463

2564
All packages are preconfigured and IDE is redy for use after installing. This installer contain script that will download and install all comptonents.
65+
66+
## Changelog
67+
68+
### 0.3.1
69+
- updated Eclipse to newest version (oxygen)
70+
- updated OpenOCD to 0.10.0 Release
71+
- replaced GNU ARM Eclipse plugin with GNU MCU Eclipse
72+
- updated MinGW-w64 to 7.1.0

‎eclipse-installer/setups/microIDE/microide.product.setup.linux

Lines changed: 101 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
type="URI"
4545
name="ARM_GCC_TOOLCHAIN_LOCATION"
4646
value="${microide}/toolchains/gcc-arm-none-eabi/microhal/gcc-arm-none-eabi-5_3-2016q1"
47-
defaultValue=""/>
47+
defaultValue=""/>
4848
<setupTask
4949
xsi:type="setup:VariableTask"
5050
type="URI"
@@ -56,7 +56,7 @@
5656
xsi:type="setup:VariableTask"
5757
type="URI"
5858
name="MINGW_TOOLCHAIN_LOCATION"
59-
value="${microide}/toolchains/mingw-w64/5.3.0"/>
59+
value="/usr/bin/mingw64"/>
6060
<setupTask
6161
xsi:type="setup:VariableTask"
6262
type="URI"
@@ -73,35 +73,37 @@
7373
<requirement
7474
name="org.wangzw.cppstyle.feature.feature.group"/>
7575
<requirement
76-
name="ilg.gnuarmeclipse.managedbuild.cross.feature.group"/>
76+
name="ilg.gnumcueclipse.templates.ad.feature.feature.group"/>
7777
<requirement
78-
name="ilg.gnuarmeclipse.debug.gdbjtag.jlink.feature.group"/>
78+
name="ilg.gnumcueclipse.managedbuild.cross.arm.feature.feature.group"/>
7979
<requirement
80-
name="ilg.gnuarmeclipse.debug.gdbjtag.openocd.feature.group"/>
80+
name="ilg.gnumcueclipse.codered.feature.feature.group"/>
8181
<requirement
82-
name="ilg.gnuarmeclipse.templates.ad.feature.group"/>
82+
name="ilg.gnumcueclipse.doc.user.feature.feature.group"/>
8383
<requirement
84-
name="ilg.gnuarmeclipse.codered.feature.group"/>
84+
name="ilg.gnumcueclipse.templates.freescale.feature.feature.group"/>
8585
<requirement
86-
name="ilg.gnuarmeclipse.doc.user.feature.group"/>
86+
name="ilg.gnumcueclipse.templates.cortexm.feature.feature.group"/>
8787
<requirement
88-
name="ilg.gnuarmeclipse.templates.freescale.feature.group"/>
88+
name="ilg.gnumcueclipse.debug.gdbjtag.jlink.feature.feature.group"/>
8989
<requirement
90-
name="ilg.gnuarmeclipse.templates.cortexm.feature.group"/>
90+
name="ilg.gnumcueclipse.debug.gdbjtag.openocd.feature.feature.group"/>
9191
<requirement
92-
name="ilg.gnuarmeclipse.debug.gdbjtag.qemu.feature.group"/>
92+
name="ilg.gnumcueclipse.packs.feature.feature.group"/>
9393
<requirement
94-
name="ilg.gnuarmeclipse.templates.stm.feature.group"/>
94+
name="ilg.gnumcueclipse.debug.gdbjtag.pyocd.feature.feature.group"/>
9595
<requirement
96-
name="ilg.gnuarmeclipse.packs.feature.group"/>
96+
name="ilg.gnumcueclipse.debug.gdbjtag.qemu.feature.feature.group"/>
9797
<requirement
98-
name="ilg.gnuarmeclipse.debug.gdbjtag.pyocd.feature.group"/>
98+
name="ilg.gnumcueclipse.managedbuild.cross.riscv.feature.feature.group"/>
99+
<requirement
100+
name="ilg.gnumcueclipse.templates.stm.feature.feature.group"/>
99101
<repository
100102
url="http://anb0s.github.io/eclox"/>
101103
<repository
102104
url="http://www.cppstyle.com/mars"/>
103105
<repository
104-
url="http://gnuarmeclipse.sourceforge.net/updates"/>
106+
url="http://gnu-mcu-eclipse.netlify.com/v4-neon-updates"/>
105107
<description>all plugins required by microIDE</description>
106108
</setupTask>
107109
<setupTask
@@ -118,19 +120,21 @@
118120
xsi:type="setup:StringSubstitutionTask"
119121
name="openocd_path"
120122
value="${OPENOCD_LOCATION |file}/bin"/>
123+
<setupTask
124+
xsi:type="setup:StringSubstitutionTask"
125+
filter="(osgi.os=win32)"
126+
name="openocd_executable"
127+
value="openocd.exe"/>
128+
<setupTask
129+
xsi:type="setup:StringSubstitutionTask"
130+
filter="(osgi.os=linux)"
131+
name="openocd_executable"
132+
value="openocd"/>
121133
<setupTask
122134
xsi:type="setup:CompoundTask"
123135
name="User Preferences">
124136
<annotation
125137
source="http://www.eclipse.org/oomph/setup/UserPreferences">
126-
<detail
127-
key="/instance/ilg.gnuarmeclipse.managedbuild.cross/buildTools.path">
128-
<value>record</value>
129-
</detail>
130-
<detail
131-
key="/instance/ilg.gnuarmeclipse.managedbuild.cross/toolchain.path.1287942917">
132-
<value>record</value>
133-
</detail>
134138
<detail
135139
key="/instance/org.eclipse.core.resources/pathvariable.microHAL_DIR">
136140
<value>record</value>
@@ -186,52 +190,108 @@
186190
</annotation>
187191
<setupTask
188192
xsi:type="setup:CompoundTask"
189-
name="ilg.gnuarmeclipse.managedbuild.cross">
193+
name="ilg.gnumcueclipse.debug.gdbjtag.openocd">
190194
<setupTask
191195
xsi:type="setup:PreferenceTask"
192-
key="/instance/ilg.gnuarmeclipse.managedbuild.cross/buildTools.path">
193-
<description></description>
194-
</setupTask>
196+
key="/instance/ilg.gnumcueclipse.debug.gdbjtag.openocd/gdb.server.executable"
197+
value="$${openocd_path}/$${openocd_executable}"/>
198+
</setupTask>
199+
<setupTask
200+
xsi:type="setup:CompoundTask"
201+
name="ilg.gnumcueclipse.managedbuild.cross">
202+
<setupTask
203+
xsi:type="setup:PreferenceTask"
204+
key="/instance/ilg.gnumcueclipse.managedbuild.cross/buildTools.path"
205+
value="${MSYS_LOCATION|file}/bin"/>
206+
</setupTask>
207+
<setupTask
208+
xsi:type="setup:CompoundTask"
209+
name="ilg.gnumcueclipse.managedbuild.cross.arm">
195210
<setupTask
196211
xsi:type="setup:PreferenceTask"
197-
key="/instance/ilg.gnuarmeclipse.managedbuild.cross/toolchain.path.1287942917"
212+
key="/instance/ilg.gnumcueclipse.managedbuild.cross.arm/toolchain.path.1287942917"
198213
value="${ARM_GCC_TOOLCHAIN_LOCATION|file}/bin"/>
199214
</setupTask>
200215
<setupTask
201216
xsi:type="setup:CompoundTask"
202217
name="org.eclipse.cdt.core">
218+
<setupTask
219+
xsi:type="setup:PreferenceTask"
220+
key="/instance/org.eclipse.cdt.core/build.all.configs.enabled"
221+
value="false"/>
222+
<setupTask
223+
xsi:type="setup:PreferenceTask"
224+
key="/instance/org.eclipse.cdt.core/build.proj.ref.configs.enabled"
225+
value="false"/>
203226
<setupTask
204227
xsi:type="setup:PreferenceTask"
205228
key="/instance/org.eclipse.cdt.core/doctool/workspace.default"
206229
value="org.eclipse.cdt.ui.doxygen"/>
207230
<setupTask
208231
xsi:type="setup:PreferenceTask"
232+
filter="(osgi.os=win32)"
209233
key="/instance/org.eclipse.cdt.core/environment/workspace/MICROIDE_MINGW_HOME/delimiter"
210234
value=";"/>
211235
<setupTask
212236
xsi:type="setup:PreferenceTask"
237+
filter="(osgi.os=win32)"
213238
key="/instance/org.eclipse.cdt.core/environment/workspace/MICROIDE_MINGW_HOME/operation"
214239
value="append"/>
215240
<setupTask
216241
xsi:type="setup:PreferenceTask"
242+
filter="(osgi.os=win32)"
217243
key="/instance/org.eclipse.cdt.core/environment/workspace/MICROIDE_MINGW_HOME/value"
218244
value="${MINGW_TOOLCHAIN_LOCATION|file}">
219245
<description></description>
220246
</setupTask>
221247
<setupTask
222248
xsi:type="setup:PreferenceTask"
249+
filter="(osgi.os=win32)"
223250
key="/instance/org.eclipse.cdt.core/environment/workspace/MICROIDE_MSYS_HOME/delimiter"
224251
value=";"/>
225252
<setupTask
226253
xsi:type="setup:PreferenceTask"
254+
filter="(osgi.os=win32)"
227255
key="/instance/org.eclipse.cdt.core/environment/workspace/MICROIDE_MSYS_HOME/operation"
228256
value="append"/>
229257
<setupTask
230258
xsi:type="setup:PreferenceTask"
259+
filter="(osgi.os=win32)"
231260
key="/instance/org.eclipse.cdt.core/environment/workspace/MICROIDE_MSYS_HOME/value"
232261
value="${microIDE_tools_dir|file}\tools\msys">
233262
<description></description>
234263
</setupTask>
264+
<setupTask
265+
xsi:type="setup:PreferenceTask"
266+
filter="(osgi.os=win32)"
267+
key="/instance/org.eclipse.cdt.core/environment/workspace/PATH/delimiter"
268+
value=";"/>
269+
<setupTask
270+
xsi:type="setup:PreferenceTask"
271+
filter="(osgi.os=win32)"
272+
key="/instance/org.eclipse.cdt.core/environment/workspace/PATH/operation"
273+
value="replace"/>
274+
<setupTask
275+
xsi:type="setup:PreferenceTask"
276+
filter="(osgi.os=win32)"
277+
key="/instance/org.eclipse.cdt.core/environment/workspace/PATH/value"
278+
value="${microIDE_tools_dir|file}/tools/graphiz/bin"/>
279+
<setupTask
280+
xsi:type="setup:PreferenceTask"
281+
key="/instance/org.eclipse.cdt.core/environment/workspace/MINGW_HOME/operation"
282+
value="replace"/>
283+
<setupTask
284+
xsi:type="setup:PreferenceTask"
285+
key="/instance/org.eclipse.cdt.core/environment/workspace/MINGW_HOME/value"
286+
value="$${MICROIDE_MINGW_HOME}"/>
287+
<setupTask
288+
xsi:type="setup:PreferenceTask"
289+
key="/instance/org.eclipse.cdt.core/environment/workspace/MSYS_HOME/operation"
290+
value="replace"/>
291+
<setupTask
292+
xsi:type="setup:PreferenceTask"
293+
key="/instance/org.eclipse.cdt.core/environment/workspace/MSYS_HOME/value"
294+
value="$${MICROIDE_MSYS_HOME}"/>
235295
</setupTask>
236296
<setupTask
237297
xsi:type="setup:CompoundTask"
@@ -445,6 +505,19 @@
445505
key="/instance/org.wangzw.cppstyle/cppstyle.enable.cpplint.on.save"
446506
value="false"/>
447507
</setupTask>
508+
<setupTask
509+
xsi:type="setup:CompoundTask"
510+
filter="(osgi.os=win32)"
511+
name="org.gna.eclox.core">
512+
<setupTask
513+
xsi:type="setup:PreferenceTask"
514+
key="/instance/org.gna.eclox.core/doxygen.default"
515+
value="eclox.core.doxygen.CustomDoxygen /usr/bin"/>
516+
<setupTask
517+
xsi:type="setup:PreferenceTask"
518+
key="/instance/org.gna.eclox.core/doxygen.customs"
519+
value="eclox.core.doxygen.CustomDoxygen /usr/bin&#xA;"/>
520+
</setupTask>
448521
</setupTask>
449522
<version name="oxygen"
450523
label="Oxygen"

0 commit comments

Comments
 (0)