diff --git a/doc/ProtocoleExtractionFSM.graphml b/doc/ProtocoleExtractionFSM.graphml new file mode 100644 --- /dev/null +++ b/doc/ProtocoleExtractionFSM.graphml @@ -0,0 +1,352 @@ + + + + + + + + + + + + + + + + + + + + + + + + Default + + + + + + + + + + + + + + + + + + MoreData + + + + + + + + + + + + + + + + + + Sync? + + + + + + + + + + + + + + + + + + Header extraction + + + + + + + + + + + + + + + + + + Payload extraction + + + + + + + + + + + + + + + + + + MoreData + + + + + + + + + + + + + + + + + + CRC? + + + + + + + + + + + + + + + + + + Forward DATA + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Out of DATA + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Found 0xA5 +and +Have enough DATA + to read header + + + + + + + + + + + + + + + + + + + + + Next DATA isn't 0xF0 + + + + + + + + + + + + + + + + + + Next Data is 0xF0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Bad CRC + + + + + + + + + + + + + + + diff --git a/src/ucomport.cpp b/src/ucomport.cpp --- a/src/ucomport.cpp +++ b/src/ucomport.cpp @@ -44,6 +44,21 @@ bool UComPort::open() rs232setup(this->p_port,8,this->p_speed,rs232parityNo,rs232OneStop); p_opened = true; } + return p_opened; +} + +bool UComPort::close() +{ + if(p_opened) + { + p_opened = rs232close(this->p_port); + } + return !p_opened; +} + +bool UComPort::opened() +{ + return p_opened; } bool UComPort::open(const QString &name, int speed) @@ -52,3 +67,22 @@ bool UComPort::open(const QString &name, setSpeed(speed); return open(); } + +int UComPort::availableBytes() +{ + if(p_opened) + { + return rs232availablebytes(this->p_port); + } + return 0; +} + +int UComPort::readBytes(char *data, int count) +{ + return rs232read(this->p_port,data,count); +} + +int UComPort::writeBytes(char *data, int count) +{ + return rs232write(this->p_port,data,count); +} diff --git a/src/ucomport.h b/src/ucomport.h --- a/src/ucomport.h +++ b/src/ucomport.h @@ -10,13 +10,21 @@ class UComPort { public: explicit UComPort(); + QString portName(); int speed(); virtual void setPortName(const QString& name); virtual void setSpeed(int speed); - bool open(); - bool open(const QString& name); - bool open(const QString& name,int speed); + + virtual bool open(); + virtual bool open(const QString& name,int speed); + virtual bool close(); + bool opened(); + int availableBytes(); + + int readBytes(char* data,int count); + int writeBytes(char* data,int count); + private: rs232port_t p_port; QString p_PortName; diff --git a/src/uprobe.cpp b/src/uprobe.cpp --- a/src/uprobe.cpp +++ b/src/uprobe.cpp @@ -8,10 +8,14 @@ UProbe::UProbe(QObject *parent) : bool UProbe::setPortName(const QString &name) { - + /* TODO implement this function */ + Q_UNUSED(name) + return false; } bool UProbe::setPortSpeed(int speed) { - + /* TODO implement this function */ + Q_UNUSED(speed) + return false; } diff --git a/src/uprobeprotocol.cpp b/src/uprobeprotocol.cpp --- a/src/uprobeprotocol.cpp +++ b/src/uprobeprotocol.cpp @@ -14,9 +14,29 @@ UProbeProtocol::~UProbeProtocol() void UProbeProtocol::run() { + p_buffer = (char*)malloc(bufferSize); + if(p_buffer==NULL)return; while(!this->isInterruptionRequested()) { + getMoreData(); + while(p_indexpacketSize + 6; + //forward DATA + } + } + p_index++; + } } } @@ -29,3 +49,111 @@ void UProbeProtocol::setSpeed(int speed) { UComPort::setSpeed(speed); } + +bool UProbeProtocol::open() +{ + return UComPort::open(); +} + +bool UProbeProtocol::open(const QString &name, int speed) +{ + return UComPort::open(name,speed); +} + +bool UProbeProtocol::close() +{ + return UComPort::close(); +} + +void UProbeProtocol::getMoreData() +{ + int avail; + int maxCount=(bufferSize-32)-p_datacount; + if(p_index>(bufferSize/2)) + { + memcpy(p_buffer,p_buffer+p_index,p_datacount-p_index); + p_datacount = p_datacount-p_index; + p_index = 0; + } + if(opened()) + { + avail=availableBytes(); + if(avail) + { + if(maxCount>=avail) + { + p_datacount += readBytes(p_buffer+p_datacount,avail); + } + else + { + p_datacount += readBytes(p_buffer+p_datacount,maxCount); + } + } + } +} + +bool UProbeProtocol::FSM_SyncState() +{ + if(p_buffer[p_index+1]==(char)0x0F0) + { + return FSM_ExtractHeaderState(); + } + else + { + return false; + } +} + +bool UProbeProtocol::FSM_ExtractHeaderState() +{ + + currentPacket = new UProbeProtocolPacket(); + currentPacket->packetNumber = p_buffer[p_index+2]; + currentPacket->packetSize = ((unsigned int)p_buffer[p_index+3] + 1)*2; + currentPacket->channelCount = 0xF & (int)(p_buffer[p_index+4]>>4); + currentPacket->coding = (UProbeProtocol::UProbeProtocolPacket::PacketCoding)(0x3 & (int)(p_buffer[p_index+4]>>2)); + currentPacket->resolution = (UProbeProtocol::UProbeProtocolPacket::PacketResolution)(0x3 & (int)(p_buffer[p_index+4])); + currentPacket->ID = (unsigned int)p_buffer[p_index+5]; + while(p_datacount<(p_index+2+4+currentPacket->packetSize+1)) + { + getMoreData(); + } + return FSM_ExtractPayloadState(); +} + + +bool UProbeProtocol::FSM_ExtractPayloadState() +{ + if(!currentPacket || currentPacket->packetSize < 2 || (currentPacket->packetSize>UProbeProtocolMaxPacketSize)) + return false; + currentPacket->data = (char*)malloc(currentPacket->packetSize); + if(currentPacket->data != NULL) + { + memcpy(currentPacket->data,p_buffer+p_index+6,currentPacket->packetSize); + return FSM_CheckCRCState(); + } + return false; +} + +bool UProbeProtocol::FSM_CheckCRCState() +{ + currentPacket->receivedCRC = p_buffer[p_index+6+currentPacket->packetSize]; + currentPacket->localCRC = spw_CRC(p_buffer+p_index,6+currentPacket->packetSize); + if(currentPacket->localCRC == currentPacket->receivedCRC) + { + currentPacket->correct = true; + return true; + } + currentPacket->correct = false; + return false; +} + + + + + + + + + + diff --git a/src/uprobeprotocol.h b/src/uprobeprotocol.h --- a/src/uprobeprotocol.h +++ b/src/uprobeprotocol.h @@ -6,10 +6,118 @@ #include #include #include +#define UProbeProtocolMaxPacketSize 512 +#define bufferSize (((UProbeProtocolMaxPacketSize+7)+6)*2+32) + +/* +=========================================================================================== +=========================================================================================== + ██╗ ██╗██████╗ ██████╗ ██████╗ ████████╗ ██████╗ ██████╗ ██████╗ ██╗ + ██║ ██║██╔══██╗██╔══██╗██╔═══██╗╚══██╔══╝██╔═══██╗██╔════╝██╔═══██╗██║ + ██║ ██║██████╔╝██████╔╝██║ ██║ ██║ ██║ ██║██║ ██║ ██║██║ + ██║ ██║██╔═══╝ ██╔══██╗██║ ██║ ██║ ██║ ██║██║ ██║ ██║██║ + ╚██████╔╝██║ ██║ ██║╚██████╔╝ ██║ ╚██████╔╝╚██████╗╚██████╔╝███████╗ + ╚═════╝ ╚═╝ ╚═╝ ╚═╝ ╚═════╝ ╚═╝ ╚═════╝ ╚═════╝ ╚═════╝ ╚══════╝ +------------------------------------------------------------------------------------------- + + || Sync (2Bytes) || Header(4 Bytes) || Payload Data (2 to 512 Bytes) || CRC(1 Byte) || + || 0xA5 0xF0 || PCPT | (PSZ-1)*2 | SHAPE | ID || [...] || Uses SpaceWire CRC || + + + Shape: + |msb lsb| + | Channel count -1 [7:4] | Coding [3:2] | Channel resolution[1:0] -1 | + + Coding: + 0 Unsigned integer + 1 Signed integer (Two complement) + 2 Signed integer (sign bit) + 3 floating point + +=========================================================================================== +*/ + + + +static const unsigned char SPW_CRCTable[] = { + 0x00, 0x91, 0xe3, 0x72, 0x07, 0x96, 0xe4, 0x75, + 0x0e, 0x9f, 0xed, 0x7c, 0x09, 0x98, 0xea, 0x7b, + 0x1c, 0x8d, 0xff, 0x6e, 0x1b, 0x8a, 0xf8, 0x69, + 0x12, 0x83, 0xf1, 0x60, 0x15, 0x84, 0xf6, 0x67, + 0x38, 0xa9, 0xdb, 0x4a, 0x3f, 0xae, 0xdc, 0x4d, + 0x36, 0xa7, 0xd5, 0x44, 0x31, 0xa0, 0xd2, 0x43, + 0x24, 0xb5, 0xc7, 0x56, 0x23, 0xb2, 0xc0, 0x51, + 0x2a, 0xbb, 0xc9, 0x58, 0x2d, 0xbc, 0xce, 0x5f, + 0x70, 0xe1, 0x93, 0x02, 0x77, 0xe6, 0x94, 0x05, + 0x7e, 0xef, 0x9d, 0x0c, 0x79, 0xe8, 0x9a, 0x0b, + 0x6c, 0xfd, 0x8f, 0x1e, 0x6b, 0xfa, 0x88, 0x19, + 0x62, 0xf3, 0x81, 0x10, 0x65, 0xf4, 0x86, 0x17, + 0x48, 0xd9, 0xab, 0x3a, 0x4f, 0xde, 0xac, 0x3d, + 0x46, 0xd7, 0xa5, 0x34, 0x41, 0xd0, 0xa2, 0x33, + 0x54, 0xc5, 0xb7, 0x26, 0x53, 0xc2, 0xb0, 0x21, + 0x5a, 0xcb, 0xb9, 0x28, 0x5d, 0xcc, 0xbe, 0x2f, + 0xe0, 0x71, 0x03, 0x92, 0xe7, 0x76, 0x04, 0x95, + 0xee, 0x7f, 0x0d, 0x9c, 0xe9, 0x78, 0x0a, 0x9b, + 0xfc, 0x6d, 0x1f, 0x8e, 0xfb, 0x6a, 0x18, 0x89, + 0xf2, 0x63, 0x11, 0x80, 0xf5, 0x64, 0x16, 0x87, + 0xd8, 0x49, 0x3b, 0xaa, 0xdf, 0x4e, 0x3c, 0xad, + 0xd6, 0x47, 0x35, 0xa4, 0xd1, 0x40, 0x32, 0xa3, + 0xc4, 0x55, 0x27, 0xb6, 0xc3, 0x52, 0x20, 0xb1, + 0xca, 0x5b, 0x29, 0xb8, 0xcd, 0x5c, 0x2e, 0xbf, + 0x90, 0x01, 0x73, 0xe2, 0x97, 0x06, 0x74, 0xe5, + 0x9e, 0x0f, 0x7d, 0xec, 0x99, 0x08, 0x7a, 0xeb, + 0x8c, 0x1d, 0x6f, 0xfe, 0x8b, 0x1a, 0x68, 0xf9, + 0x82, 0x13, 0x61, 0xf0, 0x85, 0x14, 0x66, 0xf7, + 0xa8, 0x39, 0x4b, 0xda, 0xaf, 0x3e, 0x4c, 0xdd, + 0xa6, 0x37, 0x45, 0xd4, 0xa1, 0x30, 0x42, 0xd3, + 0xb4, 0x25, 0x57, 0xc6, 0xb3, 0x22, 0x50, 0xc1, + 0xba, 0x2b, 0x59, 0xc8, 0xbd, 0x2c, 0x5e, 0xcf +}; +inline unsigned char _spw_CRC_(unsigned char INCR, unsigned char INBYTE) +{ + return SPW_CRCTable[INCR ^ INBYTE]; +} + +inline char spw_CRC(char* buffer, int size) +{ + unsigned char CRC = 0; + for(int i=0;i