Skip to content

Commit 0059884

Browse files
author
jantje
committed
Merge branch 'master' of https://[email protected]/jantje/arduino-eclipse-plugin.git
2 parents 9b96959 + 03e4e52 commit 0059884

File tree

15 files changed

+178
-692
lines changed

15 files changed

+178
-692
lines changed

‎it.baeyens.arduino.core/META-INF/MANIFEST.MF

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,14 @@ Bundle-ClassPath: .,
2828
lib/jsch-0.1.50.jar,
2929
lib/jmdns-3.4.1.jar
3030
Require-Bundle: org.eclipse.core.resources,
31-
org.eclipse.equinox.registry,
3231
org.eclipse.jface,
3332
org.eclipse.ui.ide,
34-
org.eclipse.core.jobs,
35-
org.eclipse.equinox.preferences,
36-
org.eclipse.core.contenttype,
37-
org.eclipse.osgi,
3833
org.eclipse.cdt.managedbuilder.core,
3934
org.eclipse.core.filesystem,
40-
org.eclipse.swt,
4135
org.eclipse.cdt.core,
4236
org.apache.commons.compress,
4337
com.google.gson,
4438
org.eclipse.equinox.security,
4539
org.eclipse.ui.forms,
4640
org.eclipse.ui.workbench,
47-
org.eclipse.core.runtime,
48-
org.eclipse.core.commands
41+
org.eclipse.core.runtime

‎it.baeyens.arduino.feature/feature.xml

Lines changed: 89 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,11 +129,77 @@ If you do not agree with this policy, then please do not install this software.
129129
</license>
130130

131131
<url>
132-
<update label="Arduino eclipse plugin V2 update site" url="http://www.baeyens.it/eclipse/V2/"/>
133-
<discovery label="jan&apos;s site with plenty of documentation" url="http://www.baeyens.it/eclipse/"/>
132+
<update label="Arduino eclipse plugin V3 update site" url="http://eclipse.baeyens.it/V3/"/>
133+
<discovery label="jan&apos;s site with plenty of documentation" url="http://eclipse.baeyens.it/"/>
134134
</url>
135135

136+
<includes
137+
id="org.eclipse.cdt.sdk"
138+
version="0.0.0"/>
139+
140+
<includes
141+
id="org.eclipse.linuxtools.cdt.libhover.feature"
142+
version="0.0.0"/>
143+
144+
<includes
145+
id="org.eclipse.sdk"
146+
version="0.0.0"/>
147+
148+
<includes
149+
id="org.eclipse.platform"
150+
version="0.0.0"/>
151+
152+
<includes
153+
id="org.eclipse.e4.rcp"
154+
version="0.0.0"/>
155+
156+
<includes
157+
id="org.eclipse.cdt.gnu.build"
158+
version="0.0.0"/>
159+
160+
<includes
161+
id="org.eclipse.cdt.gnu.debug"
162+
version="0.0.0"/>
163+
164+
<includes
165+
id="org.eclipse.cdt.gdb"
166+
version="0.0.0"/>
167+
168+
<includes
169+
id="org.eclipse.cdt.testsrunner.feature"
170+
version="0.0.0"/>
171+
172+
<includes
173+
id="org.eclipse.cdt.autotools"
174+
version="0.0.0"/>
175+
136176
<requires>
177+
<import plugin="org.eclipse.ui"/>
178+
<import plugin="org.eclipse.core.runtime"/>
179+
<import plugin="org.junit"/>
180+
<import plugin="org.eclipse.cdt.core"/>
181+
<import plugin="org.eclipse.core.resources"/>
182+
<import plugin="org.eclipse.equinox.registry"/>
183+
<import plugin="org.eclipse.jface"/>
184+
<import plugin="org.eclipse.ui.ide"/>
185+
<import plugin="org.eclipse.core.jobs"/>
186+
<import plugin="org.eclipse.equinox.preferences"/>
187+
<import plugin="org.eclipse.core.contenttype"/>
188+
<import plugin="org.eclipse.osgi"/>
189+
<import plugin="org.eclipse.cdt.managedbuilder.core"/>
190+
<import plugin="org.eclipse.core.filesystem"/>
191+
<import plugin="org.eclipse.swt"/>
192+
<import plugin="org.eclipse.equinox.security"/>
193+
<import plugin="org.eclipse.ui.forms"/>
194+
<import plugin="org.eclipse.ui.workbench"/>
195+
<import plugin="org.eclipse.core.commands"/>
196+
<import plugin="it.baeyens.arduino.common"/>
197+
<import plugin="it.baeyens.arduino.monitor"/>
198+
<import plugin="org.eclipse.cdt.ui"/>
199+
<import plugin="org.eclipse.ui.console"/>
200+
<import plugin="org.eclipse.ui.intro"/>
201+
<import plugin="it.baeyens.cdt.refactor"/>
202+
<import plugin="org.eclipse.ltk.core.refactoring"/>
137203
<import feature="org.eclipse.cdt" version="8.0.0" match="greaterOrEqual"/>
138204
</requires>
139205

@@ -179,4 +245,25 @@ If you do not agree with this policy, then please do not install this software.
179245
version="3.0.0.qualifier"
180246
unpack="false"/>
181247

248+
<plugin
249+
id="com.google.gson"
250+
download-size="0"
251+
install-size="0"
252+
version="0.0.0"
253+
unpack="false"/>
254+
255+
<plugin
256+
id="org.apache.commons.io"
257+
download-size="0"
258+
install-size="0"
259+
version="0.0.0"
260+
unpack="false"/>
261+
262+
<plugin
263+
id="org.apache.commons.compress"
264+
download-size="0"
265+
install-size="0"
266+
version="0.0.0"
267+
unpack="false"/>
268+
182269
</feature>

‎it.baeyens.arduino.monitor/plugin.xml

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -33,65 +33,65 @@
3333
<extension point="org.eclipse.ui.themes">
3434
<themeElementCategory
3535
id="it.baeyens.arduino.themeCategory"
36-
label="arduino">
36+
label="Arduino">
3737
</themeElementCategory>
3838
<themeElementCategory
3939
id="it.baeyens.arduino.scope.themeCategory"
40-
label="Arduino scope"
40+
label="Scope"
4141
parentId="it.baeyens.arduino.themeCategory">
4242
<description>
4343
Fonts and colors used by the arduino eclipse plugin scope view
4444
</description>
4545
</themeElementCategory>
4646
<themeElementCategory
4747
id="it.baeyens.arduino.serialMonitor.themeCategory"
48-
label="Arduino serial monitor"
48+
label="Serial monitor"
4949
parentId="it.baeyens.arduino.themeCategory">
5050
<description>
5151
Fonts and colors used by the arduino eclipse plugin serial monitor view
5252
</description>
5353
</themeElementCategory>
54-
<colorDefinition categoryId="it.baeyens.arduino.scope.themeCategory" id="it.baeyens.scope.color.background" label="background Color" value="COLOR_BLACK">
54+
<colorDefinition categoryId="it.baeyens.arduino.scope.themeCategory" id="it.baeyens.scope.color.background" label="Background color" value="COLOR_BLACK">
5555
<description>
5656
The background color of the Arduino scope
5757
</description>
5858
</colorDefinition>
59-
<colorDefinition categoryId="it.baeyens.arduino.scope.themeCategory" id="it.baeyens.scope.color.foreground" label="foreground Color" value="COLOR_WHITE">
59+
<colorDefinition categoryId="it.baeyens.arduino.scope.themeCategory" id="it.baeyens.scope.color.foreground" label="Foreground color" value="COLOR_WHITE">
6060
<description>
6161
The foreground color of the Arduino scope
6262
</description>
6363
</colorDefinition>
64-
<colorDefinition categoryId="it.baeyens.arduino.scope.themeCategory" id="it.baeyens.scope.color.grid" label="grid Color" value="COLOR_DARK_CYAN">
64+
<colorDefinition categoryId="it.baeyens.arduino.scope.themeCategory" id="it.baeyens.scope.color.grid" label="Grid color" value="COLOR_DARK_CYAN">
6565
<description>
6666
The grid color of the Arduino scope
6767
</description>
6868
</colorDefinition>
69-
<colorDefinition categoryId="it.baeyens.arduino.scope.themeCategory" id="it.baeyens.scope.color.1" label="Channel 1 Color" value="COLOR_BLUE">
69+
<colorDefinition categoryId="it.baeyens.arduino.scope.themeCategory" id="it.baeyens.scope.color.1" label="Channel 1 color" value="COLOR_BLUE">
7070
<description>
7171
The color used by the first channel of the Arduino scope
7272
</description>
7373
</colorDefinition>
74-
<colorDefinition categoryId="it.baeyens.arduino.scope.themeCategory" id="it.baeyens.scope.color.2" label="Channel 2 Color" value="COLOR_CYAN">
74+
<colorDefinition categoryId="it.baeyens.arduino.scope.themeCategory" id="it.baeyens.scope.color.2" label="Channel 2 color" value="COLOR_CYAN">
7575
<description>
7676
The color used by the second channel of the Arduino scope
7777
</description>
7878
</colorDefinition>
79-
<colorDefinition categoryId="it.baeyens.arduino.scope.themeCategory" id="it.baeyens.scope.color.3" label="Channel 3 Color" value="COLOR_DARK_GRAY">
79+
<colorDefinition categoryId="it.baeyens.arduino.scope.themeCategory" id="it.baeyens.scope.color.3" label="Channel 3 color" value="COLOR_DARK_GRAY">
8080
<description>
8181
The color used by the third channel of the Arduino scope
8282
</description>
8383
</colorDefinition>
84-
<colorDefinition categoryId="it.baeyens.arduino.scope.themeCategory" id="it.baeyens.scope.color.4" label="Channel 4 Color" value="COLOR_DARK_GREEN">
84+
<colorDefinition categoryId="it.baeyens.arduino.scope.themeCategory" id="it.baeyens.scope.color.4" label="Channel 4 color" value="COLOR_DARK_GREEN">
8585
<description>
86-
The color used by the forth channel of the Arduino scope
86+
The color used by the fourth channel of the Arduino scope
8787
</description>
8888
</colorDefinition>
89-
<colorDefinition categoryId="it.baeyens.arduino.scope.themeCategory" id="it.baeyens.scope.color.5" label="Channel 5 Color" value="COLOR_DARK_RED">
89+
<colorDefinition categoryId="it.baeyens.arduino.scope.themeCategory" id="it.baeyens.scope.color.5" label="Channel 5 color" value="COLOR_DARK_RED">
9090
<description>
9191
The color used by the fifth channel of the Arduino scope
9292
</description>
9393
</colorDefinition>
94-
<colorDefinition categoryId="it.baeyens.arduino.scope.themeCategory" id="it.baeyens.scope.color.6" label="Channel 6 Color" value="COLOR_DARK_YELLOW">
94+
<colorDefinition categoryId="it.baeyens.arduino.scope.themeCategory" id="it.baeyens.scope.color.6" label="Channel 6 color" value="COLOR_DARK_YELLOW">
9595
<description>
9696
The color used by the sixth channel of the Arduino scope
9797
</description>
@@ -102,42 +102,42 @@ The font for in the serial monitor
102102
</description>
103103
</fontDefinition>
104104

105-
<colorDefinition categoryId="it.baeyens.arduino.serialMonitor.themeCategory" id="it.baeyens.serial.color.1" label="serial Channel 1 Color" value="COLOR_BLACK">
105+
<colorDefinition categoryId="it.baeyens.arduino.serialMonitor.themeCategory" id="it.baeyens.serial.color.1" label="Channel 1 color" value="COLOR_BLACK">
106106
<description>
107107
The color used by the first serial connection of the serial monitor
108108
</description>
109109
</colorDefinition>
110-
<colorDefinition categoryId="it.baeyens.arduino.serialMonitor.themeCategory" id="it.baeyens.serial.color.2" label="serial Channel 2 Color" value="COLOR_RED">
110+
<colorDefinition categoryId="it.baeyens.arduino.serialMonitor.themeCategory" id="it.baeyens.serial.color.2" label="Channel 2 color" value="COLOR_RED">
111111
<description>
112112
The color used by the second serial connection of the serial monitor
113113
</description>
114114
</colorDefinition>
115-
<colorDefinition categoryId="it.baeyens.arduino.serialMonitor.themeCategory" id="it.baeyens.serial.color.3" label="serial Channel 3 Color" value="COLOR_GREEN">
115+
<colorDefinition categoryId="it.baeyens.arduino.serialMonitor.themeCategory" id="it.baeyens.serial.color.3" label="Channel 3 color" value="COLOR_GREEN">
116116
<description>
117117
The color used by the third serial connection of the serial monitor
118118
</description>
119119
</colorDefinition>
120-
<colorDefinition categoryId="it.baeyens.arduino.serialMonitor.themeCategory" id="it.baeyens.serial.color.4" label="serial Channel 4 Color" value="COLOR_BLUE">
120+
<colorDefinition categoryId="it.baeyens.arduino.serialMonitor.themeCategory" id="it.baeyens.serial.color.4" label="Channel 4 color" value="COLOR_BLUE">
121121
<description>
122-
The color used by the forth serial connection of the serial monitor
122+
The color used by the fourth serial connection of the serial monitor
123123
</description>
124124
</colorDefinition>
125125
<colorDefinition
126126
categoryId="it.baeyens.arduino.serialMonitor.themeCategory"
127-
id="it.baeyens.serial.color.6"
128-
label="serial Channel 6 Color"
129-
value="COLOR_DARK_YELLOW">
127+
id="it.baeyens.serial.color.5"
128+
label=" Channel 5 color"
129+
value="COLOR_DARK_RED">
130130
<description>
131-
The color used by the sixth serial connection of the serial monitor
131+
The color used by the fifth serial connection of the serial monitor
132132
</description>
133133
</colorDefinition>
134134
<colorDefinition
135135
categoryId="it.baeyens.arduino.serialMonitor.themeCategory"
136-
id="it.baeyens.serial.color.5"
137-
label="serial Channel 5 Color"
138-
value="COLOR_DARK_RED">
136+
id="it.baeyens.serial.color.6"
137+
label="Channel 6 color"
138+
value="COLOR_DARK_YELLOW">
139139
<description>
140-
The color used by the fifth serial connection of the serial monitor
140+
The color used by the sixth serial connection of the serial monitor
141141
</description>
142142
</colorDefinition>
143143
</extension>

‎it.baeyens.arduino.parent/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<module>../it.baeyens.arduino.core</module>
4646
<module>../it.baeyens.arduino.monitor</module>
4747
<module>../it.baeyens.arduino.product</module>
48-
<module>../it.baeyens.arduino.updatesite</module>
48+
4949
<module>../it.baeyens.arduino.application</module>
5050
<module>../it.baeyens.cdt.refactor</module>
5151
</modules>

0 commit comments

Comments
 (0)