Updated to latest platform and libraries, added metrics to info page

judge2005 · Dec 30, 2019 · 28daa3a · 28daa3a
1 parent 41e45ff
commit 28daa3a
Show file tree

Hide file tree

Showing 15 changed files with 660 additions and 314 deletions.
diff --git a/.cproject b/.cproject
@@ -12,13 +12,13 @@
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactName="${ProjName}" buildProperties="" description="" id="io.sloeber.core.toolChain.release.34549407" name="Release" parent="org.eclipse.cdt.build.core.emptycfg">
+				<configuration artifactName="${ProjName}" buildProperties="" description="" id="io.sloeber.core.toolChain.release.34549407" name="Release" optionalBuildProperties="" parent="org.eclipse.cdt.build.core.emptycfg">
 					<folderInfo id="io.sloeber.core.toolChain.release.34549407.1458229775" name="/" resourcePath="">
 						<toolChain id="io.sloeber.core.toolChain.release.657755321" name="Arduino Toolchain (Sloeber edition)" superClass="io.sloeber.core.toolChain.release">
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="io.sloeber.targetplatform.746739590" name="Arduino Target" osList="all" superClass="io.sloeber.targetplatform"/>
 							<builder buildPath="${workspace_loc:/ITS1A}/Release" id="io.sloeber.sketch.builder.525577272" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Arduino sketch builder" superClass="io.sloeber.sketch.builder"/>
 							<tool id="io.sloeber.tool.sketch.compiler.cpp.1613433899" name="Arduino C++ Compiler" superClass="io.sloeber.tool.sketch.compiler.cpp">
-								<option id="io.sloeber.compiler.cpp.sketch.option.incpath.1954934958" name="Include Paths (-I)" superClass="io.sloeber.compiler.cpp.sketch.option.incpath" valueType="includePath">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="io.sloeber.compiler.cpp.sketch.option.incpath.1954934958" name="Include Paths (-I)" superClass="io.sloeber.compiler.cpp.sketch.option.incpath" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ITS1A/core/core}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ITS1A/core/variant}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ITS1A/libraries/ESPAsyncHttpClient}&quot;"/>
@@ -51,14 +51,17 @@
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ITS1A/libraries/Adafruit_Unified_Sensor}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ITS1A/libraries/ESP8266mDNS}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ITS1A/libraries/ArduinoOTA}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ITS1A/libraries/FauxmoESP}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ITS1A/libraries/FauxmoESP/src}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ITS1A/libraries/ESPAsyncWiFiManagerOTC}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ITS1A/libraries/ASyncOTAWebUpdate}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ITS1A/libraries/ESP8266mDNS/src}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ITS1A/libraries/ESPAsyncWiFiManager}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ITS1A/libraries/fauxmoesp/src}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ITS1A/libraries/ESPAsyncUDP/src}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ITS1A/libraries/ESPAsyncDNSServer/src}&quot;"/>
 								</option>
 								<inputType id="io.sloeber.compiler.cpp.sketch.input.1865345997" name="CPP source files" superClass="io.sloeber.compiler.cpp.sketch.input"/>
 							</tool>
 							<tool id="io.sloeber.tool.compiler.c.317473698" name="Arduino C Compiler" superClass="io.sloeber.tool.compiler.c">
-								<option id="io.sloeber.compiler.c.sketch.option.incpath.325168765" name="Include Paths (-I)" superClass="io.sloeber.compiler.c.sketch.option.incpath" valueType="includePath">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="io.sloeber.compiler.c.sketch.option.incpath.325168765" name="Include Paths (-I)" superClass="io.sloeber.compiler.c.sketch.option.incpath" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ITS1A/core/core}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ITS1A/core/variant}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ITS1A/libraries/ESPAsyncHttpClient}&quot;"/>
@@ -91,14 +94,17 @@
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ITS1A/libraries/Adafruit_Unified_Sensor}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ITS1A/libraries/ESP8266mDNS}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ITS1A/libraries/ArduinoOTA}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ITS1A/libraries/FauxmoESP}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ITS1A/libraries/FauxmoESP/src}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ITS1A/libraries/ESPAsyncWiFiManagerOTC}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ITS1A/libraries/ASyncOTAWebUpdate}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ITS1A/libraries/ESP8266mDNS/src}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ITS1A/libraries/ESPAsyncWiFiManager}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ITS1A/libraries/fauxmoesp/src}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ITS1A/libraries/ESPAsyncUDP/src}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ITS1A/libraries/ESPAsyncDNSServer/src}&quot;"/>
 								</option>
 								<inputType id="io.sloeber.compiler.c.sketch.input.1296702713" name="C Source Files" superClass="io.sloeber.compiler.c.sketch.input"/>
 							</tool>
 							<tool id="io.sloeber.tool.sketch.compiler.s.1025288190" name="Arduino Assembler" superClass="io.sloeber.tool.sketch.compiler.s">
