Skip to content
Snippets Groups Projects
Commit 567f45c0 authored by Sergi Hernandez's avatar Sergi Hernandez
Browse files

Change tData* TData* type names

parent 0be53e33
No related branches found
No related tags found
1 merge request!1Sergi
......@@ -16,13 +16,13 @@
enum sm_state { WAIT_START, READ_ID, READ_DATA_LENGTH, READ_TIMESTAMP, READ_DATA, READ_CRC, READ_END};
union tTimeStampUnion
union TTimeStampUnion
{
unsigned char raw[4];
uint32_t time_stamp;
};
union tCRCUnion
union TCRCUnion
{
unsigned char raw[2];
uint16_t crc;
......@@ -59,10 +59,10 @@ class CModelCarDriverBase
CMutex data_mutex;
static void *data_thread(void *param);
bool process_byte(THeader &header, TDataUnion &data_union, tCRCUnion &crc_union, unsigned char byte);
bool process_byte(THeader &header, TDataUnion &data_union, TCRCUnion &crc_union, unsigned char byte);
bool get_id(uint8_t & id);
void send_request(uint8_t id, uint8_t data_length, uint8_t *data);
sm_state process_data(THeader & header, TDataUnion & data_union, tCRCUnion & crc_union);
sm_state process_data(THeader & header, TDataUnion & data_union, TCRCUnion & crc_union);
virtual void process_data_frame(uint8_t id,uint32_t timestamp, TDataUnion data_union)=0;
void stuff_frame(uint8_t const *frame_in, uint8_t const size_in, uint8_t **frame_out, uint8_t & size_out);
uint16_t fletcher16(uint8_t const *data, uint8_t bytes);
......
......@@ -171,7 +171,7 @@ void *CModelCarDriverBase::data_thread(void *param)
THeader header;
TDataUnion data_union;
tCRCUnion crc_union;
TCRCUnion crc_union;
std::list<std::string> events;
events.push_back(driver->serial_port->get_rx_event_id());
......@@ -226,7 +226,7 @@ void *CModelCarDriverBase::data_thread(void *param)
bool CModelCarDriverBase::process_byte(THeader &header, TDataUnion &data_union, tCRCUnion &crc_union, unsigned char byte)
bool CModelCarDriverBase::process_byte(THeader &header, TDataUnion &data_union, TCRCUnion &crc_union, unsigned char byte)
{
bool frame_ready=false;
......@@ -235,7 +235,7 @@ bool CModelCarDriverBase::process_byte(THeader &header, TDataUnion &data_union,
static int ts_count =0;
static int data_count=0;
static int crc_count =0;
tTimeStampUnion ts_union;
TTimeStampUnion ts_union;
if(byte==ESCAPE_BYTE && !escaped)
escaped=true;
......@@ -343,7 +343,7 @@ bool CModelCarDriverBase::process_byte(THeader &header, TDataUnion &data_union,
return frame_ready;
}
sm_state CModelCarDriverBase::process_data(THeader & header, TDataUnion & data_union, tCRCUnion & crc_union)
sm_state CModelCarDriverBase::process_data(THeader & header, TDataUnion & data_union, TCRCUnion & crc_union)
{
sm_state state;
unsigned char * single_frame=NULL;
......@@ -461,19 +461,19 @@ bool CModelCarDriverBase::get_id(uint8_t & id)
void CModelCarDriverBase::send_request(uint8_t id, uint8_t data_length, uint8_t *data)
{
unsigned int req_frame_size = sizeof(uint8_t)+sizeof(uint8_t)+sizeof(tTimeStampUnion)+data_length;
unsigned int req_frame_size = sizeof(uint8_t)+sizeof(uint8_t)+sizeof(TTimeStampUnion)+data_length;
unsigned char *frame;
frame = new unsigned char[req_frame_size];
std::fill(frame, frame + req_frame_size, 0x00);
tTimeStampUnion ts={0x00,0x00,0x00,0x00};
TTimeStampUnion ts={0x00,0x00,0x00,0x00};
memcpy(frame, &id, sizeof(uint8_t));
memcpy(frame+sizeof(uint8_t), &data_length, sizeof(uint8_t));
memcpy(frame+2*sizeof(uint8_t), &ts, sizeof(tTimeStampUnion));
memcpy(frame+2*sizeof(uint8_t), &ts, sizeof(TTimeStampUnion));
for(unsigned int i=0; i<data_length; i++)
memcpy(frame+2*sizeof(uint8_t)+sizeof(tTimeStampUnion), &data[i], sizeof(uint8_t));
memcpy(frame+2*sizeof(uint8_t)+sizeof(TTimeStampUnion), &data[i], sizeof(uint8_t));
uint16_t calculated_crc = fletcher16(frame, uint8_t(req_frame_size));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment