Working on MS/TP port to PIC18F series microcontroller.

This commit is contained in:
skarg
2006-08-14 20:59:09 +00:00
parent dafc55bf9f
commit 2dd0cd5d69
8 changed files with 141 additions and 182 deletions
+18 -20
View File
@@ -67,7 +67,6 @@ file_047=no
file_048=no
file_049=no
file_050=no
file_051=no
[FILE_INFO]
file_000=C:\code\bacnet-stack\abort.c
file_001=C:\code\bacnet-stack\apdu.c
@@ -83,14 +82,14 @@ file_010=C:\code\bacnet-stack\mstp.c
file_011=C:\code\bacnet-stack\npdu.c
file_012=C:\code\bacnet-stack\rd.c
file_013=C:\code\bacnet-stack\reject.c
file_014=C:\code\bacnet-stack\ringbuf.c
file_015=C:\code\bacnet-stack\rp.c
file_016=C:\code\bacnet-stack\whois.c
file_017=C:\code\bacnet-stack\demo\handler\h_dcc.c
file_018=C:\code\bacnet-stack\demo\handler\h_rd.c
file_019=main.c
file_020=C:\code\bacnet-stack\demo\object\tiny_dev.c
file_021=dlmstp.c
file_014=C:\code\bacnet-stack\rp.c
file_015=C:\code\bacnet-stack\whois.c
file_016=C:\code\bacnet-stack\demo\handler\h_dcc.c
file_017=C:\code\bacnet-stack\demo\handler\h_rd.c
file_018=main.c
file_019=C:\code\bacnet-stack\demo\object\tiny_dev.c
file_020=dlmstp.c
file_021=rs485.c
file_022=C:\code\bacnet-stack\wp.h
file_023=C:\code\bacnet-stack\abort.h
file_024=C:\code\bacnet-stack\apdu.h
@@ -110,17 +109,16 @@ file_037=C:\code\bacnet-stack\mstp.h
file_038=C:\code\bacnet-stack\npdu.h
file_039=C:\code\bacnet-stack\rd.h
file_040=C:\code\bacnet-stack\reject.h
file_041=C:\code\bacnet-stack\ringbuf.h
file_042=C:\code\bacnet-stack\rp.h
file_043=C:\code\bacnet-stack\rs485.h
file_044=C:\code\bacnet-stack\whois.h
file_045=C:\code\bacnet-stack\demo\handler\client.h
file_046=C:\code\bacnet-stack\demo\handler\handlers.h
file_047=C:\code\bacnet-stack\demo\object\ai.h
file_048=C:\code\bacnet-stack\demo\object\ao.h
file_049=C:\code\bacnet-stack\demo\object\device.h
file_050=stdbool.h
file_051=stdint.h
file_041=C:\code\bacnet-stack\rp.h
file_042=C:\code\bacnet-stack\rs485.h
file_043=C:\code\bacnet-stack\whois.h
file_044=C:\code\bacnet-stack\demo\handler\client.h
file_045=C:\code\bacnet-stack\demo\handler\handlers.h
file_046=C:\code\bacnet-stack\demo\object\ai.h
file_047=C:\code\bacnet-stack\demo\object\ao.h
file_048=C:\code\bacnet-stack\demo\object\device.h
file_049=stdbool.h
file_050=stdint.h
[SUITE_INFO]
suite_guid={5B7D72DD-9861-47BD-9F60-2BE967BF8416}
suite_state=
Binary file not shown.
+35 -72
View File
@@ -31,23 +31,19 @@
#include "dlmstp.h"
#include "rs485.h"
#include "npdu.h"
static DLMSTP_PACKET Receive_Buffer;
static DLMSTP_PACKET Transmit_Buffer;
/* receive buffer */
static DLMSTP_PACKET Receive_Buffer;
/* temp buffer for NPDU insertion */
static uint8_t PDU_Buffer[MAX_MPDU];
/* local MS/TP port data */
volatile struct mstp_port_struct_t MSTP_Port; /* port data */
/* local MS/TP port data */
static volatile struct mstp_port_struct_t MSTP_Port;
void dlmstp_init(void)
{
/* initialize buffer */
Receive_Buffer.ready = false;
Receive_Buffer.data_expecting_reply = false;
Receive_Buffer.pdu_len = 0;
/* initialize buffer */
Transmit_Buffer.ready = false;
Transmit_Buffer.data_expecting_reply = false;
Transmit_Buffer.pdu_len = 0;
/* initialize hardware */
RS485_Initialize();
MSTP_Init(&MSTP_Port, MSTP_Port.This_Station);
@@ -66,16 +62,16 @@ int dlmstp_send_pdu(BACNET_ADDRESS * dest, /* destination address */
{ /* number of bytes of data */
bool status;
int bytes_sent = 0;
int npdu_len = 0;
int npdu_len = 0;
uint8_t frame_type = 0;
uint8_t destination = 0; /* destination address */
BACNET_ADDRESS src;
if (Transmit_Buffer.ready == false) {
if (MSTP_Port.TxReady == false) {
if (npdu_data->confirmed_message)
frame_type = FRAME_TYPE_BACNET_DATA_EXPECTING_REPLY;
MSTP_Port.TxFrameType = FRAME_TYPE_BACNET_DATA_EXPECTING_REPLY;
else
frame_type = FRAME_TYPE_BACNET_DATA_NOT_EXPECTING_REPLY;
MSTP_Port.TxFrameType = FRAME_TYPE_BACNET_DATA_NOT_EXPECTING_REPLY;
/* load destination MAC address */
if (dest && dest->mac_len == 1) {
@@ -88,58 +84,28 @@ int dlmstp_send_pdu(BACNET_ADDRESS * dest, /* destination address */
}
dlmstp_get_my_address(&src);
npdu_len = npdu_encode_pdu(&PDU_Buffer[0], dest, &src, npdu_data);
if ((8 + npdu_len + pdu_len) > MAX_MPDU) {
if ((8 /* header len */ + npdu_len + pdu_len) > MAX_MPDU) {
#if PRINT_ENABLED
fprintf(stderr, "mstp: PDU is too big to send!\n");
#endif
return -4;
}
memcpy(&PDU_Buffer[npdu_len], pdu, pdu_len);
/* copies the PDU to a buffer while calculating its CRC checksum
The CRC checksum is appended to the last two octets. */
unsigned MSTP_Copy_PDU_CRC(uint8_t * buffer, /* where frame is loaded */
unsigned buffer_len, /* amount of space available */
uint16_t crc16, /* used to calculate the crc value */
uint8_t * data, /* any data to be sent - may be null */
unsigned data_len);
}
memmove(&PDU_Buffer[npdu_len], pdu, pdu_len);
bytes_sent = MSTP_Create_Frame(
&Transmit_Buffer.pdu[0],
sizeof(Transmit_Buffer.pdu),
frame_type,
&MSTP_Port.TxBuffer[0],
sizeof(MSTP_Port.TxBuffer),
MSTP_Port.TxFrameType,
destination,
MSTP_Port.This_Station,
&PDU_Buffer[0],
npdu_len + pdu_len);
Transmit_Buffer.ready = true;
npdu_len + pdu_len);
MSTP_Port.TxLength = bytes_sent;
MSTP_Port.TxReady = true;
}
return bytes_sent;
}
/* function for MS/TP to use to get a packet to transmit
returns the number of bytes in the packet, or zero if none. */
int dlmstp_get_transmit_pdu(BACNET_ADDRESS * dest, /* destination address */
uint8_t * pdu)
{ /* any data to be sent - may be null */
bool status;
DLMSTP_PACKET *packet;
unsigned pdu_len = 0;
if (Transmit_Buffer.ready) {
memmove(dest, &packet->address, sizeof(packet->address));
pdu_len = packet->pdu_len;
memmove(pdu, packet->pdu, sizeof(packet.pdu));
}
return pdu_len;
}
int dlmstp_set_transmit_pdu_ready(bool ready)
{
Transmit_Buffer.ready = ready;
}
void dlmstp_task(void)
{
RS485_Check_UART_Data(&MSTP_Port);
@@ -161,16 +127,17 @@ uint16_t dlmstp_receive(BACNET_ADDRESS * src, /* source address */
uint8_t * pdu, /* PDU data */
uint16_t max_pdu, /* amount of space available in the PDU */
unsigned timeout)
{
DLMSTP_PACKET *packet;
{
uint16_t pdu_len = 0;
(void) timeout;
/* see if there is a packet available */
if (!Ringbuf_Empty(&Receive_Buffer)) {
packet = (char *) Ringbuf_Pop_Front(&Receive_Buffer);
memmove(src, &packet->address, sizeof(packet->address));
pdu_len = packet->pdu_len;
memmove(pdu, packet->pdu, max_pdu);
if (Receive_Buffer.ready)
{
memmove(src, &Receive_Buffer.address, sizeof(Receive_Buffer.address));
pdu_len = Receive_Buffer.pdu_len;
memmove(&pdu[0], &Receive_Buffer.pdu[0], max_pdu);
Receive_Buffer.ready = false;
}
return pdu_len;
@@ -181,17 +148,11 @@ uint16_t dlmstp_put_receive(BACNET_ADDRESS * src, /* source address */
uint8_t * pdu, /* PDU data */
uint16_t pdu_len)
{
bool status;
int bytes_put = 0;
memmove(&Receive_Buffer.address, src, sizeof(Receive_Buffer.address));
Receive_Buffer.pdu_len = pdu_len;
memmove(Receive_Buffer.pdu, pdu, sizeof(Receive_Buffer.pdu));
memmove(&Temp_Packet.address, src, sizeof(Temp_Packet.address));
Temp_Packet.pdu_len = pdu_len;
memmove(Temp_Packet.pdu, pdu, sizeof(Temp_Packet.pdu));
status = Ringbuf_Put(&Receive_Buffer, &Temp_Packet);
if (status)
bytes_put = pdu_len;
return bytes_put;
return pdu_len;
}
void dlmstp_set_my_address(uint8_t mac_address)
@@ -226,7 +187,7 @@ unsigned dlmstp_max_info_frames(void)
/* allowable address for master nodes. The value of Max_Master shall be */
/* less than or equal to 127. If Max_Master is not writable in a node, */
/* its value shall be 127. */
void dlmstp_set_max_info_frames(uint8_t max_master)
void dlmstp_set_max_master(uint8_t max_master)
{
MSTP_Port.Nmax_master = max_master;
@@ -240,6 +201,8 @@ uint8_t dlmstp_max_master(void)
void dlmstp_get_my_address(BACNET_ADDRESS * my_address)
{
int i = 0; /* counter */
my_address->mac_len = 1;
my_address->mac[0] = MSTP_Port.This_Station;
my_address->net = 0; /* local only, no routing */
+11
View File
@@ -207,6 +207,17 @@ void RS485_Process_Tx_Message(void)
return;
}
/****************************************************************************
* DESCRIPTION: Returns the value of Transmit Complete flag.
* RETURN: none
* ALGORITHM: none
* NOTES: none
*****************************************************************************/
bool RS485_Tx_Complete(void)
{
return RS485_Flags.TransmitComplete;
}
/****************************************************************************
* DESCRIPTION: Checks for data on the receive UART, and handles errors
* RETURN: none