dali/bacnet_stack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix transmitted frame and pdu counters (#236)

Browse Source
This commit is contained in:
Nick Schaf
2022-03-03 16:32:44 -06:00
committed by GitHub
parent a0449ff62f
commit aba098c450
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ports/stm32f4xx/dlmstp.c
+7 -4
View File
@@ -421,6 +421,13 @@ static void MSTP_Send_Frame(uint8_t frame_type,
OutputBufferLength = MSTP_Create_Frame(OutputBuffer, sizeof(OutputBuffer), OutputBufferLength = MSTP_Create_Frame(OutputBuffer, sizeof(OutputBuffer),
frame_type, destination, source, data, data_len); frame_type, destination, source, data, data_len);
rs485_bytes_send(OutputBuffer, OutputBufferLength); rs485_bytes_send(OutputBuffer, OutputBufferLength);
/* increment the transmitted frame count */
Statistics.transmit_frame_counter++;
/* if there was data, also increment transmitted pdu count */
if ((data != NULL) && (data_len > 0)) {
Statistics.transmit_pdu_counter++;
}
} }
static void MSTP_Receive_Frame_FSM(void) static void MSTP_Receive_Frame_FSM(void)
@@ -719,7 +726,6 @@ static void MSTP_Slave_Node_FSM(void)
/* a proprietary frame that expects a reply is received. */ /* a proprietary frame that expects a reply is received. */
pkt = (struct dlmstp_packet *)Ringbuf_Peek(&PDU_Queue); pkt = (struct dlmstp_packet *)Ringbuf_Peek(&PDU_Queue);
if (pkt != NULL) { if (pkt != NULL) {
Statistics.transmit_pdu_counter++;
MSTP_Send_Frame(pkt->frame_type, pkt->address.mac[0], MSTP_Send_Frame(pkt->frame_type, pkt->address.mac[0],
This_Station, (uint8_t *)&pkt->pdu[0], This_Station, (uint8_t *)&pkt->pdu[0],
pkt->pdu_len); pkt->pdu_len);
@@ -912,7 +918,6 @@ static bool MSTP_Master_Node_FSM(void)
MSTP_Send_Frame(pkt->frame_type, pkt->address.mac[0], MSTP_Send_Frame(pkt->frame_type, pkt->address.mac[0],
This_Station, (uint8_t *)&pkt->pdu[0], pkt->pdu_len); This_Station, (uint8_t *)&pkt->pdu[0], pkt->pdu_len);
FrameCount++; FrameCount++;
Statistics.transmit_pdu_counter++;
switch (pkt->frame_type) { switch (pkt->frame_type) {
case FRAME_TYPE_BACNET_DATA_EXPECTING_REPLY: case FRAME_TYPE_BACNET_DATA_EXPECTING_REPLY:
/* SendAndWait */ /* SendAndWait */
@@ -1271,7 +1276,6 @@ static bool MSTP_Master_Node_FSM(void)
MSTP_Flag.ReceivedValidFrame = false; MSTP_Flag.ReceivedValidFrame = false;
/* clear the queue */ /* clear the queue */
(void)Ringbuf_Pop(&PDU_Queue, NULL); (void)Ringbuf_Pop(&PDU_Queue, NULL);
Statistics.transmit_pdu_counter++;
} else if ((pkt != NULL) || timeout) { } else if ((pkt != NULL) || timeout) {
/* DeferredReply */ /* DeferredReply */
/* If no reply will be available from the higher layers */ /* If no reply will be available from the higher layers */
@@ -1345,7 +1349,6 @@ int dlmstp_send_pdu(BACNET_ADDRESS *dest, /* destination address */
if (Ringbuf_Data_Put(&PDU_Queue, (volatile uint8_t *)pkt)) { if (Ringbuf_Data_Put(&PDU_Queue, (volatile uint8_t *)pkt)) {
bytes_sent = pdu_len; bytes_sent = pdu_len;
} }
Statistics.transmit_frame_counter++;
} }
return bytes_sent; return bytes_sent;