fixed svn EOL and MIME settings.

This commit is contained in:
skarg
2012-04-06 23:24:43 +00:00
parent 62eea57d4b
commit d1f4e78cba
57 changed files with 11387 additions and 11363 deletions
+9 -1
View File
@@ -9,10 +9,18 @@ TARGET = bacgateway
TARGET_BIN = ${TARGET}$(TARGET_EXT) TARGET_BIN = ${TARGET}$(TARGET_EXT)
SRCS = main.c SRCS = main.c \
$(BACNET_OBJECT)/gw_device.c \
${CORE_SRC} \
${PORT_SRC} \
${HANDLER_SRC} \
${OBJECT_SRC} \
${ROUTING_SRC}
OBJS = ${SRCS:.c=.o} OBJS = ${SRCS:.c=.o}
DEFINES += -DBAC_ROUTING
all: ${BACNET_LIB_TARGET} Makefile ${TARGET_BIN} all: ${BACNET_LIB_TARGET} Makefile ${TARGET_BIN}
${TARGET_BIN}: ${OBJS} Makefile ${BACNET_LIB_TARGET} ${TARGET_BIN}: ${OBJS} Makefile ${BACNET_LIB_TARGET}
+6
View File
@@ -112,6 +112,12 @@ extern "C" {
uint32_t object_instance, uint32_t object_instance,
float value); float value);
bool Analog_Input_Out_Of_Service(
uint32_t object_instance);
void Analog_Input_Out_Of_Service_Set(
uint32_t object_instance,
bool oos_flag);
/* note: header of Intrinsic_Reporting function is required /* note: header of Intrinsic_Reporting function is required
even when INTRINSIC_REPORTING is not defined */ even when INTRINSIC_REPORTING is not defined */
void Analog_Input_Intrinsic_Reporting( void Analog_Input_Intrinsic_Reporting(
+10
View File
@@ -32,6 +32,8 @@
#include "bo.h" #include "bo.h"
#include "rs485.h" #include "rs485.h"
#include "dlmstp.h" #include "dlmstp.h"
#include "seeprom.h"
#include "nvdata.h"
/* me */ /* me */
#include "test.h" #include "test.h"
@@ -117,6 +119,7 @@ void test_task(
void) void)
{ {
uint8_t data_register = 0; uint8_t data_register = 0;
uint16_t id = 0;
if (timer_interval_expired(&Test_Timer)) { if (timer_interval_expired(&Test_Timer)) {
timer_interval_reset(&Test_Timer); timer_interval_reset(&Test_Timer);
@@ -159,13 +162,20 @@ void test_task(
case '9': case '9':
rs485_baud_rate_set(9600); rs485_baud_rate_set(9600);
break; break;
case 'e':
seeprom_bytes_read(NV_SEEPROM_TYPE_0, (uint8_t *) &id, 2);
sprintf(Send_Buffer, "\r\n%04X", id);
serial_bytes_send((uint8_t *) Send_Buffer, strlen(Send_Buffer));
break;
case 'b': case 'b':
sprintf(Send_Buffer, "\r\n%lubps", sprintf(Send_Buffer, "\r\n%lubps",
(unsigned long) rs485_baud_rate()); (unsigned long) rs485_baud_rate());
serial_bytes_send((uint8_t *) Send_Buffer, strlen(Send_Buffer));
break; break;
case 'm': case 'm':
sprintf(Send_Buffer, "\r\nMax:%u", sprintf(Send_Buffer, "\r\nMax:%u",
(unsigned) dlmstp_max_master()); (unsigned) dlmstp_max_master());
serial_bytes_send((uint8_t *) Send_Buffer, strlen(Send_Buffer));
break; break;
default: default:
break; break;