sven
/
libicsneo
mirror of https://github.com/intrepidcs/libicsneo.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

All: Address compiler warnings

pull/76/merge
Kyle Schwarz 2025-07-17 15:47:23 -04:00
parent 10efacf91e
commit d70defbf8a
6 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bindings/python/icsneopy/communication/network.cpp
View File

@ -123,6 +123,7 @@ void init_network(pybind11::module_& m) {
.value("I2C_03", Network::NetID::I2C_03) .value("I2C_03", Network::NetID::I2C_03)
.value("I2C_04", Network::NetID::I2C_04) .value("I2C_04", Network::NetID::I2C_04)
.value("ETHERNET_02", Network::NetID::ETHERNET_02) .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_01", Network::NetID::A2B_01)
.value("A2B_02", Network::NetID::A2B_02) .value("A2B_02", Network::NetID::A2B_02)
.value("ETHERNET_03", Network::NetID::ETHERNET_03) .value("ETHERNET_03", Network::NetID::ETHERNET_03)

2
device/device.cpp
View File

@ -277,7 +277,7 @@ bool Device::open(OpenFlags flags, OpenStatusHandler handler) {
std::condition_variable heartbeatCV; std::condition_variable heartbeatCV;
std::mutex receivedMessageMutex; std::mutex receivedMessageMutex;
bool receivedMessage = false; bool receivedMessage = false;
auto messageReceivedCallbackID = com->addMessageCallback(std::make_shared<MessageCallback>(filter, [&](std::shared_ptr<Message> message) { auto messageReceivedCallbackID = com->addMessageCallback(std::make_shared<MessageCallback>(filter, [&](std::shared_ptr<Message>) {
{ {
std::scoped_lock<std::mutex> lk(receivedMessageMutex); std::scoped_lock<std::mutex> lk(receivedMessageMutex);
receivedMessage = true; receivedMessage = true;

2
disk/extextractordiskreaddriver.cpp
View File

@ -32,7 +32,7 @@ std::optional<uint64_t> ExtExtractorDiskReadDriver::readLogicalDiskAligned(Commu
return ret; return ret;
} }
std::optional<uint64_t> ExtExtractorDiskReadDriver::attemptReadLogicalDiskAligned(Communication& com, device_eventhandler_t report, std::optional<uint64_t> ExtExtractorDiskReadDriver::attemptReadLogicalDiskAligned(Communication& com, device_eventhandler_t,
uint64_t pos, uint8_t* into, uint64_t amount, std::chrono::milliseconds timeout, MemoryType) { uint64_t pos, uint8_t* into, uint64_t amount, std::chrono::milliseconds timeout, MemoryType) {
static std::shared_ptr<MessageFilter> NeoMemorySDRead = std::make_shared<MessageFilter>(Network::NetID::NeoMemorySDRead); static std::shared_ptr<MessageFilter> NeoMemorySDRead = std::make_shared<MessageFilter>(Network::NetID::NeoMemorySDRead);

2
disk/neomemorydiskdriver.cpp
View File

@ -58,7 +58,7 @@ std::optional<uint64_t> NeoMemoryDiskDriver::readLogicalDiskAligned(Communicatio
return SectorSize; return SectorSize;
} }
std::optional<uint64_t> NeoMemoryDiskDriver::writeLogicalDiskAligned(Communication& com, device_eventhandler_t report, std::optional<uint64_t> NeoMemoryDiskDriver::writeLogicalDiskAligned(Communication& com, device_eventhandler_t,
uint64_t pos, const uint8_t* from, uint64_t amount, std::chrono::milliseconds timeout, MemoryType memType) { uint64_t pos, const uint8_t* from, uint64_t amount, std::chrono::milliseconds timeout, MemoryType memType) {
static std::shared_ptr<MessageFilter> NeoMemoryDone = std::make_shared<MessageFilter>(Network::NetID::NeoMemoryWriteDone); static std::shared_ptr<MessageFilter> NeoMemoryDone = std::make_shared<MessageFilter>(Network::NetID::NeoMemoryWriteDone);

2
disk/plasiondiskreaddriver.cpp
View File

@ -6,7 +6,7 @@
using namespace icsneo; using namespace icsneo;
using namespace icsneo::Disk; using namespace icsneo::Disk;
std::optional<uint64_t> PlasionDiskReadDriver::readLogicalDiskAligned(Communication& com, device_eventhandler_t report, std::optional<uint64_t> PlasionDiskReadDriver::readLogicalDiskAligned(Communication& com, device_eventhandler_t,
uint64_t pos, uint8_t* into, uint64_t amount, std::chrono::milliseconds timeout, MemoryType) { uint64_t pos, uint8_t* into, uint64_t amount, std::chrono::milliseconds timeout, MemoryType) {
static std::shared_ptr<MessageFilter> NeoMemorySDRead = std::make_shared<MessageFilter>(Network::NetID::NeoMemorySDRead); static std::shared_ptr<MessageFilter> NeoMemorySDRead = std::make_shared<MessageFilter>(Network::NetID::NeoMemorySDRead);

3
include/icsneo/communication/network.h
View File

@ -592,6 +592,7 @@ public:
case NetID::ETHERNET_01: case NetID::ETHERNET_01:
case NetID::ETHERNET_DAQ: case NetID::ETHERNET_DAQ:
case NetID::ETHERNET_02: case NetID::ETHERNET_02:
case NetID::ETHERNET_TX_WRAP:
case NetID::ETHERNET_03: case NetID::ETHERNET_03:
case NetID::AE_01: case NetID::AE_01:
case NetID::AE_02: case NetID::AE_02:
@ -888,6 +889,8 @@ public:
return "I2C 04"; return "I2C 04";
case NetID::ETHERNET_02: case NetID::ETHERNET_02:
return "Ethernet 02"; return "Ethernet 02";
case NetID::ETHERNET_TX_WRAP:
return "Ethernet TX Wrap";
case NetID::A2B_01: case NetID::A2B_01:
return "A2B 01"; return "A2B 01";
case NetID::A2B_02: case NetID::A2B_02: