From d70defbf8a0c1e7c4bf4f6732da2732e74f9dd89 Mon Sep 17 00:00:00 2001 From: Kyle Schwarz Date: Thu, 17 Jul 2025 15:47:23 -0400 Subject: [PATCH] All: Address compiler warnings --- bindings/python/icsneopy/communication/network.cpp | 1 + device/device.cpp | 2 +- disk/extextractordiskreaddriver.cpp | 2 +- disk/neomemorydiskdriver.cpp | 2 +- disk/plasiondiskreaddriver.cpp | 2 +- include/icsneo/communication/network.h | 3 +++ 6 files changed, 8 insertions(+), 4 deletions(-) diff --git a/bindings/python/icsneopy/communication/network.cpp b/bindings/python/icsneopy/communication/network.cpp index b1a4868..6e681ae 100644 --- a/bindings/python/icsneopy/communication/network.cpp +++ b/bindings/python/icsneopy/communication/network.cpp @@ -123,6 +123,7 @@ void init_network(pybind11::module_& m) { .value("I2C_03", Network::NetID::I2C_03) .value("I2C_04", Network::NetID::I2C_04) .value("ETHERNET_02", Network::NetID::ETHERNET_02) + .value("ETHERNET_TX_WRAP", Network::NetID::ETHERNET_TX_WRAP) .value("A2B_01", Network::NetID::A2B_01) .value("A2B_02", Network::NetID::A2B_02) .value("ETHERNET_03", Network::NetID::ETHERNET_03) diff --git a/device/device.cpp b/device/device.cpp index db33837..e8c9ade 100644 --- a/device/device.cpp +++ b/device/device.cpp @@ -277,7 +277,7 @@ bool Device::open(OpenFlags flags, OpenStatusHandler handler) { std::condition_variable heartbeatCV; std::mutex receivedMessageMutex; bool receivedMessage = false; - auto messageReceivedCallbackID = com->addMessageCallback(std::make_shared(filter, [&](std::shared_ptr message) { + auto messageReceivedCallbackID = com->addMessageCallback(std::make_shared(filter, [&](std::shared_ptr) { { std::scoped_lock lk(receivedMessageMutex); receivedMessage = true; diff --git a/disk/extextractordiskreaddriver.cpp b/disk/extextractordiskreaddriver.cpp index 8e6baa3..4a8cf7d 100644 --- a/disk/extextractordiskreaddriver.cpp +++ b/disk/extextractordiskreaddriver.cpp @@ -32,7 +32,7 @@ std::optional ExtExtractorDiskReadDriver::readLogicalDiskAligned(Commu return ret; } -std::optional ExtExtractorDiskReadDriver::attemptReadLogicalDiskAligned(Communication& com, device_eventhandler_t report, +std::optional ExtExtractorDiskReadDriver::attemptReadLogicalDiskAligned(Communication& com, device_eventhandler_t, uint64_t pos, uint8_t* into, uint64_t amount, std::chrono::milliseconds timeout, MemoryType) { static std::shared_ptr NeoMemorySDRead = std::make_shared(Network::NetID::NeoMemorySDRead); diff --git a/disk/neomemorydiskdriver.cpp b/disk/neomemorydiskdriver.cpp index fa75819..9b5ecca 100644 --- a/disk/neomemorydiskdriver.cpp +++ b/disk/neomemorydiskdriver.cpp @@ -58,7 +58,7 @@ std::optional NeoMemoryDiskDriver::readLogicalDiskAligned(Communicatio return SectorSize; } -std::optional NeoMemoryDiskDriver::writeLogicalDiskAligned(Communication& com, device_eventhandler_t report, +std::optional NeoMemoryDiskDriver::writeLogicalDiskAligned(Communication& com, device_eventhandler_t, uint64_t pos, const uint8_t* from, uint64_t amount, std::chrono::milliseconds timeout, MemoryType memType) { static std::shared_ptr NeoMemoryDone = std::make_shared(Network::NetID::NeoMemoryWriteDone); diff --git a/disk/plasiondiskreaddriver.cpp b/disk/plasiondiskreaddriver.cpp index 466c7dd..cd885d2 100644 --- a/disk/plasiondiskreaddriver.cpp +++ b/disk/plasiondiskreaddriver.cpp @@ -6,7 +6,7 @@ using namespace icsneo; using namespace icsneo::Disk; -std::optional PlasionDiskReadDriver::readLogicalDiskAligned(Communication& com, device_eventhandler_t report, +std::optional PlasionDiskReadDriver::readLogicalDiskAligned(Communication& com, device_eventhandler_t, uint64_t pos, uint8_t* into, uint64_t amount, std::chrono::milliseconds timeout, MemoryType) { static std::shared_ptr NeoMemorySDRead = std::make_shared(Network::NetID::NeoMemorySDRead); diff --git a/include/icsneo/communication/network.h b/include/icsneo/communication/network.h index df77009..2acfe49 100644 --- a/include/icsneo/communication/network.h +++ b/include/icsneo/communication/network.h @@ -592,6 +592,7 @@ public: case NetID::ETHERNET_01: case NetID::ETHERNET_DAQ: case NetID::ETHERNET_02: + case NetID::ETHERNET_TX_WRAP: case NetID::ETHERNET_03: case NetID::AE_01: case NetID::AE_02: @@ -888,6 +889,8 @@ public: return "I2C 04"; case NetID::ETHERNET_02: return "Ethernet 02"; + case NetID::ETHERNET_TX_WRAP: + return "Ethernet TX Wrap"; case NetID::A2B_01: return "A2B 01"; case NetID::A2B_02: