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

Refactor MessageDecoder to Decoder

pull/4/head
Paul Hollinsky 2018-09-25 18:00:16 -04:00
parent 69773d6537
commit 9f20d70102
20 changed files with 301 additions and 301 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -41,7 +41,7 @@ endif()
set(COMMON_SRC
communication/message/neomessage.cpp
communication/messagedecoder.cpp
communication/decoder.cpp
communication/packetizer.cpp
communication/multichannelcommunication.cpp
communication/communication.cpp

2
communication/communication.cpp
View File

@ -7,7 +7,7 @@
#include <mutex>
#include <condition_variable>
#include "communication/include/command.h"
#include "communication/include/messagedecoder.h"
#include "communication/include/decoder.h"
#include "communication/include/packetizer.h"
#include "communication/message/include/serialnumbermessage.h"
#include "communication/message/filter/include/main51messagefilter.h"

6
communication/messagedecoder.cpp → communication/decoder.cpp
View File

@ -1,4 +1,4 @@
#include "communication/include/messagedecoder.h"
#include "communication/include/decoder.h"
#include "communication/include/communication.h"
#include "communication/message/include/serialnumbermessage.h"
#include "communication/include/command.h"
@ -7,14 +7,14 @@
using namespace icsneo;
uint64_t MessageDecoder::GetUInt64FromLEBytes(uint8_t* bytes) {
uint64_t Decoder::GetUInt64FromLEBytes(uint8_t* bytes) {
uint64_t ret = 0;
for(int i = 0; i < 8; i++)
ret |= (bytes[i] << (i * 8));
return ret;
}
std::shared_ptr<Message> MessageDecoder::decodePacket(const std::shared_ptr<Packet>& packet) {
std::shared_ptr<Message> Decoder::decodePacket(const std::shared_ptr<Packet>& packet) {
switch(packet->network.getType()) {
case Network::Type::CAN: {
if(packet->data.size() < 24)

6
communication/include/communication.h
View File

@ -8,7 +8,7 @@
#include "communication/message/callback/include/messagecallback.h"
#include "communication/message/include/serialnumbermessage.h"
#include "communication/include/packetizer.h"
#include "communication/include/messagedecoder.h"
#include "communication/include/decoder.h"
#include <memory>
#include <vector>
#include <atomic>
@ -20,7 +20,7 @@ namespace icsneo {
class Communication {
public:
Communication(std::shared_ptr<ICommunication> com, std::shared_ptr<Packetizer> p, std::shared_ptr<MessageDecoder> md) : impl(com), packetizer(p), decoder(md) {}
Communication(std::shared_ptr<ICommunication> com, std::shared_ptr<Packetizer> p, std::shared_ptr<Decoder> md) : impl(com), packetizer(p), decoder(md) {}
virtual ~Communication() { close(); }
bool open();
@ -43,7 +43,7 @@ public:
std::shared_ptr<Message> waitForMessageSync(std::shared_ptr<MessageFilter> f, std::chrono::milliseconds timeout = std::chrono::milliseconds(50));
std::shared_ptr<Packetizer> packetizer;
std::shared_ptr<MessageDecoder> decoder;
std::shared_ptr<Decoder> decoder;
protected:
std::shared_ptr<ICommunication> impl;

554
communication/include/messagedecoder.h → communication/include/decoder.h
View File

@ -1,278 +1,278 @@
#ifndef __MESSAGEDECODER_H_
#define __MESSAGEDECODER_H_
#include "communication/message/include/message.h"
#include "communication/message/include/canmessage.h"
#include "communication/include/packet.h"
#include "communication/include/network.h"
#include <queue>
#include <vector>
#include <memory>
#pragma pack(push)
#pragma pack(1)
namespace icsneo {
class MessageDecoder {
public:
static uint64_t GetUInt64FromLEBytes(uint8_t* bytes);
std::shared_ptr<Message> decodePacket(const std::shared_ptr<Packet>& message);
private:
typedef uint16_t icscm_bitfield;
struct HardwareCANPacket {
struct {
icscm_bitfield IDE : 1;
icscm_bitfield SRR : 1;
icscm_bitfield SID : 11;
icscm_bitfield EDL : 1;
icscm_bitfield BRS : 1;
icscm_bitfield ESI : 1;
} header;
struct {
icscm_bitfield EID : 12;
icscm_bitfield TXMSG : 1;
icscm_bitfield TXAborted : 1;
icscm_bitfield TXLostArb : 1;
icscm_bitfield TXError : 1;
} eid;
struct {
icscm_bitfield DLC : 4;
icscm_bitfield RB0 : 1;
icscm_bitfield IVRIF : 1;
icscm_bitfield HVEnable : 1;// must be cleared before passing into CAN driver
icscm_bitfield ExtendedNetworkIndexBit : 1;//DO NOT CLOBBER THIS
icscm_bitfield RB1 : 1;
icscm_bitfield RTR : 1;
icscm_bitfield EID : 6;
} dlc;
unsigned char data[8];
struct {
uint64_t TS : 60;
uint64_t : 3;
uint64_t IsExtended : 1;
} timestamp;
};
// struct CoreMiniMsg {
// CANMessage toCANMessage(Network netid);
// union {
// uint16_t CxTRB0SID16;
// struct
// {
// icscm_bitfield IDE : 1;
// icscm_bitfield SRR : 1;
// icscm_bitfield SID : 11;
// icscm_bitfield NETWORKINDEX : 3;//DO NOT CLOBBER THIS
// } CxTRB0SID;
// struct
// {
// icscm_bitfield : 13;
// icscm_bitfield EDL : 1;
// icscm_bitfield BRS : 1;
// icscm_bitfield ESI : 1;
// } CxTRB0FD;
// struct
// {
// icscm_bitfield ErrRxOnlyBreak : 1;
// icscm_bitfield ErrRxOnlyBreakSync : 1;
// icscm_bitfield ID : 11;
// icscm_bitfield NETWORKINDEX : 3;//DO NOT CLOBBER THIS
// } CxLIN3;
// struct
// {
// uint8_t D8;
// uint8_t options : 4;
// uint8_t TXMSG : 1;
// uint8_t NETWORKINDEX : 3;//DO NOT CLOBBER THIS
// } C1xJ1850;
// struct
// {
// uint8_t D8;
// uint8_t options : 4;
// uint8_t TXMSG : 1;
// uint8_t NETWORKINDEX : 3;//DO NOT CLOBBER THIS
// } C1xISO;
// struct
// {
// uint8_t D8;
// uint8_t options : 4;
// uint8_t TXMSG : 1;
// uint8_t NETWORKINDEX : 3;//DO NOT CLOBBER THIS
// } C1xJ1708;
// struct
// {
// icscm_bitfield FCS_AVAIL : 1;
// icscm_bitfield RUNT_FRAME : 1;
// icscm_bitfield DISABLE_PADDING : 1;
// icscm_bitfield PREEMPTION_ENABLED : 1;
// icscm_bitfield MPACKET_TYPE : 4;
// icscm_bitfield MPACKET_FRAG_CNT : 2;
// icscm_bitfield : 6;
// } C1xETH;
// struct
// {
// uint16_t ID : 11;
// uint16_t STARTUP : 1;
// uint16_t SYNC : 1;
// uint16_t NULL_FRAME : 1;
// uint16_t PAYLOAD_PREAMBLE : 1;
// uint16_t RESERVED_0 : 1;
// } C1xFlex;
// struct
// {
// uint8_t daqType;
// uint8_t ethDaqRes1;
// } C1xETHDAQ;
// };
// union {
// uint16_t CxTRB0EID16;
// struct
// {
// icscm_bitfield EID : 12;
// icscm_bitfield TXMSG : 1;
// icscm_bitfield TXAborted : 1;
// icscm_bitfield TXLostArb : 1;
// icscm_bitfield TXError : 1;
// } CxTRB0EID;
// struct
// {
// uint8_t LINByte9;
// uint8_t ErrTxRxMismatch : 1;
// uint8_t TxChkSumEnhanced : 1;
// uint8_t TXMaster : 1;
// uint8_t TXSlave : 1;
// uint8_t ErrRxBreakNot0 : 1;
// uint8_t ErrRxBreakTooShort : 1;
// uint8_t ErrRxSyncNot55 : 1;
// uint8_t ErrRxDataGreater8 : 1;
// } CxLIN;
// struct
// {
// uint8_t D9;
// uint8_t D10;
// } C2xJ1850;
// struct
// {
// uint8_t D9;
// uint8_t D10;
// } C2xISO;
// struct
// {
// uint8_t D9;
// uint8_t D10;
// } C2xJ1708;
// struct
// {
// uint16_t txlen : 12;
// uint16_t TXMSG : 1;
// uint16_t : 3;
// } C2xETH;
// struct
// {
// uint16_t HDR_CRC_10 : 1;
// uint16_t PAYLOAD_LEN : 7;
// uint16_t RESERVED_1 : 4;
// uint16_t TXMSG : 1;
// uint16_t RESERVED_2 : 3;
// } C2xFlex;
// };
// union {
// // For use by CAN
// uint16_t CxTRB0DLC16;
// struct
// {
// icscm_bitfield DLC : 4;
// icscm_bitfield RB0 : 1;
// icscm_bitfield IVRIF : 1;
// icscm_bitfield HVEnable : 1;// must be cleared before passing into CAN driver
// icscm_bitfield ExtendedNetworkIndexBit : 1;//DO NOT CLOBBER THIS
// icscm_bitfield RB1 : 1;
// icscm_bitfield RTR : 1;
// icscm_bitfield EID : 6;
// } CxTRB0DLC;
// struct
// {
// icscm_bitfield len : 4;
// icscm_bitfield ExtendedNetworkIndexBit2 : 1;//DO NOT CLOBBER THIS
// icscm_bitfield UpdateSlaveOnce : 1;
// icscm_bitfield HasUpdatedSlaveOnce : 1;
// icscm_bitfield ExtendedNetworkIndexBit : 1;//DO NOT CLOBBER THIS
// icscm_bitfield BusRecovered : 1;
// icscm_bitfield SyncFerr : 1;//!< We got framing error in our sync byte.
// icscm_bitfield MidFerr : 1;//!< We got framing error in our message id.
// icscm_bitfield SlaveByteFerr : 1;//!< We got framing error in one of our slave bytes.
// icscm_bitfield TxAborted : 1;//!< This transmit was aborted.
// icscm_bitfield breakOnly : 1;
// icscm_bitfield : 2;
// } CxLIN2;
// // For use by JVPW
// struct
// {
// icscm_bitfield len : 4;
// icscm_bitfield ExtendedNetworkIndexBit2 : 1;//DO NOT CLOBBER THIS
// icscm_bitfield just_tx_timestamp : 1;
// icscm_bitfield first_seg : 1;
// icscm_bitfield ExtendedNetworkIndexBit : 1;// do not clobber ExtendedNetworkIndexBit
// icscm_bitfield D11 : 8;
// } C3xJ1850;
// // For use by the ISO/KEYWORD
// struct
// {
// icscm_bitfield len : 4;
// icscm_bitfield ExtendedNetworkIndexBit2 : 1;//DO NOT CLOBBER THIS
// icscm_bitfield FRM : 1;
// icscm_bitfield INIT : 1;
// icscm_bitfield ExtendedNetworkIndexBit : 1;// do not clobber ExtendedNetworkIndexBit
// icscm_bitfield D11 : 8;
// } C3xISO;
// struct
// {
// icscm_bitfield len : 4;
// icscm_bitfield ExtendedNetworkIndexBit2 : 1;//DO NOT CLOBBER THIS
// icscm_bitfield FRM : 1;
// icscm_bitfield : 1;
// icscm_bitfield ExtendedNetworkIndexBit : 1;// do not clobber ExtendedNetworkIndexBit
// icscm_bitfield pri : 8;
// } C3xJ1708;
// struct
// {
// uint16_t rsvd;
// } C3xETH;
// struct
// {
// uint16_t CYCLE : 6;
// uint16_t HDR_CRC_9_0 : 10;
// } C3xFlex;
// };
// unsigned char CxTRB0Dall[8];
// union {
// uint16_t CxTRB0STAT;
// uint16_t J1850_TX_ID;
// };
// union {
// struct
// {
// uint32_t uiTimeStamp10uS;
// union {
// uint32_t uiTimeStamp10uSMSB;
// struct
// {
// unsigned : 28;
// unsigned res_0s : 3;// must be 0!!!
// unsigned bIsExtended : 1;// always 1 for CoreMiniMsgExtended.
// };
// };
// };
// int64_t uiTimeStampLarge;
// uint8_t uiTimeStampBytes[8];
// };
// };
};
}
#pragma pack(pop)
#ifndef __DECODER_H_
#define __DECODER_H_
#include "communication/message/include/message.h"
#include "communication/message/include/canmessage.h"
#include "communication/include/packet.h"
#include "communication/include/network.h"
#include <queue>
#include <vector>
#include <memory>
#pragma pack(push)
#pragma pack(1)
namespace icsneo {
class Decoder {
public:
static uint64_t GetUInt64FromLEBytes(uint8_t* bytes);
std::shared_ptr<Message> decodePacket(const std::shared_ptr<Packet>& message);
private:
typedef uint16_t icscm_bitfield;
struct HardwareCANPacket {
struct {
icscm_bitfield IDE : 1;
icscm_bitfield SRR : 1;
icscm_bitfield SID : 11;
icscm_bitfield EDL : 1;
icscm_bitfield BRS : 1;
icscm_bitfield ESI : 1;
} header;
struct {
icscm_bitfield EID : 12;
icscm_bitfield TXMSG : 1;
icscm_bitfield TXAborted : 1;
icscm_bitfield TXLostArb : 1;
icscm_bitfield TXError : 1;
} eid;
struct {
icscm_bitfield DLC : 4;
icscm_bitfield RB0 : 1;
icscm_bitfield IVRIF : 1;
icscm_bitfield HVEnable : 1;// must be cleared before passing into CAN driver
icscm_bitfield ExtendedNetworkIndexBit : 1;//DO NOT CLOBBER THIS
icscm_bitfield RB1 : 1;
icscm_bitfield RTR : 1;
icscm_bitfield EID : 6;
} dlc;
unsigned char data[8];
struct {
uint64_t TS : 60;
uint64_t : 3;
uint64_t IsExtended : 1;
} timestamp;
};
// struct CoreMiniMsg {
// CANMessage toCANMessage(Network netid);
// union {
// uint16_t CxTRB0SID16;
// struct
// {
// icscm_bitfield IDE : 1;
// icscm_bitfield SRR : 1;
// icscm_bitfield SID : 11;
// icscm_bitfield NETWORKINDEX : 3;//DO NOT CLOBBER THIS
// } CxTRB0SID;
// struct
// {
// icscm_bitfield : 13;
// icscm_bitfield EDL : 1;
// icscm_bitfield BRS : 1;
// icscm_bitfield ESI : 1;
// } CxTRB0FD;
// struct
// {
// icscm_bitfield ErrRxOnlyBreak : 1;
// icscm_bitfield ErrRxOnlyBreakSync : 1;
// icscm_bitfield ID : 11;
// icscm_bitfield NETWORKINDEX : 3;//DO NOT CLOBBER THIS
// } CxLIN3;
// struct
// {
// uint8_t D8;
// uint8_t options : 4;
// uint8_t TXMSG : 1;
// uint8_t NETWORKINDEX : 3;//DO NOT CLOBBER THIS
// } C1xJ1850;
// struct
// {
// uint8_t D8;
// uint8_t options : 4;
// uint8_t TXMSG : 1;
// uint8_t NETWORKINDEX : 3;//DO NOT CLOBBER THIS
// } C1xISO;
// struct
// {
// uint8_t D8;
// uint8_t options : 4;
// uint8_t TXMSG : 1;
// uint8_t NETWORKINDEX : 3;//DO NOT CLOBBER THIS
// } C1xJ1708;
// struct
// {
// icscm_bitfield FCS_AVAIL : 1;
// icscm_bitfield RUNT_FRAME : 1;
// icscm_bitfield DISABLE_PADDING : 1;
// icscm_bitfield PREEMPTION_ENABLED : 1;
// icscm_bitfield MPACKET_TYPE : 4;
// icscm_bitfield MPACKET_FRAG_CNT : 2;
// icscm_bitfield : 6;
// } C1xETH;
// struct
// {
// uint16_t ID : 11;
// uint16_t STARTUP : 1;
// uint16_t SYNC : 1;
// uint16_t NULL_FRAME : 1;
// uint16_t PAYLOAD_PREAMBLE : 1;
// uint16_t RESERVED_0 : 1;
// } C1xFlex;
// struct
// {
// uint8_t daqType;
// uint8_t ethDaqRes1;
// } C1xETHDAQ;
// };
// union {
// uint16_t CxTRB0EID16;
// struct
// {
// icscm_bitfield EID : 12;
// icscm_bitfield TXMSG : 1;
// icscm_bitfield TXAborted : 1;
// icscm_bitfield TXLostArb : 1;
// icscm_bitfield TXError : 1;
// } CxTRB0EID;
// struct
// {
// uint8_t LINByte9;
// uint8_t ErrTxRxMismatch : 1;
// uint8_t TxChkSumEnhanced : 1;
// uint8_t TXMaster : 1;
// uint8_t TXSlave : 1;
// uint8_t ErrRxBreakNot0 : 1;
// uint8_t ErrRxBreakTooShort : 1;
// uint8_t ErrRxSyncNot55 : 1;
// uint8_t ErrRxDataGreater8 : 1;
// } CxLIN;
// struct
// {
// uint8_t D9;
// uint8_t D10;
// } C2xJ1850;
// struct
// {
// uint8_t D9;
// uint8_t D10;
// } C2xISO;
// struct
// {
// uint8_t D9;
// uint8_t D10;
// } C2xJ1708;
// struct
// {
// uint16_t txlen : 12;
// uint16_t TXMSG : 1;
// uint16_t : 3;
// } C2xETH;
// struct
// {
// uint16_t HDR_CRC_10 : 1;
// uint16_t PAYLOAD_LEN : 7;
// uint16_t RESERVED_1 : 4;
// uint16_t TXMSG : 1;
// uint16_t RESERVED_2 : 3;
// } C2xFlex;
// };
// union {
// // For use by CAN
// uint16_t CxTRB0DLC16;
// struct
// {
// icscm_bitfield DLC : 4;
// icscm_bitfield RB0 : 1;
// icscm_bitfield IVRIF : 1;
// icscm_bitfield HVEnable : 1;// must be cleared before passing into CAN driver
// icscm_bitfield ExtendedNetworkIndexBit : 1;//DO NOT CLOBBER THIS
// icscm_bitfield RB1 : 1;
// icscm_bitfield RTR : 1;
// icscm_bitfield EID : 6;
// } CxTRB0DLC;
// struct
// {
// icscm_bitfield len : 4;
// icscm_bitfield ExtendedNetworkIndexBit2 : 1;//DO NOT CLOBBER THIS
// icscm_bitfield UpdateSlaveOnce : 1;
// icscm_bitfield HasUpdatedSlaveOnce : 1;
// icscm_bitfield ExtendedNetworkIndexBit : 1;//DO NOT CLOBBER THIS
// icscm_bitfield BusRecovered : 1;
// icscm_bitfield SyncFerr : 1;//!< We got framing error in our sync byte.
// icscm_bitfield MidFerr : 1;//!< We got framing error in our message id.
// icscm_bitfield SlaveByteFerr : 1;//!< We got framing error in one of our slave bytes.
// icscm_bitfield TxAborted : 1;//!< This transmit was aborted.
// icscm_bitfield breakOnly : 1;
// icscm_bitfield : 2;
// } CxLIN2;
// // For use by JVPW
// struct
// {
// icscm_bitfield len : 4;
// icscm_bitfield ExtendedNetworkIndexBit2 : 1;//DO NOT CLOBBER THIS
// icscm_bitfield just_tx_timestamp : 1;
// icscm_bitfield first_seg : 1;
// icscm_bitfield ExtendedNetworkIndexBit : 1;// do not clobber ExtendedNetworkIndexBit
// icscm_bitfield D11 : 8;
// } C3xJ1850;
// // For use by the ISO/KEYWORD
// struct
// {
// icscm_bitfield len : 4;
// icscm_bitfield ExtendedNetworkIndexBit2 : 1;//DO NOT CLOBBER THIS
// icscm_bitfield FRM : 1;
// icscm_bitfield INIT : 1;
// icscm_bitfield ExtendedNetworkIndexBit : 1;// do not clobber ExtendedNetworkIndexBit
// icscm_bitfield D11 : 8;
// } C3xISO;
// struct
// {
// icscm_bitfield len : 4;
// icscm_bitfield ExtendedNetworkIndexBit2 : 1;//DO NOT CLOBBER THIS
// icscm_bitfield FRM : 1;
// icscm_bitfield : 1;
// icscm_bitfield ExtendedNetworkIndexBit : 1;// do not clobber ExtendedNetworkIndexBit
// icscm_bitfield pri : 8;
// } C3xJ1708;
// struct
// {
// uint16_t rsvd;
// } C3xETH;
// struct
// {
// uint16_t CYCLE : 6;
// uint16_t HDR_CRC_9_0 : 10;
// } C3xFlex;
// };
// unsigned char CxTRB0Dall[8];
// union {
// uint16_t CxTRB0STAT;
// uint16_t J1850_TX_ID;
// };
// union {
// struct
// {
// uint32_t uiTimeStamp10uS;
// union {
// uint32_t uiTimeStamp10uSMSB;
// struct
// {
// unsigned : 28;
// unsigned res_0s : 3;// must be 0!!!
// unsigned bIsExtended : 1;// always 1 for CoreMiniMsgExtended.
// };
// };
// };
// int64_t uiTimeStampLarge;
// uint8_t uiTimeStampBytes[8];
// };
// };
};
}
#pragma pack(pop)
#endif

2
communication/include/multichannelcommunication.h
View File

@ -9,7 +9,7 @@ namespace icsneo {
class MultiChannelCommunication : public Communication {
public:
MultiChannelCommunication(std::shared_ptr<ICommunication> com, std::shared_ptr<Packetizer> p, std::shared_ptr<MessageDecoder> md) : Communication(com, p, md) {}
MultiChannelCommunication(std::shared_ptr<ICommunication> com, std::shared_ptr<Packetizer> p, std::shared_ptr<Decoder> md) : Communication(com, p, md) {}
void spawnThreads();
void joinThreads();
bool sendCommand(Command cmd, std::vector<uint8_t> arguments);

2
communication/multichannelcommunication.cpp
View File

@ -1,6 +1,6 @@
#include "communication/include/multichannelcommunication.h"
#include "communication/include/command.h"
#include "communication/include/messagedecoder.h"
#include "communication/include/decoder.h"
#include "communication/include/packetizer.h"
#include <iostream>
#include <iomanip>

2
device/include/device.h
View File

@ -8,7 +8,7 @@
#include "device/include/idevicesettings.h"
#include "communication/include/communication.h"
#include "communication/include/packetizer.h"
#include "communication/include/messagedecoder.h"
#include "communication/include/decoder.h"
#include "third-party/concurrentqueue/concurrentqueue.h"
namespace icsneo {

2
device/neoobd2pro/include/neoobd2pro.h
View File

@ -14,7 +14,7 @@ public:
NeoOBD2PRO(neodevice_t neodevice) : Device(neodevice) {
auto transport = std::make_shared<STM32>(getWritableNeoDevice());
auto packetizer = std::make_shared<Packetizer>();
auto decoder = std::make_shared<MessageDecoder>();
auto decoder = std::make_shared<Decoder>();
com = std::make_shared<Communication>(transport, packetizer, decoder);
setProductName(PRODUCT_NAME);
productId = PRODUCT_ID;

2
device/neoobd2sim/include/neoobd2sim.h
View File

@ -14,7 +14,7 @@ public:
NeoOBD2SIM(neodevice_t neodevice) : Device(neodevice) {
auto transport = std::make_shared<STM32>(getWritableNeoDevice());
auto packetizer = std::make_shared<Packetizer>();
auto decoder = std::make_shared<MessageDecoder>();
auto decoder = std::make_shared<Decoder>();
com = std::make_shared<Communication>(transport, packetizer, decoder);
setProductName(PRODUCT_NAME);
productId = PRODUCT_ID;

2
device/neovifire/include/neovifire.h
View File

@ -13,7 +13,7 @@ public:
NeoVIFIRE(neodevice_t neodevice) : Device(neodevice) {
auto transport = std::make_shared<FTDI>(getWritableNeoDevice());
auto packetizer = std::make_shared<Packetizer>();
auto decoder = std::make_shared<MessageDecoder>();
auto decoder = std::make_shared<Decoder>();
com = std::make_shared<Communication>(transport, packetizer, decoder);
setProductName(PRODUCT_NAME);
productId = PRODUCT_ID;

2
device/neovifire2/include/neovifire2eth.h
View File

@ -13,7 +13,7 @@ public:
NeoVIFIRE2ETH(neodevice_t neodevice) : NeoVIFIRE2(neodevice) {
auto transport = std::make_shared<PCAP>(getWritableNeoDevice());
auto packetizer = std::make_shared<Packetizer>();
auto decoder = std::make_shared<MessageDecoder>();
auto decoder = std::make_shared<Decoder>();
com = std::make_shared<Communication>(transport, packetizer, decoder);
productId = PRODUCT_ID;
}

2
device/neovifire2/include/neovifire2usb.h
View File

@ -12,7 +12,7 @@ public:
NeoVIFIRE2USB(neodevice_t neodevice) : NeoVIFIRE2(neodevice) {
auto transport = std::make_shared<FTDI>(getWritableNeoDevice());
auto packetizer = std::make_shared<Packetizer>();
auto decoder = std::make_shared<MessageDecoder>();
auto decoder = std::make_shared<Decoder>();
com = std::make_shared<Communication>(transport, packetizer, decoder);
productId = PRODUCT_ID;
}

2
device/plasion/include/plasion.h
View File

@ -12,7 +12,7 @@ public:
Plasion(neodevice_t neodevice) : Device(neodevice) {
auto transport = std::make_shared<FTDI>(getWritableNeoDevice());
auto packetizer = std::make_shared<Packetizer>();
auto decoder = std::make_shared<MessageDecoder>();
auto decoder = std::make_shared<Decoder>();
com = std::make_shared<MultiChannelCommunication>(transport, packetizer, decoder);
}
};

4
device/radgalaxy/include/radgalaxy.h
View File

@ -4,7 +4,7 @@
#include "device/include/device.h"
#include "platform/include/pcap.h"
#include "communication/include/packetizer.h"
#include "communication/include/messagedecoder.h"
#include "communication/include/decoder.h"
namespace icsneo {
@ -18,7 +18,7 @@ public:
auto packetizer = std::make_shared<Packetizer>();
packetizer->disableChecksum = true;
packetizer->align16bit = false;
auto decoder = std::make_shared<MessageDecoder>();
auto decoder = std::make_shared<Decoder>();
com = std::make_shared<Communication>(transport, packetizer, decoder);
setProductName(PRODUCT_NAME);
productId = PRODUCT_ID;

2
device/radstar2/include/radstar2.h
View File

@ -14,7 +14,7 @@ public:
RADStar2(neodevice_t neodevice) : Device(neodevice) {
auto transport = std::make_shared<FTDI>(getWritableNeoDevice());
auto packetizer = std::make_shared<Packetizer>();
auto decoder = std::make_shared<MessageDecoder>();
auto decoder = std::make_shared<Decoder>();
com = std::make_shared<Communication>(transport, packetizer, decoder);
setProductName(PRODUCT_NAME);
productId = PRODUCT_ID;

2
device/radsupermoon/include/radsupermoon.h
View File

@ -16,7 +16,7 @@ public:
auto packetizer = std::make_shared<Packetizer>();
packetizer->disableChecksum = true;
packetizer->align16bit = false;
auto decoder = std::make_shared<MessageDecoder>();
auto decoder = std::make_shared<Decoder>();
com = std::make_shared<Communication>(transport, packetizer, decoder);
setProductName(PRODUCT_NAME);
productId = PRODUCT_ID;

2
device/valuecan3/include/valuecan3.h
View File

@ -13,7 +13,7 @@ public:
ValueCAN3(neodevice_t neodevice) : Device(neodevice) {
auto transport = std::make_shared<FTDI>(getWritableNeoDevice());
auto packetizer = std::make_shared<Packetizer>();
auto decoder = std::make_shared<MessageDecoder>();
auto decoder = std::make_shared<Decoder>();
com = std::make_shared<Communication>(transport, packetizer, decoder);
setProductName(PRODUCT_NAME);
productId = PRODUCT_ID;

2
device/valuecan4/include/valuecan4.h
View File

@ -14,7 +14,7 @@ public:
ValueCAN4(neodevice_t neodevice) : Device(neodevice) {
auto transport = std::make_shared<STM32>(getWritableNeoDevice());
auto packetizer = std::make_shared<Packetizer>();
auto decoder = std::make_shared<MessageDecoder>();
auto decoder = std::make_shared<Decoder>();
com = std::make_shared<Communication>(transport, packetizer, decoder);
setProductName(PRODUCT_NAME);
productId = PRODUCT_ID;

2
device/vividcan/include/vividcan.h
View File

@ -14,7 +14,7 @@ public:
VividCAN(neodevice_t neodevice) : Device(neodevice) {
auto transport = std::make_shared<STM32>(getWritableNeoDevice());
auto packetizer = std::make_shared<Packetizer>();
auto decoder = std::make_shared<MessageDecoder>();
auto decoder = std::make_shared<Decoder>();
com = std::make_shared<Communication>(transport, packetizer, decoder);
setProductName(PRODUCT_NAME);
productId = PRODUCT_ID;