diff --git a/CMakeLists.txt b/CMakeLists.txt index b644369..9ebbecc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,11 +4,13 @@ project(tf) set(CMAKE_CXX_STANDARD GNU89) set(SOURCE_FILES - demo/test/test.c - demo/test/TF_Config.h - demo/hello/master.c - demo/hello/slave.c - demo/hello/TF_Config.h + demo/simple/test.c + demo/simple/TF_Config.h + demo/socket_demo/master.c + demo/socket_demo/slave.c + demo/socket_demo/TF_Config.h + demo/multipart_tx/test.c + demo/multipart_tx/TF_Config.h demo/demo.c demo/demo.h TinyFrame.c @@ -18,6 +20,6 @@ set(SOURCE_FILES demo/utils.h ) -include_directories(demo/test) +include_directories(demo/simple) add_executable(tf ${SOURCE_FILES}) diff --git a/TF_Config.example.h b/TF_Config.example.h index edbd372..4ace3bd 100644 --- a/TF_Config.example.h +++ b/TF_Config.example.h @@ -47,10 +47,12 @@ typedef uint8_t TF_COUNT; //----------------------------- PARAMETERS ---------------------------------- -// Maximum send / receive payload size (static buffers size) +// Maximum received payload size (static buffer) // Larger payloads will be rejected. #define TF_MAX_PAYLOAD_RX 1024 -#define TF_MAX_PAYLOAD_TX 1024 +// Size of the sending buffer. Larger payloads will be split to pieces and sent +// in multiple calls to the write function. This can be lowered to reduce RAM usage. +#define TF_SENDBUF_LEN 1024 // --- Listener counts - determine sizes of the static slot tables --- diff --git a/TinyFrame.c b/TinyFrame.c index 2a54faf..048a991 100644 --- a/TinyFrame.c +++ b/TinyFrame.c @@ -6,11 +6,15 @@ // Compatibility with ESP8266 SDK #ifdef ICACHE_FLASH_ATTR - #define _TF_FN ICACHE_FLASH_ATTR +#define _TF_FN ICACHE_FLASH_ATTR #else - #define _TF_FN +#define _TF_FN #endif +// Helper macros +#define TF_MAX(a, b) ((a)>(b)?(a):(b)) +#define TF_MIN(a, b) ((a)<(b)?(a):(b)) + enum TFState { TFState_SOF = 0, //!< Wait for SOF TFState_LEN, //!< Wait for Number Of Bytes @@ -73,128 +77,128 @@ static struct TinyFrameStruct { TF_COUNT count_generic_lst; // Buffer for building frames - uint8_t sendbuf[TF_MAX_PAYLOAD_TX + TF_OVERHEAD_BYTES]; // TODO generate and send frames without a buffer + uint8_t sendbuf[TF_SENDBUF_LEN]; } tf; //region Checksums #if TF_CKSUM_TYPE == TF_CKSUM_NONE - // NONE - #define CKSUM_RESET(cksum) - #define CKSUM_ADD(cksum, byte) - #define CKSUM_FINALIZE(cksum) +// NONE +#define CKSUM_RESET(cksum) +#define CKSUM_ADD(cksum, byte) +#define CKSUM_FINALIZE(cksum) #elif TF_CKSUM_TYPE == TF_CKSUM_XOR - // ~XOR - #define CKSUM_RESET(cksum) do { (cksum) = 0; } while (0) - #define CKSUM_ADD(cksum, byte) do { (cksum) ^= (byte); } while(0) - #define CKSUM_FINALIZE(cksum) do { (cksum) = (TF_CKSUM)~cksum; } while(0) +// ~XOR +#define CKSUM_RESET(cksum) do { (cksum) = 0; } while (0) +#define CKSUM_ADD(cksum, byte) do { (cksum) ^= (byte); } while(0) +#define CKSUM_FINALIZE(cksum) do { (cksum) = (TF_CKSUM)~cksum; } while(0) #elif TF_CKSUM_TYPE == TF_CKSUM_CRC16 - /** CRC table for the CRC-16. The poly is 0x8005 (x^16 + x^15 + x^2 + 1) */ - static const uint16_t crc16_table[256] = { - 0x0000, 0xC0C1, 0xC181, 0x0140, 0xC301, 0x03C0, 0x0280, 0xC241, - 0xC601, 0x06C0, 0x0780, 0xC741, 0x0500, 0xC5C1, 0xC481, 0x0440, - 0xCC01, 0x0CC0, 0x0D80, 0xCD41, 0x0F00, 0xCFC1, 0xCE81, 0x0E40, - 0x0A00, 0xCAC1, 0xCB81, 0x0B40, 0xC901, 0x09C0, 0x0880, 0xC841, - 0xD801, 0x18C0, 0x1980, 0xD941, 0x1B00, 0xDBC1, 0xDA81, 0x1A40, - 0x1E00, 0xDEC1, 0xDF81, 0x1F40, 0xDD01, 0x1DC0, 0x1C80, 0xDC41, - 0x1400, 0xD4C1, 0xD581, 0x1540, 0xD701, 0x17C0, 0x1680, 0xD641, - 0xD201, 0x12C0, 0x1380, 0xD341, 0x1100, 0xD1C1, 0xD081, 0x1040, - 0xF001, 0x30C0, 0x3180, 0xF141, 0x3300, 0xF3C1, 0xF281, 0x3240, - 0x3600, 0xF6C1, 0xF781, 0x3740, 0xF501, 0x35C0, 0x3480, 0xF441, - 0x3C00, 0xFCC1, 0xFD81, 0x3D40, 0xFF01, 0x3FC0, 0x3E80, 0xFE41, - 0xFA01, 0x3AC0, 0x3B80, 0xFB41, 0x3900, 0xF9C1, 0xF881, 0x3840, - 0x2800, 0xE8C1, 0xE981, 0x2940, 0xEB01, 0x2BC0, 0x2A80, 0xEA41, - 0xEE01, 0x2EC0, 0x2F80, 0xEF41, 0x2D00, 0xEDC1, 0xEC81, 0x2C40, - 0xE401, 0x24C0, 0x2580, 0xE541, 0x2700, 0xE7C1, 0xE681, 0x2640, - 0x2200, 0xE2C1, 0xE381, 0x2340, 0xE101, 0x21C0, 0x2080, 0xE041, - 0xA001, 0x60C0, 0x6180, 0xA141, 0x6300, 0xA3C1, 0xA281, 0x6240, - 0x6600, 0xA6C1, 0xA781, 0x6740, 0xA501, 0x65C0, 0x6480, 0xA441, - 0x6C00, 0xACC1, 0xAD81, 0x6D40, 0xAF01, 0x6FC0, 0x6E80, 0xAE41, - 0xAA01, 0x6AC0, 0x6B80, 0xAB41, 0x6900, 0xA9C1, 0xA881, 0x6840, - 0x7800, 0xB8C1, 0xB981, 0x7940, 0xBB01, 0x7BC0, 0x7A80, 0xBA41, - 0xBE01, 0x7EC0, 0x7F80, 0xBF41, 0x7D00, 0xBDC1, 0xBC81, 0x7C40, - 0xB401, 0x74C0, 0x7580, 0xB541, 0x7700, 0xB7C1, 0xB681, 0x7640, - 0x7200, 0xB2C1, 0xB381, 0x7340, 0xB101, 0x71C0, 0x7080, 0xB041, - 0x5000, 0x90C1, 0x9181, 0x5140, 0x9301, 0x53C0, 0x5280, 0x9241, - 0x9601, 0x56C0, 0x5780, 0x9741, 0x5500, 0x95C1, 0x9481, 0x5440, - 0x9C01, 0x5CC0, 0x5D80, 0x9D41, 0x5F00, 0x9FC1, 0x9E81, 0x5E40, - 0x5A00, 0x9AC1, 0x9B81, 0x5B40, 0x9901, 0x59C0, 0x5880, 0x9841, - 0x8801, 0x48C0, 0x4980, 0x8941, 0x4B00, 0x8BC1, 0x8A81, 0x4A40, - 0x4E00, 0x8EC1, 0x8F81, 0x4F40, 0x8D01, 0x4DC0, 0x4C80, 0x8C41, - 0x4400, 0x84C1, 0x8581, 0x4540, 0x8701, 0x47C0, 0x4680, 0x8641, - 0x8201, 0x42C0, 0x4380, 0x8341, 0x4100, 0x81C1, 0x8081, 0x4040 - }; - - static inline uint16_t crc16_byte(uint16_t cksum, const uint8_t byte) - { - return (cksum >> 8) ^ crc16_table[(cksum ^ byte) & 0xff]; - } +/** CRC table for the CRC-16. The poly is 0x8005 (x^16 + x^15 + x^2 + 1) */ +static const uint16_t crc16_table[256] = { + 0x0000, 0xC0C1, 0xC181, 0x0140, 0xC301, 0x03C0, 0x0280, 0xC241, + 0xC601, 0x06C0, 0x0780, 0xC741, 0x0500, 0xC5C1, 0xC481, 0x0440, + 0xCC01, 0x0CC0, 0x0D80, 0xCD41, 0x0F00, 0xCFC1, 0xCE81, 0x0E40, + 0x0A00, 0xCAC1, 0xCB81, 0x0B40, 0xC901, 0x09C0, 0x0880, 0xC841, + 0xD801, 0x18C0, 0x1980, 0xD941, 0x1B00, 0xDBC1, 0xDA81, 0x1A40, + 0x1E00, 0xDEC1, 0xDF81, 0x1F40, 0xDD01, 0x1DC0, 0x1C80, 0xDC41, + 0x1400, 0xD4C1, 0xD581, 0x1540, 0xD701, 0x17C0, 0x1680, 0xD641, + 0xD201, 0x12C0, 0x1380, 0xD341, 0x1100, 0xD1C1, 0xD081, 0x1040, + 0xF001, 0x30C0, 0x3180, 0xF141, 0x3300, 0xF3C1, 0xF281, 0x3240, + 0x3600, 0xF6C1, 0xF781, 0x3740, 0xF501, 0x35C0, 0x3480, 0xF441, + 0x3C00, 0xFCC1, 0xFD81, 0x3D40, 0xFF01, 0x3FC0, 0x3E80, 0xFE41, + 0xFA01, 0x3AC0, 0x3B80, 0xFB41, 0x3900, 0xF9C1, 0xF881, 0x3840, + 0x2800, 0xE8C1, 0xE981, 0x2940, 0xEB01, 0x2BC0, 0x2A80, 0xEA41, + 0xEE01, 0x2EC0, 0x2F80, 0xEF41, 0x2D00, 0xEDC1, 0xEC81, 0x2C40, + 0xE401, 0x24C0, 0x2580, 0xE541, 0x2700, 0xE7C1, 0xE681, 0x2640, + 0x2200, 0xE2C1, 0xE381, 0x2340, 0xE101, 0x21C0, 0x2080, 0xE041, + 0xA001, 0x60C0, 0x6180, 0xA141, 0x6300, 0xA3C1, 0xA281, 0x6240, + 0x6600, 0xA6C1, 0xA781, 0x6740, 0xA501, 0x65C0, 0x6480, 0xA441, + 0x6C00, 0xACC1, 0xAD81, 0x6D40, 0xAF01, 0x6FC0, 0x6E80, 0xAE41, + 0xAA01, 0x6AC0, 0x6B80, 0xAB41, 0x6900, 0xA9C1, 0xA881, 0x6840, + 0x7800, 0xB8C1, 0xB981, 0x7940, 0xBB01, 0x7BC0, 0x7A80, 0xBA41, + 0xBE01, 0x7EC0, 0x7F80, 0xBF41, 0x7D00, 0xBDC1, 0xBC81, 0x7C40, + 0xB401, 0x74C0, 0x7580, 0xB541, 0x7700, 0xB7C1, 0xB681, 0x7640, + 0x7200, 0xB2C1, 0xB381, 0x7340, 0xB101, 0x71C0, 0x7080, 0xB041, + 0x5000, 0x90C1, 0x9181, 0x5140, 0x9301, 0x53C0, 0x5280, 0x9241, + 0x9601, 0x56C0, 0x5780, 0x9741, 0x5500, 0x95C1, 0x9481, 0x5440, + 0x9C01, 0x5CC0, 0x5D80, 0x9D41, 0x5F00, 0x9FC1, 0x9E81, 0x5E40, + 0x5A00, 0x9AC1, 0x9B81, 0x5B40, 0x9901, 0x59C0, 0x5880, 0x9841, + 0x8801, 0x48C0, 0x4980, 0x8941, 0x4B00, 0x8BC1, 0x8A81, 0x4A40, + 0x4E00, 0x8EC1, 0x8F81, 0x4F40, 0x8D01, 0x4DC0, 0x4C80, 0x8C41, + 0x4400, 0x84C1, 0x8581, 0x4540, 0x8701, 0x47C0, 0x4680, 0x8641, + 0x8201, 0x42C0, 0x4380, 0x8341, 0x4100, 0x81C1, 0x8081, 0x4040 +}; + +static inline uint16_t crc16_byte(uint16_t cksum, const uint8_t byte) +{ + return (cksum >> 8) ^ crc16_table[(cksum ^ byte) & 0xff]; +} - #define CKSUM_RESET(cksum) do { (cksum) = 0; } while (0) - #define CKSUM_ADD(cksum, byte) do { (cksum) = crc16_byte((cksum), (byte)); } while(0) - #define CKSUM_FINALIZE(cksum) +#define CKSUM_RESET(cksum) do { (cksum) = 0; } while (0) +#define CKSUM_ADD(cksum, byte) do { (cksum) = crc16_byte((cksum), (byte)); } while(0) +#define CKSUM_FINALIZE(cksum) #elif TF_CKSUM_TYPE == TF_CKSUM_CRC32 - static const uint32_t crc32_table[] = { /* CRC polynomial 0xedb88320 */ - 0x00000000, 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 inline uint32_t crc32_byte(uint32_t cksum, const uint8_t byte) - { - return (crc32_table[((cksum) ^ ((uint8_t)byte)) & 0xff] ^ ((cksum) >> 8)); - } +static const uint32_t crc32_table[] = { /* CRC polynomial 0xedb88320 */ + 0x00000000, 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 +}; - #define CKSUM_RESET(cksum) do { (cksum) = (TF_CKSUM)0xFFFFFFFF; } while (0) - #define CKSUM_ADD(cksum, byte) do { (cksum) = crc32_byte(cksum, byte); } while(0) - #define CKSUM_FINALIZE(cksum) do { (cksum) = (TF_CKSUM)~(cksum); } while(0) +static inline uint32_t crc32_byte(uint32_t cksum, const uint8_t byte) +{ + return (crc32_table[((cksum) ^ ((uint8_t)byte)) & 0xff] ^ ((cksum) >> 8)); +} + +#define CKSUM_RESET(cksum) do { (cksum) = (TF_CKSUM)0xFFFFFFFF; } while (0) +#define CKSUM_ADD(cksum, byte) do { (cksum) = crc32_byte(cksum, byte); } while(0) +#define CKSUM_FINALIZE(cksum) do { (cksum) = (TF_CKSUM)~(cksum); } while(0) #endif @@ -466,9 +470,9 @@ void _TF_FN TF_ResetParser(void) static void _TF_FN TF_ParsBeginFrame(void) { // Reset state vars CKSUM_RESET(tf.cksum); - #if TF_USE_SOF_BYTE - CKSUM_ADD(tf.cksum, TF_SOF_BYTE); - #endif +#if TF_USE_SOF_BYTE + CKSUM_ADD(tf.cksum, TF_SOF_BYTE); +#endif tf.discard_data = false; @@ -489,11 +493,11 @@ void _TF_FN TF_AcceptChar(unsigned char c) #define COLLECT_NUMBER(dest, type) dest = (type)(((dest) << 8) | c); \ if (++tf.rxi == sizeof(type)) - #if !TF_USE_SOF_BYTE - if (tf.state == TFState_SOF) { +#if !TF_USE_SOF_BYTE + if (tf.state == TFState_SOF) { TF_ParsBeginFrame(); } - #endif +#endif switch (tf.state) { case TFState_SOF: @@ -505,63 +509,63 @@ void _TF_FN TF_AcceptChar(unsigned char c) case TFState_ID: CKSUM_ADD(tf.cksum, c); COLLECT_NUMBER(tf.id, TF_ID) { - // Enter LEN state - tf.state = TFState_LEN; - tf.rxi = 0; - } + // Enter LEN state + tf.state = TFState_LEN; + tf.rxi = 0; + } break; case TFState_LEN: CKSUM_ADD(tf.cksum, c); COLLECT_NUMBER(tf.len, TF_LEN) { - // Enter TYPE state - tf.state = TFState_TYPE; - tf.rxi = 0; - } + // Enter TYPE state + tf.state = TFState_TYPE; + tf.rxi = 0; + } break; case TFState_TYPE: CKSUM_ADD(tf.cksum, c); COLLECT_NUMBER(tf.type, TF_TYPE) { - #if TF_CKSUM_TYPE == TF_CKSUM_NONE - tf.state = TFState_DATA; - tf.rxi = 0; - #else - // enter HEAD_CKSUM state - tf.state = TFState_HEAD_CKSUM; +#if TF_CKSUM_TYPE == TF_CKSUM_NONE + tf.state = TFState_DATA; tf.rxi = 0; - tf.ref_cksum = 0; - #endif - } +#else + // enter HEAD_CKSUM state + tf.state = TFState_HEAD_CKSUM; + tf.rxi = 0; + tf.ref_cksum = 0; +#endif + } break; case TFState_HEAD_CKSUM: - COLLECT_NUMBER(tf.ref_cksum, TF_CKSUM) { - // Check the header checksum against the computed value - CKSUM_FINALIZE(tf.cksum); + COLLECT_NUMBER(tf.ref_cksum, TF_CKSUM) { + // Check the header checksum against the computed value + CKSUM_FINALIZE(tf.cksum); - if (tf.cksum != tf.ref_cksum) { - TF_ResetParser(); - break; - } + if (tf.cksum != tf.ref_cksum) { + TF_ResetParser(); + break; + } - if (tf.len == 0) { - TF_HandleReceivedMessage(); - TF_ResetParser(); - break; - } + if (tf.len == 0) { + TF_HandleReceivedMessage(); + TF_ResetParser(); + break; + } - // Enter DATA state - tf.state = TFState_DATA; - tf.rxi = 0; + // Enter DATA state + tf.state = TFState_DATA; + tf.rxi = 0; - CKSUM_RESET(tf.cksum); // Start collecting the payload + CKSUM_RESET(tf.cksum); // Start collecting the payload - if (tf.len >= TF_MAX_PAYLOAD_RX) { - // ERROR - frame too long. Consume, but do not store. - tf.discard_data = true; - } - } + if (tf.len >= TF_MAX_PAYLOAD_RX) { + // ERROR - frame too long. Consume, but do not store. + tf.discard_data = true; + } + } break; case TFState_DATA: @@ -573,29 +577,29 @@ void _TF_FN TF_AcceptChar(unsigned char c) } if (tf.rxi == tf.len) { - #if TF_CKSUM_TYPE == TF_CKSUM_NONE - // All done +#if TF_CKSUM_TYPE == TF_CKSUM_NONE + // All done TF_HandleReceivedMessage(); TF_ResetParser(); - #else - // Enter DATA_CKSUM state - tf.state = TFState_DATA_CKSUM; - tf.rxi = 0; - tf.ref_cksum = 0; - #endif +#else + // Enter DATA_CKSUM state + tf.state = TFState_DATA_CKSUM; + tf.rxi = 0; + tf.ref_cksum = 0; +#endif } break; case TFState_DATA_CKSUM: - COLLECT_NUMBER(tf.ref_cksum, TF_CKSUM) { - // Check the header checksum against the computed value - CKSUM_FINALIZE(tf.cksum); - if (!tf.discard_data && tf.cksum == tf.ref_cksum) { - TF_HandleReceivedMessage(); - } + COLLECT_NUMBER(tf.ref_cksum, TF_CKSUM) { + // Check the header checksum against the computed value + CKSUM_FINALIZE(tf.cksum); + if (!tf.discard_data && tf.cksum == tf.ref_cksum) { + TF_HandleReceivedMessage(); + } - TF_ResetParser(); - } + TF_ResetParser(); + } break; } @@ -606,6 +610,18 @@ void _TF_FN TF_AcceptChar(unsigned char c) } } +// Helper macros for the Compose functions +// use variables: si - signed int, b - byte, outbuf - target buffer, pos - count of bytes in buffer +#define WRITENUM_BASE(type, num, xtra) \ + for (si = sizeof(type)-1; si>=0; si--) { \ + b = (uint8_t)((num) >> (si*8) & 0xFF); \ + outbuff[pos++] = b; \ + xtra; \ + } +#define _NOOP() +#define WRITENUM(type, num) WRITENUM_BASE(type, num, _NOOP()) +#define WRITENUM_CKSUM(type, num) WRITENUM_BASE(type, num, CKSUM_ADD(cksum, b)) + /** * Compose a frame (used internally by TF_Send and TF_Respond). * The frame can be sent using TF_WriteImpl(), or received by TF_Accept() @@ -613,19 +629,16 @@ void _TF_FN TF_AcceptChar(unsigned char c) * @param outbuff - buffer to store the result in * @param msgid - message ID is stored here, if not NULL * @param type - message type - * @param data - data buffer * @param len - payload size in bytes * @param explicit_id - ID to use in the frame (8-bit) * @param use_expl_id - whether to use the previous param * @return nr of bytes in outbuff used by the frame, 0 on failure */ -static inline size_t _TF_FN TF_Compose(uint8_t *outbuff, TF_ID *id_ptr, - TF_TYPE type, - const uint8_t *data, TF_LEN data_len, - TF_ID explicit_id, bool use_expl_id) +static inline size_t _TF_FN TF_ComposeHead(uint8_t *outbuff, TF_ID *id_ptr, + TF_TYPE type, TF_LEN data_len, + TF_ID explicit_id, bool use_expl_id) { - char si = 0; // signed small int - TF_LEN i = 0; + int8_t si = 0; // signed small int uint8_t b = 0; TF_ID id = 0; TF_CKSUM cksum = 0; @@ -635,11 +648,6 @@ static inline size_t _TF_FN TF_Compose(uint8_t *outbuff, TF_ID *id_ptr, CKSUM_RESET(cksum); - // sanitize len - if (data_len > TF_MAX_PAYLOAD_TX) { - return 0; - } - // Gen ID if (use_expl_id) { id = explicit_id; @@ -651,62 +659,123 @@ static inline size_t _TF_FN TF_Compose(uint8_t *outbuff, TF_ID *id_ptr, } } - if (id_ptr != NULL) - *id_ptr = id; - - // DRY helper for writing a multi-byte variable to the buffer -#define WRITENUM_BASE(type, num, xtra) \ - for (si = sizeof(type)-1; si>=0; si--) { \ - b = (uint8_t)(num >> (si*8) & 0xFF); \ - outbuff[pos++] = b; \ - xtra; \ - } - -#define _NOOP() -#define WRITENUM(type, num) WRITENUM_BASE(type, num, _NOOP()) -#define WRITENUM_CKSUM(type, num) WRITENUM_BASE(type, num, CKSUM_ADD(cksum, b)) + if (id_ptr != NULL) *id_ptr = id; // --- Start --- CKSUM_RESET(cksum); - #if TF_USE_SOF_BYTE - outbuff[pos++] = TF_SOF_BYTE; - CKSUM_ADD(cksum, TF_SOF_BYTE); - #endif +#if TF_USE_SOF_BYTE + outbuff[pos++] = TF_SOF_BYTE; + CKSUM_ADD(cksum, TF_SOF_BYTE); +#endif WRITENUM_CKSUM(TF_ID, id); WRITENUM_CKSUM(TF_LEN, data_len); WRITENUM_CKSUM(TF_TYPE, type); - #if TF_CKSUM_TYPE != TF_CKSUM_NONE - CKSUM_FINALIZE(cksum); - WRITENUM(TF_CKSUM, cksum); - #endif +#if TF_CKSUM_TYPE != TF_CKSUM_NONE + CKSUM_FINALIZE(cksum); + WRITENUM(TF_CKSUM, cksum); +#endif - // --- payload begin --- - if (data_len > 0) { - CKSUM_RESET(cksum); + return pos; +} - // DATA - for (i = 0; i < data_len; i++) { - b = data[i]; - outbuff[pos++] = b; - CKSUM_ADD(cksum, b); - } +/** + * Compose a frame (used internally by TF_Send and TF_Respond). + * The frame can be sent using TF_WriteImpl(), or received by TF_Accept() + * + * @param outbuff - buffer to store the result in + * @param data - data buffer + * @param data_len - data buffer len + * @param cksum - checksum variable, used for all calls to TF_ComposeBody. Must be reset before first use! (CKSUM_RESET(cksum);) + * @return nr of bytes in outbuff used + */ +static size_t _TF_FN TF_ComposeBody(uint8_t *outbuff, const uint8_t *data, TF_LEN data_len, TF_CKSUM *cksum) +{ + TF_LEN i = 0; + uint8_t b = 0; + size_t pos = 0; - #if TF_CKSUM_TYPE != TF_CKSUM_NONE - CKSUM_FINALIZE(cksum); - WRITENUM(TF_CKSUM, cksum); - #endif + for (i = 0; i < data_len; i++) { + b = data[i]; + outbuff[pos++] = b; + CKSUM_ADD(*cksum, b); } return pos; } +/** + * Finalize a frame + * + * @param outbuff - buffer to store the result in + * @param cksum - checksum variable used for the body + * @return nr of bytes in outbuff used + */ +static size_t _TF_FN TF_ComposeTail(uint8_t *outbuff, TF_CKSUM *cksum) +{ + int8_t si = 0; // signed small int + uint8_t b = 0; + size_t pos = 0; + +#if TF_CKSUM_TYPE != TF_CKSUM_NONE + CKSUM_FINALIZE(*cksum); + WRITENUM(TF_CKSUM, *cksum); +#endif + return pos; +} + +// send with listener +static bool _TF_FN TF_SendFrame(TF_Msg *msg, TF_Listener listener, TF_TICKS timeout) +{ + size_t len = 0; + size_t remain = 0; + size_t sent = 0; + TF_CKSUM cksum = 0; + + len = TF_ComposeHead(tf.sendbuf, + &msg->frame_id, + msg->type, + msg->len, + msg->frame_id, + msg->is_response); + + if (listener) TF_AddIdListener(msg, listener, timeout); + + CKSUM_RESET(cksum); + + remain = msg->len; + while (remain > 0) { + size_t chunk = TF_MIN(TF_SENDBUF_LEN - len, remain); + len += TF_ComposeBody(tf.sendbuf+len, msg->data+sent, (TF_LEN) chunk, &cksum); + remain -= chunk; + sent += chunk; + + // Flush if the buffer is full and we have more to send + if (remain > 0 && len == TF_SENDBUF_LEN) { + TF_WriteImpl((const uint8_t *) tf.sendbuf, len); + len = 0; + } + } + + // Flush if checksum wouldn't fit in the buffer + if (TF_SENDBUF_LEN - len < sizeof(TF_CKSUM)) { + TF_WriteImpl((const uint8_t *) tf.sendbuf, len); + len = 0; + } + + // Add checksum, flush what remains to be sent + len += TF_ComposeTail(tf.sendbuf+len, &cksum); + TF_WriteImpl((const uint8_t *) tf.sendbuf, len); + + return true; +} + // send without listener bool _TF_FN TF_Send(TF_Msg *msg) { - return TF_Query(msg, NULL, 0); + return TF_SendFrame(msg, NULL, 0); } // send without listener and struct @@ -729,27 +798,13 @@ bool _TF_FN TF_QuerySimple(TF_TYPE type, const uint8_t *data, TF_LEN len, TF_Lis msg.data = data; msg.len = len; msg.userdata = userdata; - return TF_Query(&msg, listener, timeout); + return TF_SendFrame(&msg, listener, timeout); } // send with listener bool _TF_FN TF_Query(TF_Msg *msg, TF_Listener listener, TF_TICKS timeout) { - size_t len; - len = TF_Compose(tf.sendbuf, - &msg->frame_id, - msg->type, - msg->data, - msg->len, - msg->frame_id, - msg->is_response); - - if (len == 0) return false; - - if (listener) TF_AddIdListener(msg, listener, timeout); - - TF_WriteImpl((const uint8_t *) tf.sendbuf, len); - return true; + return TF_SendFrame(msg, listener, timeout); } // Like TF_Send, but with explicit frame ID diff --git a/demo/test/Makefile b/demo/multipart_tx/Makefile similarity index 100% rename from demo/test/Makefile rename to demo/multipart_tx/Makefile diff --git a/demo/multipart_tx/TF_Config.h b/demo/multipart_tx/TF_Config.h new file mode 100644 index 0000000..2180cac --- /dev/null +++ b/demo/multipart_tx/TF_Config.h @@ -0,0 +1,25 @@ +// +// Created by MightyPork on 2017/10/15. +// + +#ifndef TF_CONFIG_H +#define TF_CONFIG_H + +#include + +#define TF_ID_BYTES 1 +#define TF_LEN_BYTES 2 +#define TF_TYPE_BYTES 1 +#define TF_CKSUM_TYPE TF_CKSUM_CRC16 +#define TF_USE_SOF_BYTE 1 +#define TF_SOF_BYTE 0x01 +typedef uint16_t TF_TICKS; +typedef uint8_t TF_COUNT; +#define TF_MAX_PAYLOAD_RX 10240 +#define TF_SENDBUF_LEN 64 +#define TF_MAX_ID_LST 10 +#define TF_MAX_TYPE_LST 10 +#define TF_MAX_GEN_LST 5 +#define TF_PARSER_TIMEOUT_TICKS 10 + +#endif //TF_CONFIG_H diff --git a/demo/multipart_tx/test.c b/demo/multipart_tx/test.c new file mode 100644 index 0000000..5f40870 --- /dev/null +++ b/demo/multipart_tx/test.c @@ -0,0 +1,297 @@ +#include +#include +#include "../../TinyFrame.h" +#include "../utils.h" + +extern const char *romeo; + +/** + * This function should be defined in the application code. + * It implements the lowest layer - sending bytes to UART (or other) + */ +void TF_WriteImpl(const uint8_t *buff, size_t len) +{ + printf("--------------------\n"); + printf("\033[32mTF_WriteImpl - sending frame:\033[0m\n"); + dumpFrame(buff, len); + + // Send it back as if we received it + TF_Accept(buff, len); +} + +/** An example listener function */ +TF_Result myListener(TF_Msg *msg) +{ + dumpFrameInfo(msg); + if (strcmp(msg->data, romeo) == 0) { + printf("FILE TRANSFERRED OK!\r\n"); + } else { + printf("FAIL!!!!\r\n"); + } + return TF_STAY; +} + +void main(void) +{ + TF_Msg msg; + + // Set up the TinyFrame library + TF_Init(TF_MASTER); // 1 = master, 0 = slave + TF_AddGenericListener(myListener); + + printf("------ Simulate sending a LOOONG message --------\n"); + + TF_ClearMsg(&msg); + msg.type = 0x22; + msg.data = (pu8)romeo; + msg.len = strlen(romeo); + TF_Send(&msg); +} + +const char *romeo ="THE TRAGEDY OF ROMEO AND JULIET\n" +"\n" +"by William Shakespeare\n" +"\n" +"\n" +"\n" +"Dramatis Personae\n" +"\n" +" Chorus.\n" +"\n" +"\n" +" Escalus, Prince of Verona.\n" +"\n" +" Paris, a young Count, kinsman to the Prince.\n" +"\n" +" Montague, heads of two houses at variance with each other.\n" +"\n" +" Capulet, heads of two houses at variance with each other.\n" +"\n" +" An old Man, of the Capulet family.\n" +"\n" +" Romeo, son to Montague.\n" +"\n" +" Tybalt, nephew to Lady Capulet.\n" +"\n" +" Mercutio, kinsman to the Prince and friend to Romeo.\n" +"\n" +" Benvolio, nephew to Montague, and friend to Romeo\n" +"\n" +" Tybalt, nephew to Lady Capulet.\n" +"\n" +" Friar Laurence, Franciscan.\n" +"\n" +" Friar John, Franciscan.\n" +"\n" +" Balthasar, servant to Romeo.\n" +"\n" +" Abram, servant to Montague.\n" +"\n" +" Sampson, servant to Capulet.\n" +"\n" +" Gregory, servant to Capulet.\n" +"\n" +" Peter, servant to Juliet's nurse.\n" +"\n" +" An Apothecary.\n" +"\n" +" Three Musicians.\n" +"\n" +" An Officer.\n" +"\n" +"\n" +" Lady Montague, wife to Montague.\n" +"\n" +" Lady Capulet, wife to Capulet.\n" +"\n" +" Juliet, daughter to Capulet.\n" +"\n" +" Nurse to Juliet.\n" +"\n" +"\n" +" Citizens of Verona; Gentlemen and Gentlewomen of both houses;\n" +" Maskers, Torchbearers, Pages, Guards, Watchmen, Servants, and\n" +" Attendants.\n" +"\n" +" SCENE.--Verona; Mantua.\n" +"\n" +"\n" +"\n" +" THE PROLOGUE\n" +"\n" +" Enter Chorus.\n" +"\n" +"\n" +" Chor. Two households, both alike in dignity,\n" +" In fair Verona, where we lay our scene,\n" +" From ancient grudge break to new mutiny,\n" +" Where civil blood makes civil hands unclean.\n" +" From forth the fatal loins of these two foes\n" +" A pair of star-cross'd lovers take their life;\n" +" Whose misadventur'd piteous overthrows\n" +" Doth with their death bury their parents' strife.\n" +" The fearful passage of their death-mark'd love,\n" +" And the continuance of their parents' rage,\n" +" Which, but their children's end, naught could remove,\n" +" Is now the two hours' traffic of our stage;\n" +" The which if you with patient ears attend,\n" +" What here shall miss, our toil shall strive to mend.\n" +" [Exit.]\n" +"\n" +"\n" +"\n" +"\n" +"ACT I. Scene I.\n" +"Verona. A public place.\n" +"\n" +"Enter Sampson and Gregory (with swords and bucklers) of the house\n" +"of Capulet.\n" +"\n" +"\n" +" Samp. Gregory, on my word, we'll not carry coals.\n" +"\n" +" Greg. No, for then we should be colliers.\n" +"\n" +" Samp. I mean, an we be in choler, we'll draw.\n" +"\n" +" Greg. Ay, while you live, draw your neck out of collar.\n" +"\n" +" Samp. I strike quickly, being moved.\n" +"\n" +" Greg. But thou art not quickly moved to strike.\n" +"\n" +" Samp. A dog of the house of Montague moves me.\n" +"\n" +" Greg. To move is to stir, and to be valiant is to stand.\n" +" Therefore, if thou art moved, thou runn'st away.\n" +"\n" +" Samp. A dog of that house shall move me to stand. I will take\n" +" the wall of any man or maid of Montague's.\n" +"\n" +" Greg. That shows thee a weak slave; for the weakest goes to the\n" +" wall.\n" +"\n" +" Samp. 'Tis true; and therefore women, being the weaker vessels,\n" +" are ever thrust to the wall. Therefore I will push Montague's men\n" +" from the wall and thrust his maids to the wall.\n" +"\n" +" Greg. The quarrel is between our masters and us their men.\n" +"\n" +" Samp. 'Tis all one. I will show myself a tyrant. When I have\n" +" fought with the men, I will be cruel with the maids- I will cut off\n" +" their heads.\n" +"\n" +" Greg. The heads of the maids?\n" +"\n" +" Samp. Ay, the heads of the maids, or their maidenheads.\n" +" Take it in what sense thou wilt.\n" +"\n" +" Greg. They must take it in sense that feel it.\n" +"\n" +" Samp. Me they shall feel while I am able to stand; and 'tis known I\n" +" am a pretty piece of flesh.\n" +"\n" +" Greg. 'Tis well thou art not fish; if thou hadst, thou hadst\n" +" been poor-John. Draw thy tool! Here comes two of the house of\n" +" Montagues.\n" +"\n" +" Enter two other Servingmen [Abram and Balthasar].\n" +"\n" +"\n" +" Samp. My naked weapon is out. Quarrel! I will back thee.\n" +"\n" +" Greg. How? turn thy back and run?\n" +"\n" +" Samp. Fear me not.\n" +"\n" +" Greg. No, marry. I fear thee!\n" +"\n" +" Samp. Let us take the law of our sides; let them begin.\n" +"\n" +" Greg. I will frown as I pass by, and let them take it as they list.\n" +"\n" +" Samp. Nay, as they dare. I will bite my thumb at them; which is\n" +" disgrace to them, if they bear it.\n" +"\n" +" Abr. Do you bite your thumb at us, sir?\n" +"\n" +" Samp. I do bite my thumb, sir.\n" +"\n" +" Abr. Do you bite your thumb at us, sir?\n" +"\n" +" Samp. [aside to Gregory] Is the law of our side if I say ay?\n" +"\n" +" Greg. [aside to Sampson] No.\n" +"\n" +" Samp. No, sir, I do not bite my thumb at you, sir; but I bite my\n" +" thumb, sir.\n" +"\n" +" Greg. Do you quarrel, sir?\n" +"\n" +" Abr. Quarrel, sir? No, sir.\n" +"\n" +" Samp. But if you do, sir, am for you. I serve as good a man as\n" +" you.\n" +"\n" +" Abr. No better.\n" +"\n" +" Samp. Well, sir.\n" +"\n" +" Enter Benvolio.\n" +"\n" +"\n" +" Greg. [aside to Sampson] Say 'better.' Here comes one of my\n" +" master's kinsmen.\n" +"\n" +" Samp. Yes, better, sir.\n" +"\n" +" Abr. You lie.\n" +"\n" +" Samp. Draw, if you be men. Gregory, remember thy swashing blow.\n" +" They fight.\n" +"\n" +" Ben. Part, fools! [Beats down their swords.]\n" +" Put up your swords. You know not what you do.\n" +"\n" +" Enter Tybalt.\n" +"\n" +"\n" +" Tyb. What, art thou drawn among these heartless hinds?\n" +" Turn thee Benvolio! look upon thy death.\n" +"\n" +" Ben. I do but keep the peace. Put up thy sword,\n" +" Or manage it to part these men with me.\n" +"\n" +" Tyb. What, drawn, and talk of peace? I hate the word\n" +" As I hate hell, all Montagues, and thee.\n" +" Have at thee, coward! They fight.\n" +"\n" +" Enter an officer, and three or four Citizens with clubs or\n" +" partisans.\n" +"\n" +"\n" +" Officer. Clubs, bills, and partisans! Strike! beat them down!\n" +"\n" +" Citizens. Down with the Capulets! Down with the Montagues!\n" +"\n" +" Enter Old Capulet in his gown, and his Wife.\n" +"\n" +"\n" +" Cap. What noise is this? Give me my long sword, ho!\n" +"\n" +" Wife. A crutch, a crutch! Why call you for a sword?\n" +"\n" +" Cap. My sword, I say! Old Montague is come\n" +" And flourishes his blade in spite of me.\n" +"\n" +" Enter Old Montague and his Wife.\n" +"\n" +"\n" +" Mon. Thou villain Capulet!- Hold me not, let me go.\n" +"\n" +" M. Wife. Thou shalt not stir one foot to seek a foe.\n" +"\n" +" Enter Prince Escalus, with his Train.\n" +"\n" +"\n" +"END OF FILE\n"; diff --git a/demo/simple/Makefile b/demo/simple/Makefile new file mode 100644 index 0000000..118c385 --- /dev/null +++ b/demo/simple/Makefile @@ -0,0 +1,11 @@ +CFILES=../utils.c ../../TinyFrame.c +INCLDIRS=-I. -I.. -I../.. +CFLAGS=-O0 -ggdb --std=gnu99 -Wno-main -Wall -Wextra $(CFILES) $(INCLDIRS) + +run: test.bin + ./test.bin + +build: test.bin + +test.bin: test.c $(CFILES) + gcc test.c $(CFLAGS) -o test.bin diff --git a/demo/hello/TF_Config.h b/demo/simple/TF_Config.h similarity index 94% rename from demo/hello/TF_Config.h rename to demo/simple/TF_Config.h index 306b833..d5f42ad 100644 --- a/demo/hello/TF_Config.h +++ b/demo/simple/TF_Config.h @@ -16,7 +16,7 @@ typedef uint16_t TF_TICKS; typedef uint8_t TF_COUNT; #define TF_MAX_PAYLOAD_RX 1024 -#define TF_MAX_PAYLOAD_TX 1024 +#define TF_SENDBUF_LEN 1024 #define TF_MAX_ID_LST 10 #define TF_MAX_TYPE_LST 10 #define TF_MAX_GEN_LST 5 diff --git a/demo/test/test.c b/demo/simple/test.c similarity index 100% rename from demo/test/test.c rename to demo/simple/test.c diff --git a/demo/hello/Makefile b/demo/socket_demo/Makefile similarity index 100% rename from demo/hello/Makefile rename to demo/socket_demo/Makefile diff --git a/demo/test/TF_Config.h b/demo/socket_demo/TF_Config.h similarity index 94% rename from demo/test/TF_Config.h rename to demo/socket_demo/TF_Config.h index 306b833..d5f42ad 100644 --- a/demo/test/TF_Config.h +++ b/demo/socket_demo/TF_Config.h @@ -16,7 +16,7 @@ typedef uint16_t TF_TICKS; typedef uint8_t TF_COUNT; #define TF_MAX_PAYLOAD_RX 1024 -#define TF_MAX_PAYLOAD_TX 1024 +#define TF_SENDBUF_LEN 1024 #define TF_MAX_ID_LST 10 #define TF_MAX_TYPE_LST 10 #define TF_MAX_GEN_LST 5 diff --git a/demo/hello/master.c b/demo/socket_demo/master.c similarity index 100% rename from demo/hello/master.c rename to demo/socket_demo/master.c diff --git a/demo/hello/slave.c b/demo/socket_demo/slave.c similarity index 100% rename from demo/hello/slave.c rename to demo/socket_demo/slave.c