diff options
| author | Jaime van Kessel <nallath@gmail.com> | 2022-01-28 11:59:41 +0300 |
|---|---|---|
| committer | Jaime van Kessel <nallath@gmail.com> | 2022-01-28 11:59:41 +0300 |
| commit | f322925ad86ea65e9b215e5479e5f0748e4cee42 (patch) | |
| tree | 180fbe81c23b4b44f83050d2c0866a4957a70f58 | |
| parent | b587d5154d7ab7e4b280a241eec3f5a66283c582 (diff) | |
Change namespaces of some arcus enumsupdate_to_sip_6
We had this as a work around for older SIP versions. It doesn't
seem to work for sip 6, so we need to remove this again
| -rw-r--r-- | src/communication/ArcusCommunication.cpp | 8 | ||||
| -rw-r--r-- | src/communication/Listener.cpp | 2 | ||||
| -rw-r--r-- | src/communication/Listener.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/communication/ArcusCommunication.cpp b/src/communication/ArcusCommunication.cpp index 6575677d1..73d71c596 100644 --- a/src/communication/ArcusCommunication.cpp +++ b/src/communication/ArcusCommunication.cpp @@ -308,7 +308,7 @@ void ArcusCommunication::connect(const std::string& ip, const uint16_t port) log("Connecting to %s:%i\n", ip.c_str(), port); private_data->socket->connect(ip, port); - while (private_data->socket->getState() != Arcus::SocketState::Connected && private_data->socket->getState() != Arcus::SocketState::Error) + while (private_data->socket->getState() != Arcus::SocketState::SocketState::Connected && private_data->socket->getState() != Arcus::SocketState::SocketState::Error) { std::this_thread::sleep_for(std::chrono::milliseconds(private_data->millisecUntilNextTry)); //Wait until we're connected. Check every XXXms. } @@ -349,8 +349,8 @@ bool ArcusCommunication::isSequential() const bool ArcusCommunication::hasSlice() const { - return private_data->socket->getState() != Arcus::SocketState::Closed - && private_data->socket->getState() != Arcus::SocketState::Error + return private_data->socket->getState() != Arcus::SocketState::SocketState::Closed + && private_data->socket->getState() != Arcus::SocketState::SocketState::Error && private_data->slice_count < 1; //Only slice once per run of CuraEngine. See documentation of slice_count. } @@ -535,4 +535,4 @@ void ArcusCommunication::sliceNext() } //namespace cura -#endif //ARCUS
\ No newline at end of file +#endif //ARCUS diff --git a/src/communication/Listener.cpp b/src/communication/Listener.cpp index 42217a403..3d483418d 100644 --- a/src/communication/Listener.cpp +++ b/src/communication/Listener.cpp @@ -35,4 +35,4 @@ void Listener::error(const Arcus::Error& error) } //namespace cura -#endif //ARCUS
\ No newline at end of file +#endif //ARCUS diff --git a/src/communication/Listener.h b/src/communication/Listener.h index bd697928a..90c65d0f9 100644 --- a/src/communication/Listener.h +++ b/src/communication/Listener.h @@ -36,4 +36,4 @@ public: } //namespace cura #endif //ARCUS -#endif //LISTENER_H
\ No newline at end of file +#endif //LISTENER_H |