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

Cleaned up gcc build on linux for whohas and i-have changes.

Browse Source
This commit is contained in:
skarg
2006-02-16 21:53:23 +00:00
parent 5fcf45a781
commit 44587d5b81
7 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/Makefile
+7 -2
View File
@@ -1,4 +1,4 @@
all: readprop writeprop readfile writefile reinit server dcc all: readprop writeprop readfile writefile reinit server dcc whohas
@echo "utilities are in demo/xx directories" @echo "utilities are in demo/xx directories"
clean: \ clean: \
@@ -7,7 +7,8 @@ clean: \
demo/readfile/Makefile \ demo/readfile/Makefile \
demo/writefile/Makefile \ demo/writefile/Makefile \
demo/server/Makefile \ demo/server/Makefile \
demo/dcc/Makefile demo/dcc/Makefile \
demo/whohas/Makefile
( cd demo/readprop ; make clean ) ( cd demo/readprop ; make clean )
( cd demo/writeprop ; make clean ) ( cd demo/writeprop ; make clean )
( cd demo/readfile ; make clean ) ( cd demo/readfile ; make clean )
@@ -15,6 +16,7 @@ clean: \
( cd demo/reinit ; make clean ) ( cd demo/reinit ; make clean )
( cd demo/server ; make clean ) ( cd demo/server ; make clean )
( cd demo/dcc ; make clean ) ( cd demo/dcc ; make clean )
( cd demo/whohas ; make clean )
readprop: demo/readprop/Makefile readprop: demo/readprop/Makefile
( cd demo/readprop ; make clean ; make ) ( cd demo/readprop ; make clean ; make )
@@ -37,3 +39,6 @@ server: demo/server/Makefile
dcc: demo/dcc/Makefile dcc: demo/dcc/Makefile
( cd demo/dcc ; make clean ; make ) ( cd demo/dcc ; make clean ; make )
whohas: demo/whohas/Makefile
( cd demo/whohas ; make clean ; make )
bacnet-stack/demo/object/ai.c
-1
View File
@@ -87,7 +87,6 @@ int Analog_Input_Encode_Property_APDU(
int apdu_len = 0; // return value int apdu_len = 0; // return value
BACNET_BIT_STRING bit_string; BACNET_BIT_STRING bit_string;
BACNET_CHARACTER_STRING char_string; BACNET_CHARACTER_STRING char_string;
char text_string[32] = {""};
float value = 3.14; float value = 3.14;
(void)array_index; (void)array_index;
bacnet-stack/demo/object/ao.c
-1
View File
@@ -168,7 +168,6 @@ int Analog_Output_Encode_Property_APDU(
int apdu_len = 0; // return value int apdu_len = 0; // return value
BACNET_BIT_STRING bit_string; BACNET_BIT_STRING bit_string;
BACNET_CHARACTER_STRING char_string; BACNET_CHARACTER_STRING char_string;
char text_string[32] = {""};
float real_value = 1.414; float real_value = 1.414;
unsigned object_index = 0; unsigned object_index = 0;
unsigned i = 0; unsigned i = 0;
bacnet-stack/demo/whohas/Makefile
+7 -6
View File
@@ -9,7 +9,7 @@ BASEDIR = .
#DEFINES = -DBACFILE=1 -DBACDL_ETHERNET=1 #DEFINES = -DBACFILE=1 -DBACDL_ETHERNET=1
#DEFINES = -DBACFILE=1 -DBACDL_ARCNET=1 #DEFINES = -DBACFILE=1 -DBACDL_ARCNET=1
#DEFINES = -DBACFILE=1 -DBACDL_MSTP=1 #DEFINES = -DBACFILE=1 -DBACDL_MSTP=1
DEFINES = -DBACFILE=1 -DTSM_ENABLED=1 -DBACDL_BIP=1 DEFINES = -DBACFILE=1 -DTSM_ENABLED=0 -DBACDL_BIP=1
BACNET_PORT = ../../ports/linux BACNET_PORT = ../../ports/linux
BACNET_OBJECT = ../object BACNET_OBJECT = ../object
BACNET_HANDLER = ../handler BACNET_HANDLER = ../handler
@@ -18,7 +18,7 @@ INCLUDES = -I$(BACNET_ROOT) -I$(BACNET_PORT) -I$(BACNET_OBJECT) -I$(BACNET_HANDL
CFLAGS = -Wall -g $(INCLUDES) $(DEFINES) CFLAGS = -Wall -g $(INCLUDES) $(DEFINES)
TARGET = bacrd TARGET = bacwh
SRCS = main.c \ SRCS = main.c \
$(BACNET_ROOT)/rd.c \ $(BACNET_ROOT)/rd.c \
@@ -27,10 +27,10 @@ SRCS = main.c \
$(BACNET_HANDLER)/txbuf.c \ $(BACNET_HANDLER)/txbuf.c \
$(BACNET_HANDLER)/noserv.c \ $(BACNET_HANDLER)/noserv.c \
$(BACNET_HANDLER)/h_whois.c \ $(BACNET_HANDLER)/h_whois.c \
$(BACNET_HANDLER)/h_ihave.c \
$(BACNET_HANDLER)/h_rp.c \ $(BACNET_HANDLER)/h_rp.c \
$(BACNET_HANDLER)/h_iam.c \ $(BACNET_HANDLER)/s_whohas.c \
$(BACNET_HANDLER)/s_whois.c \ $(BACNET_HANDLER)/s_ihave.c \
$(BACNET_HANDLER)/s_rd.c \
$(BACNET_OBJECT)/device.c \ $(BACNET_OBJECT)/device.c \
$(BACNET_OBJECT)/ai.c \ $(BACNET_OBJECT)/ai.c \
$(BACNET_OBJECT)/ao.c \ $(BACNET_OBJECT)/ao.c \
@@ -47,7 +47,8 @@ SRCS = main.c \
$(BACNET_ROOT)/bigend.c \ $(BACNET_ROOT)/bigend.c \
$(BACNET_ROOT)/whois.c \ $(BACNET_ROOT)/whois.c \
$(BACNET_ROOT)/iam.c \ $(BACNET_ROOT)/iam.c \
$(BACNET_ROOT)/tsm.c \ $(BACNET_ROOT)/whohas.c \
$(BACNET_ROOT)/ihave.c \
$(BACNET_ROOT)/datalink.c \ $(BACNET_ROOT)/datalink.c \
$(BACNET_ROOT)/address.c \ $(BACNET_ROOT)/address.c \
$(BACNET_ROOT)/arf.c \ $(BACNET_ROOT)/arf.c \
bacnet-stack/demo/whohas/main.c
-3
View File
@@ -135,13 +135,10 @@ int main(int argc, char *argv[])
BACNET_ADDRESS src = {0}; // address where message came from BACNET_ADDRESS src = {0}; // address where message came from
uint16_t pdu_len = 0; uint16_t pdu_len = 0;
unsigned timeout = 100; // milliseconds unsigned timeout = 100; // milliseconds
unsigned max_apdu = 0;
time_t elapsed_seconds = 0; time_t elapsed_seconds = 0;
time_t last_seconds = 0; time_t last_seconds = 0;
time_t current_seconds = 0; time_t current_seconds = 0;
time_t timeout_seconds = 0; time_t timeout_seconds = 0;
uint8_t invoke_id = 0;
bool found = false;
#ifdef BIP_DEBUG #ifdef BIP_DEBUG
BACNET_ADDRESS my_address, broadcast_address; BACNET_ADDRESS my_address, broadcast_address;
#endif #endif
bacnet-stack/ihave.c
-2
View File
@@ -79,7 +79,6 @@ int ihave_decode_service_request(
int len = 0; int len = 0;
uint8_t tag_number = 0; uint8_t tag_number = 0;
uint32_t len_value = 0; uint32_t len_value = 0;
uint32_t decoded_value = 0; /* for decoding */
int decoded_type = 0; /* for decoding */ int decoded_type = 0; /* for decoding */
if (apdu_len && data) if (apdu_len && data)
@@ -175,7 +174,6 @@ void testIHaveData(Test * pTest, BACNET_I_HAVE_DATA *data)
data->object_id.instance); data->object_id.instance);
ct_test(pTest, characterstring_same( ct_test(pTest, characterstring_same(
&test_data.object_name,&data->object_name)); &test_data.object_name,&data->object_name));
}
} }
void testIHave(Test * pTest) void testIHave(Test * pTest)
bacnet-stack/unittest.sh
+5
View File
@@ -74,6 +74,11 @@ make -f iam.mak
./iam >> test.log ./iam >> test.log
make -f iam.mak clean make -f iam.mak clean
make -f ihave.mak clean
make -f ihave.mak
./ihave >> test.log
make -f ihave.mak clean
make -f indtext.mak clean make -f indtext.mak clean
make -f indtext.mak make -f indtext.mak
./indtext >> test.log ./indtext >> test.log