From 02c04143d029fa1fc24154e3990cac7c5b042c6a Mon Sep 17 00:00:00 2001 From: David Rebbe Date: Tue, 10 Dec 2024 16:11:45 -0500 Subject: [PATCH] libicsneoc fixes --- CMakeLists.txt | 6 ++--- api/icsneoc/icsneoc.cpp | 26 +++++++++---------- examples/CMakeLists.txt | 2 +- .../interactive/src/InteractiveExample.cpp | 2 +- test/unit/a2bencoderdecodertest.cpp | 4 +-- test/unit/apperrordecodertest.cpp | 4 +-- test/unit/i2cencoderdecodertest.cpp | 4 +-- test/unit/linencoderdecodertest.cpp | 16 ++++++------ test/unit/mdioencoderdecodertest.cpp | 12 ++++----- 9 files changed, 38 insertions(+), 38 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9074777..6bca196 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,8 +12,8 @@ option(LIBICSNEO_BUILD_DOCS "Build documentation. Don't use in Visual Studio." O option(LIBICSNEO_BUILD_EXAMPLES "Build examples." ON) option(LIBICSNEO_BUILD_ICSNEO "Build dynamic C library" ON) option(LIBICSNEO_BUILD_ICSNEO_STATIC "Build static C library" ON) -option(LIBICSNEO_BUILD_ICSNEOC "Build dynamic C legacy library" OFF) -option(LIBICSNEO_BUILD_ICSNEOC_STATIC "Build static C legacy library" OFF) +option(LIBICSNEO_BUILD_ICSNEOC "Build dynamic C legacy library" ON) +option(LIBICSNEO_BUILD_ICSNEOC_STATIC "Build static C legacy library" ON) option(LIBICSNEO_BUILD_ICSNEOLEGACY "Build icsnVC40 compatibility library" OFF) option(LIBICSNEO_BUILD_ICSNEOLEGACY_STATIC "Build static icsnVC40 compatibility library" OFF) set(LIBICSNEO_NPCAP_INCLUDE_DIR "" CACHE STRING "Npcap include directory; set to build with Npcap") @@ -29,7 +29,7 @@ option(LIBICSNEO_ENABLE_FTDI "Enable devices which communicate over USB FTDI2XX" option(LIBICSNEO_ENABLE_TCP "Enable devices which communicate over TCP" OFF) option(LIBICSNEO_ENABLE_FTD3XX "Enable devices which communicate over USB FTD3XX" ON) -option(LIBICSNEO_ENABLE_BINDINGS_PYTHON "Enable Python library" OFF) +option(LIBICSNEO_ENABLE_BINDINGS_PYTHON "Enable Python library" ON) if(NOT CMAKE_CXX_STANDARD) set(CMAKE_CXX_STANDARD 17) diff --git a/api/icsneoc/icsneoc.cpp b/api/icsneoc/icsneoc.cpp index c4f15ab..fa51621 100644 --- a/api/icsneoc/icsneoc.cpp +++ b/api/icsneoc/icsneoc.cpp @@ -274,10 +274,10 @@ bool icsneo_removeMessageCallback(const neodevice_t* device, int id) { return device->device->removeMessageCallback(id); } -neonetid_t icsneo_getNetworkByNumber(const neodevice_t* device, icsneo_msg_bus_type_t type, unsigned int number) { +icsneo_netid_t icsneo_getNetworkByNumber(const neodevice_t* device, icsneo_msg_bus_type_t type, unsigned int number) { if(!icsneo_isValidNeoDevice(device)) return false; - return neonetid_t(device->device->getNetworkByNumber(icsneo::icsneo_msg_bus_type_t(type), size_t(number)).getNetID()); + return icsneo_netid_t(device->device->getNetworkByNumber(icsneo_msg_bus_type_t(type), size_t(number)).getNetID()); } bool icsneo_getProductName(const neodevice_t* device, char* str, size_t* maxLength) { @@ -430,28 +430,28 @@ bool icsneo_settingsApplyStructureTemporary(const neodevice_t* device, const voi return icsneo_settingsWriteStructure(device, structure, structureSize) && icsneo_settingsApplyTemporary(device); } -int64_t icsneo_getBaudrate(const neodevice_t* device, neonetid_t netid) { +int64_t icsneo_getBaudrate(const neodevice_t* device, icsneo_netid_t netid) { if(!icsneo_isValidNeoDevice(device)) return -1; return device->device->settings->getBaudrateFor(netid); } -bool icsneo_setBaudrate(const neodevice_t* device, neonetid_t netid, int64_t newBaudrate) { +bool icsneo_setBaudrate(const neodevice_t* device, icsneo_netid_t netid, int64_t newBaudrate) { if(!icsneo_isValidNeoDevice(device)) return false; return device->device->settings->setBaudrateFor(netid, newBaudrate); } -int64_t icsneo_getFDBaudrate(const neodevice_t* device, neonetid_t netid) { +int64_t icsneo_getFDBaudrate(const neodevice_t* device, icsneo_netid_t netid) { if(!icsneo_isValidNeoDevice(device)) return -1; return device->device->settings->getFDBaudrateFor(netid); } -bool icsneo_setFDBaudrate(const neodevice_t* device, neonetid_t netid, int64_t newBaudrate) { +bool icsneo_setFDBaudrate(const neodevice_t* device, icsneo_netid_t netid, int64_t newBaudrate) { if(!icsneo_isValidNeoDevice(device)) return false; @@ -628,7 +628,7 @@ bool icsneo_getSupportedDevices(icsneo_devicetype_t* devices, size_t* count) { } for(size_t i = 0; i < len; i++) - devices[i] = supported[i]; + devices[i] = supported[i].getDeviceType(); *count = len; return true; @@ -671,28 +671,28 @@ bool icsneo_setDigitalIO(const neodevice_t* device, neoio_t type, uint32_t numbe return device->device->setDigitalIO(static_cast(type), number, value); } -bool icsneo_isTerminationSupportedFor(const neodevice_t* device, neonetid_t netid) { +bool icsneo_isTerminationSupportedFor(const neodevice_t* device, icsneo_netid_t netid) { if(!icsneo_isValidNeoDevice(device)) return false; return device->device->settings->isTerminationSupportedFor(Network(netid)); } -bool icsneo_canTerminationBeEnabledFor(const neodevice_t* device, neonetid_t netid) { +bool icsneo_canTerminationBeEnabledFor(const neodevice_t* device, icsneo_netid_t netid) { if(!icsneo_isValidNeoDevice(device)) return false; return device->device->settings->canTerminationBeEnabledFor(Network(netid)); } -bool icsneo_isTerminationEnabledFor(const neodevice_t* device, neonetid_t netid) { +bool icsneo_isTerminationEnabledFor(const neodevice_t* device, icsneo_netid_t netid) { if(!icsneo_isValidNeoDevice(device)) return false; return device->device->settings->isTerminationEnabledFor(Network(netid)).value_or(false); } -bool icsneo_setTerminationFor(const neodevice_t* device, neonetid_t netid, bool enabled) { +bool icsneo_setTerminationFor(const neodevice_t* device, icsneo_netid_t netid, bool enabled) { if(!icsneo_isValidNeoDevice(device)) return false; @@ -733,13 +733,13 @@ int icsneo_getDeviceStatus(const neodevice_t* device, void* status, size_t* size std::shared_ptr msg = device->device->com->waitForMessageSync([&]() { return device->device->com->sendCommand(Command::RequestStatusUpdate); - }, std::make_shared(Network::NetID::DeviceStatus), std::chrono::milliseconds(100)); + }, std::make_shared(icsneo_netid_device_status), std::chrono::milliseconds(100)); if(!msg) // Did not receive a message return false; auto rawMessage = std::static_pointer_cast(msg); - if(!rawMessage || (rawMessage->network.getNetID() != Network::NetID::DeviceStatus)) + if(!rawMessage || (rawMessage->network.getNetID() != icsneo_netid_device_status)) return false; if(*size < rawMessage->data.size()) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 003eb9d..77f7c7e 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -1,6 +1,6 @@ option(LIBICSNEO_BUILD_C_SIMPLE_EXAMPLE "Build the command-line simple C example." ON) option(LIBICSNEO_BUILD_C_LEGACY_INTERACTIVE_EXAMPLE "Build the command-line interactive C example." OFF) -option(LIBICSNEO_BUILD_C_LEGACY_SIMPLE_EXAMPLE "Build the command-line simple C example." OFF) +option(LIBICSNEO_BUILD_C_LEGACY_SIMPLE_EXAMPLE "Build the command-line simple C example." ON) option(LIBICSNEO_BUILD_C_LEGACY_LEGACY_EXAMPLE "Build the command-line simple C example." OFF) option(LIBICSNEO_BUILD_CPP_SIMPLE_EXAMPLE "Build the simple C++ example." ON) option(LIBICSNEO_BUILD_CPP_INTERACTIVE_EXAMPLE "Build the command-line interactive C++ example." ON) diff --git a/examples/cpp/interactive/src/InteractiveExample.cpp b/examples/cpp/interactive/src/InteractiveExample.cpp index 81ef7cc..bf7d6fa 100644 --- a/examples/cpp/interactive/src/InteractiveExample.cpp +++ b/examples/cpp/interactive/src/InteractiveExample.cpp @@ -525,7 +525,7 @@ int main() { /** Example of CAN FD std::cout << "Transmitting an extended CAN FD frame... " << std::endl; auto txMessage = std::make_shared(); - txMessage->network = icsneo::Network::NetID::HSCAN; + txMessage->network = icsneo::icsneo_netid_hscan; txMessage->arbid = 0x1C5001C5; txMessage->data.insert(txMessage->data.end(), {0xaa, 0xbb, 0xcc}); // The DLC will come from the length of the data vector diff --git a/test/unit/a2bencoderdecodertest.cpp b/test/unit/a2bencoderdecodertest.cpp index ea7f8ff..32e731e 100644 --- a/test/unit/a2bencoderdecodertest.cpp +++ b/test/unit/a2bencoderdecodertest.cpp @@ -52,7 +52,7 @@ TEST_F(A2BEncoderDecoderTest, PacketEncoderTest) true ); - messagePtr->network = icsneo::Network::NetID::A2B2; + messagePtr->network = icsneo::icsneo_netid_a2b2; A2BMessage& message = *messagePtr.get(); message.setChannelSample( @@ -99,7 +99,7 @@ TEST_F(A2BEncoderDecoderTest, PacketDecoderTest) true ); - message->network = icsneo::Network::NetID::A2B1; + message->network = icsneo_netid_a2b1; message->txmsg = false; message->monitor = true; diff --git a/test/unit/apperrordecodertest.cpp b/test/unit/apperrordecodertest.cpp index f0919ce..403af93 100644 --- a/test/unit/apperrordecodertest.cpp +++ b/test/unit/apperrordecodertest.cpp @@ -46,10 +46,10 @@ TEST_F(REDAppErrorDecoderTest, PacketDecoderTest) { auto msg1 = std::make_shared(); msg1->errorType = static_cast(AppErrorType::AppErrorNetworkNotEnabled); - msg1->errorNetID = Network::NetID::HSCAN; + msg1->errorNetID = icsneo_netid_hscan; msg1->timestamp10us = 0x66554433; msg1->timestamp10usMSB = 0xAA998877; - msg1->network = icsneo::Network::NetID::RED_App_Error; + msg1->network = icsneo_netid_red_app_error; ringBuffer.clear(); ringBuffer.write(testErrorData); diff --git a/test/unit/i2cencoderdecodertest.cpp b/test/unit/i2cencoderdecodertest.cpp index e5fe628..bb8862a 100644 --- a/test/unit/i2cencoderdecodertest.cpp +++ b/test/unit/i2cencoderdecodertest.cpp @@ -51,7 +51,7 @@ protected: TEST_F(I2CEncoderDecoderTest, PacketEncoderTest) { std::vector bytestream; auto message = std::make_shared(); - message->network = icsneo::Network::NetID::I2C; + message->network = icsneo_netid_i2c; message->controlBytes.push_back(static_cast(0x12u)); //Product ID register address message->dataBytes.push_back(static_cast(0x00u)); message->address = 0x68u; //7 bit addressing, BASE_ADDR @@ -66,7 +66,7 @@ TEST_F(I2CEncoderDecoderTest, PacketDecoderTest) { std::shared_ptr decodeMsg; std::shared_ptr message = std::make_shared(); - message->network = icsneo::Network::NetID::I2C; + message->network = icsneo_netid_i2c; message->controlBytes.push_back(static_cast(0x12u)); //Product ID register address message->dataBytes.push_back(static_cast(0x80u)); message->address = 0x68u; //7 bit addressing, BASE_ADDR diff --git a/test/unit/linencoderdecodertest.cpp b/test/unit/linencoderdecodertest.cpp index dede8ce..7c24e8c 100644 --- a/test/unit/linencoderdecodertest.cpp +++ b/test/unit/linencoderdecodertest.cpp @@ -89,7 +89,7 @@ std::vector testControllerWithData = TEST_F(LINEncoderDecoderTest, ProtectedIDCalcTest) { std::vector bytestream; auto message = std::make_shared(static_cast(0x22u)); - message->network = icsneo::Network::NetID::LIN; + message->network = icsneo_netid_lin; message->linMsgType = icsneo::LINMessage::Type::LIN_UPDATE_RESPONDER; message->isEnhancedChecksum = false; packetEncoder->encode(*packetizer, bytestream, message); @@ -99,7 +99,7 @@ TEST_F(LINEncoderDecoderTest, ProtectedIDCalcTest) { TEST_F(LINEncoderDecoderTest, ChecksumCalcTestClassic) { std::vector bytestream; auto message = std::make_shared(static_cast(0x22u)); - message->network = icsneo::Network::NetID::LIN2; + message->network = icsneo_netid_lin2; message->linMsgType = icsneo::LINMessage::Type::LIN_UPDATE_RESPONDER; message->isEnhancedChecksum = false; message->data = {0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88}; @@ -110,7 +110,7 @@ TEST_F(LINEncoderDecoderTest, ChecksumCalcTestClassic) { TEST_F(LINEncoderDecoderTest, ChecksumCalcTestEnhanced) { std::vector bytestream; auto message = std::make_shared(static_cast(0x22u)); - message->network = icsneo::Network::NetID::LIN2; + message->network = icsneo_netid_lin2; message->linMsgType = icsneo::LINMessage::Type::LIN_UPDATE_RESPONDER; message->isEnhancedChecksum = true; message->data = {0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88}; @@ -121,7 +121,7 @@ TEST_F(LINEncoderDecoderTest, ChecksumCalcTestEnhanced) { TEST_F(LINEncoderDecoderTest, PacketEncoderResponderLoadTest) { std::vector bytestream; auto message = std::make_shared(static_cast(0x22u)); - message->network = icsneo::Network::NetID::LIN2; + message->network = icsneo_netid_lin2; message->linMsgType = icsneo::LINMessage::Type::LIN_UPDATE_RESPONDER; message->isEnhancedChecksum = false; message->data = {0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88}; @@ -132,7 +132,7 @@ TEST_F(LINEncoderDecoderTest, PacketEncoderResponderLoadTest) { TEST_F(LINEncoderDecoderTest, PacketEncoderControllerHeaderTest) { std::vector bytestream; auto message = std::make_shared(static_cast(0x22u)); - message->network = icsneo::Network::NetID::LIN; + message->network = icsneo_netid_lin; message->linMsgType = icsneo::LINMessage::Type::LIN_HEADER_ONLY; message->isEnhancedChecksum = false; packetEncoder->encode(*packetizer, bytestream, message); @@ -142,7 +142,7 @@ TEST_F(LINEncoderDecoderTest, PacketEncoderControllerHeaderTest) { TEST_F(LINEncoderDecoderTest, PacketEncoderControllerWithDataTest) { std::vector bytestream; auto message = std::make_shared(static_cast(0x11u)); - message->network = icsneo::Network::NetID::LIN; + message->network = icsneo_netid_lin; message->linMsgType = icsneo::LINMessage::Type::LIN_COMMANDER_MSG; message->isEnhancedChecksum = false; message->data = {0xaa, 0xbb, 0xcc}; @@ -154,14 +154,14 @@ TEST_F(LINEncoderDecoderTest, PacketDecoderTest) { std::shared_ptr decodeMsg; auto msg1 = std::make_shared(static_cast(0x22u)); - msg1->network = icsneo::Network::NetID::LIN2; + msg1->network = icsneo_netid_lin2; msg1->linMsgType = icsneo::LINMessage::Type::LIN_COMMANDER_MSG; msg1->isEnhancedChecksum = false; msg1->data = {0xaa, 0xbb, 0xcc}; msg1->checksum = 0xcc; auto msg2 = std::make_shared(static_cast(0x22u)); - msg2->network = icsneo::Network::NetID::LIN; + msg2->network = icsneo_netid_lin; msg2->linMsgType = icsneo::LINMessage::Type::LIN_COMMANDER_MSG; msg2->isEnhancedChecksum = false; msg2->data = {0xaa, 0xbb, 0xcc}; diff --git a/test/unit/mdioencoderdecodertest.cpp b/test/unit/mdioencoderdecodertest.cpp index bef7835..2455521 100644 --- a/test/unit/mdioencoderdecodertest.cpp +++ b/test/unit/mdioencoderdecodertest.cpp @@ -82,7 +82,7 @@ protected: TEST_F(MDIOEncoderDecoderTest, PacketEncoderClause22Test) { std::vector bytestream; auto message = std::make_shared(); - message->network = icsneo::Network::NetID::MDIO1; + message->network = icsneo_netid_mdio1; message->description = 0xABCD; message->phyAddress = 0x18u; message->devAddress = 0x13u; @@ -98,7 +98,7 @@ TEST_F(MDIOEncoderDecoderTest, PacketEncoderClause22Test) { TEST_F(MDIOEncoderDecoderTest, PacketEncoderClause45Test) { std::vector bytestream; auto message = std::make_shared(); - message->network = icsneo::Network::NetID::MDIO1; + message->network = icsneo_netid_mdio1; message->description = 0xABCD; message->phyAddress = 0x06u; message->devAddress = 0x14u; @@ -114,7 +114,7 @@ TEST_F(MDIOEncoderDecoderTest, PacketEncoderClause45Test) { TEST_F(MDIOEncoderDecoderTest, PacketEncoderClause22MaskTest) { std::vector bytestream; auto message = std::make_shared(); - message->network = icsneo::Network::NetID::MDIO1; + message->network = icsneo_netid_mdio1; message->description = 0xFFFFu; message->phyAddress = 0xFFu; message->devAddress = 0xFFu; @@ -130,7 +130,7 @@ TEST_F(MDIOEncoderDecoderTest, PacketEncoderClause22MaskTest) { TEST_F(MDIOEncoderDecoderTest, PacketEncoderClause45MaskTest) { std::vector bytestream; auto message = std::make_shared(); - message->network = icsneo::Network::NetID::MDIO1; + message->network = icsneo_netid_mdio1; message->description = 0xFFFFu; message->phyAddress = 0xFFu; message->devAddress = 0xFFu; @@ -147,7 +147,7 @@ TEST_F(MDIOEncoderDecoderTest, PacketDecoderClause22Test) { std::shared_ptr decodeMsg; std::shared_ptr message = std::make_shared(); - message->network = icsneo::Network::NetID::MDIO1; + message->network = icsneo_netid_mdio1; message->description = 0xABCD; message->phyAddress = 0x06u; message->devAddress = 0x00u; @@ -188,7 +188,7 @@ TEST_F(MDIOEncoderDecoderTest, PacketDecoderClause45Test) { std::shared_ptr decodeMsg; std::shared_ptr message = std::make_shared(); - message->network = icsneo::Network::NetID::MDIO1; + message->network = icsneo_netid_mdio1; message->description = 0xABCD; message->phyAddress = 0x12u; message->devAddress = 0x03u;