Skip to content

Commit 9ada406

Browse files
jantjejantje
committed
Merge branch 'master' of https://github.com/wimjongman/arduino-eclipse-plugin into wimjongman-master
Conflicts: it.baeyens.arduino.monitor/src/it/baeyens/arduino/monitor/views/ScopeListener.java it.baeyens.arduino.monitor/src/it/baeyens/arduino/monitor/views/ScopeView.java
2 parents 6f64608 + 8deb07c commit 9ada406

File tree

10 files changed

+709
-14
lines changed

10 files changed

+709
-14
lines changed

‎it.baeyens.arduino.monitor/src/it/baeyens/arduino/monitor/views/ScopeListener.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,14 @@
99
import java.util.LinkedList;
1010
import java.util.Queue;
1111

12+
<<<<<<< HEAD
1213
import multichannel.Oscilloscope;
1314
import multichannel.OscilloscopeStackAdapter;
15+
=======
16+
import org.eclipse.nebula.widgets.oscilloscope.multichannel.Oscilloscope;
17+
import org.eclipse.nebula.widgets.oscilloscope.multichannel.OscilloscopeDispatcher;
18+
import org.eclipse.nebula.widgets.oscilloscope.multichannel.OscilloscopeStackAdapter;
19+
>>>>>>> 8deb07cce97a2af36feca468a03be763cc148b84
1420

1521
import org.eclipse.core.runtime.IStatus;
1622
import org.eclipse.core.runtime.Status;

‎it.baeyens.arduino.monitor/src/it/baeyens/arduino/monitor/views/ScopeView.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
package it.baeyens.arduino.monitor.views;
22

33
import it.baeyens.arduino.arduino.Serial;
4+
<<<<<<< HEAD
45
import multichannel.Oscilloscope;
56
import multichannel.OscilloscopeDispatcher;
7+
=======
8+
>>>>>>> 8deb07cce97a2af36feca468a03be763cc148b84
69

10+
import org.eclipse.nebula.widgets.oscilloscope.multichannel.Oscilloscope;
711
import org.eclipse.swt.SWT;
812
import org.eclipse.swt.events.ControlAdapter;
913
import org.eclipse.swt.events.ControlEvent;

‎it.baeyens.arduino.packaging.feature/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/target

‎it.baeyens.arduino.packaging.feature/.project

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>it.baeyens.arduino.packaging.feature</name>
4+
<comment></comment>
5+
<projects>
6+
<project>it.baeyens.arduino.common</project>
7+
<project>it.baeyens.arduino.core</project>
8+
<project>it.baeyens.avreclipse.core</project>
9+
<project>it.baeyens.avreclipse.core.managedbuildsystem</project>
10+
<project>it.baeyens.avreclipse.ui</project>
11+
</projects>
12+
<buildSpec>
13+
<buildCommand>
14+
<name>org.eclipse.pde.FeatureBuilder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
18+
</buildSpec>
19+
<natures>
20+
<nature>org.eclipse.pde.FeatureNature</nature>
21+
</natures>
22+
</projectDescription>

‎it.baeyens.arduino.packaging.feature/build.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
bin.includes = feature.xml,\
2+
licence.html

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

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<feature
3+
id="it.baeyens.arduino.packaging.feature"
4+
label="Arduino Eclipse Features"
5+
version="1.0.0.qualifier">
6+
7+
<description>
8+
An IDE for C/C++ developers with Arduino integration.
9+
</description>
10+
11+
<license url="license.html">
12+
%license
13+
</license>
14+
15+
<url>
16+
<discovery label="Juno" url="http://download.eclipse.org/releases/juno/"/>
17+
<discovery label="Eclipse Platform 4.2" url="http://download.eclipse.org/eclipse/updates/4.2"/>
18+
</url>
19+
20+
<includes
21+
id="org.eclipse.cvs"
22+
version="0.0.0"/>
23+
24+
<includes
25+
id="org.eclipse.equinox.p2.user.ui"
26+
version="0.0.0"/>
27+
28+
<includes
29+
id="org.eclipse.help"
30+
version="0.0.0"/>
31+
32+
<includes
33+
id="org.eclipse.platform"
34+
version="0.0.0"/>
35+
36+
<includes
37+
id="org.eclipse.rcp"
38+
version="0.0.0"/>
39+
40+
<includes
41+
id="org.eclipse.cdt"
42+
version="0.0.0"/>
43+
44+
<includes
45+
id="org.eclipse.cdt.debug.ui.memory"
46+
version="0.0.0"/>
47+
48+
<includes
49+
id="org.eclipse.cdt.msw"
50+
version="0.0.0"/>
51+
52+
<includes
53+
id="org.eclipse.cdt.build.crossgcc"
54+
version="0.0.0"/>
55+
56+
<includes
57+
id="org.eclipse.cdt.launch.remote"
58+
version="0.0.0"/>
59+
60+
<includes
61+
id="org.eclipse.cdt.autotools"
62+
version="0.0.0"/>
63+
64+
<includes
65+
id="org.eclipse.cdt.mylyn"
66+
version="0.0.0"/>
67+
68+
<includes
69+
id="org.eclipse.mylyn_feature"
70+
version="0.0.0"/>
71+
72+
<includes
73+
id="org.eclipse.mylyn.context_feature"
74+
version="0.0.0"/>
75+
76+
<includes
77+
id="org.eclipse.mylyn.team_feature"
78+
version="0.0.0"/>
79+
80+
<includes
81+
id="org.eclipse.mylyn.ide_feature"
82+
version="0.0.0"/>
83+
84+
<includes
85+
id="org.eclipse.mylyn.bugzilla_feature"
86+
version="0.0.0"/>
87+
88+
<includes
89+
id="org.eclipse.mylyn.wikitext_feature"
90+
version="0.0.0"/>
91+
92+
<includes
93+
id="org.eclipse.rse"
94+
version="0.0.0"/>
95+
96+
<includes
97+
id="org.eclipse.egit"
98+
version="0.0.0"/>
99+
100+
<includes
101+
id="org.eclipse.egit.import"
102+
version="0.0.0"/>
103+
104+
<includes
105+
id="org.eclipse.epp.package.common.feature"
106+
version="0.0.0"/>
107+
108+
<includes
109+
id="org.eclipse.nebula.widgets.oscilloscope.feature"
110+
version="0.0.0"/>
111+
112+
</feature>

0 commit comments

Comments
 (0)