diff options
author | David Crocker <dcrocker@eschertech.com> | 2018-02-10 14:45:18 +0300 |
---|---|---|
committer | David Crocker <dcrocker@eschertech.com> | 2018-02-10 14:45:18 +0300 |
commit | 5fa6a17b4678b54c17dff37b8717cfac15446c7c (patch) | |
tree | ed2c9133159f83daa47fa6f491451a0a8714f1f4 /.cproject | |
parent | ccb75833e49add7f5391f60784cfbe7069d16fc0 (diff) |
Towards 1.21RC2 again
Recognise Ideamaker filament usage comments
Unified network interface for all generation 2+ Duets
Diffstat (limited to '.cproject')
-rw-r--r-- | .cproject | 57 |
1 files changed, 27 insertions, 30 deletions
@@ -110,7 +110,7 @@ </toolChain> </folderInfo> <sourceEntries> - <entry excluding="src/Display|src/Network2|src/Alligator|src/Duet/Lwip/lwip/src/core/ipv6|src/Duet/Lwip/lwip/test|src/SAME70_TEST|src/DuetNG|src/DuetM|src/RADDS" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/> + <entry excluding="src/Alligator|src/Duet/Lwip/lwip/src/core/ipv6|src/Duet/Lwip/lwip/test|src/SAME70_TEST|src/Display|src/Networking|src/DuetNG|src/DuetM|src/RADDS" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/> </sourceEntries> </configuration> </storageModule> @@ -166,7 +166,6 @@ </option> <option id="gnu.c.compiler.option.preprocessor.def.symbols.1695995740" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" useByScannerDiscovery="false" valueType="definedSymbols"> <listOptionValue builtIn="false" value="__SAM4E8E__"/> - <listOptionValue builtIn="false" value="CORE_NG"/> <listOptionValue builtIn="false" value="DUET_NG"/> </option> <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.763992947" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/> @@ -212,13 +211,11 @@ <listOptionValue builtIn="false" value=""${workspace_loc:/${CoreName}/variants/duetNG}""/> <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/src}""/> <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/src/DuetNG}""/> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/src/Network2}""/> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/src/Network2/ESP8266}""/> + <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/src/Networking}""/> <listOptionValue builtIn="false" value=""${workspace_loc:/DuetWiFiSocketServer/src/include}""/> </option> <option id="gnu.cpp.compiler.option.preprocessor.def.1610427238" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" useByScannerDiscovery="false" valueType="definedSymbols"> <listOptionValue builtIn="false" value="__SAM4E8E__"/> - <listOptionValue builtIn="false" value="CORE_NG"/> <listOptionValue builtIn="false" value="DUET_NG"/> <listOptionValue builtIn="false" value="DUET_WIFI"/> <listOptionValue builtIn="false" value="_XOPEN_SOURCE"/> @@ -228,7 +225,7 @@ </toolChain> </folderInfo> <sourceEntries> - <entry excluding="src/Display|src/Network2/W5500|src/Alligator|src/SAME70_TEST|src/Duet|src/DuetM|src/RADDS" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/> + <entry excluding="src/Networking/LwipEthernet|src/Networking/W5500Ethernet|src/Alligator|src/SAME70_TEST|src/Display|src/Duet|src/DuetM|src/RADDS" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/> </sourceEntries> </configuration> </storageModule> @@ -338,7 +335,7 @@ </toolChain> </folderInfo> <sourceEntries> - <entry excluding="src/Display|src/Network2|src/Alligator|src/SAME70_TEST|src/Duet|src/DuetNG|src/DuetM" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/> + <entry excluding="src/Networking|src/Alligator|src/SAME70_TEST|src/Display|src/Duet|src/DuetNG|src/DuetM" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/> </sourceEntries> </configuration> </storageModule> @@ -393,13 +390,12 @@ <listOptionValue builtIn="false" value=""${workspace_loc:/${CoreName}/asf/sam/utils/preprocessor}""/> <listOptionValue builtIn="false" value=""${workspace_loc:/${CoreName}/asf/thirdparty/CMSIS/Include}""/> <listOptionValue builtIn="false" value=""${workspace_loc:/${CoreName}/variants/duetNG}""/> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/src/Network2}""/> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/src/Network2/W5500}""/> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/src/Network2/W5500/Wiznet/Ethernet}""/> + <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/src/Networking}""/> + <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/src/Networking/W5500Ethernet}""/> + <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/src/Networking/W5500Ethernet/Wiznet/Ethernet}""/> </option> <option id="gnu.c.compiler.option.preprocessor.def.symbols.299877277" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" useByScannerDiscovery="false" valueType="definedSymbols"> <listOptionValue builtIn="false" value="__SAM4E8E__"/> - <listOptionValue builtIn="false" value="CORE_NG"/> <listOptionValue builtIn="false" value="DUET_NG"/> </option> <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.786131774" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/> @@ -445,13 +441,13 @@ <listOptionValue builtIn="false" value=""${workspace_loc:/${CoreName}/variants/duetNG}""/> <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/src}""/> <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/src/DuetNG}""/> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/src/Network2}""/> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/src/Network2/W5500}""/> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/src/Network2/W5500/Wiznet/Ethernet}""/> + <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/src/Networking}""/> + <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/src/Networking/W5500Ethernet}""/> + <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/src/Networking/W5500Ethernet/Wiznet/Ethernet}""/> + <listOptionValue builtIn="false" value=""${workspace_loc:/DuetWiFiSocketServer/src/include}""/> </option> <option id="gnu.cpp.compiler.option.preprocessor.def.1120095540" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" useByScannerDiscovery="false" valueType="definedSymbols"> <listOptionValue builtIn="false" value="__SAM4E8E__"/> - <listOptionValue builtIn="false" value="CORE_NG"/> <listOptionValue builtIn="false" value="DUET_NG"/> <listOptionValue builtIn="false" value="DUET_ETHERNET"/> <listOptionValue builtIn="false" value="_XOPEN_SOURCE"/> @@ -461,7 +457,7 @@ </toolChain> </folderInfo> <sourceEntries> - <entry excluding="src/Display|src/Alligator|src/SAME70_TEST|src/Duet|src/DuetM|src/Network2/ESP8266|src/RADDS" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/> + <entry excluding="src/Networking/ESP8266WiFi|src/Networking/LwipEthernet|src/Alligator|src/SAME70_TEST|src/Display|src/Duet|src/DuetM|src/RADDS" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/> </sourceEntries> </configuration> </storageModule> @@ -582,7 +578,7 @@ </toolChain> </folderInfo> <sourceEntries> - <entry excluding="src/Display|src/Network2|src/Duet/Lwip/lwip/src/core/ipv6|src/Duet/Lwip/lwip/test|src/SAME70_TEST|src/DuetNG|src/DuetM|src/Alligator/Lwip/lwip/src/include/ipv6|src/Alligator/Lwip/lwip/test|src/Duet/MCP4461|src/Alligator/Lwip/lwip/src/core/ipv6|src/RADDS" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/> + <entry excluding="src/Networking|src/Duet/Lwip/lwip/src/core/ipv6|src/Networking|src/DuetNG|src/Alligator/Lwip/lwip/src/include/ipv6|src/Alligator/Lwip/lwip/test|src/Duet/MCP4461|src/Duet/Lwip/lwip/test|src/SAME70_TEST|src/Display|src/DuetM|src/Alligator/Lwip/lwip/src/core/ipv6|src/RADDS" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/> </sourceEntries> </configuration> </storageModule> @@ -637,12 +633,11 @@ <listOptionValue builtIn="false" value=""${workspace_loc:/${CoreName}/asf/sam/utils/preprocessor}""/> <listOptionValue builtIn="false" value=""${workspace_loc:/${CoreName}/asf/thirdparty/CMSIS/Include}""/> <listOptionValue builtIn="false" value=""${workspace_loc:/${CoreName}/variants/sam4s}""/> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/src/Network2/W5500}""/> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/src/Network2/W5500/Wiznet/Ethernet}""/> + <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/src/Networking/W5500Ethernet}""/> + <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/src/Networking/W5500Ethernet/Wiznet/Ethernet}""/> </option> <option id="gnu.c.compiler.option.preprocessor.def.symbols.2086359888" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" useByScannerDiscovery="false" valueType="definedSymbols"> <listOptionValue builtIn="false" value="__SAM4S8C__"/> - <listOptionValue builtIn="false" value="CORE_NG"/> <listOptionValue builtIn="false" value="DUET_M"/> </option> <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1068938062" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/> @@ -688,13 +683,12 @@ <listOptionValue builtIn="false" value=""${workspace_loc:/${CoreName}/variants/sam4s}""/> <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/src}""/> <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/src/DuetM}""/> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/src/Network2}""/> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/src/Network2/W5500}""/> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/src/Network2/W5500/Wiznet/Ethernet}""/> + <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/src/Networking}""/> + <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/src/Networking/W5500Ethernet}""/> + <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/src/Networking/W5500Ethernet/Wiznet/Ethernet}""/> </option> <option id="gnu.cpp.compiler.option.preprocessor.def.1565207565" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" useByScannerDiscovery="false" valueType="definedSymbols"> <listOptionValue builtIn="false" value="__SAM4S8C__"/> - <listOptionValue builtIn="false" value="CORE_NG"/> <listOptionValue builtIn="false" value="DUET_M"/> <listOptionValue builtIn="false" value="_XOPEN_SOURCE"/> </option> @@ -703,7 +697,7 @@ </toolChain> </folderInfo> <sourceEntries> - <entry excluding="src/DuetNG/DuetEthernet/Wiznet/Internet/TFTP|src/DuetNG/DuetEthernet/Ethernet3|src/DuetNG/DuetWiFi|src/DuetNG/DuetEthernet/Wiznet/Internet/FTPServer|src/Duet|src/NetworkW5500/Wiznet/Internet/SNMP|src/DuetNG/DuetEthernet/Wiznet/Internet/SNTP|src/DuetNG/DuetEthernet/Ethernet3/examples|src/DuetNG|src/DuetNG/DuetEthernet/Wiznet/Internet/DNS|src/NetworkW5500/Wiznet/Internet/TFTP|src/DuetNG/DuetEthernet/Wiznet/Application|src/DuetNG/DuetEthernet/Wiznet/Internet/MQTT|src/Alligator|src/DuetNG/DuetEthernet/Wiznet/Internet/FTPClient|src/SAME70_TEST|src/DuetNG/DuetEthernet/Wiznet/Internet/httpServer|src/NetworkW5500/Wiznet/Internet/SNTP|src/NetworkW5500/Wiznet/Internet/DNS|src/DuetNG/DuetEthernet/Wiznet/Internet/SNMP|src/NetworkESP8266|src/Network2/ESP8266|src/RADDS" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/> + <entry excluding="src/Networking/ESP8266WiFi|src/Networking/LwipEthernet|src/DuetNG/DuetEthernet/Wiznet/Internet/TFTP|src/DuetNG/DuetEthernet/Ethernet3|src/DuetNG/DuetWiFi|src/DuetNG/DuetEthernet/Wiznet/Internet/FTPServer|src/Duet|src/DuetNG/DuetEthernet/Wiznet/Internet/SNTP|src/DuetNG/DuetEthernet/Ethernet3/examples|src/DuetNG|src/DuetNG/DuetEthernet/Wiznet/Internet/DNS|src/DuetNG/DuetEthernet/Wiznet/Application|src/DuetNG/DuetEthernet/Wiznet/Internet/MQTT|src/Alligator|src/DuetNG/DuetEthernet/Wiznet/Internet/FTPClient|src/SAME70_TEST|src/DuetNG/DuetEthernet/Wiznet/Internet/httpServer|src/DuetNG/DuetEthernet/Wiznet/Internet/SNMP|src/NetworkESP8266|src/Networking/ESP8266|src/RADDS" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/> </sourceEntries> </configuration> </storageModule> @@ -763,11 +757,12 @@ <listOptionValue builtIn="false" value=""${workspace_loc:/${CoreName}/asf/thirdparty/CMSIS/Include}""/> <listOptionValue builtIn="false" value=""${workspace_loc:/${CoreName}/variants/same70}""/> <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/src/SAME70_TEST}""/> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/src/SAME70_TEST/Lwip/src/include}""/> + <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/src/Networking/LwipEthernet}""/> + <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/src/Networking/LwipEthernet/Lwip/src/include}""/> </option> <option id="gnu.c.compiler.option.preprocessor.def.symbols.1749077053" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" useByScannerDiscovery="false" valueType="definedSymbols"> <listOptionValue builtIn="false" value="__SAME70Q21__"/> - <listOptionValue builtIn="false" value="CORE_NG"/> + <listOptionValue builtIn="false" value="SAME70_TEST_BOARD"/> </option> <option id="gnu.c.compiler.option.dialect.std.699989842" name="Language standard" superClass="gnu.c.compiler.option.dialect.std" useByScannerDiscovery="true" value="gnu.c.compiler.dialect.default" valueType="enumerated"/> <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.113093911" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/> @@ -814,12 +809,14 @@ <listOptionValue builtIn="false" value=""${workspace_loc:/${CoreName}/variants/same70}""/> <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/src}""/> <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/src/SAME70_TEST}""/> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/src/SAME70_TEST/Lwip/src/include}""/> + <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/src/Networking}""/> + <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/src/Networking/LwipEthernet}""/> + <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/src/Networking/LwipEthernet/Lwip/src/include}""/> <listOptionValue builtIn="false" value=""${workspace_loc:/DuetWiFiSocketServer/src/include}""/> </option> <option id="gnu.cpp.compiler.option.preprocessor.def.178336065" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" useByScannerDiscovery="false" valueType="definedSymbols"> <listOptionValue builtIn="false" value="__SAME70Q21__"/> - <listOptionValue builtIn="false" value="CORE_NG"/> + <listOptionValue builtIn="false" value="SAME70_TEST_BOARD"/> <listOptionValue builtIn="false" value="_XOPEN_SOURCE"/> </option> <option id="gnu.cpp.compiler.option.dialect.std.678634997" name="Language standard" superClass="gnu.cpp.compiler.option.dialect.std" useByScannerDiscovery="true" value="gnu.cpp.compiler.dialect.default" valueType="enumerated"/> @@ -828,7 +825,7 @@ </toolChain> </folderInfo> <sourceEntries> - <entry excluding="src/Display|src/Network2/W5500|src/Network2|src/SAME70_TEST/Lwip/src/netif/ppp|src/DuetNG/DuetWiFi|src/Duet|src/SAME70_TEST/Lwip/doc|src/DuetNG/DuetEthernet/Wiznet/Internet/SNTP|src/DuetNG|src/DuetNG/DuetEthernet/Wiznet/Internet/DNS|src/DuetNG/DuetEthernet/Wiznet/Application|src/DuetNG/DuetEthernet/Wiznet/Internet/MQTT|src/Alligator|src/SAME70_TEST/Lwip/test|src/SAME70_TEST/Lwip/src/apps/snmp|src/SAME70_TEST/Lwip/src/apps/httpd|src/SAME70_TEST/Lwip/src/apps/tftp|src/DuetNG/DuetEthernet/Wiznet/Internet/TFTP|src/DuetNG/DuetEthernet/Ethernet3|src/SAME70_TEST/Lwip/src/apps/lwiperf|src/SAME70_TEST/Lwip/src/apps/sntp|src/DuetNG/DuetEthernet/Wiznet/Internet/FTPServer|src/DuetNG/DuetEthernet/Ethernet3/examples|src/SAME70_TEST/Lwip/src/apps/mqtt|src/DuetNG/DuetEthernet/Wiznet/Internet/FTPClient|src/DuetNG/DuetEthernet/Wiznet/Internet/httpServer|src/DuetNG/DuetEthernet/Wiznet/Internet/SNMP|src/DuetM|src/Network2/ESP8266|src/RADDS" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/> + <entry excluding="src/Networking/W5500Ethernet|src/DuetNG/DuetWiFi|src/Duet|src/DuetNG/DuetEthernet/Wiznet/Internet/SNTP|src/DuetNG|src/Networking/LwipEthernet/Lwip/test|src/DuetNG/DuetEthernet/Wiznet/Internet/DNS|src/DuetNG/DuetEthernet/Wiznet/Application|src/DuetNG/DuetEthernet/Wiznet/Internet/MQTT|src/Alligator|src/Display|src/Networking/LwipEthernet/Lwip/src/apps/mqtt|src/Networking/LwipEthernet/Lwip/doc|src/DuetNG/DuetEthernet/Wiznet/Internet/TFTP|src/DuetNG/DuetEthernet/Ethernet3|src/Networking/LwipEthernet/Lwip/src/apps/snmp|src/Networking/LwipEthernet/Lwip/src/apps/httpd|src/DuetNG/DuetEthernet/Wiznet/Internet/FTPServer|src/DuetNG/DuetEthernet/Ethernet3/examples|src/Networking/LwipEthernet/Lwip/src/apps/tftp|src/Networking/LwipEthernet/Lwip/src/netif/ppp|src/Networking/LwipEthernet/Lwip/src/apps/lwiperf|src/DuetNG/DuetEthernet/Wiznet/Internet/FTPClient|src/Networking/LwipEthernet/Lwip/src/apps/sntp|src/DuetNG/DuetEthernet/Wiznet/Internet/httpServer|src/DuetNG/DuetEthernet/Wiznet/Internet/SNMP|src/DuetM|src/RADDS" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/> </sourceEntries> </configuration> </storageModule> |