sven/libicsneo
1
0
Fork 0
mirror of https://github.com/intrepidcs/libicsneo.git synced 2026-08-05 01:18:36 +02:00
Code Issues Projects Releases Wiki Activity

All: Update network names

Browse Source 
Updates all network names, the new format is <id>_<%02d>.
This commit is contained in:
Kyle Schwarz
2025-04-17 20:57:46 +00:00
parent e88cd244c8
commit 8b680f2b64
134 changed files with 2107 additions and 20559 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/unit/a2bencoderdecodertest.cpp
+2 -2
View File
@@ -52,7 +52,7 @@ TEST_F(A2BEncoderDecoderTest, PacketEncoderTest)
true
);
messagePtr->network = icsneo::Network::NetID::A2B2;
messagePtr->network = icsneo::Network::NetID::A2B_02;
A2BMessage& message = *messagePtr.get();
message.setChannelSample(
@@ -99,7 +99,7 @@ TEST_F(A2BEncoderDecoderTest, PacketDecoderTest)
true
);
message->network = icsneo::Network::NetID::A2B1;
message->network = icsneo::Network::NetID::A2B_01;
message->txmsg = false;
message->monitor = true;
test/unit/apperrordecodertest.cpp
+2 -2
View File
@@ -46,7 +46,7 @@ TEST_F(REDAppErrorDecoderTest, PacketDecoderTest) {
auto msg1 = std::make_shared<icsneo::AppErrorMessage>();
msg1->errorType = static_cast<uint16_t>(AppErrorType::AppErrorNetworkNotEnabled);
msg1->errorNetID = Network::NetID::HSCAN;
msg1->errorNetID = Network::NetID::DWCAN_01;
msg1->timestamp10us = 0x66554433;
msg1->timestamp10usMSB = 0xAA998877;
msg1->network = icsneo::Network::NetID::RED_App_Error;
@@ -80,7 +80,7 @@ TEST_F(REDAppErrorDecoderTest, GetErrorStringTest) {
EXPECT_TRUE(packetDecoder->decode(decodeMsg, packets.back()));
EXPECT_NE(decodeMsg, nullptr);
auto testMessage = std::dynamic_pointer_cast<icsneo::AppErrorMessage>(decodeMsg);
EXPECT_EQ("HSCAN: Network not enabled", testMessage->getAppErrorString());
EXPECT_EQ("DW CAN 01: Network not enabled", testMessage->getAppErrorString());
packets.pop_back();
}
test/unit/i2cencoderdecodertest.cpp
+3 -3
View File
@@ -34,7 +34,7 @@ protected:
RingBuffer ringBuffer = RingBuffer(128);
//Read request to the device
//Control length 1, control bytes 0x12 (I2C register to read from)
//Control length 1, control bytes 0x12 (I2C_01 register to read from)
//data length 1: blank bytes padded in that the device will fill in the reply
std::vector<uint8_t> testBytes =
{0xaa, 0x0c, 0x11, 0x00, 0x58, 0x00, 0x01, 0x00,
@@ -51,7 +51,7 @@ protected:
TEST_F(I2CEncoderDecoderTest, PacketEncoderTest) {
std::vector<uint8_t> bytestream;
auto message = std::make_shared<icsneo::I2CMessage>();
message->network = icsneo::Network::NetID::I2C;
message->network = icsneo::Network::NetID::I2C_01;
message->controlBytes.push_back(static_cast<uint8_t>(0x12u)); //Product ID register address
message->dataBytes.push_back(static_cast<uint8_t>(0x00u));
message->address = 0x68u; //7 bit addressing, BASE_ADDR
@@ -66,7 +66,7 @@ TEST_F(I2CEncoderDecoderTest, PacketDecoderTest) {
std::shared_ptr<icsneo::Message> decodeMsg;
std::shared_ptr<icsneo::I2CMessage> message = std::make_shared<icsneo::I2CMessage>();
message->network = icsneo::Network::NetID::I2C;
message->network = icsneo::Network::NetID::I2C_01;
message->controlBytes.push_back(static_cast<uint8_t>(0x12u)); //Product ID register address
message->dataBytes.push_back(static_cast<uint8_t>(0x80u));
message->address = 0x68u; //7 bit addressing, BASE_ADDR
test/unit/linencoderdecodertest.cpp
+10 -10
View File
@@ -89,7 +89,7 @@ std::vector<uint8_t> testControllerWithData =
TEST_F(LINEncoderDecoderTest, ProtectedIDCalcTest) {
std::vector<uint8_t> bytestream;
auto message = std::make_shared<icsneo::LINMessage>(static_cast<uint8_t>(0x22u));
message->network = icsneo::Network::NetID::LIN;
message->network = icsneo::Network::NetID::LIN_01;
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<uint8_t> bytestream;
auto message = std::make_shared<icsneo::LINMessage>(static_cast<uint8_t>(0x22u));
message->network = icsneo::Network::NetID::LIN2;
message->network = icsneo::Network::NetID::LIN_02;
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<uint8_t> bytestream;
auto message = std::make_shared<icsneo::LINMessage>(static_cast<uint8_t>(0x22u));
message->network = icsneo::Network::NetID::LIN2;
message->network = icsneo::Network::NetID::LIN_02;
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<uint8_t> bytestream;
auto message = std::make_shared<icsneo::LINMessage>(static_cast<uint8_t>(0x22u));
message->network = icsneo::Network::NetID::LIN2;
message->network = icsneo::Network::NetID::LIN_02;
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<uint8_t> bytestream;
auto message = std::make_shared<icsneo::LINMessage>(static_cast<uint8_t>(0x22u));
message->network = icsneo::Network::NetID::LIN;
message->network = icsneo::Network::NetID::LIN_01;
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<uint8_t> bytestream;
auto message = std::make_shared<icsneo::LINMessage>(static_cast<uint8_t>(0x11u));
message->network = icsneo::Network::NetID::LIN;
message->network = icsneo::Network::NetID::LIN_01;
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<icsneo::Message> decodeMsg;
auto msg1 = std::make_shared<icsneo::LINMessage>(static_cast<uint8_t>(0x22u));
msg1->network = icsneo::Network::NetID::LIN2;
msg1->network = icsneo::Network::NetID::LIN_02;
msg1->linMsgType = icsneo::LINMessage::Type::LIN_COMMANDER_MSG;
msg1->isEnhancedChecksum = false;
msg1->data = {0xaa, 0xbb, 0xcc};
msg1->checksum = 0xcc;
auto msg2 = std::make_shared<icsneo::LINMessage>(static_cast<uint8_t>(0x22u));
msg2->network = icsneo::Network::NetID::LIN;
msg2->network = icsneo::Network::NetID::LIN_01;
msg2->linMsgType = icsneo::LINMessage::Type::LIN_COMMANDER_MSG;
msg2->isEnhancedChecksum = false;
msg2->data = {0xaa, 0xbb, 0xcc};
@@ -172,7 +172,7 @@ TEST_F(LINEncoderDecoderTest, PacketDecoderTest) {
EXPECT_TRUE(packetizer->input(ringBuffer));
auto packets = packetizer->output();
if(packets.size() != 2) { EXPECT_TRUE(false); }
//LIN2 frame from device
//LIN_02 frame from device
EXPECT_TRUE(packetDecoder->decode(decodeMsg, packets.back()));
auto testMessage = std::dynamic_pointer_cast<icsneo::LINMessage>(decodeMsg);
EXPECT_EQ(msg1->network, testMessage->network);
@@ -183,7 +183,7 @@ TEST_F(LINEncoderDecoderTest, PacketDecoderTest) {
EXPECT_EQ(msg1->checksum, testMessage->checksum);
packets.pop_back();
//LIN1 frame from device
//LIN_01 frame from device
EXPECT_TRUE(packetDecoder->decode(decodeMsg, packets.back()));
auto testMessage2 = std::dynamic_pointer_cast<icsneo::LINMessage>(decodeMsg);
EXPECT_EQ(msg2->network, testMessage2->network);
test/unit/mdioencoderdecodertest.cpp
+6 -6
View File
@@ -82,7 +82,7 @@ protected:
TEST_F(MDIOEncoderDecoderTest, PacketEncoderClause22Test) {
std::vector<uint8_t> bytestream;
auto message = std::make_shared<icsneo::MDIOMessage>();
message->network = icsneo::Network::NetID::MDIO1;
message->network = icsneo::Network::NetID::MDIO_01;
message->description = 0xABCD;
message->phyAddress = 0x18u;
message->devAddress = 0x13u;
@@ -98,7 +98,7 @@ TEST_F(MDIOEncoderDecoderTest, PacketEncoderClause22Test) {
TEST_F(MDIOEncoderDecoderTest, PacketEncoderClause45Test) {
std::vector<uint8_t> bytestream;
auto message = std::make_shared<icsneo::MDIOMessage>();
message->network = icsneo::Network::NetID::MDIO1;
message->network = icsneo::Network::NetID::MDIO_01;
message->description = 0xABCD;
message->phyAddress = 0x06u;
message->devAddress = 0x14u;
@@ -114,7 +114,7 @@ TEST_F(MDIOEncoderDecoderTest, PacketEncoderClause45Test) {
TEST_F(MDIOEncoderDecoderTest, PacketEncoderClause22MaskTest) {
std::vector<uint8_t> bytestream;
auto message = std::make_shared<icsneo::MDIOMessage>();
message->network = icsneo::Network::NetID::MDIO1;
message->network = icsneo::Network::NetID::MDIO_01;
message->description = 0xFFFFu;
message->phyAddress = 0xFFu;
message->devAddress = 0xFFu;
@@ -130,7 +130,7 @@ TEST_F(MDIOEncoderDecoderTest, PacketEncoderClause22MaskTest) {
TEST_F(MDIOEncoderDecoderTest, PacketEncoderClause45MaskTest) {
std::vector<uint8_t> bytestream;
auto message = std::make_shared<icsneo::MDIOMessage>();
message->network = icsneo::Network::NetID::MDIO1;
message->network = icsneo::Network::NetID::MDIO_01;
message->description = 0xFFFFu;
message->phyAddress = 0xFFu;
message->devAddress = 0xFFu;
@@ -147,7 +147,7 @@ TEST_F(MDIOEncoderDecoderTest, PacketDecoderClause22Test) {
std::shared_ptr<icsneo::Message> decodeMsg;
std::shared_ptr<icsneo::MDIOMessage> message = std::make_shared<icsneo::MDIOMessage>();
message->network = icsneo::Network::NetID::MDIO1;
message->network = icsneo::Network::NetID::MDIO_01;
message->description = 0xABCD;
message->phyAddress = 0x06u;
message->devAddress = 0x00u;
@@ -188,7 +188,7 @@ TEST_F(MDIOEncoderDecoderTest, PacketDecoderClause45Test) {
std::shared_ptr<icsneo::Message> decodeMsg;
std::shared_ptr<icsneo::MDIOMessage> message = std::make_shared<icsneo::MDIOMessage>();
message->network = icsneo::Network::NetID::MDIO1;
message->network = icsneo::Network::NetID::MDIO_01;
message->description = 0xABCD;
message->phyAddress = 0x12u;
message->devAddress = 0x03u;