Skip to content

Commit 2d340c7

Browse files
committed
Merge pull request #438 from Links2004/esp8266
update SDK to esp_iot_sdk_v1.1.2_15_06_16_p1
2 parents 3d112b2 + 272695b commit 2d340c7

File tree

424 files changed

+6074
-12698
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

424 files changed

+6074
-12698
lines changed

.classpath

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<classpathentry kind="lib" path="app/lib/antlr.jar"/>
77
<classpathentry kind="lib" path="app/lib/apple.jar"/>
88
<classpathentry kind="lib" path="app/lib/ecj.jar"/>
9-
<classpathentry kind="lib" path="app/lib/jna.jar"/>
109
<classpathentry kind="lib" path="app/test-lib/junit-4.11.jar"/>
1110
<classpathentry kind="lib" path="app/test-lib/fest-assert-1.2.jar"/>
1211
<classpathentry kind="lib" path="app/test-lib/fest-reflect-1.2.jar"/>

.gitignore

+4-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ hardware/arduino/bootloaders/caterina_LUFA/Caterina.lss
1313
hardware/arduino/bootloaders/caterina_LUFA/Caterina.elf
1414
hardware/arduino/bootloaders/caterina_LUFA/Caterina.eep
1515
hardware/arduino/bootloaders/caterina_LUFA/.dep/
16-
build/libastylej-*.zip
16+
build/*.zip
1717
build/windows/work/
1818
build/windows/*.zip
1919
build/windows/*.tgz
@@ -56,6 +56,9 @@ avr-toolchain-*.zip
5656
/hardware/tools/esp8266/utils/
5757
/hardware/tools/esp8266/xtensa-lx106-elf
5858
/hardware/tools/esp8266/esptool.exe
59+
/hardware/esp8266com/esp8266/tools/xtensa*
60+
/hardware/esp8266com/esp8266/tools/esptool*
61+
/hardware/esp8266com/esp8266/tools/utils
5962
/hardware/tools/avr/
6063
/hardware/tools/gcc-arm-none-eabi-4.8.3-2014q1/
6164
/hardware/tools/bossac.exe

README.Arduino.md

+9-1
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,19 @@ language. Arduino can be used to develop stand-alone interactive objects or
77
can be connected to software on your computer (e.g. Flash, Processing, MaxMSP).
88
The boards can be assembled by hand or purchased preassembled; the open-source
99
IDE can be downloaded for free at http://arduino.cc/en/Main/Software
10+
* Arduino is an open-source physical computing platform based on a simple i/o
11+
board and a development environment that implements the Processing/Wiring
12+
language. Arduino can be used to develop stand-alone interactive objects or
13+
can be connected to software on your computer (e.g. Flash, Processing, MaxMSP).
14+
The boards can be assembled by hand or purchased preassembled; the open-source
15+
IDE can be downloaded for free at http://www.arduino.cc/en/Main/Software
1016

1117
* For more information, see the website at: http://www.arduino.cc/
1218
or the forums at: http://arduino.cc/forum/
1319
You can also follow Arduino on twitter at: https://twitter.com/arduino or like Arduino on Facebook at: https://www.facebook.com/official.arduino
20+
* For more information, see the website at: http://www.arduino.cc/
21+
or the forums at: http://www.arduino.cc/forum/
22+
You can also follow Arduino on twitter at: https://twitter.com/arduino or like Arduino on Facebook at: https://www.facebook.com/official.arduino
1423

1524
* To report a *bug* in the software or to request *a simple enhancement* go to:
1625
http://github.com/arduino/Arduino/issues
@@ -42,4 +51,3 @@ Arduino uses the [GNU avr-gcc toolchain](http://gcc.gnu.org/wiki/avr-gcc), [avrd
4251
[Processing](http://www.processing.org) and [Wiring](http://wiring.org.co).
4352

4453
Icon and about image designed by [ToDo](http://www.todo.to.it/)
45-

app/.classpath

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<classpathentry kind="src" path="test"/>
55
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
66
<classpathentry kind="lib" path="lib/antlr.jar"/>
7-
<classpathentry kind="lib" path="lib/jna.jar"/>
87
<classpathentry kind="lib" path="lib/ecj.jar"/>
98
<classpathentry kind="lib" path="lib/apple.jar"/>
109
<classpathentry kind="lib" path="lib/bcpg-jdk15on-152.jar"/>

app/.classpath_macosx

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
<classpathentry combineaccessrules="false" kind="src" path="/serial"/>
1515
<classpathentry combineaccessrules="false" kind="src" path="/video"/>
1616
<classpathentry kind="lib" path="lib/antlr.jar"/>
17-
<classpathentry kind="lib" path="lib/jna.jar"/>
1817
<classpathentry kind="lib" path="lib/ecj.jar"/>
1918
<classpathentry kind="output" path="bin"/>
2019
</classpath>

app/.classpath_vista

-21
This file was deleted.

app/build.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<echo message="override ${env.JAVA_HOME}/lib/tools.jar" />
7474
<fail />
7575
-->
76-
<javac source="1.6" target="1.6"
76+
<javac source="1.8" target="1.8"
7777
srcdir="src"
7878
destdir="bin"
7979
encoding="UTF-8"
@@ -85,7 +85,7 @@
8585
<target name="test" depends="compile" description="Runs the test">
8686
<mkdir dir="test-bin"/>
8787

88-
<javac source="1.6" target="1.6"
88+
<javac source="1.8" target="1.8"
8989
srcdir="test"
9090
destdir="test-bin"
9191
encoding="UTF-8"

app/lib/jna.LICENSE.LGPL-2.1.txt

-1
This file was deleted.

app/lib/jna.jar

-611 KB
Binary file not shown.

app/run-linux.launch

-22
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
/*
2+
* This file is part of Arduino.
3+
*
4+
* Copyright 2015 Arduino LLC (http://www.arduino.cc/)
5+
*
6+
* Arduino is free software; you can redistribute it and/or modify
7+
* it under the terms of the GNU General Public License as published by
8+
* the Free Software Foundation; either version 2 of the License, or
9+
* (at your option) any later version.
10+
*
11+
* This program is distributed in the hope that it will be useful,
12+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
* GNU General Public License for more details.
15+
*
16+
* You should have received a copy of the GNU General Public License
17+
* along with this program; if not, write to the Free Software
18+
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
19+
*
20+
* As a special exception, you may use this file as part of a free software
21+
* library without restriction. Specifically, if other files instantiate
22+
* templates or use macros or inline functions from this file, or you compile
23+
* this file and link it with other files to produce an executable, this
24+
* file does not by itself cause the resulting executable to be covered by
25+
* the GNU General Public License. This exception does not however
26+
* invalidate any other reasons why the executable file might be covered by
27+
* the GNU General Public License.
28+
*/
29+
30+
package cc.arduino.contributions.libraries;
31+
32+
import java.util.Comparator;
33+
34+
public class LibraryByTypeComparator implements Comparator<ContributedLibrary> {
35+
36+
private final LibraryTypeComparator libraryTypeComparator;
37+
38+
public LibraryByTypeComparator() {
39+
this(new LibraryTypeComparator());
40+
}
41+
42+
public LibraryByTypeComparator(LibraryTypeComparator libraryTypeComparator) {
43+
this.libraryTypeComparator = libraryTypeComparator;
44+
}
45+
46+
@Override
47+
public int compare(ContributedLibrary o1, ContributedLibrary o2) {
48+
if (o1.getTypes() == null) {
49+
return 1;
50+
}
51+
if (o2.getTypes() == null) {
52+
return -1;
53+
}
54+
return libraryTypeComparator.compare(o1.getTypes().get(0), o2.getTypes().get(0));
55+
}
56+
57+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
/*
2+
* This file is part of Arduino.
3+
*
4+
* Copyright 2015 Arduino LLC (http://www.arduino.cc/)
5+
*
6+
* Arduino is free software; you can redistribute it and/or modify
7+
* it under the terms of the GNU General Public License as published by
8+
* the Free Software Foundation; either version 2 of the License, or
9+
* (at your option) any later version.
10+
*
11+
* This program is distributed in the hope that it will be useful,
12+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
* GNU General Public License for more details.
15+
*
16+
* You should have received a copy of the GNU General Public License
17+
* along with this program; if not, write to the Free Software
18+
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
19+
*
20+
* As a special exception, you may use this file as part of a free software
21+
* library without restriction. Specifically, if other files instantiate
22+
* templates or use macros or inline functions from this file, or you compile
23+
* this file and link it with other files to produce an executable, this
24+
* file does not by itself cause the resulting executable to be covered by
25+
* the GNU General Public License. This exception does not however
26+
* invalidate any other reasons why the executable file might be covered by
27+
* the GNU General Public License.
28+
*/
29+
30+
package cc.arduino.contributions.libraries;
31+
32+
import java.util.Comparator;
33+
34+
public class LibraryOfSameTypeComparator implements Comparator<ContributedLibrary> {
35+
36+
@Override
37+
public int compare(ContributedLibrary o1, ContributedLibrary o2) {
38+
if (o1.getTypes() == null) {
39+
return 1;
40+
}
41+
if (o2.getTypes() == null) {
42+
return -1;
43+
}
44+
if (!o1.getTypes().get(0).equals(o2.getTypes().get(0))) {
45+
return 0;
46+
}
47+
return o1.getName().compareTo(o2.getName());
48+
}
49+
50+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
/*
2+
* This file is part of Arduino.
3+
*
4+
* Copyright 2015 Arduino LLC (http://www.arduino.cc/)
5+
*
6+
* Arduino is free software; you can redistribute it and/or modify
7+
* it under the terms of the GNU General Public License as published by
8+
* the Free Software Foundation; either version 2 of the License, or
9+
* (at your option) any later version.
10+
*
11+
* This program is distributed in the hope that it will be useful,
12+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
* GNU General Public License for more details.
15+
*
16+
* You should have received a copy of the GNU General Public License
17+
* along with this program; if not, write to the Free Software
18+
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
19+
*
20+
* As a special exception, you may use this file as part of a free software
21+
* library without restriction. Specifically, if other files instantiate
22+
* templates or use macros or inline functions from this file, or you compile
23+
* this file and link it with other files to produce an executable, this
24+
* file does not by itself cause the resulting executable to be covered by
25+
* the GNU General Public License. This exception does not however
26+
* invalidate any other reasons why the executable file might be covered by
27+
* the GNU General Public License.
28+
*/
29+
30+
package cc.arduino.contributions.libraries;
31+
32+
import java.util.Arrays;
33+
import java.util.Comparator;
34+
import java.util.List;
35+
36+
public class LibraryTypeComparator implements Comparator<String> {
37+
38+
private final List<String> types;
39+
40+
public LibraryTypeComparator() {
41+
this("Arduino", "Recommended", "Contributed");
42+
}
43+
44+
public LibraryTypeComparator(String... types) {
45+
this.types = Arrays.asList(types);
46+
}
47+
48+
@Override
49+
public int compare(String o1, String o2) {
50+
if (types.contains(o1) && types.contains(o2)) {
51+
return types.indexOf(o1) - types.indexOf(o2);
52+
} else if (types.contains(o1)) {
53+
return -1;
54+
} else if (types.contains(o2)) {
55+
return 1;
56+
}
57+
return o1.compareTo(o2);
58+
}
59+
60+
}

app/src/cc/arduino/contributions/libraries/ui/ContributedLibraryTableCell.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,16 @@
2626
* invalidate any other reasons why the executable file might be covered by
2727
* the GNU General Public License.
2828
*/
29+
2930
package cc.arduino.contributions.libraries.ui;
3031

32+
import cc.arduino.contributions.DownloadableContribution;
33+
import cc.arduino.contributions.DownloadableContributionVersionComparator;
3134
import cc.arduino.contributions.VersionComparator;
3235
import cc.arduino.contributions.filters.BuiltInPredicate;
3336
import cc.arduino.contributions.filters.InstalledPredicate;
3437
import cc.arduino.contributions.libraries.ContributedLibrary;
3538
import cc.arduino.contributions.libraries.filters.OnlyUpstreamReleasePredicate;
36-
import cc.arduino.contributions.packages.DownloadableContribution;
37-
import cc.arduino.contributions.DownloadableContributionVersionComparator;
3839
import cc.arduino.contributions.ui.InstallerTableCell;
3940
import cc.arduino.contributions.ui.listeners.DelegatingKeyListener;
4041
import cc.arduino.utils.ReverseComparator;

app/src/cc/arduino/contributions/libraries/ui/DropdownLibraryOfTypeItem.java

-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
package cc.arduino.contributions.libraries.ui;
3131

3232
import cc.arduino.contributions.libraries.ContributedLibrary;
33-
import cc.arduino.contributions.libraries.filters.CategoryPredicate;
3433
import cc.arduino.contributions.libraries.filters.TypePredicate;
3534
import cc.arduino.contributions.ui.DropdownItem;
3635
import com.google.common.base.Predicate;

app/src/cc/arduino/contributions/libraries/ui/LibrariesIndexTableModel.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,15 @@
2626
* invalidate any other reasons why the executable file might be covered by
2727
* the GNU General Public License.
2828
*/
29+
2930
package cc.arduino.contributions.libraries.ui;
3031

3132
import cc.arduino.contributions.DownloadableContributionBuiltInAtTheBottomComparator;
32-
import cc.arduino.contributions.VersionHelper;
3333
import cc.arduino.contributions.filters.InstalledPredicate;
3434
import cc.arduino.contributions.libraries.ContributedLibrary;
3535
import cc.arduino.contributions.libraries.LibrariesIndexer;
3636
import cc.arduino.contributions.packages.ContributedPlatform;
3737
import cc.arduino.contributions.ui.FilteredAbstractTableModel;
38-
import com.github.zafarkhaja.semver.Version;
3938
import com.google.common.base.Predicate;
4039
import com.google.common.base.Predicates;
4140
import com.google.common.collect.Collections2;

0 commit comments

Comments
 (0)