-								<option id="io.sloeber.compiler.asm.sketch.option.incpath.1699788103" name="Include Paths (-I)" superClass="io.sloeber.compiler.asm.sketch.option.incpath" valueType="includePath">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="io.sloeber.compiler.asm.sketch.option.incpath.1699788103" name="Include Paths (-I)" superClass="io.sloeber.compiler.asm.sketch.option.incpath" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ITS1A/core/core}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ITS1A/core/variant}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ITS1A/libraries/ESPAsyncHttpClient}&quot;"/>
@@ -131,9 +137,12 @@
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ITS1A/libraries/Adafruit_Unified_Sensor}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ITS1A/libraries/ESP8266mDNS}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ITS1A/libraries/ArduinoOTA}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ITS1A/libraries/FauxmoESP}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ITS1A/libraries/FauxmoESP/src}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ITS1A/libraries/ESPAsyncWiFiManagerOTC}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ITS1A/libraries/ASyncOTAWebUpdate}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ITS1A/libraries/ESP8266mDNS/src}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ITS1A/libraries/ESPAsyncWiFiManager}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ITS1A/libraries/fauxmoesp/src}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ITS1A/libraries/ESPAsyncUDP/src}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ITS1A/libraries/ESPAsyncDNSServer/src}&quot;"/>
 								</option>
 								<inputType id="io.sloeber.compiler.S.sketch.input.1861504163" name="Assembly source files" superClass="io.sloeber.compiler.S.sketch.input"/>
 							</tool>
@@ -144,7 +153,7 @@
 						</toolChain>
 					</folderInfo>
 					<sourceEntries>
-						<entry excluding="libraries/ESPAsyncWiFiManager/.git|libraries/ESPAsyncWebServer/.git|libraries/FauxmoESP/docs|libraries/Configs/.git|libraries/ArduinoJson/scripts|libraries/ArduinoJson/fuzzing|libraries/ArduinoJson/.github|libraries/ESPAsyncWebServer/travis|libraries/OneNixieClock/.git|libraries/NixieMisc/.git|libraries/NixieDriver/.git|libraries/ESPAsyncTCP/travis|libraries/ESPAsyncTCP/ssl|libraries/?*/**/?xamples/**|libraries/?*/**/?xtras/**|libraries/?*/**/test*/**|libraries/?*/**/third-party/**|libraries/**/._*|libraries/?*/utility/*/*" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name=""/>
+						<entry excluding="libraries/ESPAsyncUDP/.github|libraries/ESPAsyncUDP/.git|libraries/ESPAsyncDNSServer/.git|libraries/fauxmoesp/.git|libraries/UPS/.git|libraries/FauxmoESP/.git|libraries/ESPAsyncWiFiManagerOTC/.git|libraries/ASyncOTAWebUpdate/.git|libraries/Adafruit_NeoPixel/.github|libraries/Adafruit_NeoPixel/.git|libraries/ESPAsyncWiFiManager/.git|libraries/ESPAsyncWebServer/.git|libraries/FauxmoESP/docs|libraries/Configs/.git|libraries/ArduinoJson/scripts|libraries/ArduinoJson/fuzzing|libraries/ArduinoJson/.github|libraries/ESPAsyncWebServer/travis|libraries/OneNixieClock/.git|libraries/NixieMisc/.git|libraries/NixieDriver/.git|libraries/ESPAsyncTCP/travis|libraries/ESPAsyncTCP/ssl|libraries/?*/**/?xamples/**|libraries/?*/**/?xtras/**|libraries/?*/**/test*/**|libraries/?*/**/third-party/**|libraries/**/._*|libraries/?*/utility/*/*" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name=""/>
 					</sourceEntries>
 				</configuration>
 			</storageModule>

