forked from esp8266/Arduino
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request esp8266#11 from esp8266/esp8266
Esp8266
- Loading branch information
Showing
434 changed files
with
6,200 additions
and
12,709 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
Binary file not shown.
This file was deleted.
Oops, something went wrong.
57 changes: 57 additions & 0 deletions
57
app/src/cc/arduino/contributions/libraries/LibraryByTypeComparator.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| /* | ||
| * This file is part of Arduino. | ||
| * | ||
| * Copyright 2015 Arduino LLC (http://www.arduino.cc/) | ||
| * | ||
| * Arduino is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation; either version 2 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program; if not, write to the Free Software | ||
| * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | ||
| * | ||
| * As a special exception, you may use this file as part of a free software | ||
| * library without restriction. Specifically, if other files instantiate | ||
| * templates or use macros or inline functions from this file, or you compile | ||
| * this file and link it with other files to produce an executable, this | ||
| * file does not by itself cause the resulting executable to be covered by | ||
| * the GNU General Public License. This exception does not however | ||
| * invalidate any other reasons why the executable file might be covered by | ||
| * the GNU General Public License. | ||
| */ | ||
|
|
||
| package cc.arduino.contributions.libraries; | ||
|
|
||
| import java.util.Comparator; | ||
|
|
||
| public class LibraryByTypeComparator implements Comparator<ContributedLibrary> { | ||
|
|
||
| private final LibraryTypeComparator libraryTypeComparator; | ||
|
|
||
| public LibraryByTypeComparator() { | ||
| this(new LibraryTypeComparator()); | ||
| } | ||
|
|
||
| public LibraryByTypeComparator(LibraryTypeComparator libraryTypeComparator) { | ||
| this.libraryTypeComparator = libraryTypeComparator; | ||
| } | ||
|
|
||
| @Override | ||
| public int compare(ContributedLibrary o1, ContributedLibrary o2) { | ||
| if (o1.getTypes() == null) { | ||
| return 1; | ||
| } | ||
| if (o2.getTypes() == null) { | ||
| return -1; | ||
| } | ||
| return libraryTypeComparator.compare(o1.getTypes().get(0), o2.getTypes().get(0)); | ||
| } | ||
|
|
||
| } |
50 changes: 50 additions & 0 deletions
50
app/src/cc/arduino/contributions/libraries/LibraryOfSameTypeComparator.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| /* | ||
| * This file is part of Arduino. | ||
| * | ||
| * Copyright 2015 Arduino LLC (http://www.arduino.cc/) | ||
| * | ||
| * Arduino is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation; either version 2 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program; if not, write to the Free Software | ||
| * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | ||
| * | ||
| * As a special exception, you may use this file as part of a free software | ||
| * library without restriction. Specifically, if other files instantiate | ||
| * templates or use macros or inline functions from this file, or you compile | ||
| * this file and link it with other files to produce an executable, this | ||
| * file does not by itself cause the resulting executable to be covered by | ||
| * the GNU General Public License. This exception does not however | ||
| * invalidate any other reasons why the executable file might be covered by | ||
| * the GNU General Public License. | ||
| */ | ||
|
|
||
| package cc.arduino.contributions.libraries; | ||
|
|
||
| import java.util.Comparator; | ||
|
|
||
| public class LibraryOfSameTypeComparator implements Comparator<ContributedLibrary> { | ||
|
|
||
| @Override | ||
| public int compare(ContributedLibrary o1, ContributedLibrary o2) { | ||
| if (o1.getTypes() == null) { | ||
| return 1; | ||
| } | ||
| if (o2.getTypes() == null) { | ||
| return -1; | ||
| } | ||
| if (!o1.getTypes().get(0).equals(o2.getTypes().get(0))) { | ||
| return 0; | ||
| } | ||
| return o1.getName().compareTo(o2.getName()); | ||
| } | ||
|
|
||
| } |
60 changes: 60 additions & 0 deletions
60
app/src/cc/arduino/contributions/libraries/LibraryTypeComparator.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| /* | ||
| * This file is part of Arduino. | ||
| * | ||
| * Copyright 2015 Arduino LLC (http://www.arduino.cc/) | ||
| * | ||
| * Arduino is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation; either version 2 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program; if not, write to the Free Software | ||
| * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | ||
| * | ||
| * As a special exception, you may use this file as part of a free software | ||
| * library without restriction. Specifically, if other files instantiate | ||
| * templates or use macros or inline functions from this file, or you compile | ||
| * this file and link it with other files to produce an executable, this | ||
| * file does not by itself cause the resulting executable to be covered by | ||
| * the GNU General Public License. This exception does not however | ||
| * invalidate any other reasons why the executable file might be covered by | ||
| * the GNU General Public License. | ||
| */ | ||
|
|
||
| package cc.arduino.contributions.libraries; | ||
|
|
||
| import java.util.Arrays; | ||
| import java.util.Comparator; | ||
| import java.util.List; | ||
|
|
||
| public class LibraryTypeComparator implements Comparator<String> { | ||
|
|
||
| private final List<String> types; | ||
|
|
||
| public LibraryTypeComparator() { | ||
| this("Arduino", "Recommended", "Contributed"); | ||
| } | ||
|
|
||
| public LibraryTypeComparator(String... types) { | ||
| this.types = Arrays.asList(types); | ||
| } | ||
|
|
||
| @Override | ||
| public int compare(String o1, String o2) { | ||
| if (types.contains(o1) && types.contains(o2)) { | ||
| return types.indexOf(o1) - types.indexOf(o2); | ||
| } else if (types.contains(o1)) { | ||
| return -1; | ||
| } else if (types.contains(o2)) { | ||
| return 1; | ||
| } | ||
| return o1.compareTo(o2); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.