merge and cleaned up warning

This commit is contained in:
skarg
2013-06-11 22:36:16 +00:00
parent c1e9558655
commit 63e4e1ce2d
3 changed files with 28 additions and 4 deletions
+26 -2
View File
@@ -36,10 +36,14 @@
extern "C" {
#endif /* __cplusplus */
void Binary_Value_Init(
void);
void Binary_Value_Property_Lists(
const int **pRequired,
const int **pOptional,
const int **pProprietary);
bool Binary_Value_Valid_Instance(
uint32_t object_instance);
unsigned Binary_Value_Count(
@@ -48,13 +52,32 @@ extern "C" {
unsigned index);
unsigned Binary_Value_Instance_To_Index(
uint32_t object_instance);
bool Binary_Value_Object_Instance_Add(
uint32_t instance);
bool Binary_Value_Object_Name(
uint32_t object_instance,
BACNET_CHARACTER_STRING * object_name);
bool Binary_Value_Name_Set(
uint32_t object_instance,
char *new_name);
void Binary_Value_Init(
void);
char *Binary_Value_Description(
uint32_t instance);
bool Binary_Value_Description_Set(
uint32_t instance,
char *new_name);
char *Binary_Value_Inactive_Text(
uint32_t instance);
bool Binary_Value_Inactive_Text_Set(
uint32_t instance,
char *new_name);
char *Binary_Value_Active_Text(
uint32_t instance);
bool Binary_Value_Active_Text_Set(
uint32_t instance,
char *new_name);
int Binary_Value_Read_Property(
BACNET_READ_PROPERTY_DATA * rpdata);
@@ -115,3 +138,4 @@ extern "C" {
}
#endif /* __cplusplus */
#endif
+1 -1
View File
@@ -9,7 +9,7 @@ A BACnet device is supposed to support, at a minimum, ReadProperty service
PC that is used for reading other BACnet devices.
There are a number of core files that you will need. Services such as
ReadProperty, I-Am, and Reject are consided core files. After determinging
ReadProperty, I-Am, and Reject are consided core files. After determining
which services you want in your device, add files to your project or makefile
from the following BACnet services (messages) provided by this BACnet stack:
+1 -1
View File
@@ -150,7 +150,7 @@ uint32_t datetime_days_since_epoch(
return days;
}
void days_since_epoch_into_ymd(
static void days_since_epoch_into_ymd(
uint32_t days,
uint16_t * pYear,
uint8_t * pMonth,