diff --git a/.project b/.project
@@ -34,12 +34,17 @@
 		<link>
 			<name>core/core</name>
 			<type>2</type>
-			<locationURI>ECLIPSE_HOME/arduinoPlugin/packages/esp8266/hardware/esp8266/2.3.0/cores/esp8266</locationURI>
+			<locationURI>ECLIPSE_HOME/arduinoPlugin/packages/esp8266/hardware/esp8266/2.6.1/cores/esp8266</locationURI>
 		</link>
 		<link>
 			<name>core/variant</name>
 			<type>2</type>
-			<locationURI>ECLIPSE_HOME/arduinoPlugin/packages/esp8266/hardware/esp8266/2.3.0/variants/generic</locationURI>
+			<locationURI>ECLIPSE_HOME/arduinoPlugin/packages/esp8266/hardware/esp8266/2.6.1/variants/generic</locationURI>
+		</link>
+		<link>
+			<name>libraries/ASyncOTAWebUpdate</name>
+			<type>2</type>
+			<location>C:/Users/mpand/Documents/Arduino/libraries/ASyncOTAWebUpdate</location>
 		</link>
 		<link>
 			<name>libraries/Adafruit_LIS3DH</name>
@@ -59,7 +64,7 @@
 		<link>
 			<name>libraries/Adafruit_Unified_Sensor</name>
 			<type>2</type>
-			<locationURI>ECLIPSE_HOME/arduinoPlugin/libraries/Adafruit_Unified_Sensor/1.0.2</locationURI>
+			<locationURI>ECLIPSE_HOME/arduinoPlugin/libraries/Adafruit_Unified_Sensor/1.0.3</locationURI>
 		</link>
 		<link>
 			<name>libraries/ArduinoJson</name>
@@ -69,7 +74,7 @@
 		<link>
 			<name>libraries/ArduinoOTA</name>
 			<type>2</type>
-			<locationURI>ECLIPSE_HOME/arduinoPlugin/packages/esp8266/hardware/esp8266/2.3.0/libraries/ArduinoOTA</locationURI>
+			<locationURI>ECLIPSE_HOME/arduinoPlugin/packages/esp8266/hardware/esp8266/2.6.1/libraries/ArduinoOTA</locationURI>
 		</link>
 		<link>
 			<name>libraries/Configs</name>
@@ -79,22 +84,27 @@
 		<link>
 			<name>libraries/DNSServer</name>
 			<type>2</type>
-			<locationURI>ECLIPSE_HOME/arduinoPlugin/packages/esp8266/hardware/esp8266/2.3.0/libraries/DNSServer</locationURI>
+			<locationURI>ECLIPSE_HOME/arduinoPlugin/packages/esp8266/hardware/esp8266/2.6.1/libraries/DNSServer</locationURI>
 		</link>
 		<link>
 			<name>libraries/EEPROM</name>
 			<type>2</type>
-			<locationURI>ECLIPSE_HOME/arduinoPlugin/packages/esp8266/hardware/esp8266/2.3.0/libraries/EEPROM</locationURI>
+			<locationURI>ECLIPSE_HOME/arduinoPlugin/packages/esp8266/hardware/esp8266/2.6.1/libraries/EEPROM</locationURI>
 		</link>
 		<link>
 			<name>libraries/ESP8266WiFi</name>
 			<type>2</type>
-			<locationURI>ECLIPSE_HOME/arduinoPlugin/packages/esp8266/hardware/esp8266/2.3.0/libraries/ESP8266WiFi</locationURI>
+			<locationURI>ECLIPSE_HOME/arduinoPlugin/packages/esp8266/hardware/esp8266/2.6.1/libraries/ESP8266WiFi</locationURI>
 		</link>
 		<link>
 			<name>libraries/ESP8266mDNS</name>
 			<type>2</type>
