diff options
Diffstat (limited to 'src/Networking')
19 files changed, 66 insertions, 66 deletions
diff --git a/src/Networking/ESP8266WiFi/WiFiInterface.cpp b/src/Networking/ESP8266WiFi/WiFiInterface.cpp index b81f94a0..4b199e37 100644 --- a/src/Networking/ESP8266WiFi/WiFiInterface.cpp +++ b/src/Networking/ESP8266WiFi/WiFiInterface.cpp @@ -7,14 +7,14 @@ #include "WiFiInterface.h" -#include "Platform.h" -#include "RepRap.h" -#include "GCodes/GCodeBuffer/GCodeBuffer.h" -#include "HttpResponder.h" -#include "FtpResponder.h" -#include "TelnetResponder.h" +#include <Platform/Platform.h> +#include <Platform/RepRap.h> +#include <GCodes/GCodeBuffer/GCodeBuffer.h> +#include <Networking/HttpResponder.h> +#include <Networking/FtpResponder.h> +#include <Networking/TelnetResponder.h> #include "WifiFirmwareUploader.h" -#include "General/IP4String.h" +#include <General/IP4String.h> #include "WiFiSocket.h" #include <Cache.h> diff --git a/src/Networking/ESP8266WiFi/WiFiInterface.h b/src/Networking/ESP8266WiFi/WiFiInterface.h index 4b5ac09b..d812ca30 100644 --- a/src/Networking/ESP8266WiFi/WiFiInterface.h +++ b/src/Networking/ESP8266WiFi/WiFiInterface.h @@ -9,11 +9,11 @@ #define SRC_NETWORKING_WIFIINTERFACE_H_ #include <RepRapFirmware.h> -#include "Networking/NetworkDefs.h" -#include "MessageType.h" -#include "Networking/NetworkInterface.h" -#include "GCodes/GCodeResult.h" -#include "MessageFormats.h" +#include <Networking/NetworkDefs.h> +#include <Platform/MessageType.h> +#include <Networking/NetworkInterface.h> +#include <GCodes/GCodeResult.h> +#include <MessageFormats.h> // Forward declarations class WiFiSocket; diff --git a/src/Networking/ESP8266WiFi/WiFiSocket.cpp b/src/Networking/ESP8266WiFi/WiFiSocket.cpp index e9643f95..27007b47 100644 --- a/src/Networking/ESP8266WiFi/WiFiSocket.cpp +++ b/src/Networking/ESP8266WiFi/WiFiSocket.cpp @@ -5,8 +5,8 @@ * Author: David */ -#include "NetworkBuffer.h" -#include "RepRap.h" +#include <Networking/NetworkBuffer.h> +#include <Platform/RepRap.h> #include "WiFiInterface.h" #include "WiFiSocket.h" diff --git a/src/Networking/ESP8266WiFi/WifiFirmwareUploader.cpp b/src/Networking/ESP8266WiFi/WifiFirmwareUploader.cpp index 50f64030..eb9e0e0c 100644 --- a/src/Networking/ESP8266WiFi/WifiFirmwareUploader.cpp +++ b/src/Networking/ESP8266WiFi/WifiFirmwareUploader.cpp @@ -8,9 +8,9 @@ #include "WifiFirmwareUploader.h" #include "WiFiInterface.h" -#include "Platform.h" -#include "RepRap.h" -#include "Storage/FileStore.h" +#include <Platform/Platform.h> +#include <Platform/RepRap.h> +#include <Storage/FileStore.h> // ESP8266 command codes const uint8_t ESP_FLASH_BEGIN = 0x02; diff --git a/src/Networking/FtpResponder.cpp b/src/Networking/FtpResponder.cpp index ae0a9603..6ac6d4a6 100644 --- a/src/Networking/FtpResponder.cpp +++ b/src/Networking/FtpResponder.cpp @@ -12,7 +12,7 @@ #include "Socket.h" #include "Network.h" #include "NetworkInterface.h" -#include "Platform.h" +#include <Platform/Platform.h> FtpResponder::FtpResponder(NetworkResponder *n) noexcept : UploadingNetworkResponder(n), dataSocket(nullptr), passivePort(0), passivePortOpenTime(0), dataBuf(nullptr), haveFileToMove(false) diff --git a/src/Networking/LwipEthernet/LwipEthernetInterface.cpp b/src/Networking/LwipEthernet/LwipEthernetInterface.cpp index d00fbb5b..9fa2c1b3 100644 --- a/src/Networking/LwipEthernet/LwipEthernetInterface.cpp +++ b/src/Networking/LwipEthernet/LwipEthernetInterface.cpp @@ -9,16 +9,16 @@ #define NO_STATUS_CODES #include "LwipEthernetInterface.h" -#include "Networking/NetworkBuffer.h" +#include <Networking/NetworkBuffer.h> #include "LwipSocket.h" -#include "Platform.h" -#include "RepRap.h" -#include "Networking/HttpResponder.h" -#include "Networking/FtpResponder.h" -#include "Networking/TelnetResponder.h" -#include "General/IP4String.h" -#include "Version.h" // version is reported by MDNS +#include <Platform/Platform.h> +#include <Platform/RepRap.h> +#include <Networking/HttpResponder.h> +#include <Networking/FtpResponder.h> +#include <Networking/TelnetResponder.h> +#include <General/IP4String.h> +#include <Version.h> // version is reported by MDNS #include "GMAC/ethernet_sam.h" #if SAME70 diff --git a/src/Networking/LwipEthernet/LwipEthernetInterface.h b/src/Networking/LwipEthernet/LwipEthernetInterface.h index 5a4ce2a8..d4dc0788 100644 --- a/src/Networking/LwipEthernet/LwipEthernetInterface.h +++ b/src/Networking/LwipEthernet/LwipEthernetInterface.h @@ -9,9 +9,9 @@ #define SRC_NETWORKING_LWIPETHERNET_LWIPETHERNETINTERFACE_H_ #include <RepRapFirmware.h> -#include "Networking/NetworkInterface.h" -#include "Networking/NetworkDefs.h" -#include "MessageType.h" +#include <Networking/NetworkInterface.h> +#include <Networking/NetworkDefs.h> +#include <Platform/MessageType.h> // We have 8 sockets available for Ethernet const size_t NumHttpSockets = 5; // sockets 0-4 are for HTTP diff --git a/src/Networking/LwipEthernet/LwipSocket.cpp b/src/Networking/LwipEthernet/LwipSocket.cpp index 0f2154ac..67623fe8 100644 --- a/src/Networking/LwipEthernet/LwipSocket.cpp +++ b/src/Networking/LwipEthernet/LwipSocket.cpp @@ -9,8 +9,8 @@ #define NO_STATUS_CODES #include "LwipSocket.h" -#include "Networking/NetworkBuffer.h" -#include "RepRap.h" +#include <Networking/NetworkBuffer.h> +#include <Platform/RepRap.h> extern Mutex lwipMutex; diff --git a/src/Networking/Network.cpp b/src/Networking/Network.cpp index 08816fe1..3da1528c 100644 --- a/src/Networking/Network.cpp +++ b/src/Networking/Network.cpp @@ -9,8 +9,12 @@ #define NO_STATUS_CODES #include "Network.h" -#include <Platform.h> -#include <RepRap.h> +#include <Platform/Platform.h> +#include <Platform/RepRap.h> +#include <General/IP4String.h> +#include <Version.h> +#include <Movement/StepTimer.h> +#include <Platform/TaskPriorities.h> #if HAS_NETWORKING #include "NetworkBuffer.h" @@ -41,10 +45,6 @@ #if SUPPORT_TELNET #include "TelnetResponder.h" #endif -#include <General/IP4String.h> -#include <Version.h> -#include <Movement/StepTimer.h> -#include <TaskPriorities.h> #ifdef __LPC17xx__ constexpr size_t NetworkStackWords = 375; diff --git a/src/Networking/Network.h b/src/Networking/Network.h index 5f131764..697360f4 100644 --- a/src/Networking/Network.h +++ b/src/Networking/Network.h @@ -10,7 +10,7 @@ #include <RepRapFirmware.h> #include "NetworkDefs.h" -#include <MessageType.h> +#include <Platform/MessageType.h> #include <GCodes/GCodeResult.h> #include <RTOSIface/RTOSIface.h> #include <ObjectModel/ObjectModel.h> diff --git a/src/Networking/NetworkInterface.cpp b/src/Networking/NetworkInterface.cpp index f6c1655c..7603224d 100644 --- a/src/Networking/NetworkInterface.cpp +++ b/src/Networking/NetworkInterface.cpp @@ -6,7 +6,7 @@ */ #include "NetworkInterface.h" -#include <RepRap.h> +#include <Platform/RepRap.h> void NetworkInterface::SetState(NetworkState::RawType newState) noexcept { diff --git a/src/Networking/NetworkResponder.cpp b/src/Networking/NetworkResponder.cpp index d37a887d..3f7d162c 100644 --- a/src/Networking/NetworkResponder.cpp +++ b/src/Networking/NetworkResponder.cpp @@ -7,7 +7,7 @@ #include "NetworkResponder.h" #include "Socket.h" -#include "Platform.h" +#include <Platform/Platform.h> // NetworkResponder members diff --git a/src/Networking/NetworkResponder.h b/src/Networking/NetworkResponder.h index ee5aa26d..2bf3976d 100644 --- a/src/Networking/NetworkResponder.h +++ b/src/Networking/NetworkResponder.h @@ -8,12 +8,12 @@ #ifndef SRC_NETWORKING_NETWORKRESPONDER_H_ #define SRC_NETWORKING_NETWORKRESPONDER_H_ -#include "RepRapFirmware.h" -#include "RepRap.h" +#include <RepRapFirmware.h> +#include <Platform/RepRap.h> #include "NetworkDefs.h" -#include "Storage/FileData.h" +#include <Storage/FileData.h> #include "NetworkBuffer.h" -#include "OutputMemory.h" +#include <Platform/OutputMemory.h> // Forward declarations class NetworkResponder; diff --git a/src/Networking/TelnetResponder.cpp b/src/Networking/TelnetResponder.cpp index b702c3e4..4fcb7835 100644 --- a/src/Networking/TelnetResponder.cpp +++ b/src/Networking/TelnetResponder.cpp @@ -10,9 +10,9 @@ #if SUPPORT_TELNET #include "Socket.h" -#include "OutputMemory.h" -#include "GCodes/GCodes.h" -#include "Platform.h" +#include <Platform/OutputMemory.h> +#include <GCodes/GCodes.h> +#include <Platform/Platform.h> TelnetResponder::TelnetResponder(NetworkResponder *n) noexcept : NetworkResponder(n) { diff --git a/src/Networking/UploadingNetworkResponder.cpp b/src/Networking/UploadingNetworkResponder.cpp index d1a5ee01..4925a1c4 100644 --- a/src/Networking/UploadingNetworkResponder.cpp +++ b/src/Networking/UploadingNetworkResponder.cpp @@ -7,7 +7,7 @@ #include "UploadingNetworkResponder.h" #include "Socket.h" -#include "Platform.h" +#include <Platform/Platform.h> UploadingNetworkResponder::UploadingNetworkResponder(NetworkResponder *n) noexcept : NetworkResponder(n) #if HAS_MASS_STORAGE diff --git a/src/Networking/W5500Ethernet/MdnsResponder.cpp b/src/Networking/W5500Ethernet/MdnsResponder.cpp index 772e1b8e..12290175 100644 --- a/src/Networking/W5500Ethernet/MdnsResponder.cpp +++ b/src/Networking/W5500Ethernet/MdnsResponder.cpp @@ -9,9 +9,9 @@ * */ -#include "RepRap.h" -#include "RepRapFirmware.h" -#include "Platform.h" +#include <Platform/RepRap.h> +#include <RepRapFirmware.h> +#include <Platform/Platform.h> #include "MdnsResponder.h" #include "W5500Interface.h" diff --git a/src/Networking/W5500Ethernet/W5500Interface.cpp b/src/Networking/W5500Ethernet/W5500Interface.cpp index 740b82ec..dafcff0d 100644 --- a/src/Networking/W5500Ethernet/W5500Interface.cpp +++ b/src/Networking/W5500Ethernet/W5500Interface.cpp @@ -9,14 +9,14 @@ #include "W5500Socket.h" #include "Wiznet/Ethernet/wizchip_conf.h" #include "Wiznet/Internet/DHCP/dhcp.h" -#include "NetworkBuffer.h" -#include "Platform.h" -#include "RepRap.h" -#include "HttpResponder.h" -#include "FtpResponder.h" -#include "TelnetResponder.h" +#include <Networking/NetworkBuffer.h> +#include <Platform/Platform.h> +#include <Platform/RepRap.h> +#include <Networking/HttpResponder.h> +#include <Networking/FtpResponder.h> +#include <Networking/TelnetResponder.h> #include "MdnsResponder.h" -#include "General/IP4String.h" +#include <General/IP4String.h> W5500Interface::W5500Interface(Platform& p) noexcept : platform(p), lastTickMillis(0), ftpDataSocket(0), activated(false) diff --git a/src/Networking/W5500Ethernet/W5500Interface.h b/src/Networking/W5500Ethernet/W5500Interface.h index 01b4b781..dc996a81 100644 --- a/src/Networking/W5500Ethernet/W5500Interface.h +++ b/src/Networking/W5500Ethernet/W5500Interface.h @@ -9,9 +9,9 @@ Separated out from Platform.h by dc42 and extended by chrishamm #ifndef NETWORK_H #define NETWORK_H -#include "NetworkInterface.h" -#include "NetworkDefs.h" -#include "MessageType.h" +#include <Networking/NetworkInterface.h> +#include <Networking/NetworkDefs.h> +#include <Platform/MessageType.h> class NetworkResponder; class HttpResponder; diff --git a/src/Networking/W5500Ethernet/W5500Socket.cpp b/src/Networking/W5500Ethernet/W5500Socket.cpp index e961d08a..46901f2e 100644 --- a/src/Networking/W5500Ethernet/W5500Socket.cpp +++ b/src/Networking/W5500Ethernet/W5500Socket.cpp @@ -6,12 +6,12 @@ */ #include "W5500Socket.h" -#include "Network.h" -#include "NetworkDefs.h" -#include "NetworkInterface.h" +#include <Networking/Network.h> +#include <Networking/NetworkDefs.h> +#include <Networking/NetworkInterface.h> #include "Wiznet/Ethernet/socketlib.h" -#include "NetworkBuffer.h" -#include "RepRap.h" +#include <Networking/NetworkBuffer.h> +#include <Platform/RepRap.h> //*************************************************************************************************** // Socket class |