Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1a62d78443 | ||
|
|
1488abb517 | ||
|
|
1f52a17fc2 | ||
|
|
7f6f21cdb7 |
+35
-29
@@ -481,10 +481,11 @@ void _TF_FN TF_AcceptChar(TinyFrame *tf, unsigned char c)
|
|||||||
|
|
||||||
#if !TF_USE_SOF_BYTE
|
#if !TF_USE_SOF_BYTE
|
||||||
if (tf->state == TFState_SOF) {
|
if (tf->state == TFState_SOF) {
|
||||||
TF_ParsBeginFrame();
|
TF_ParsBeginFrame();
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
//@formatter:off
|
||||||
switch (tf->state) {
|
switch (tf->state) {
|
||||||
case TFState_SOF:
|
case TFState_SOF:
|
||||||
if (c == TF_SOF_BYTE) {
|
if (c == TF_SOF_BYTE) {
|
||||||
@@ -513,15 +514,15 @@ void _TF_FN TF_AcceptChar(TinyFrame *tf, unsigned char c)
|
|||||||
case TFState_TYPE:
|
case TFState_TYPE:
|
||||||
CKSUM_ADD(tf->cksum, c);
|
CKSUM_ADD(tf->cksum, c);
|
||||||
COLLECT_NUMBER(tf->type, TF_TYPE) {
|
COLLECT_NUMBER(tf->type, TF_TYPE) {
|
||||||
#if TF_CKSUM_TYPE == TF_CKSUM_NONE
|
#if TF_CKSUM_TYPE == TF_CKSUM_NONE
|
||||||
tf->state = TFState_DATA;
|
tf->state = TFState_DATA;
|
||||||
tf->rxi = 0;
|
tf->rxi = 0;
|
||||||
#else
|
#else
|
||||||
// enter HEAD_CKSUM state
|
// enter HEAD_CKSUM state
|
||||||
tf->state = TFState_HEAD_CKSUM;
|
tf->state = TFState_HEAD_CKSUM;
|
||||||
tf->rxi = 0;
|
tf->rxi = 0;
|
||||||
tf->ref_cksum = 0;
|
tf->ref_cksum = 0;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
@@ -536,6 +537,7 @@ void _TF_FN TF_AcceptChar(TinyFrame *tf, unsigned char c)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (tf->len == 0) {
|
if (tf->len == 0) {
|
||||||
|
// if the message has no body, we're done.
|
||||||
TF_HandleReceivedMessage(tf);
|
TF_HandleReceivedMessage(tf);
|
||||||
TF_ResetParser(tf);
|
TF_ResetParser(tf);
|
||||||
break;
|
break;
|
||||||
@@ -547,7 +549,7 @@ void _TF_FN TF_AcceptChar(TinyFrame *tf, unsigned char c)
|
|||||||
|
|
||||||
CKSUM_RESET(tf->cksum); // Start collecting the payload
|
CKSUM_RESET(tf->cksum); // Start collecting the payload
|
||||||
|
|
||||||
if (tf->len >= TF_MAX_PAYLOAD_RX) {
|
if (tf->len > TF_MAX_PAYLOAD_RX) {
|
||||||
// ERROR - frame too long. Consume, but do not store.
|
// ERROR - frame too long. Consume, but do not store.
|
||||||
tf->discard_data = true;
|
tf->discard_data = true;
|
||||||
}
|
}
|
||||||
@@ -563,16 +565,16 @@ void _TF_FN TF_AcceptChar(TinyFrame *tf, unsigned char c)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (tf->rxi == tf->len) {
|
if (tf->rxi == tf->len) {
|
||||||
#if TF_CKSUM_TYPE == TF_CKSUM_NONE
|
#if TF_CKSUM_TYPE == TF_CKSUM_NONE
|
||||||
// All done
|
// All done
|
||||||
TF_HandleReceivedMessage();
|
TF_HandleReceivedMessage();
|
||||||
TF_ResetParser();
|
TF_ResetParser();
|
||||||
#else
|
#else
|
||||||
// Enter DATA_CKSUM state
|
// Enter DATA_CKSUM state
|
||||||
tf->state = TFState_DATA_CKSUM;
|
tf->state = TFState_DATA_CKSUM;
|
||||||
tf->rxi = 0;
|
tf->rxi = 0;
|
||||||
tf->ref_cksum = 0;
|
tf->ref_cksum = 0;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
@@ -588,6 +590,7 @@ void _TF_FN TF_AcceptChar(TinyFrame *tf, unsigned char c)
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
//@formatter:on
|
||||||
|
|
||||||
// we get here after finishing HEAD, if no data are to be received - handle and clear
|
// we get here after finishing HEAD, if no data are to be received - handle and clear
|
||||||
if (tf->len == 0 && tf->state == TFState_DATA) {
|
if (tf->len == 0 && tf->state == TFState_DATA) {
|
||||||
@@ -771,16 +774,19 @@ static bool _TF_FN TF_SendFrame(TinyFrame *tf, TF_Msg *msg, TF_Listener listener
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Flush if checksum wouldn't fit in the buffer
|
// Checksum only if message had a body
|
||||||
if (TF_SENDBUF_LEN - len < sizeof(TF_CKSUM)) {
|
if (msg->len > 0) {
|
||||||
TF_WriteImpl(tf, (const uint8_t *) tf->sendbuf, len);
|
// Flush if checksum wouldn't fit in the buffer
|
||||||
len = 0;
|
if (TF_SENDBUF_LEN - len < sizeof(TF_CKSUM)) {
|
||||||
|
TF_WriteImpl(tf, (const uint8_t *) tf->sendbuf, len);
|
||||||
|
len = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add checksum, flush what remains to be sent
|
||||||
|
len += TF_ComposeTail(tf->sendbuf + len, &cksum);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add checksum, flush what remains to be sent
|
|
||||||
len += TF_ComposeTail(tf->sendbuf+len, &cksum);
|
|
||||||
TF_WriteImpl(tf, (const uint8_t *) tf->sendbuf, len);
|
TF_WriteImpl(tf, (const uint8_t *) tf->sendbuf, len);
|
||||||
|
|
||||||
TF_ReleaseTx(tf);
|
TF_ReleaseTx(tf);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
|||||||
+1
-1
@@ -10,7 +10,7 @@
|
|||||||
* Upstream URL: https://github.com/MightyPork/TinyFrame
|
* Upstream URL: https://github.com/MightyPork/TinyFrame
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define TF_VERSION "2.0.2"
|
#define TF_VERSION "2.0.4"
|
||||||
|
|
||||||
//---------------------------------------------------------------------------
|
//---------------------------------------------------------------------------
|
||||||
#include <stdint.h> // for uint8_t etc
|
#include <stdint.h> // for uint8_t etc
|
||||||
|
|||||||
Reference in New Issue
Block a user