-			<locationURI>ECLIPSE_HOME/arduinoPlugin/packages/esp8266/hardware/esp8266/2.3.0/libraries/ESP8266mDNS</locationURI>
+			<locationURI>ECLIPSE_HOME/arduinoPlugin/packages/esp8266/hardware/esp8266/2.6.1/libraries/ESP8266mDNS</locationURI>
+		</link>
+		<link>
+			<name>libraries/ESPAsyncDNSServer</name>
+			<type>2</type>
+			<location>C:/Users/mpand/Documents/Arduino/libraries/ESPAsyncDNSServer</location>
 		</link>
 		<link>
 			<name>libraries/ESPAsyncHttpClient</name>
@@ -107,24 +117,24 @@
 			<location>C:/Users/mpand/Documents/Arduino/libraries/ESPAsyncTCP</location>
 		</link>
 		<link>
-			<name>libraries/ESPAsyncWebServer</name>
+			<name>libraries/ESPAsyncUDP</name>
 			<type>2</type>
-			<location>C:/Users/mpand/Documents/Arduino/libraries/ESPAsyncWebServer</location>
+			<location>C:/Users/mpand/Documents/Arduino/libraries/ESPAsyncUDP</location>
 		</link>
 		<link>
-			<name>libraries/ESPAsyncWiFiManagerOTC</name>
+			<name>libraries/ESPAsyncWebServer</name>
 			<type>2</type>
-			<location>C:/Users/mpand/Documents/Arduino/libraries/ESPAsyncWiFiManagerOTC</location>
+			<location>C:/Users/mpand/Documents/Arduino/libraries/ESPAsyncWebServer</location>
 		</link>
 		<link>
-			<name>libraries/FauxmoESP</name>
+			<name>libraries/ESPAsyncWiFiManager</name>
 			<type>2</type>
-			<location>C:/Users/mpand/Documents/Arduino/libraries/FauxmoESP</location>
+			<location>C:/Users/mpand/Documents/Arduino/libraries/ESPAsyncWiFiManager</location>
 		</link>
 		<link>
 			<name>libraries/Hash</name>
 			<type>2</type>
-			<locationURI>ECLIPSE_HOME/arduinoPlugin/packages/esp8266/hardware/esp8266/2.3.0/libraries/Hash</locationURI>
+			<locationURI>ECLIPSE_HOME/arduinoPlugin/packages/esp8266/hardware/esp8266/2.6.1/libraries/Hash</locationURI>
 		</link>
 		<link>
 			<name>libraries/NixieDriver</name>
@@ -144,7 +154,7 @@
 		<link>
 			<name>libraries/SPI</name>
 			<type>2</type>
-			<locationURI>ECLIPSE_HOME/arduinoPlugin/packages/esp8266/hardware/esp8266/2.3.0/libraries/SPI</locationURI>
+			<locationURI>ECLIPSE_HOME/arduinoPlugin/packages/esp8266/hardware/esp8266/2.6.1/libraries/SPI</locationURI>
 		</link>
 		<link>
 			<name>libraries/Time</name>
@@ -164,7 +174,12 @@
 		<link>
 			<name>libraries/Wire</name>
 			<type>2</type>
-			<locationURI>ECLIPSE_HOME/arduinoPlugin/packages/esp8266/hardware/esp8266/2.3.0/libraries/Wire</locationURI>
+			<locationURI>ECLIPSE_HOME/arduinoPlugin/packages/esp8266/hardware/esp8266/2.6.1/libraries/Wire</locationURI>
+		</link>
+		<link>
+			<name>libraries/fauxmoesp</name>
+			<type>2</type>
+			<location>C:/Users/mpand/Documents/Arduino/libraries/fauxmoesp</location>
 		</link>
 	</linkedResources>
 </projectDescription>
diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml
@@ -4,7 +4,7 @@
 		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="io.sloeber.core.toolchain.ArduinoLanguageProvider" console="false" env-hash="703070679159587902" id="io.sloeber.languageSettingsProvider" keep-relative-paths="false" name="Arduino Compiler Settings" parameter="${COMMAND} -E -P -v -dD -D__IN_ECLIPSE__ &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="io.sloeber.core.toolchain.ArduinoLanguageProvider" console="false" env-hash="1164219024921998429" id="io.sloeber.languageSettingsProvider" keep-relative-paths="false" name="Arduino Compiler Settings" parameter="${COMMAND} -E -P -v -dD -D__IN_ECLIPSE__ &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>