clang-format changes
This commit is contained in:
skullY
skullydazed
parent
61af76a10d
commit
b624f32f94
502 changed files with 32259 additions and 39062 deletions
|
|
@ -34,21 +34,21 @@ SOFTWARE.
|
|||
typedef struct byte_stuffer_state {
|
||||
uint16_t next_zero;
|
||||
uint16_t data_pos;
|
||||
bool long_frame;
|
||||
uint8_t data[MAX_FRAME_SIZE];
|
||||
}byte_stuffer_state_t;
|
||||
bool long_frame;
|
||||
uint8_t data[MAX_FRAME_SIZE];
|
||||
} byte_stuffer_state_t;
|
||||
|
||||
static byte_stuffer_state_t states[NUM_LINKS];
|
||||
|
||||
void init_byte_stuffer_state(byte_stuffer_state_t* state) {
|
||||
state->next_zero = 0;
|
||||
state->data_pos = 0;
|
||||
state->next_zero = 0;
|
||||
state->data_pos = 0;
|
||||
state->long_frame = false;
|
||||
}
|
||||
|
||||
void init_byte_stuffer(void) {
|
||||
int i;
|
||||
for (i=0;i<NUM_LINKS;i++) {
|
||||
for (i = 0; i < NUM_LINKS; i++) {
|
||||
init_byte_stuffer_state(&states[i]);
|
||||
}
|
||||
}
|
||||
|
|
@ -57,9 +57,9 @@ void byte_stuffer_recv_byte(uint8_t link, uint8_t data) {
|
|||
byte_stuffer_state_t* state = &states[link];
|
||||
// Start of a new frame
|
||||
if (state->next_zero == 0) {
|
||||
state->next_zero = data;
|
||||
state->next_zero = data;
|
||||
state->long_frame = data == 0xFF;
|
||||
state->data_pos = 0;
|
||||
state->data_pos = 0;
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -70,33 +70,28 @@ void byte_stuffer_recv_byte(uint8_t link, uint8_t data) {
|
|||
if (state->data_pos > 0) {
|
||||
validator_recv_frame(link, state->data, state->data_pos);
|
||||
}
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
// The frame is invalid, so reset
|
||||
init_byte_stuffer_state(state);
|
||||
}
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
if (state->data_pos == MAX_FRAME_SIZE) {
|
||||
// We exceeded our maximum frame size
|
||||
// therefore there's nothing else to do than reset to a new frame
|
||||
state->next_zero = data;
|
||||
state->next_zero = data;
|
||||
state->long_frame = data == 0xFF;
|
||||
state->data_pos = 0;
|
||||
}
|
||||
else if (state->next_zero == 0) {
|
||||
state->data_pos = 0;
|
||||
} else if (state->next_zero == 0) {
|
||||
if (state->long_frame) {
|
||||
// This is part of a long frame, so continue
|
||||
state->next_zero = data;
|
||||
state->next_zero = data;
|
||||
state->long_frame = data == 0xFF;
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
// Special case for zeroes
|
||||
state->next_zero = data;
|
||||
state->next_zero = data;
|
||||
state->data[state->data_pos++] = 0;
|
||||
}
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
state->data[state->data_pos++] = data;
|
||||
}
|
||||
}
|
||||
|
|
@ -105,7 +100,7 @@ void byte_stuffer_recv_byte(uint8_t link, uint8_t data) {
|
|||
static void send_block(uint8_t link, uint8_t* start, uint8_t* end, uint8_t num_non_zero) {
|
||||
send_data(link, &num_non_zero, 1);
|
||||
if (end > start) {
|
||||
send_data(link, start, end-start);
|
||||
send_data(link, start, end - start);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -113,24 +108,22 @@ void byte_stuffer_send_frame(uint8_t link, uint8_t* data, uint16_t size) {
|
|||
const uint8_t zero = 0;
|
||||
if (size > 0) {
|
||||
uint16_t num_non_zero = 1;
|
||||
uint8_t* end = data + size;
|
||||
uint8_t* start = data;
|
||||
uint8_t* end = data + size;
|
||||
uint8_t* start = data;
|
||||
while (data < end) {
|
||||
if (num_non_zero == 0xFF) {
|
||||
// There's more data after big non-zero block
|
||||
// So send it, and start a new block
|
||||
send_block(link, start, data, num_non_zero);
|
||||
start = data;
|
||||
start = data;
|
||||
num_non_zero = 1;
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
if (*data == 0) {
|
||||
// A zero encountered, so send the block
|
||||
send_block(link, start, data, num_non_zero);
|
||||
start = data + 1;
|
||||
start = data + 1;
|
||||
num_non_zero = 1;
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
num_non_zero++;
|
||||
}
|
||||
++data;
|
||||
|
|
|
|||
|
|
@ -28,26 +28,22 @@ SOFTWARE.
|
|||
|
||||
static bool is_master;
|
||||
|
||||
void router_set_master(bool master) {
|
||||
is_master = master;
|
||||
}
|
||||
void router_set_master(bool master) { is_master = master; }
|
||||
|
||||
void route_incoming_frame(uint8_t link, uint8_t* data, uint16_t size){
|
||||
void route_incoming_frame(uint8_t link, uint8_t* data, uint16_t size) {
|
||||
if (is_master) {
|
||||
if (link == DOWN_LINK) {
|
||||
transport_recv_frame(data[size-1], data, size - 1);
|
||||
transport_recv_frame(data[size - 1], data, size - 1);
|
||||
}
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
if (link == UP_LINK) {
|
||||
if (data[size-1] & 1) {
|
||||
if (data[size - 1] & 1) {
|
||||
transport_recv_frame(0, data, size - 1);
|
||||
}
|
||||
data[size-1] >>= 1;
|
||||
data[size - 1] >>= 1;
|
||||
validator_send_frame(DOWN_LINK, data, size);
|
||||
}
|
||||
else {
|
||||
data[size-1]++;
|
||||
} else {
|
||||
data[size - 1]++;
|
||||
validator_send_frame(UP_LINK, data, size);
|
||||
}
|
||||
}
|
||||
|
|
@ -59,8 +55,7 @@ void router_send_frame(uint8_t destination, uint8_t* data, uint16_t size) {
|
|||
data[size] = 1;
|
||||
validator_send_frame(UP_LINK, data, size + 1);
|
||||
}
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
if (is_master) {
|
||||
data[size] = destination;
|
||||
validator_send_frame(DOWN_LINK, data, size + 1);
|
||||
|
|
|
|||
|
|
@ -27,78 +27,14 @@ SOFTWARE.
|
|||
#include "serial_link/protocol/byte_stuffer.h"
|
||||
#include <string.h>
|
||||
|
||||
const uint32_t poly8_lookup[256] =
|
||||
{
|
||||
0, 0x77073096, 0xEE0E612C, 0x990951BA,
|
||||
0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3,
|
||||
0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988,
|
||||
0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91,
|
||||
0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE,
|
||||
0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
|
||||
0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC,
|
||||
0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5,
|
||||
0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172,
|
||||
0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B,
|
||||
0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940,
|
||||
0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
|
||||
0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116,
|
||||
0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F,
|
||||
0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924,
|
||||
0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D,
|
||||
0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A,
|
||||
0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
|
||||
0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818,
|
||||
0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01,
|
||||
0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E,
|
||||
0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457,
|
||||
0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C,
|
||||
0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
|
||||
0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2,
|
||||
0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB,
|
||||
0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0,
|
||||
0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9,
|
||||
0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086,
|
||||
0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
|
||||
0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4,
|
||||
0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD,
|
||||
0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A,
|
||||
0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683,
|
||||
0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8,
|
||||
0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
|
||||
0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE,
|
||||
0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7,
|
||||
0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC,
|
||||
0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5,
|
||||
0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252,
|
||||
0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
|
||||
0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60,
|
||||
0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79,
|
||||
0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236,
|
||||
0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F,
|
||||
0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04,
|
||||
0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
|
||||
0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A,
|
||||
0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713,
|
||||
0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38,
|
||||
0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21,
|
||||
0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E,
|
||||
0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
|
||||
0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C,
|
||||
0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45,
|
||||
0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2,
|
||||
0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB,
|
||||
0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0,
|
||||
0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
|
||||
0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6,
|
||||
0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF,
|
||||
0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94,
|
||||
0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D
|
||||
};
|
||||
const uint32_t poly8_lookup[256] = {0, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3, 0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988, 0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91, 0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE, 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7, 0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, 0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5, 0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172, 0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B, 0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940, 0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59, 0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F, 0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924, 0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D,
|
||||
0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433, 0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, 0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01, 0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E, 0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457, 0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C, 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65, 0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2, 0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB, 0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0, 0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9, 0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086, 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F, 0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD,
|
||||
0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A, 0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683, 0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8, 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1, 0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE, 0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7, 0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC, 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5, 0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B, 0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60, 0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79, 0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236, 0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F, 0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
|
||||
0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A, 0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713, 0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38, 0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21, 0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777, 0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, 0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45, 0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2, 0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB, 0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9, 0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF, 0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94, 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D};
|
||||
|
||||
static uint32_t crc32_byte(uint8_t *p, uint32_t bytelength)
|
||||
{
|
||||
static uint32_t crc32_byte(uint8_t* p, uint32_t bytelength) {
|
||||
uint32_t crc = 0xffffffff;
|
||||
while (bytelength-- !=0) crc = poly8_lookup[((uint8_t) crc ^ *(p++))] ^ (crc >> 8);
|
||||
while (bytelength-- != 0) crc = poly8_lookup[((uint8_t)crc ^ *(p++))] ^ (crc >> 8);
|
||||
// return (~crc); also works
|
||||
return (crc ^ 0xffffffff);
|
||||
}
|
||||
|
|
@ -106,10 +42,10 @@ static uint32_t crc32_byte(uint8_t *p, uint32_t bytelength)
|
|||
void validator_recv_frame(uint8_t link, uint8_t* data, uint16_t size) {
|
||||
if (size > 4) {
|
||||
uint32_t frame_crc;
|
||||
memcpy(&frame_crc, data + size -4, 4);
|
||||
memcpy(&frame_crc, data + size - 4, 4);
|
||||
uint32_t expected_crc = crc32_byte(data, size - 4);
|
||||
if (frame_crc == expected_crc) {
|
||||
route_incoming_frame(link, data, size-4);
|
||||
route_incoming_frame(link, data, size - 4);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,42 +29,38 @@ SOFTWARE.
|
|||
|
||||
#define MAX_REMOTE_OBJECTS 16
|
||||
static remote_object_t* remote_objects[MAX_REMOTE_OBJECTS];
|
||||
static uint32_t num_remote_objects = 0;
|
||||
static uint32_t num_remote_objects = 0;
|
||||
|
||||
void reinitialize_serial_link_transport(void) {
|
||||
num_remote_objects = 0;
|
||||
}
|
||||
void reinitialize_serial_link_transport(void) { num_remote_objects = 0; }
|
||||
|
||||
void add_remote_objects(remote_object_t** _remote_objects, uint32_t _num_remote_objects) {
|
||||
unsigned int i;
|
||||
for(i=0;i<_num_remote_objects;i++) {
|
||||
remote_object_t* obj = _remote_objects[i];
|
||||
for (i = 0; i < _num_remote_objects; i++) {
|
||||
remote_object_t* obj = _remote_objects[i];
|
||||
remote_objects[num_remote_objects++] = obj;
|
||||
if (obj->object_type == MASTER_TO_ALL_SLAVES) {
|
||||
triple_buffer_object_t* tb = (triple_buffer_object_t*)obj->buffer;
|
||||
triple_buffer_init(tb);
|
||||
uint8_t* start = obj->buffer + LOCAL_OBJECT_SIZE(obj->object_size);
|
||||
tb = (triple_buffer_object_t*)start;
|
||||
tb = (triple_buffer_object_t*)start;
|
||||
triple_buffer_init(tb);
|
||||
}
|
||||
else if(obj->object_type == MASTER_TO_SINGLE_SLAVE) {
|
||||
uint8_t* start = obj->buffer;
|
||||
} else if (obj->object_type == MASTER_TO_SINGLE_SLAVE) {
|
||||
uint8_t* start = obj->buffer;
|
||||
unsigned int j;
|
||||
for (j=0;j<NUM_SLAVES;j++) {
|
||||
for (j = 0; j < NUM_SLAVES; j++) {
|
||||
triple_buffer_object_t* tb = (triple_buffer_object_t*)start;
|
||||
triple_buffer_init(tb);
|
||||
start += LOCAL_OBJECT_SIZE(obj->object_size);
|
||||
}
|
||||
triple_buffer_object_t* tb = (triple_buffer_object_t*)start;
|
||||
triple_buffer_init(tb);
|
||||
}
|
||||
else {
|
||||
uint8_t* start = obj->buffer;
|
||||
triple_buffer_object_t* tb = (triple_buffer_object_t*)start;
|
||||
} else {
|
||||
uint8_t* start = obj->buffer;
|
||||
triple_buffer_object_t* tb = (triple_buffer_object_t*)start;
|
||||
triple_buffer_init(tb);
|
||||
start += LOCAL_OBJECT_SIZE(obj->object_size);
|
||||
unsigned int j;
|
||||
for (j=0;j<NUM_SLAVES;j++) {
|
||||
for (j = 0; j < NUM_SLAVES; j++) {
|
||||
tb = (triple_buffer_object_t*)start;
|
||||
triple_buffer_init(tb);
|
||||
start += REMOTE_OBJECT_SIZE(obj->object_size);
|
||||
|
|
@ -74,23 +70,21 @@ void add_remote_objects(remote_object_t** _remote_objects, uint32_t _num_remote_
|
|||
}
|
||||
|
||||
void transport_recv_frame(uint8_t from, uint8_t* data, uint16_t size) {
|
||||
uint8_t id = data[size-1];
|
||||
uint8_t id = data[size - 1];
|
||||
if (id < num_remote_objects) {
|
||||
remote_object_t* obj = remote_objects[id];
|
||||
if (obj->object_size == size - 1) {
|
||||
uint8_t* start;
|
||||
if (obj->object_type == MASTER_TO_ALL_SLAVES) {
|
||||
start = obj->buffer + LOCAL_OBJECT_SIZE(obj->object_size);
|
||||
}
|
||||
else if(obj->object_type == SLAVE_TO_MASTER) {
|
||||
} else if (obj->object_type == SLAVE_TO_MASTER) {
|
||||
start = obj->buffer + LOCAL_OBJECT_SIZE(obj->object_size);
|
||||
start += (from - 1) * REMOTE_OBJECT_SIZE(obj->object_size);
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
start = obj->buffer + NUM_SLAVES * LOCAL_OBJECT_SIZE(obj->object_size);
|
||||
}
|
||||
triple_buffer_object_t* tb = (triple_buffer_object_t*)start;
|
||||
void* ptr = triple_buffer_begin_write_internal(obj->object_size, tb);
|
||||
triple_buffer_object_t* tb = (triple_buffer_object_t*)start;
|
||||
void* ptr = triple_buffer_begin_write_internal(obj->object_size, tb);
|
||||
memcpy(ptr, data, size - 1);
|
||||
triple_buffer_end_write_internal(tb);
|
||||
}
|
||||
|
|
@ -99,26 +93,25 @@ void transport_recv_frame(uint8_t from, uint8_t* data, uint16_t size) {
|
|||
|
||||
void update_transport(void) {
|
||||
unsigned int i;
|
||||
for(i=0;i<num_remote_objects;i++) {
|
||||
for (i = 0; i < num_remote_objects; i++) {
|
||||
remote_object_t* obj = remote_objects[i];
|
||||
if (obj->object_type == MASTER_TO_ALL_SLAVES || obj->object_type == SLAVE_TO_MASTER) {
|
||||
triple_buffer_object_t* tb = (triple_buffer_object_t*)obj->buffer;
|
||||
uint8_t* ptr = (uint8_t*)triple_buffer_read_internal(obj->object_size + LOCAL_OBJECT_EXTRA, tb);
|
||||
triple_buffer_object_t* tb = (triple_buffer_object_t*)obj->buffer;
|
||||
uint8_t* ptr = (uint8_t*)triple_buffer_read_internal(obj->object_size + LOCAL_OBJECT_EXTRA, tb);
|
||||
if (ptr) {
|
||||
ptr[obj->object_size] = i;
|
||||
uint8_t dest = obj->object_type == MASTER_TO_ALL_SLAVES ? 0xFF : 0;
|
||||
uint8_t dest = obj->object_type == MASTER_TO_ALL_SLAVES ? 0xFF : 0;
|
||||
router_send_frame(dest, ptr, obj->object_size + 1);
|
||||
}
|
||||
}
|
||||
else {
|
||||
uint8_t* start = obj->buffer;
|
||||
} else {
|
||||
uint8_t* start = obj->buffer;
|
||||
unsigned int j;
|
||||
for (j=0;j<NUM_SLAVES;j++) {
|
||||
triple_buffer_object_t* tb = (triple_buffer_object_t*)start;
|
||||
uint8_t* ptr = (uint8_t*)triple_buffer_read_internal(obj->object_size + LOCAL_OBJECT_EXTRA, tb);
|
||||
for (j = 0; j < NUM_SLAVES; j++) {
|
||||
triple_buffer_object_t* tb = (triple_buffer_object_t*)start;
|
||||
uint8_t* ptr = (uint8_t*)triple_buffer_read_internal(obj->object_size + LOCAL_OBJECT_EXTRA, tb);
|
||||
if (ptr) {
|
||||
ptr[obj->object_size] = i;
|
||||
uint8_t dest = j + 1;
|
||||
uint8_t dest = j + 1;
|
||||
router_send_frame(dest, ptr, obj->object_size + 1);
|
||||
}
|
||||
start += LOCAL_OBJECT_SIZE(obj->object_size);
|
||||
|
|
|
|||
|
|
@ -42,104 +42,94 @@ typedef enum {
|
|||
|
||||
typedef struct {
|
||||
remote_object_type object_type;
|
||||
uint16_t object_size;
|
||||
uint8_t buffer[] __attribute__((aligned(4)));
|
||||
uint16_t object_size;
|
||||
uint8_t buffer[] __attribute__((aligned(4)));
|
||||
} remote_object_t;
|
||||
|
||||
#define REMOTE_OBJECT_SIZE(objectsize) \
|
||||
(sizeof(triple_buffer_object_t) + objectsize * 3)
|
||||
#define LOCAL_OBJECT_SIZE(objectsize) \
|
||||
(sizeof(triple_buffer_object_t) + (objectsize + LOCAL_OBJECT_EXTRA) * 3)
|
||||
#define REMOTE_OBJECT_SIZE(objectsize) (sizeof(triple_buffer_object_t) + objectsize * 3)
|
||||
#define LOCAL_OBJECT_SIZE(objectsize) (sizeof(triple_buffer_object_t) + (objectsize + LOCAL_OBJECT_EXTRA) * 3)
|
||||
|
||||
#define REMOTE_OBJECT_HELPER(name, type, num_local, num_remote) \
|
||||
typedef struct { \
|
||||
remote_object_t object; \
|
||||
uint8_t buffer[ \
|
||||
num_remote * REMOTE_OBJECT_SIZE(sizeof(type)) + \
|
||||
num_local * LOCAL_OBJECT_SIZE(sizeof(type))]; \
|
||||
} remote_object_##name##_t;
|
||||
#define REMOTE_OBJECT_HELPER(name, type, num_local, num_remote) \
|
||||
typedef struct { \
|
||||
remote_object_t object; \
|
||||
uint8_t buffer[num_remote * REMOTE_OBJECT_SIZE(sizeof(type)) + num_local * LOCAL_OBJECT_SIZE(sizeof(type))]; \
|
||||
} remote_object_##name##_t;
|
||||
|
||||
#define MASTER_TO_ALL_SLAVES_OBJECT(name, type) \
|
||||
REMOTE_OBJECT_HELPER(name, type, 1, 1) \
|
||||
remote_object_##name##_t remote_object_##name = { \
|
||||
.object = { \
|
||||
.object_type = MASTER_TO_ALL_SLAVES, \
|
||||
.object_size = sizeof(type), \
|
||||
} \
|
||||
}; \
|
||||
type* begin_write_##name(void) { \
|
||||
remote_object_t* obj = (remote_object_t*)&remote_object_##name; \
|
||||
triple_buffer_object_t* tb = (triple_buffer_object_t*)obj->buffer; \
|
||||
#define MASTER_TO_ALL_SLAVES_OBJECT(name, type) \
|
||||
REMOTE_OBJECT_HELPER(name, type, 1, 1) \
|
||||
remote_object_##name##_t remote_object_##name = {.object = { \
|
||||
.object_type = MASTER_TO_ALL_SLAVES, \
|
||||
.object_size = sizeof(type), \
|
||||
}}; \
|
||||
type* begin_write_##name(void) { \
|
||||
remote_object_t* obj = (remote_object_t*)&remote_object_##name; \
|
||||
triple_buffer_object_t* tb = (triple_buffer_object_t*)obj->buffer; \
|
||||
return (type*)triple_buffer_begin_write_internal(sizeof(type) + LOCAL_OBJECT_EXTRA, tb); \
|
||||
}\
|
||||
void end_write_##name(void) { \
|
||||
remote_object_t* obj = (remote_object_t*)&remote_object_##name; \
|
||||
triple_buffer_object_t* tb = (triple_buffer_object_t*)obj->buffer; \
|
||||
triple_buffer_end_write_internal(tb); \
|
||||
signal_data_written(); \
|
||||
}\
|
||||
type* read_##name(void) { \
|
||||
remote_object_t* obj = (remote_object_t*)&remote_object_##name; \
|
||||
uint8_t* start = obj->buffer + LOCAL_OBJECT_SIZE(obj->object_size);\
|
||||
triple_buffer_object_t* tb = (triple_buffer_object_t*)start; \
|
||||
return (type*)triple_buffer_read_internal(obj->object_size, tb); \
|
||||
} \
|
||||
void end_write_##name(void) { \
|
||||
remote_object_t* obj = (remote_object_t*)&remote_object_##name; \
|
||||
triple_buffer_object_t* tb = (triple_buffer_object_t*)obj->buffer; \
|
||||
triple_buffer_end_write_internal(tb); \
|
||||
signal_data_written(); \
|
||||
} \
|
||||
type* read_##name(void) { \
|
||||
remote_object_t* obj = (remote_object_t*)&remote_object_##name; \
|
||||
uint8_t* start = obj->buffer + LOCAL_OBJECT_SIZE(obj->object_size); \
|
||||
triple_buffer_object_t* tb = (triple_buffer_object_t*)start; \
|
||||
return (type*)triple_buffer_read_internal(obj->object_size, tb); \
|
||||
}
|
||||
|
||||
#define MASTER_TO_SINGLE_SLAVE_OBJECT(name, type) \
|
||||
REMOTE_OBJECT_HELPER(name, type, NUM_SLAVES, 1) \
|
||||
remote_object_##name##_t remote_object_##name = { \
|
||||
.object = { \
|
||||
.object_type = MASTER_TO_SINGLE_SLAVE, \
|
||||
.object_size = sizeof(type), \
|
||||
} \
|
||||
}; \
|
||||
type* begin_write_##name(uint8_t slave) { \
|
||||
remote_object_t* obj = (remote_object_t*)&remote_object_##name; \
|
||||
uint8_t* start = obj->buffer;\
|
||||
start += slave * LOCAL_OBJECT_SIZE(obj->object_size); \
|
||||
triple_buffer_object_t* tb = (triple_buffer_object_t*)start; \
|
||||
#define MASTER_TO_SINGLE_SLAVE_OBJECT(name, type) \
|
||||
REMOTE_OBJECT_HELPER(name, type, NUM_SLAVES, 1) \
|
||||
remote_object_##name##_t remote_object_##name = {.object = { \
|
||||
.object_type = MASTER_TO_SINGLE_SLAVE, \
|
||||
.object_size = sizeof(type), \
|
||||
}}; \
|
||||
type* begin_write_##name(uint8_t slave) { \
|
||||
remote_object_t* obj = (remote_object_t*)&remote_object_##name; \
|
||||
uint8_t* start = obj->buffer; \
|
||||
start += slave * LOCAL_OBJECT_SIZE(obj->object_size); \
|
||||
triple_buffer_object_t* tb = (triple_buffer_object_t*)start; \
|
||||
return (type*)triple_buffer_begin_write_internal(sizeof(type) + LOCAL_OBJECT_EXTRA, tb); \
|
||||
}\
|
||||
void end_write_##name(uint8_t slave) { \
|
||||
remote_object_t* obj = (remote_object_t*)&remote_object_##name; \
|
||||
uint8_t* start = obj->buffer;\
|
||||
start += slave * LOCAL_OBJECT_SIZE(obj->object_size); \
|
||||
triple_buffer_object_t* tb = (triple_buffer_object_t*)start; \
|
||||
triple_buffer_end_write_internal(tb); \
|
||||
signal_data_written(); \
|
||||
}\
|
||||
type* read_##name() { \
|
||||
remote_object_t* obj = (remote_object_t*)&remote_object_##name; \
|
||||
uint8_t* start = obj->buffer + NUM_SLAVES * LOCAL_OBJECT_SIZE(obj->object_size);\
|
||||
triple_buffer_object_t* tb = (triple_buffer_object_t*)start; \
|
||||
return (type*)triple_buffer_read_internal(obj->object_size, tb); \
|
||||
} \
|
||||
void end_write_##name(uint8_t slave) { \
|
||||
remote_object_t* obj = (remote_object_t*)&remote_object_##name; \
|
||||
uint8_t* start = obj->buffer; \
|
||||
start += slave * LOCAL_OBJECT_SIZE(obj->object_size); \
|
||||
triple_buffer_object_t* tb = (triple_buffer_object_t*)start; \
|
||||
triple_buffer_end_write_internal(tb); \
|
||||
signal_data_written(); \
|
||||
} \
|
||||
type* read_##name() { \
|
||||
remote_object_t* obj = (remote_object_t*)&remote_object_##name; \
|
||||
uint8_t* start = obj->buffer + NUM_SLAVES * LOCAL_OBJECT_SIZE(obj->object_size); \
|
||||
triple_buffer_object_t* tb = (triple_buffer_object_t*)start; \
|
||||
return (type*)triple_buffer_read_internal(obj->object_size, tb); \
|
||||
}
|
||||
|
||||
#define SLAVE_TO_MASTER_OBJECT(name, type) \
|
||||
REMOTE_OBJECT_HELPER(name, type, 1, NUM_SLAVES) \
|
||||
remote_object_##name##_t remote_object_##name = { \
|
||||
.object = { \
|
||||
.object_type = SLAVE_TO_MASTER, \
|
||||
.object_size = sizeof(type), \
|
||||
} \
|
||||
}; \
|
||||
type* begin_write_##name(void) { \
|
||||
remote_object_t* obj = (remote_object_t*)&remote_object_##name; \
|
||||
triple_buffer_object_t* tb = (triple_buffer_object_t*)obj->buffer; \
|
||||
#define SLAVE_TO_MASTER_OBJECT(name, type) \
|
||||
REMOTE_OBJECT_HELPER(name, type, 1, NUM_SLAVES) \
|
||||
remote_object_##name##_t remote_object_##name = {.object = { \
|
||||
.object_type = SLAVE_TO_MASTER, \
|
||||
.object_size = sizeof(type), \
|
||||
}}; \
|
||||
type* begin_write_##name(void) { \
|
||||
remote_object_t* obj = (remote_object_t*)&remote_object_##name; \
|
||||
triple_buffer_object_t* tb = (triple_buffer_object_t*)obj->buffer; \
|
||||
return (type*)triple_buffer_begin_write_internal(sizeof(type) + LOCAL_OBJECT_EXTRA, tb); \
|
||||
}\
|
||||
void end_write_##name(void) { \
|
||||
remote_object_t* obj = (remote_object_t*)&remote_object_##name; \
|
||||
triple_buffer_object_t* tb = (triple_buffer_object_t*)obj->buffer; \
|
||||
triple_buffer_end_write_internal(tb); \
|
||||
signal_data_written(); \
|
||||
}\
|
||||
type* read_##name(uint8_t slave) { \
|
||||
remote_object_t* obj = (remote_object_t*)&remote_object_##name; \
|
||||
uint8_t* start = obj->buffer + LOCAL_OBJECT_SIZE(obj->object_size);\
|
||||
start+=slave * REMOTE_OBJECT_SIZE(obj->object_size); \
|
||||
triple_buffer_object_t* tb = (triple_buffer_object_t*)start; \
|
||||
return (type*)triple_buffer_read_internal(obj->object_size, tb); \
|
||||
} \
|
||||
void end_write_##name(void) { \
|
||||
remote_object_t* obj = (remote_object_t*)&remote_object_##name; \
|
||||
triple_buffer_object_t* tb = (triple_buffer_object_t*)obj->buffer; \
|
||||
triple_buffer_end_write_internal(tb); \
|
||||
signal_data_written(); \
|
||||
} \
|
||||
type* read_##name(uint8_t slave) { \
|
||||
remote_object_t* obj = (remote_object_t*)&remote_object_##name; \
|
||||
uint8_t* start = obj->buffer + LOCAL_OBJECT_SIZE(obj->object_size); \
|
||||
start += slave * REMOTE_OBJECT_SIZE(obj->object_size); \
|
||||
triple_buffer_object_t* tb = (triple_buffer_object_t*)start; \
|
||||
return (type*)triple_buffer_read_internal(obj->object_size, tb); \
|
||||
}
|
||||
|
||||
#define REMOTE_OBJECT(name) (remote_object_t*)&remote_object_##name
|
||||
|
|
|
|||
|
|
@ -49,14 +49,13 @@ void* triple_buffer_read_internal(uint16_t object_size, triple_buffer_object_t*
|
|||
serial_link_lock();
|
||||
if (GET_DATA_AVAILABLE()) {
|
||||
uint8_t shared_index = GET_SHARED_INDEX();
|
||||
uint8_t read_index = GET_READ_INDEX();
|
||||
uint8_t read_index = GET_READ_INDEX();
|
||||
SET_READ_INDEX(shared_index);
|
||||
SET_SHARED_INDEX(read_index);
|
||||
SET_DATA_AVAILABLE(false);
|
||||
serial_link_unlock();
|
||||
return object->buffer + object_size * shared_index;
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
serial_link_unlock();
|
||||
return NULL;
|
||||
}
|
||||
|
|
@ -70,7 +69,7 @@ void* triple_buffer_begin_write_internal(uint16_t object_size, triple_buffer_obj
|
|||
void triple_buffer_end_write_internal(triple_buffer_object_t* object) {
|
||||
serial_link_lock();
|
||||
uint8_t shared_index = GET_SHARED_INDEX();
|
||||
uint8_t write_index = GET_WRITE_INDEX();
|
||||
uint8_t write_index = GET_WRITE_INDEX();
|
||||
SET_SHARED_INDEX(write_index);
|
||||
SET_WRITE_INDEX(shared_index);
|
||||
SET_DATA_AVAILABLE(true);
|
||||
|
|
|
|||
|
|
@ -30,22 +30,18 @@ SOFTWARE.
|
|||
typedef struct {
|
||||
uint8_t state;
|
||||
uint8_t buffer[] __attribute__((aligned(4)));
|
||||
}triple_buffer_object_t;
|
||||
} triple_buffer_object_t;
|
||||
|
||||
void triple_buffer_init(triple_buffer_object_t* object);
|
||||
|
||||
#define triple_buffer_begin_write(object) \
|
||||
(typeof(*object.buffer[0])*)triple_buffer_begin_write_internal(sizeof(*object.buffer[0]), (triple_buffer_object_t*)object)
|
||||
#define triple_buffer_begin_write(object) (typeof(*object.buffer[0])*)triple_buffer_begin_write_internal(sizeof(*object.buffer[0]), (triple_buffer_object_t*)object)
|
||||
|
||||
#define triple_buffer_end_write(object) \
|
||||
triple_buffer_end_write_internal((triple_buffer_object_t*)object)
|
||||
#define triple_buffer_end_write(object) triple_buffer_end_write_internal((triple_buffer_object_t*)object)
|
||||
|
||||
#define triple_buffer_read(object) \
|
||||
(typeof(*object.buffer[0])*)triple_buffer_read_internal(sizeof(*object.buffer[0]), (triple_buffer_object_t*)object)
|
||||
#define triple_buffer_read(object) (typeof(*object.buffer[0])*)triple_buffer_read_internal(sizeof(*object.buffer[0]), (triple_buffer_object_t*)object)
|
||||
|
||||
void* triple_buffer_begin_write_internal(uint16_t object_size, triple_buffer_object_t* object);
|
||||
void triple_buffer_end_write_internal(triple_buffer_object_t* object);
|
||||
void triple_buffer_end_write_internal(triple_buffer_object_t* object);
|
||||
void* triple_buffer_read_internal(uint16_t object_size, triple_buffer_object_t* object);
|
||||
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -34,45 +34,37 @@ SOFTWARE.
|
|||
#include "config.h"
|
||||
|
||||
static event_source_t new_data_event;
|
||||
static bool serial_link_connected;
|
||||
static bool is_master = false;
|
||||
static bool serial_link_connected;
|
||||
static bool is_master = false;
|
||||
|
||||
static uint8_t keyboard_leds(void);
|
||||
static void send_keyboard(report_keyboard_t *report);
|
||||
static void send_mouse(report_mouse_t *report);
|
||||
static void send_system(uint16_t data);
|
||||
static void send_consumer(uint16_t data);
|
||||
static void send_keyboard(report_keyboard_t* report);
|
||||
static void send_mouse(report_mouse_t* report);
|
||||
static void send_system(uint16_t data);
|
||||
static void send_consumer(uint16_t data);
|
||||
|
||||
host_driver_t serial_driver = {
|
||||
keyboard_leds,
|
||||
send_keyboard,
|
||||
send_mouse,
|
||||
send_system,
|
||||
send_consumer
|
||||
};
|
||||
host_driver_t serial_driver = {keyboard_leds, send_keyboard, send_mouse, send_system, send_consumer};
|
||||
|
||||
// Define these in your Config.h file
|
||||
#ifndef SERIAL_LINK_BAUD
|
||||
#error "Serial link baud is not set"
|
||||
# error "Serial link baud is not set"
|
||||
#endif
|
||||
|
||||
#ifndef SERIAL_LINK_THREAD_PRIORITY
|
||||
#error "Serial link thread priority not set"
|
||||
# error "Serial link thread priority not set"
|
||||
#endif
|
||||
|
||||
static SerialConfig config = {
|
||||
.sc_speed = SERIAL_LINK_BAUD
|
||||
};
|
||||
static SerialConfig config = {.sc_speed = SERIAL_LINK_BAUD};
|
||||
|
||||
//#define DEBUG_LINK_ERRORS
|
||||
|
||||
static uint32_t read_from_serial(SerialDriver* driver, uint8_t link) {
|
||||
const uint32_t buffer_size = 16;
|
||||
uint8_t buffer[buffer_size];
|
||||
uint32_t bytes_read = sdAsynchronousRead(driver, buffer, buffer_size);
|
||||
uint8_t* current = buffer;
|
||||
uint8_t* end = current + bytes_read;
|
||||
while(current < end) {
|
||||
uint8_t buffer[buffer_size];
|
||||
uint32_t bytes_read = sdAsynchronousRead(driver, buffer, buffer_size);
|
||||
uint8_t* current = buffer;
|
||||
uint8_t* end = current + bytes_read;
|
||||
while (current < end) {
|
||||
byte_stuffer_recv_byte(link, *current);
|
||||
current++;
|
||||
}
|
||||
|
|
@ -93,7 +85,6 @@ static void print_error(char* str, eventflags_t flags, SerialDriver* driver) {
|
|||
print(str);
|
||||
uint32_t size = qSpaceI(&(driver->iqueue));
|
||||
xprintf(" Overrun error, queue size %d\n", size);
|
||||
|
||||
}
|
||||
if (flags & SD_NOISE_ERROR) {
|
||||
print(str);
|
||||
|
|
@ -110,9 +101,7 @@ static void print_error(char* str, eventflags_t flags, SerialDriver* driver) {
|
|||
#endif
|
||||
}
|
||||
|
||||
bool is_serial_link_master(void) {
|
||||
return is_master;
|
||||
}
|
||||
bool is_serial_link_master(void) { return is_master; }
|
||||
|
||||
// TODO: Optimize the stack size, this is probably way too big
|
||||
static THD_WORKING_AREA(serialThreadStack, 1024);
|
||||
|
|
@ -122,18 +111,11 @@ static THD_FUNCTION(serialThread, arg) {
|
|||
event_listener_t sd1_listener;
|
||||
event_listener_t sd2_listener;
|
||||
chEvtRegister(&new_data_event, &new_data_listener, 0);
|
||||
eventflags_t events = CHN_INPUT_AVAILABLE
|
||||
| SD_PARITY_ERROR | SD_FRAMING_ERROR | SD_OVERRUN_ERROR | SD_NOISE_ERROR | SD_BREAK_DETECTED;
|
||||
chEvtRegisterMaskWithFlags(chnGetEventSource(&SD1),
|
||||
&sd1_listener,
|
||||
EVENT_MASK(1),
|
||||
events);
|
||||
chEvtRegisterMaskWithFlags(chnGetEventSource(&SD2),
|
||||
&sd2_listener,
|
||||
EVENT_MASK(2),
|
||||
events);
|
||||
eventflags_t events = CHN_INPUT_AVAILABLE | SD_PARITY_ERROR | SD_FRAMING_ERROR | SD_OVERRUN_ERROR | SD_NOISE_ERROR | SD_BREAK_DETECTED;
|
||||
chEvtRegisterMaskWithFlags(chnGetEventSource(&SD1), &sd1_listener, EVENT_MASK(1), events);
|
||||
chEvtRegisterMaskWithFlags(chnGetEventSource(&SD2), &sd2_listener, EVENT_MASK(2), events);
|
||||
bool need_wait = false;
|
||||
while(true) {
|
||||
while (true) {
|
||||
eventflags_t flags1 = 0;
|
||||
eventflags_t flags2 = 0;
|
||||
if (need_wait) {
|
||||
|
|
@ -162,8 +144,7 @@ static THD_FUNCTION(serialThread, arg) {
|
|||
void send_data(uint8_t link, const uint8_t* data, uint16_t size) {
|
||||
if (link == DOWN_LINK) {
|
||||
sdWrite(&SD1, data, size);
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
sdWrite(&SD2, data, size);
|
||||
}
|
||||
}
|
||||
|
|
@ -187,13 +168,12 @@ static remote_object_t* remote_objects[] = {
|
|||
void init_serial_link(void) {
|
||||
serial_link_connected = false;
|
||||
init_serial_link_hal();
|
||||
add_remote_objects(remote_objects, sizeof(remote_objects)/sizeof(remote_object_t*));
|
||||
add_remote_objects(remote_objects, sizeof(remote_objects) / sizeof(remote_object_t*));
|
||||
init_byte_stuffer();
|
||||
sdStart(&SD1, &config);
|
||||
sdStart(&SD2, &config);
|
||||
chEvtObjectInit(&new_data_event);
|
||||
(void)chThdCreateStatic(serialThreadStack, sizeof(serialThreadStack),
|
||||
SERIAL_LINK_THREAD_PRIORITY, serialThread, NULL);
|
||||
(void)chThdCreateStatic(serialThreadStack, sizeof(serialThreadStack), SERIAL_LINK_THREAD_PRIORITY, serialThread, NULL);
|
||||
}
|
||||
|
||||
void matrix_set_remote(matrix_row_t* rows, uint8_t index);
|
||||
|
|
@ -204,19 +184,19 @@ void serial_link_update(void) {
|
|||
}
|
||||
|
||||
matrix_object_t matrix;
|
||||
bool changed = false;
|
||||
for(uint8_t i=0;i<MATRIX_ROWS;i++) {
|
||||
bool changed = false;
|
||||
for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
|
||||
matrix.rows[i] = matrix_get_row(i);
|
||||
changed |= matrix.rows[i] != last_matrix.rows[i];
|
||||
}
|
||||
|
||||
systime_t current_time = chVTGetSystemTimeX();
|
||||
systime_t delta = current_time - last_update;
|
||||
systime_t delta = current_time - last_update;
|
||||
if (changed || delta > US2ST(5000)) {
|
||||
last_update = current_time;
|
||||
last_matrix = matrix;
|
||||
last_update = current_time;
|
||||
last_matrix = matrix;
|
||||
matrix_object_t* m = begin_write_keyboard_matrix();
|
||||
for(uint8_t i=0;i<MATRIX_ROWS;i++) {
|
||||
for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
|
||||
m->rows[i] = matrix.rows[i];
|
||||
}
|
||||
end_write_keyboard_matrix();
|
||||
|
|
@ -230,36 +210,19 @@ void serial_link_update(void) {
|
|||
}
|
||||
}
|
||||
|
||||
void signal_data_written(void) {
|
||||
chEvtBroadcast(&new_data_event);
|
||||
}
|
||||
void signal_data_written(void) { chEvtBroadcast(&new_data_event); }
|
||||
|
||||
bool is_serial_link_connected(void) {
|
||||
return serial_link_connected;
|
||||
}
|
||||
bool is_serial_link_connected(void) { return serial_link_connected; }
|
||||
|
||||
host_driver_t* get_serial_link_driver(void) {
|
||||
return &serial_driver;
|
||||
}
|
||||
host_driver_t* get_serial_link_driver(void) { return &serial_driver; }
|
||||
|
||||
// NOTE: The driver does nothing, because the master handles everything
|
||||
uint8_t keyboard_leds(void) {
|
||||
return 0;
|
||||
}
|
||||
uint8_t keyboard_leds(void) { return 0; }
|
||||
|
||||
void send_keyboard(report_keyboard_t *report) {
|
||||
(void)report;
|
||||
}
|
||||
void send_keyboard(report_keyboard_t* report) { (void)report; }
|
||||
|
||||
void send_mouse(report_mouse_t *report) {
|
||||
(void)report;
|
||||
}
|
||||
void send_mouse(report_mouse_t* report) { (void)report; }
|
||||
|
||||
void send_system(uint16_t data) {
|
||||
(void)data;
|
||||
}
|
||||
|
||||
void send_consumer(uint16_t data) {
|
||||
(void)data;
|
||||
}
|
||||
void send_system(uint16_t data) { (void)data; }
|
||||
|
||||
void send_consumer(uint16_t data) { (void)data; }
|
||||
|
|
|
|||
|
|
@ -28,33 +28,27 @@ SOFTWARE.
|
|||
#include "host_driver.h"
|
||||
#include <stdbool.h>
|
||||
|
||||
void init_serial_link(void);
|
||||
void init_serial_link_hal(void);
|
||||
bool is_serial_link_connected(void);
|
||||
bool is_serial_link_master(void);
|
||||
void init_serial_link(void);
|
||||
void init_serial_link_hal(void);
|
||||
bool is_serial_link_connected(void);
|
||||
bool is_serial_link_master(void);
|
||||
host_driver_t* get_serial_link_driver(void);
|
||||
void serial_link_update(void);
|
||||
void serial_link_update(void);
|
||||
|
||||
#if defined(PROTOCOL_CHIBIOS)
|
||||
#include "ch.h"
|
||||
# include "ch.h"
|
||||
|
||||
static inline void serial_link_lock(void) {
|
||||
chSysLock();
|
||||
}
|
||||
static inline void serial_link_lock(void) { chSysLock(); }
|
||||
|
||||
static inline void serial_link_unlock(void) {
|
||||
chSysUnlock();
|
||||
}
|
||||
static inline void serial_link_unlock(void) { chSysUnlock(); }
|
||||
|
||||
void signal_data_written(void);
|
||||
|
||||
#else
|
||||
|
||||
inline void serial_link_lock(void) {
|
||||
}
|
||||
inline void serial_link_lock(void) {}
|
||||
|
||||
inline void serial_link_unlock(void) {
|
||||
}
|
||||
inline void serial_link_unlock(void) {}
|
||||
|
||||
void signal_data_written(void);
|
||||
|
||||
|
|
|
|||
|
|
@ -33,25 +33,21 @@ extern "C" {
|
|||
}
|
||||
|
||||
using testing::_;
|
||||
using testing::ElementsAreArray;
|
||||
using testing::Args;
|
||||
using testing::ElementsAreArray;
|
||||
|
||||
class ByteStuffer : public ::testing::Test{
|
||||
public:
|
||||
class ByteStuffer : public ::testing::Test {
|
||||
public:
|
||||
ByteStuffer() {
|
||||
Instance = this;
|
||||
init_byte_stuffer();
|
||||
}
|
||||
|
||||
~ByteStuffer() {
|
||||
Instance = nullptr;
|
||||
}
|
||||
~ByteStuffer() { Instance = nullptr; }
|
||||
|
||||
MOCK_METHOD3(validator_recv_frame, void (uint8_t link, uint8_t* data, uint16_t size));
|
||||
MOCK_METHOD3(validator_recv_frame, void(uint8_t link, uint8_t* data, uint16_t size));
|
||||
|
||||
void send_data(uint8_t link, const uint8_t* data, uint16_t size) {
|
||||
std::copy(data, data + size, std::back_inserter(sent_data));
|
||||
}
|
||||
void send_data(uint8_t link, const uint8_t* data, uint16_t size) { std::copy(data, data + size, std::back_inserter(sent_data)); }
|
||||
std::vector<uint8_t> sent_data;
|
||||
|
||||
static ByteStuffer* Instance;
|
||||
|
|
@ -60,52 +56,42 @@ public:
|
|||
ByteStuffer* ByteStuffer::Instance = nullptr;
|
||||
|
||||
extern "C" {
|
||||
void validator_recv_frame(uint8_t link, uint8_t* data, uint16_t size) {
|
||||
ByteStuffer::Instance->validator_recv_frame(link, data, size);
|
||||
}
|
||||
void validator_recv_frame(uint8_t link, uint8_t* data, uint16_t size) { ByteStuffer::Instance->validator_recv_frame(link, data, size); }
|
||||
|
||||
void send_data(uint8_t link, const uint8_t* data, uint16_t size) {
|
||||
ByteStuffer::Instance->send_data(link, data, size);
|
||||
}
|
||||
void send_data(uint8_t link, const uint8_t* data, uint16_t size) { ByteStuffer::Instance->send_data(link, data, size); }
|
||||
}
|
||||
|
||||
TEST_F(ByteStuffer, receives_no_frame_for_a_single_zero_byte) {
|
||||
EXPECT_CALL(*this, validator_recv_frame(_, _, _))
|
||||
.Times(0);
|
||||
EXPECT_CALL(*this, validator_recv_frame(_, _, _)).Times(0);
|
||||
byte_stuffer_recv_byte(0, 0);
|
||||
}
|
||||
|
||||
TEST_F(ByteStuffer, receives_no_frame_for_a_single_FF_byte) {
|
||||
EXPECT_CALL(*this, validator_recv_frame(_, _, _))
|
||||
.Times(0);
|
||||
EXPECT_CALL(*this, validator_recv_frame(_, _, _)).Times(0);
|
||||
byte_stuffer_recv_byte(0, 0xFF);
|
||||
}
|
||||
|
||||
TEST_F(ByteStuffer, receives_no_frame_for_a_single_random_byte) {
|
||||
EXPECT_CALL(*this, validator_recv_frame(_, _, _))
|
||||
.Times(0);
|
||||
EXPECT_CALL(*this, validator_recv_frame(_, _, _)).Times(0);
|
||||
byte_stuffer_recv_byte(0, 0x4A);
|
||||
}
|
||||
|
||||
TEST_F(ByteStuffer, receives_no_frame_for_a_zero_length_frame) {
|
||||
EXPECT_CALL(*this, validator_recv_frame(_, _, _))
|
||||
.Times(0);
|
||||
EXPECT_CALL(*this, validator_recv_frame(_, _, _)).Times(0);
|
||||
byte_stuffer_recv_byte(0, 1);
|
||||
byte_stuffer_recv_byte(0, 0);
|
||||
}
|
||||
|
||||
TEST_F(ByteStuffer, receives_single_byte_valid_frame) {
|
||||
uint8_t expected[] = {0x37};
|
||||
EXPECT_CALL(*this, validator_recv_frame(_, _, _))
|
||||
.With(Args<1, 2>(ElementsAreArray(expected)));
|
||||
EXPECT_CALL(*this, validator_recv_frame(_, _, _)).With(Args<1, 2>(ElementsAreArray(expected)));
|
||||
byte_stuffer_recv_byte(0, 2);
|
||||
byte_stuffer_recv_byte(0, 0x37);
|
||||
byte_stuffer_recv_byte(0, 0);
|
||||
}
|
||||
TEST_F(ByteStuffer, receives_three_bytes_valid_frame) {
|
||||
uint8_t expected[] = {0x37, 0x99, 0xFF};
|
||||
EXPECT_CALL(*this, validator_recv_frame(_, _, _))
|
||||
.With(Args<1, 2>(ElementsAreArray(expected)));
|
||||
EXPECT_CALL(*this, validator_recv_frame(_, _, _)).With(Args<1, 2>(ElementsAreArray(expected)));
|
||||
byte_stuffer_recv_byte(0, 4);
|
||||
byte_stuffer_recv_byte(0, 0x37);
|
||||
byte_stuffer_recv_byte(0, 0x99);
|
||||
|
|
@ -115,8 +101,7 @@ TEST_F(ByteStuffer, receives_three_bytes_valid_frame) {
|
|||
|
||||
TEST_F(ByteStuffer, receives_single_zero_valid_frame) {
|
||||
uint8_t expected[] = {0};
|
||||
EXPECT_CALL(*this, validator_recv_frame(_, _, _))
|
||||
.With(Args<1, 2>(ElementsAreArray(expected)));
|
||||
EXPECT_CALL(*this, validator_recv_frame(_, _, _)).With(Args<1, 2>(ElementsAreArray(expected)));
|
||||
byte_stuffer_recv_byte(0, 1);
|
||||
byte_stuffer_recv_byte(0, 1);
|
||||
byte_stuffer_recv_byte(0, 0);
|
||||
|
|
@ -124,8 +109,7 @@ TEST_F(ByteStuffer, receives_single_zero_valid_frame) {
|
|||
|
||||
TEST_F(ByteStuffer, receives_valid_frame_with_zeroes) {
|
||||
uint8_t expected[] = {5, 0, 3, 0};
|
||||
EXPECT_CALL(*this, validator_recv_frame(_, _, _))
|
||||
.With(Args<1, 2>(ElementsAreArray(expected)));
|
||||
EXPECT_CALL(*this, validator_recv_frame(_, _, _)).With(Args<1, 2>(ElementsAreArray(expected)));
|
||||
byte_stuffer_recv_byte(0, 2);
|
||||
byte_stuffer_recv_byte(0, 5);
|
||||
byte_stuffer_recv_byte(0, 2);
|
||||
|
|
@ -134,14 +118,11 @@ TEST_F(ByteStuffer, receives_valid_frame_with_zeroes) {
|
|||
byte_stuffer_recv_byte(0, 0);
|
||||
}
|
||||
|
||||
|
||||
TEST_F(ByteStuffer, receives_two_valid_frames) {
|
||||
uint8_t expected1[] = {5, 0};
|
||||
uint8_t expected2[] = {3};
|
||||
EXPECT_CALL(*this, validator_recv_frame(_, _, _))
|
||||
.With(Args<1, 2>(ElementsAreArray(expected1)));
|
||||
EXPECT_CALL(*this, validator_recv_frame(_, _, _))
|
||||
.With(Args<1, 2>(ElementsAreArray(expected2)));
|
||||
EXPECT_CALL(*this, validator_recv_frame(_, _, _)).With(Args<1, 2>(ElementsAreArray(expected1)));
|
||||
EXPECT_CALL(*this, validator_recv_frame(_, _, _)).With(Args<1, 2>(ElementsAreArray(expected2)));
|
||||
byte_stuffer_recv_byte(1, 2);
|
||||
byte_stuffer_recv_byte(1, 5);
|
||||
byte_stuffer_recv_byte(1, 1);
|
||||
|
|
@ -153,8 +134,7 @@ TEST_F(ByteStuffer, receives_two_valid_frames) {
|
|||
|
||||
TEST_F(ByteStuffer, receives_valid_frame_after_unexpected_zero) {
|
||||
uint8_t expected[] = {5, 7};
|
||||
EXPECT_CALL(*this, validator_recv_frame(_, _, _))
|
||||
.With(Args<1, 2>(ElementsAreArray(expected)));
|
||||
EXPECT_CALL(*this, validator_recv_frame(_, _, _)).With(Args<1, 2>(ElementsAreArray(expected)));
|
||||
byte_stuffer_recv_byte(1, 3);
|
||||
byte_stuffer_recv_byte(1, 1);
|
||||
byte_stuffer_recv_byte(1, 0);
|
||||
|
|
@ -166,11 +146,10 @@ TEST_F(ByteStuffer, receives_valid_frame_after_unexpected_zero) {
|
|||
|
||||
TEST_F(ByteStuffer, receives_valid_frame_after_unexpected_non_zero) {
|
||||
uint8_t expected[] = {5, 7};
|
||||
EXPECT_CALL(*this, validator_recv_frame(_, _, _))
|
||||
.With(Args<1, 2>(ElementsAreArray(expected)));
|
||||
EXPECT_CALL(*this, validator_recv_frame(_, _, _)).With(Args<1, 2>(ElementsAreArray(expected)));
|
||||
byte_stuffer_recv_byte(0, 2);
|
||||
byte_stuffer_recv_byte(0, 9);
|
||||
byte_stuffer_recv_byte(0, 4); // This should have been zero
|
||||
byte_stuffer_recv_byte(0, 4); // This should have been zero
|
||||
byte_stuffer_recv_byte(0, 0);
|
||||
byte_stuffer_recv_byte(0, 3);
|
||||
byte_stuffer_recv_byte(0, 5);
|
||||
|
|
@ -180,31 +159,29 @@ TEST_F(ByteStuffer, receives_valid_frame_after_unexpected_non_zero) {
|
|||
|
||||
TEST_F(ByteStuffer, receives_a_valid_frame_with_over254_non_zeroes_and_then_end_of_frame) {
|
||||
uint8_t expected[254];
|
||||
int i;
|
||||
for (i=0;i<254;i++) {
|
||||
int i;
|
||||
for (i = 0; i < 254; i++) {
|
||||
expected[i] = i + 1;
|
||||
}
|
||||
EXPECT_CALL(*this, validator_recv_frame(_, _, _))
|
||||
.With(Args<1, 2>(ElementsAreArray(expected)));
|
||||
EXPECT_CALL(*this, validator_recv_frame(_, _, _)).With(Args<1, 2>(ElementsAreArray(expected)));
|
||||
byte_stuffer_recv_byte(0, 0xFF);
|
||||
for (i=0;i<254;i++) {
|
||||
byte_stuffer_recv_byte(0, i+1);
|
||||
for (i = 0; i < 254; i++) {
|
||||
byte_stuffer_recv_byte(0, i + 1);
|
||||
}
|
||||
byte_stuffer_recv_byte(0, 0);
|
||||
}
|
||||
|
||||
TEST_F(ByteStuffer, receives_a_valid_frame_with_over254_non_zeroes_next_byte_is_non_zero) {
|
||||
uint8_t expected[255];
|
||||
int i;
|
||||
for (i=0;i<254;i++) {
|
||||
int i;
|
||||
for (i = 0; i < 254; i++) {
|
||||
expected[i] = i + 1;
|
||||
}
|
||||
expected[254] = 7;
|
||||
EXPECT_CALL(*this, validator_recv_frame(_, _, _))
|
||||
.With(Args<1, 2>(ElementsAreArray(expected)));
|
||||
EXPECT_CALL(*this, validator_recv_frame(_, _, _)).With(Args<1, 2>(ElementsAreArray(expected)));
|
||||
byte_stuffer_recv_byte(0, 0xFF);
|
||||
for (i=0;i<254;i++) {
|
||||
byte_stuffer_recv_byte(0, i+1);
|
||||
for (i = 0; i < 254; i++) {
|
||||
byte_stuffer_recv_byte(0, i + 1);
|
||||
}
|
||||
byte_stuffer_recv_byte(0, 2);
|
||||
byte_stuffer_recv_byte(0, 7);
|
||||
|
|
@ -213,16 +190,15 @@ TEST_F(ByteStuffer, receives_a_valid_frame_with_over254_non_zeroes_next_byte_is_
|
|||
|
||||
TEST_F(ByteStuffer, receives_a_valid_frame_with_over254_non_zeroes_next_byte_is_zero) {
|
||||
uint8_t expected[255];
|
||||
int i;
|
||||
for (i=0;i<254;i++) {
|
||||
int i;
|
||||
for (i = 0; i < 254; i++) {
|
||||
expected[i] = i + 1;
|
||||
}
|
||||
expected[254] = 0;
|
||||
EXPECT_CALL(*this, validator_recv_frame(_, _, _))
|
||||
.With(Args<1, 2>(ElementsAreArray(expected)));
|
||||
EXPECT_CALL(*this, validator_recv_frame(_, _, _)).With(Args<1, 2>(ElementsAreArray(expected)));
|
||||
byte_stuffer_recv_byte(0, 0xFF);
|
||||
for (i=0;i<254;i++) {
|
||||
byte_stuffer_recv_byte(0, i+1);
|
||||
for (i = 0; i < 254; i++) {
|
||||
byte_stuffer_recv_byte(0, i + 1);
|
||||
}
|
||||
byte_stuffer_recv_byte(0, 1);
|
||||
byte_stuffer_recv_byte(0, 1);
|
||||
|
|
@ -231,25 +207,24 @@ TEST_F(ByteStuffer, receives_a_valid_frame_with_over254_non_zeroes_next_byte_is_
|
|||
|
||||
TEST_F(ByteStuffer, receives_two_long_frames_and_some_more) {
|
||||
uint8_t expected[515];
|
||||
int i;
|
||||
int j;
|
||||
for (j=0;j<2;j++) {
|
||||
for (i=0;i<254;i++) {
|
||||
expected[i+254*j] = i + 1;
|
||||
int i;
|
||||
int j;
|
||||
for (j = 0; j < 2; j++) {
|
||||
for (i = 0; i < 254; i++) {
|
||||
expected[i + 254 * j] = i + 1;
|
||||
}
|
||||
}
|
||||
for (i=0;i<7;i++) {
|
||||
expected[254*2+i] = i + 1;
|
||||
for (i = 0; i < 7; i++) {
|
||||
expected[254 * 2 + i] = i + 1;
|
||||
}
|
||||
EXPECT_CALL(*this, validator_recv_frame(_, _, _))
|
||||
.With(Args<1, 2>(ElementsAreArray(expected)));
|
||||
EXPECT_CALL(*this, validator_recv_frame(_, _, _)).With(Args<1, 2>(ElementsAreArray(expected)));
|
||||
byte_stuffer_recv_byte(0, 0xFF);
|
||||
for (i=0;i<254;i++) {
|
||||
byte_stuffer_recv_byte(0, i+1);
|
||||
for (i = 0; i < 254; i++) {
|
||||
byte_stuffer_recv_byte(0, i + 1);
|
||||
}
|
||||
byte_stuffer_recv_byte(0, 0xFF);
|
||||
for (i=0;i<254;i++) {
|
||||
byte_stuffer_recv_byte(0, i+1);
|
||||
for (i = 0; i < 254; i++) {
|
||||
byte_stuffer_recv_byte(0, i + 1);
|
||||
}
|
||||
byte_stuffer_recv_byte(0, 8);
|
||||
byte_stuffer_recv_byte(0, 1);
|
||||
|
|
@ -264,24 +239,22 @@ TEST_F(ByteStuffer, receives_two_long_frames_and_some_more) {
|
|||
|
||||
TEST_F(ByteStuffer, receives_an_all_zeros_frame_that_is_maximum_size) {
|
||||
uint8_t expected[MAX_FRAME_SIZE] = {};
|
||||
EXPECT_CALL(*this, validator_recv_frame(_, _, _))
|
||||
.With(Args<1, 2>(ElementsAreArray(expected)));
|
||||
EXPECT_CALL(*this, validator_recv_frame(_, _, _)).With(Args<1, 2>(ElementsAreArray(expected)));
|
||||
int i;
|
||||
byte_stuffer_recv_byte(0, 1);
|
||||
for(i=0;i<MAX_FRAME_SIZE;i++) {
|
||||
byte_stuffer_recv_byte(0, 1);
|
||||
for (i = 0; i < MAX_FRAME_SIZE; i++) {
|
||||
byte_stuffer_recv_byte(0, 1);
|
||||
}
|
||||
byte_stuffer_recv_byte(0, 0);
|
||||
}
|
||||
|
||||
TEST_F(ByteStuffer, doesnt_recv_a_frame_thats_too_long_all_zeroes) {
|
||||
uint8_t expected[1] = {0};
|
||||
EXPECT_CALL(*this, validator_recv_frame(_, _, _))
|
||||
.Times(0);
|
||||
EXPECT_CALL(*this, validator_recv_frame(_, _, _)).Times(0);
|
||||
int i;
|
||||
byte_stuffer_recv_byte(0, 1);
|
||||
for(i=0;i<MAX_FRAME_SIZE;i++) {
|
||||
byte_stuffer_recv_byte(0, 1);
|
||||
for (i = 0; i < MAX_FRAME_SIZE; i++) {
|
||||
byte_stuffer_recv_byte(0, 1);
|
||||
}
|
||||
byte_stuffer_recv_byte(0, 1);
|
||||
byte_stuffer_recv_byte(0, 0);
|
||||
|
|
@ -289,12 +262,11 @@ TEST_F(ByteStuffer, doesnt_recv_a_frame_thats_too_long_all_zeroes) {
|
|||
|
||||
TEST_F(ByteStuffer, received_frame_is_aborted_when_its_too_long) {
|
||||
uint8_t expected[1] = {1};
|
||||
EXPECT_CALL(*this, validator_recv_frame(_, _, _))
|
||||
.With(Args<1, 2>(ElementsAreArray(expected)));
|
||||
EXPECT_CALL(*this, validator_recv_frame(_, _, _)).With(Args<1, 2>(ElementsAreArray(expected)));
|
||||
int i;
|
||||
byte_stuffer_recv_byte(0, 1);
|
||||
for(i=0;i<MAX_FRAME_SIZE;i++) {
|
||||
byte_stuffer_recv_byte(0, 1);
|
||||
for (i = 0; i < MAX_FRAME_SIZE; i++) {
|
||||
byte_stuffer_recv_byte(0, 1);
|
||||
}
|
||||
byte_stuffer_recv_byte(0, 2);
|
||||
byte_stuffer_recv_byte(0, 1);
|
||||
|
|
@ -364,14 +336,14 @@ TEST_F(ByteStuffer, sends_three_byte_frame_with_all_zeroes) {
|
|||
|
||||
TEST_F(ByteStuffer, sends_frame_with_254_non_zeroes) {
|
||||
uint8_t data[254];
|
||||
int i;
|
||||
for(i=0;i<254;i++) {
|
||||
int i;
|
||||
for (i = 0; i < 254; i++) {
|
||||
data[i] = i + 1;
|
||||
}
|
||||
byte_stuffer_send_frame(0, data, 254);
|
||||
uint8_t expected[256];
|
||||
expected[0] = 0xFF;
|
||||
for(i=1;i<255;i++) {
|
||||
for (i = 1; i < 255; i++) {
|
||||
expected[i] = i;
|
||||
}
|
||||
expected[255] = 0;
|
||||
|
|
@ -380,14 +352,14 @@ TEST_F(ByteStuffer, sends_frame_with_254_non_zeroes) {
|
|||
|
||||
TEST_F(ByteStuffer, sends_frame_with_255_non_zeroes) {
|
||||
uint8_t data[255];
|
||||
int i;
|
||||
for(i=0;i<255;i++) {
|
||||
int i;
|
||||
for (i = 0; i < 255; i++) {
|
||||
data[i] = i + 1;
|
||||
}
|
||||
byte_stuffer_send_frame(0, data, 255);
|
||||
uint8_t expected[258];
|
||||
expected[0] = 0xFF;
|
||||
for(i=1;i<255;i++) {
|
||||
for (i = 1; i < 255; i++) {
|
||||
expected[i] = i;
|
||||
}
|
||||
expected[255] = 2;
|
||||
|
|
@ -398,15 +370,15 @@ TEST_F(ByteStuffer, sends_frame_with_255_non_zeroes) {
|
|||
|
||||
TEST_F(ByteStuffer, sends_frame_with_254_non_zeroes_followed_by_zero) {
|
||||
uint8_t data[255];
|
||||
int i;
|
||||
for(i=0;i<254;i++) {
|
||||
int i;
|
||||
for (i = 0; i < 254; i++) {
|
||||
data[i] = i + 1;
|
||||
}
|
||||
data[254] = 0;
|
||||
byte_stuffer_send_frame(0, data, 255);
|
||||
uint8_t expected[258];
|
||||
expected[0] = 0xFF;
|
||||
for(i=1;i<255;i++) {
|
||||
for (i = 1; i < 255; i++) {
|
||||
expected[i] = i;
|
||||
}
|
||||
expected[255] = 1;
|
||||
|
|
@ -416,68 +388,63 @@ TEST_F(ByteStuffer, sends_frame_with_254_non_zeroes_followed_by_zero) {
|
|||
}
|
||||
|
||||
TEST_F(ByteStuffer, sends_and_receives_full_roundtrip_small_packet) {
|
||||
uint8_t original_data[] = { 1, 2, 3};
|
||||
uint8_t original_data[] = {1, 2, 3};
|
||||
byte_stuffer_send_frame(0, original_data, sizeof(original_data));
|
||||
EXPECT_CALL(*this, validator_recv_frame(_, _, _))
|
||||
.With(Args<1, 2>(ElementsAreArray(original_data)));
|
||||
EXPECT_CALL(*this, validator_recv_frame(_, _, _)).With(Args<1, 2>(ElementsAreArray(original_data)));
|
||||
int i;
|
||||
for(auto& d : sent_data) {
|
||||
byte_stuffer_recv_byte(1, d);
|
||||
for (auto& d : sent_data) {
|
||||
byte_stuffer_recv_byte(1, d);
|
||||
}
|
||||
}
|
||||
|
||||
TEST_F(ByteStuffer, sends_and_receives_full_roundtrip_small_packet_with_zeros) {
|
||||
uint8_t original_data[] = { 1, 0, 3, 0, 0, 9};
|
||||
uint8_t original_data[] = {1, 0, 3, 0, 0, 9};
|
||||
byte_stuffer_send_frame(1, original_data, sizeof(original_data));
|
||||
EXPECT_CALL(*this, validator_recv_frame(_, _, _))
|
||||
.With(Args<1, 2>(ElementsAreArray(original_data)));
|
||||
EXPECT_CALL(*this, validator_recv_frame(_, _, _)).With(Args<1, 2>(ElementsAreArray(original_data)));
|
||||
int i;
|
||||
for(auto& d : sent_data) {
|
||||
byte_stuffer_recv_byte(1, d);
|
||||
for (auto& d : sent_data) {
|
||||
byte_stuffer_recv_byte(1, d);
|
||||
}
|
||||
}
|
||||
|
||||
TEST_F(ByteStuffer, sends_and_receives_full_roundtrip_254_bytes) {
|
||||
uint8_t original_data[254];
|
||||
int i;
|
||||
for(i=0;i<254;i++) {
|
||||
int i;
|
||||
for (i = 0; i < 254; i++) {
|
||||
original_data[i] = i + 1;
|
||||
}
|
||||
byte_stuffer_send_frame(0, original_data, sizeof(original_data));
|
||||
EXPECT_CALL(*this, validator_recv_frame(_, _, _))
|
||||
.With(Args<1, 2>(ElementsAreArray(original_data)));
|
||||
for(auto& d : sent_data) {
|
||||
byte_stuffer_recv_byte(1, d);
|
||||
EXPECT_CALL(*this, validator_recv_frame(_, _, _)).With(Args<1, 2>(ElementsAreArray(original_data)));
|
||||
for (auto& d : sent_data) {
|
||||
byte_stuffer_recv_byte(1, d);
|
||||
}
|
||||
}
|
||||
|
||||
TEST_F(ByteStuffer, sends_and_receives_full_roundtrip_256_bytes) {
|
||||
uint8_t original_data[256];
|
||||
int i;
|
||||
for(i=0;i<254;i++) {
|
||||
int i;
|
||||
for (i = 0; i < 254; i++) {
|
||||
original_data[i] = i + 1;
|
||||
}
|
||||
original_data[254] = 22;
|
||||
original_data[255] = 23;
|
||||
byte_stuffer_send_frame(0, original_data, sizeof(original_data));
|
||||
EXPECT_CALL(*this, validator_recv_frame(_, _, _))
|
||||
.With(Args<1, 2>(ElementsAreArray(original_data)));
|
||||
for(auto& d : sent_data) {
|
||||
byte_stuffer_recv_byte(1, d);
|
||||
EXPECT_CALL(*this, validator_recv_frame(_, _, _)).With(Args<1, 2>(ElementsAreArray(original_data)));
|
||||
for (auto& d : sent_data) {
|
||||
byte_stuffer_recv_byte(1, d);
|
||||
}
|
||||
}
|
||||
|
||||
TEST_F(ByteStuffer, sends_and_receives_full_roundtrip_254_bytes_and_then_zero) {
|
||||
uint8_t original_data[255];
|
||||
int i;
|
||||
for(i=0;i<254;i++) {
|
||||
int i;
|
||||
for (i = 0; i < 254; i++) {
|
||||
original_data[i] = i + 1;
|
||||
}
|
||||
original_data[254] = 0;
|
||||
byte_stuffer_send_frame(0, original_data, sizeof(original_data));
|
||||
EXPECT_CALL(*this, validator_recv_frame(_, _, _))
|
||||
.With(Args<1, 2>(ElementsAreArray(original_data)));
|
||||
for(auto& d : sent_data) {
|
||||
byte_stuffer_recv_byte(1, d);
|
||||
EXPECT_CALL(*this, validator_recv_frame(_, _, _)).With(Args<1, 2>(ElementsAreArray(original_data)));
|
||||
for (auto& d : sent_data) {
|
||||
byte_stuffer_recv_byte(1, d);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,27 +26,23 @@ SOFTWARE.
|
|||
#include "gmock/gmock.h"
|
||||
#include <array>
|
||||
extern "C" {
|
||||
#include "serial_link/protocol/transport.h"
|
||||
#include "serial_link/protocol/byte_stuffer.h"
|
||||
#include "serial_link/protocol/frame_router.h"
|
||||
#include "serial_link/protocol/transport.h"
|
||||
#include "serial_link/protocol/byte_stuffer.h"
|
||||
#include "serial_link/protocol/frame_router.h"
|
||||
}
|
||||
|
||||
using testing::_;
|
||||
using testing::ElementsAreArray;
|
||||
using testing::Args;
|
||||
using testing::ElementsAreArray;
|
||||
|
||||
class FrameRouter : public testing::Test {
|
||||
public:
|
||||
FrameRouter() :
|
||||
current_router_buffer(nullptr)
|
||||
{
|
||||
public:
|
||||
FrameRouter() : current_router_buffer(nullptr) {
|
||||
Instance = this;
|
||||
init_byte_stuffer();
|
||||
}
|
||||
|
||||
~FrameRouter() {
|
||||
Instance = nullptr;
|
||||
}
|
||||
~FrameRouter() { Instance = nullptr; }
|
||||
|
||||
void send_data(uint8_t link, const uint8_t* data, uint16_t size) {
|
||||
auto& buffer = current_router_buffer->send_buffers[link];
|
||||
|
|
@ -55,31 +51,26 @@ public:
|
|||
|
||||
void receive_data(uint8_t link, uint8_t* data, uint16_t size) {
|
||||
int i;
|
||||
for(i=0;i<size;i++) {
|
||||
for (i = 0; i < size; i++) {
|
||||
byte_stuffer_recv_byte(link, data[i]);
|
||||
}
|
||||
}
|
||||
|
||||
void activate_router(uint8_t num) {
|
||||
current_router_buffer = router_buffers + num;
|
||||
router_set_master(num==0);
|
||||
router_set_master(num == 0);
|
||||
}
|
||||
|
||||
void simulate_transport(uint8_t from, uint8_t to) {
|
||||
activate_router(to);
|
||||
if (from > to) {
|
||||
receive_data(DOWN_LINK,
|
||||
router_buffers[from].send_buffers[UP_LINK].data(),
|
||||
router_buffers[from].send_buffers[UP_LINK].size());
|
||||
}
|
||||
else if(to > from) {
|
||||
receive_data(UP_LINK,
|
||||
router_buffers[from].send_buffers[DOWN_LINK].data(),
|
||||
router_buffers[from].send_buffers[DOWN_LINK].size());
|
||||
}
|
||||
activate_router(to);
|
||||
if (from > to) {
|
||||
receive_data(DOWN_LINK, router_buffers[from].send_buffers[UP_LINK].data(), router_buffers[from].send_buffers[UP_LINK].size());
|
||||
} else if (to > from) {
|
||||
receive_data(UP_LINK, router_buffers[from].send_buffers[DOWN_LINK].data(), router_buffers[from].send_buffers[DOWN_LINK].size());
|
||||
}
|
||||
}
|
||||
|
||||
MOCK_METHOD3(transport_recv_frame, void (uint8_t from, uint8_t* data, uint16_t size));
|
||||
MOCK_METHOD3(transport_recv_frame, void(uint8_t from, uint8_t* data, uint16_t size));
|
||||
|
||||
std::vector<uint8_t> received_data;
|
||||
|
||||
|
|
@ -87,7 +78,7 @@ public:
|
|||
std::vector<uint8_t> send_buffers[2];
|
||||
};
|
||||
|
||||
router_buffer router_buffers[8];
|
||||
router_buffer router_buffers[8];
|
||||
router_buffer* current_router_buffer;
|
||||
|
||||
static FrameRouter* Instance;
|
||||
|
|
@ -95,22 +86,15 @@ public:
|
|||
|
||||
FrameRouter* FrameRouter::Instance = nullptr;
|
||||
|
||||
|
||||
typedef struct {
|
||||
std::array<uint8_t, 4> data;
|
||||
uint8_t extra[16];
|
||||
uint8_t extra[16];
|
||||
} frame_buffer_t;
|
||||
|
||||
|
||||
extern "C" {
|
||||
void send_data(uint8_t link, const uint8_t* data, uint16_t size) {
|
||||
FrameRouter::Instance->send_data(link, data, size);
|
||||
}
|
||||
void send_data(uint8_t link, const uint8_t* data, uint16_t size) { FrameRouter::Instance->send_data(link, data, size); }
|
||||
|
||||
|
||||
void transport_recv_frame(uint8_t from, uint8_t* data, uint16_t size) {
|
||||
FrameRouter::Instance->transport_recv_frame(from, data, size);
|
||||
}
|
||||
void transport_recv_frame(uint8_t from, uint8_t* data, uint16_t size) { FrameRouter::Instance->transport_recv_frame(from, data, size); }
|
||||
}
|
||||
|
||||
TEST_F(FrameRouter, master_broadcast_is_received_by_everyone) {
|
||||
|
|
@ -120,14 +104,12 @@ TEST_F(FrameRouter, master_broadcast_is_received_by_everyone) {
|
|||
router_send_frame(0xFF, (uint8_t*)&data, 4);
|
||||
EXPECT_GT(router_buffers[0].send_buffers[DOWN_LINK].size(), 0);
|
||||
EXPECT_EQ(router_buffers[0].send_buffers[UP_LINK].size(), 0);
|
||||
EXPECT_CALL(*this, transport_recv_frame(0, _, _))
|
||||
.With(Args<1, 2>(ElementsAreArray(data.data)));
|
||||
EXPECT_CALL(*this, transport_recv_frame(0, _, _)).With(Args<1, 2>(ElementsAreArray(data.data)));
|
||||
simulate_transport(0, 1);
|
||||
EXPECT_GT(router_buffers[1].send_buffers[DOWN_LINK].size(), 0);
|
||||
EXPECT_EQ(router_buffers[1].send_buffers[UP_LINK].size(), 0);
|
||||
|
||||
EXPECT_CALL(*this, transport_recv_frame(0, _, _))
|
||||
.With(Args<1, 2>(ElementsAreArray(data.data)));
|
||||
EXPECT_CALL(*this, transport_recv_frame(0, _, _)).With(Args<1, 2>(ElementsAreArray(data.data)));
|
||||
simulate_transport(1, 2);
|
||||
EXPECT_GT(router_buffers[2].send_buffers[DOWN_LINK].size(), 0);
|
||||
EXPECT_EQ(router_buffers[2].send_buffers[UP_LINK].size(), 0);
|
||||
|
|
@ -145,14 +127,12 @@ TEST_F(FrameRouter, master_send_is_received_by_targets) {
|
|||
EXPECT_GT(router_buffers[1].send_buffers[DOWN_LINK].size(), 0);
|
||||
EXPECT_EQ(router_buffers[1].send_buffers[UP_LINK].size(), 0);
|
||||
|
||||
EXPECT_CALL(*this, transport_recv_frame(0, _, _))
|
||||
.With(Args<1, 2>(ElementsAreArray(data.data)));
|
||||
EXPECT_CALL(*this, transport_recv_frame(0, _, _)).With(Args<1, 2>(ElementsAreArray(data.data)));
|
||||
simulate_transport(1, 2);
|
||||
EXPECT_GT(router_buffers[2].send_buffers[DOWN_LINK].size(), 0);
|
||||
EXPECT_EQ(router_buffers[2].send_buffers[UP_LINK].size(), 0);
|
||||
|
||||
EXPECT_CALL(*this, transport_recv_frame(0, _, _))
|
||||
.With(Args<1, 2>(ElementsAreArray(data.data)));
|
||||
EXPECT_CALL(*this, transport_recv_frame(0, _, _)).With(Args<1, 2>(ElementsAreArray(data.data)));
|
||||
simulate_transport(2, 3);
|
||||
EXPECT_GT(router_buffers[3].send_buffers[DOWN_LINK].size(), 0);
|
||||
EXPECT_EQ(router_buffers[3].send_buffers[UP_LINK].size(), 0);
|
||||
|
|
@ -166,8 +146,7 @@ TEST_F(FrameRouter, first_link_sends_to_master) {
|
|||
EXPECT_GT(router_buffers[1].send_buffers[UP_LINK].size(), 0);
|
||||
EXPECT_EQ(router_buffers[1].send_buffers[DOWN_LINK].size(), 0);
|
||||
|
||||
EXPECT_CALL(*this, transport_recv_frame(1, _, _))
|
||||
.With(Args<1, 2>(ElementsAreArray(data.data)));
|
||||
EXPECT_CALL(*this, transport_recv_frame(1, _, _)).With(Args<1, 2>(ElementsAreArray(data.data)));
|
||||
simulate_transport(1, 0);
|
||||
EXPECT_EQ(router_buffers[0].send_buffers[DOWN_LINK].size(), 0);
|
||||
EXPECT_EQ(router_buffers[0].send_buffers[UP_LINK].size(), 0);
|
||||
|
|
@ -185,8 +164,7 @@ TEST_F(FrameRouter, second_link_sends_to_master) {
|
|||
EXPECT_GT(router_buffers[1].send_buffers[UP_LINK].size(), 0);
|
||||
EXPECT_EQ(router_buffers[1].send_buffers[DOWN_LINK].size(), 0);
|
||||
|
||||
EXPECT_CALL(*this, transport_recv_frame(2, _, _))
|
||||
.With(Args<1, 2>(ElementsAreArray(data.data)));
|
||||
EXPECT_CALL(*this, transport_recv_frame(2, _, _)).With(Args<1, 2>(ElementsAreArray(data.data)));
|
||||
simulate_transport(1, 0);
|
||||
EXPECT_EQ(router_buffers[0].send_buffers[DOWN_LINK].size(), 0);
|
||||
EXPECT_EQ(router_buffers[0].send_buffers[UP_LINK].size(), 0);
|
||||
|
|
@ -218,12 +196,9 @@ TEST_F(FrameRouter, master_receives_on_uplink_does_nothing) {
|
|||
EXPECT_GT(router_buffers[1].send_buffers[UP_LINK].size(), 0);
|
||||
EXPECT_EQ(router_buffers[1].send_buffers[DOWN_LINK].size(), 0);
|
||||
|
||||
EXPECT_CALL(*this, transport_recv_frame(_, _, _))
|
||||
.Times(0);
|
||||
EXPECT_CALL(*this, transport_recv_frame(_, _, _)).Times(0);
|
||||
activate_router(0);
|
||||
receive_data(UP_LINK,
|
||||
router_buffers[1].send_buffers[UP_LINK].data(),
|
||||
router_buffers[1].send_buffers[UP_LINK].size());
|
||||
receive_data(UP_LINK, router_buffers[1].send_buffers[UP_LINK].data(), router_buffers[1].send_buffers[UP_LINK].size());
|
||||
EXPECT_EQ(router_buffers[0].send_buffers[UP_LINK].size(), 0);
|
||||
EXPECT_EQ(router_buffers[0].send_buffers[DOWN_LINK].size(), 0);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,21 +29,17 @@ extern "C" {
|
|||
}
|
||||
|
||||
using testing::_;
|
||||
using testing::ElementsAreArray;
|
||||
using testing::Args;
|
||||
using testing::ElementsAreArray;
|
||||
|
||||
class FrameValidator : public testing::Test {
|
||||
public:
|
||||
FrameValidator() {
|
||||
Instance = this;
|
||||
}
|
||||
public:
|
||||
FrameValidator() { Instance = this; }
|
||||
|
||||
~FrameValidator() {
|
||||
Instance = nullptr;
|
||||
}
|
||||
~FrameValidator() { Instance = nullptr; }
|
||||
|
||||
MOCK_METHOD3(route_incoming_frame, void (uint8_t link, uint8_t* data, uint16_t size));
|
||||
MOCK_METHOD3(byte_stuffer_send_frame, void (uint8_t link, uint8_t* data, uint16_t size));
|
||||
MOCK_METHOD3(route_incoming_frame, void(uint8_t link, uint8_t* data, uint16_t size));
|
||||
MOCK_METHOD3(byte_stuffer_send_frame, void(uint8_t link, uint8_t* data, uint16_t size));
|
||||
|
||||
static FrameValidator* Instance;
|
||||
};
|
||||
|
|
@ -51,18 +47,13 @@ public:
|
|||
FrameValidator* FrameValidator::Instance = nullptr;
|
||||
|
||||
extern "C" {
|
||||
void route_incoming_frame(uint8_t link, uint8_t* data, uint16_t size) {
|
||||
FrameValidator::Instance->route_incoming_frame(link, data, size);
|
||||
}
|
||||
void route_incoming_frame(uint8_t link, uint8_t* data, uint16_t size) { FrameValidator::Instance->route_incoming_frame(link, data, size); }
|
||||
|
||||
void byte_stuffer_send_frame(uint8_t link, uint8_t* data, uint16_t size) {
|
||||
FrameValidator::Instance->byte_stuffer_send_frame(link, data, size);
|
||||
}
|
||||
void byte_stuffer_send_frame(uint8_t link, uint8_t* data, uint16_t size) { FrameValidator::Instance->byte_stuffer_send_frame(link, data, size); }
|
||||
}
|
||||
|
||||
TEST_F(FrameValidator, doesnt_validate_frames_under_5_bytes) {
|
||||
EXPECT_CALL(*this, route_incoming_frame(_, _, _))
|
||||
.Times(0);
|
||||
EXPECT_CALL(*this, route_incoming_frame(_, _, _)).Times(0);
|
||||
uint8_t data[] = {1, 2};
|
||||
validator_recv_frame(0, 0, 1);
|
||||
validator_recv_frame(0, data, 2);
|
||||
|
|
@ -72,44 +63,38 @@ TEST_F(FrameValidator, doesnt_validate_frames_under_5_bytes) {
|
|||
|
||||
TEST_F(FrameValidator, validates_one_byte_frame_with_correct_crc) {
|
||||
uint8_t data[] = {0x44, 0x04, 0x6A, 0xB3, 0xA3};
|
||||
EXPECT_CALL(*this, route_incoming_frame(_, _, _))
|
||||
.With(Args<1, 2>(ElementsAreArray(data, 1)));
|
||||
EXPECT_CALL(*this, route_incoming_frame(_, _, _)).With(Args<1, 2>(ElementsAreArray(data, 1)));
|
||||
validator_recv_frame(0, data, 5);
|
||||
}
|
||||
|
||||
TEST_F(FrameValidator, does_not_validate_one_byte_frame_with_incorrect_crc) {
|
||||
uint8_t data[] = {0x44, 0, 0, 0, 0};
|
||||
EXPECT_CALL(*this, route_incoming_frame(_, _, _))
|
||||
.Times(0);
|
||||
EXPECT_CALL(*this, route_incoming_frame(_, _, _)).Times(0);
|
||||
validator_recv_frame(1, data, 5);
|
||||
}
|
||||
|
||||
TEST_F(FrameValidator, validates_four_byte_frame_with_correct_crc) {
|
||||
uint8_t data[] = {0x44, 0x10, 0xFF, 0x00, 0x74, 0x4E, 0x30, 0xBA};
|
||||
EXPECT_CALL(*this, route_incoming_frame(_, _, _))
|
||||
.With(Args<1, 2>(ElementsAreArray(data, 4)));
|
||||
EXPECT_CALL(*this, route_incoming_frame(_, _, _)).With(Args<1, 2>(ElementsAreArray(data, 4)));
|
||||
validator_recv_frame(1, data, 8);
|
||||
}
|
||||
|
||||
TEST_F(FrameValidator, validates_five_byte_frame_with_correct_crc) {
|
||||
uint8_t data[] = {1, 2, 3, 4, 5, 0xF4, 0x99, 0x0B, 0x47};
|
||||
EXPECT_CALL(*this, route_incoming_frame(_, _, _))
|
||||
.With(Args<1, 2>(ElementsAreArray(data, 5)));
|
||||
EXPECT_CALL(*this, route_incoming_frame(_, _, _)).With(Args<1, 2>(ElementsAreArray(data, 5)));
|
||||
validator_recv_frame(0, data, 9);
|
||||
}
|
||||
|
||||
TEST_F(FrameValidator, sends_one_byte_with_correct_crc) {
|
||||
uint8_t original[] = {0x44, 0, 0, 0, 0};
|
||||
uint8_t expected[] = {0x44, 0x04, 0x6A, 0xB3, 0xA3};
|
||||
EXPECT_CALL(*this, byte_stuffer_send_frame(_, _, _))
|
||||
.With(Args<1, 2>(ElementsAreArray(expected)));
|
||||
EXPECT_CALL(*this, byte_stuffer_send_frame(_, _, _)).With(Args<1, 2>(ElementsAreArray(expected)));
|
||||
validator_send_frame(0, original, 1);
|
||||
}
|
||||
|
||||
TEST_F(FrameValidator, sends_five_bytes_with_correct_crc) {
|
||||
uint8_t original[] = {1, 2, 3, 4, 5, 0, 0, 0, 0};
|
||||
uint8_t expected[] = {1, 2, 3, 4, 5, 0xF4, 0x99, 0x0B, 0x47};
|
||||
EXPECT_CALL(*this, byte_stuffer_send_frame(_, _, _))
|
||||
.With(Args<1, 2>(ElementsAreArray(expected)));
|
||||
EXPECT_CALL(*this, byte_stuffer_send_frame(_, _, _)).With(Args<1, 2>(ElementsAreArray(expected)));
|
||||
validator_send_frame(0, original, 5);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,8 +26,8 @@ SOFTWARE.
|
|||
#include "gmock/gmock.h"
|
||||
|
||||
using testing::_;
|
||||
using testing::ElementsAreArray;
|
||||
using testing::Args;
|
||||
using testing::ElementsAreArray;
|
||||
|
||||
extern "C" {
|
||||
#include "serial_link/protocol/transport.h"
|
||||
|
|
@ -53,7 +53,7 @@ static remote_object_t* test_remote_objects[] = {
|
|||
};
|
||||
|
||||
class Transport : public testing::Test {
|
||||
public:
|
||||
public:
|
||||
Transport() {
|
||||
Instance = this;
|
||||
add_remote_objects(test_remote_objects, sizeof(test_remote_objects) / sizeof(remote_object_t*));
|
||||
|
|
@ -64,8 +64,8 @@ public:
|
|||
reinitialize_serial_link_transport();
|
||||
}
|
||||
|
||||
MOCK_METHOD0(signal_data_written, void ());
|
||||
MOCK_METHOD1(router_send_frame, void (uint8_t destination));
|
||||
MOCK_METHOD0(signal_data_written, void());
|
||||
MOCK_METHOD1(router_send_frame, void(uint8_t destination));
|
||||
|
||||
void router_send_frame(uint8_t destination, uint8_t* data, uint16_t size) {
|
||||
router_send_frame(destination);
|
||||
|
|
@ -80,13 +80,9 @@ public:
|
|||
Transport* Transport::Instance = nullptr;
|
||||
|
||||
extern "C" {
|
||||
void signal_data_written(void) {
|
||||
Transport::Instance->signal_data_written();
|
||||
}
|
||||
void signal_data_written(void) { Transport::Instance->signal_data_written(); }
|
||||
|
||||
void router_send_frame(uint8_t destination, uint8_t* data, uint16_t size) {
|
||||
Transport::Instance->router_send_frame(destination, data, size);
|
||||
}
|
||||
void router_send_frame(uint8_t destination, uint8_t* data, uint16_t size) { Transport::Instance->router_send_frame(destination, data, size); }
|
||||
}
|
||||
|
||||
TEST_F(Transport, write_to_local_signals_an_event) {
|
||||
|
|
@ -104,7 +100,7 @@ TEST_F(Transport, write_to_local_signals_an_event) {
|
|||
TEST_F(Transport, writes_from_master_to_all_slaves) {
|
||||
update_transport();
|
||||
test_object1* obj = begin_write_master_to_slave();
|
||||
obj->test = 5;
|
||||
obj->test = 5;
|
||||
EXPECT_CALL(*this, signal_data_written());
|
||||
end_write_master_to_slave();
|
||||
EXPECT_CALL(*this, router_send_frame(0xFF));
|
||||
|
|
@ -118,7 +114,7 @@ TEST_F(Transport, writes_from_master_to_all_slaves) {
|
|||
TEST_F(Transport, writes_from_slave_to_master) {
|
||||
update_transport();
|
||||
test_object1* obj = begin_write_slave_to_master();
|
||||
obj->test = 7;
|
||||
obj->test = 7;
|
||||
EXPECT_CALL(*this, signal_data_written());
|
||||
end_write_slave_to_master();
|
||||
EXPECT_CALL(*this, router_send_frame(0));
|
||||
|
|
@ -133,7 +129,7 @@ TEST_F(Transport, writes_from_slave_to_master) {
|
|||
TEST_F(Transport, writes_from_master_to_single_slave) {
|
||||
update_transport();
|
||||
test_object1* obj = begin_write_master_to_single_slave(3);
|
||||
obj->test = 7;
|
||||
obj->test = 7;
|
||||
EXPECT_CALL(*this, signal_data_written());
|
||||
end_write_master_to_single_slave(3);
|
||||
EXPECT_CALL(*this, router_send_frame(4));
|
||||
|
|
@ -147,7 +143,7 @@ TEST_F(Transport, writes_from_master_to_single_slave) {
|
|||
TEST_F(Transport, ignores_object_with_invalid_id) {
|
||||
update_transport();
|
||||
test_object1* obj = begin_write_master_to_single_slave(3);
|
||||
obj->test = 7;
|
||||
obj->test = 7;
|
||||
EXPECT_CALL(*this, signal_data_written());
|
||||
end_write_master_to_single_slave(3);
|
||||
EXPECT_CALL(*this, router_send_frame(4));
|
||||
|
|
@ -161,7 +157,7 @@ TEST_F(Transport, ignores_object_with_invalid_id) {
|
|||
TEST_F(Transport, ignores_object_with_size_too_small) {
|
||||
update_transport();
|
||||
test_object1* obj = begin_write_master_to_slave();
|
||||
obj->test = 7;
|
||||
obj->test = 7;
|
||||
EXPECT_CALL(*this, signal_data_written());
|
||||
end_write_master_to_slave();
|
||||
EXPECT_CALL(*this, router_send_frame(_));
|
||||
|
|
@ -175,7 +171,7 @@ TEST_F(Transport, ignores_object_with_size_too_small) {
|
|||
TEST_F(Transport, ignores_object_with_size_too_big) {
|
||||
update_transport();
|
||||
test_object1* obj = begin_write_master_to_slave();
|
||||
obj->test = 7;
|
||||
obj->test = 7;
|
||||
EXPECT_CALL(*this, signal_data_written());
|
||||
end_write_master_to_slave();
|
||||
EXPECT_CALL(*this, router_send_frame(_));
|
||||
|
|
|
|||
|
|
@ -27,18 +27,16 @@ extern "C" {
|
|||
#include "serial_link/protocol/triple_buffered_object.h"
|
||||
}
|
||||
|
||||
struct test_object{
|
||||
uint8_t state;
|
||||
struct test_object {
|
||||
uint8_t state;
|
||||
uint32_t buffer[3];
|
||||
};
|
||||
|
||||
test_object test_object;
|
||||
|
||||
class TripleBufferedObject : public testing::Test {
|
||||
public:
|
||||
TripleBufferedObject() {
|
||||
triple_buffer_init((triple_buffer_object_t*)&test_object);
|
||||
}
|
||||
public:
|
||||
TripleBufferedObject() { triple_buffer_init((triple_buffer_object_t*)&test_object); }
|
||||
};
|
||||
|
||||
TEST_F(TripleBufferedObject, writes_and_reads_object) {
|
||||
|
|
@ -47,9 +45,7 @@ TEST_F(TripleBufferedObject, writes_and_reads_object) {
|
|||
EXPECT_EQ(*triple_buffer_read(&test_object), 0x3456ABCC);
|
||||
}
|
||||
|
||||
TEST_F(TripleBufferedObject, does_not_read_empty) {
|
||||
EXPECT_EQ(triple_buffer_read(&test_object), nullptr);
|
||||
}
|
||||
TEST_F(TripleBufferedObject, does_not_read_empty) { EXPECT_EQ(triple_buffer_read(&test_object), nullptr); }
|
||||
|
||||
TEST_F(TripleBufferedObject, writes_twice_and_reads_object) {
|
||||
*triple_buffer_begin_write(&test_object) = 0x3456ABCC;
|
||||
|
|
@ -62,7 +58,7 @@ TEST_F(TripleBufferedObject, writes_twice_and_reads_object) {
|
|||
TEST_F(TripleBufferedObject, performs_another_write_in_the_middle_of_read) {
|
||||
*triple_buffer_begin_write(&test_object) = 1;
|
||||
triple_buffer_end_write(&test_object);
|
||||
uint32_t* read = triple_buffer_read(&test_object);
|
||||
uint32_t* read = triple_buffer_read(&test_object);
|
||||
*triple_buffer_begin_write(&test_object) = 2;
|
||||
triple_buffer_end_write(&test_object);
|
||||
EXPECT_EQ(*read, 1);
|
||||
|
|
@ -73,7 +69,7 @@ TEST_F(TripleBufferedObject, performs_another_write_in_the_middle_of_read) {
|
|||
TEST_F(TripleBufferedObject, performs_two_writes_in_the_middle_of_read) {
|
||||
*triple_buffer_begin_write(&test_object) = 1;
|
||||
triple_buffer_end_write(&test_object);
|
||||
uint32_t* read = triple_buffer_read(&test_object);
|
||||
uint32_t* read = triple_buffer_read(&test_object);
|
||||
*triple_buffer_begin_write(&test_object) = 2;
|
||||
triple_buffer_end_write(&test_object);
|
||||
*triple_buffer_begin_write(&test_object) = 3;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue