Schedule encoding/decoding (#319)
* schedule: add decode_daily_schedule() and encode_daily_schedule() * schedule: encode/decode implemented + add to bacapp * add safe encode/decode functions for timevalue, schedule function renaming * fix unit tests build failing * add IDEA and test temporary files to .gitignore * try to make "deprecated" work in MSVC * add WeeklySchedule compare function * add bacnet_weeklyschedule_context_decode() * Add basic test for WeeklySchedule * Fix WeeklySchedule parsing and snprintf, decoder verified with real hardware * try to fix windows build * improve boolean parsing in 'bacapp_parse_application_data' * add parse function for weekly schedule * allow types > 16 in bacwp, show the decoded value before sending * add bacapp binaries to gitignore * remove bacwp logging * Add error checking to bacapp_parse_application_data * try to fix windows build * fix avr build * Fix error handling in RP Ack * add singleDay flag * show day name in single day weeklyschedule snprintf * show weeklyschedule inner tag in snprintf * improve weeklyschedule parsing and printing, supports type names now * add weekly schedule to bacapp_decode_data * move bacnet/bacnet_plat_compat.h to bacnet/basic/sys/platform.h * disable tag limit also in bacwpm * add ifdef's around strtoX helper functions in bacapp * move strtox to BACAPP_PRINT_ENABLED ifdef in bacapp * fix stm32 makefiles * fix at91sam7s build * use BACNET_UNSIGNED_INTEGER in BACnet_Short_Application_Data_Value * fix capitalization in BACnet_Daily_Schedule * add name to BACNET_TIME_VALUE struct * change bacwp bacwpm to use bacapp_known_property_tag() * fix some macros in bacdcode missing parentheses * Remove dummy fields from BACNET_SHORT_APPLICATION_DATA_VALUE, replace remaining uses of upcasting (adds extra overhead but is maybe safer), rename short DV to Primitive * fix new ci warnings * more fixes for ancient C * fix tests no longer building * primitive value renamed to shorter name
This commit is contained in:
Ondřej Hruška
+109
-6
@@ -29,39 +29,142 @@
|
||||
#include <stdbool.h>
|
||||
#include <stddef.h>
|
||||
#include "bacnet/bacnet_stack_exports.h"
|
||||
#include "bacnet/basic/sys/platform.h"
|
||||
#include "bacnet/bacdef.h"
|
||||
#include "bacnet/bacenum.h"
|
||||
#include "bacnet/bacapp.h"
|
||||
#include "bacnet/datetime.h"
|
||||
|
||||
typedef struct {
|
||||
/**
|
||||
* Smaller version of BACnet_Application_Data_Value used in BACnetTimeValue
|
||||
*
|
||||
* This must be a separate struct to avoid recursive structure.
|
||||
* Keeping it small also helps keep the size of BACNET_APPLICATION_DATA_VALUE
|
||||
* small. Besides, schedule can't contain complex types.
|
||||
*/
|
||||
typedef struct BACnet_Primitive_Data_Value {
|
||||
uint8_t tag; /* application tag data type */
|
||||
union {
|
||||
/*
|
||||
* ATTENTION! If a new type is added here, update
|
||||
* `is_data_value_schedule_compatible()` in bactimevalue.c!
|
||||
*/
|
||||
|
||||
/* NULL - not needed as it is encoded in the tag alone */
|
||||
#if defined (BACAPP_BOOLEAN)
|
||||
bool Boolean;
|
||||
#endif
|
||||
#if defined (BACAPP_UNSIGNED)
|
||||
BACNET_UNSIGNED_INTEGER Unsigned_Int;
|
||||
#endif
|
||||
#if defined (BACAPP_SIGNED)
|
||||
int32_t Signed_Int;
|
||||
#endif
|
||||
#if defined (BACAPP_REAL)
|
||||
float Real;
|
||||
#endif
|
||||
#if defined (BACAPP_DOUBLE)
|
||||
double Double;
|
||||
#endif
|
||||
#if defined (BACAPP_ENUMERATED)
|
||||
uint32_t Enumerated;
|
||||
#endif
|
||||
} type;
|
||||
} BACNET_PRIMITIVE_DATA_VALUE;
|
||||
|
||||
typedef struct BACnet_Time_Value {
|
||||
BACNET_TIME Time;
|
||||
BACNET_APPLICATION_DATA_VALUE Value;
|
||||
BACNET_PRIMITIVE_DATA_VALUE Value;
|
||||
} BACNET_TIME_VALUE;
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif /* __cplusplus */
|
||||
struct BACnet_Application_Data_Value;
|
||||
|
||||
/** returns 0 if OK, -1 on error */
|
||||
BACNET_STACK_EXPORT
|
||||
int bacnet_application_to_primitive_data_value(BACNET_PRIMITIVE_DATA_VALUE * dest,
|
||||
const struct BACnet_Application_Data_Value * src);
|
||||
|
||||
/** returns 0 if OK, -1 on error */
|
||||
BACNET_STACK_EXPORT
|
||||
int bacnet_primitive_to_application_data_value(
|
||||
struct BACnet_Application_Data_Value * dest,
|
||||
const BACNET_PRIMITIVE_DATA_VALUE * src);
|
||||
|
||||
BACNET_STACK_EXPORT
|
||||
int bacapp_encode_time_value(uint8_t * apdu,
|
||||
int bacnet_time_value_encode(uint8_t * apdu,
|
||||
BACNET_TIME_VALUE * value);
|
||||
|
||||
BACNET_STACK_DEPRECATED("Use bacnet_time_value_encode() instead")
|
||||
BACNET_STACK_EXPORT
|
||||
int bacapp_encode_context_time_value(uint8_t * apdu,
|
||||
int bacapp_encode_time_value(uint8_t *apdu, BACNET_TIME_VALUE *value);
|
||||
|
||||
BACNET_STACK_EXPORT
|
||||
int bacnet_time_value_context_encode(uint8_t * apdu,
|
||||
uint8_t tag_number,
|
||||
BACNET_TIME_VALUE * value);
|
||||
|
||||
BACNET_STACK_DEPRECATED("Use bacnet_time_value_context_encode() instead")
|
||||
BACNET_STACK_EXPORT
|
||||
int bacapp_encode_context_time_value(uint8_t *apdu, uint8_t tag_number, BACNET_TIME_VALUE *value);
|
||||
|
||||
BACNET_STACK_DEPRECATED("Use bacnet_time_value_decode() instead")
|
||||
BACNET_STACK_EXPORT
|
||||
int bacapp_decode_time_value(uint8_t * apdu,
|
||||
BACNET_TIME_VALUE * value);
|
||||
|
||||
BACNET_STACK_EXPORT
|
||||
int bacnet_time_value_decode(uint8_t *apdu, int max_apdu_len,
|
||||
BACNET_TIME_VALUE *value);
|
||||
|
||||
BACNET_STACK_DEPRECATED("Use bacnet_time_value_context_decode() instead")
|
||||
BACNET_STACK_EXPORT
|
||||
int bacapp_decode_context_time_value(uint8_t * apdu,
|
||||
uint8_t tag_number,
|
||||
BACNET_TIME_VALUE * value);
|
||||
|
||||
BACNET_STACK_EXPORT
|
||||
int bacnet_time_value_context_decode(uint8_t *apdu, int max_apdu_len,
|
||||
uint8_t tag_number, BACNET_TIME_VALUE *value);
|
||||
|
||||
/**
|
||||
* Decode array of time-values wrapped in a context tag
|
||||
* @param apdu
|
||||
* @param max_apdu_len
|
||||
* @param tag_number - number expected in the context tag; 0 used for DailySchedule
|
||||
* @param time_values
|
||||
* @param max_time_values - number of time values to encode
|
||||
* @param[out] out_count - actual number of time values found
|
||||
* @return used bytes, <0 if decoding failed
|
||||
*/
|
||||
BACNET_STACK_EXPORT
|
||||
int bacnet_time_values_context_decode(
|
||||
uint8_t * apdu,
|
||||
int max_apdu_len,
|
||||
uint8_t tag_number,
|
||||
BACNET_TIME_VALUE *time_values,
|
||||
unsigned int max_time_values,
|
||||
unsigned int *out_count);
|
||||
|
||||
/**
|
||||
* Encode array of time-values wrapped in a context tag
|
||||
* @param apdu - output buffer, NULL to just measure length
|
||||
* @param max_apdu_len
|
||||
* @param tag_number - number to use for the context tag; 0 used for DailySchedule
|
||||
* @param time_values
|
||||
* @param max_time_values - number of time values to encode
|
||||
* @return used bytes, <=0 if encoding failed
|
||||
*/
|
||||
BACNET_STACK_EXPORT
|
||||
int bacnet_time_values_context_encode(
|
||||
uint8_t * apdu,
|
||||
uint8_t tag_number,
|
||||
BACNET_TIME_VALUE * time_values,
|
||||
unsigned int max_time_values);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif /* __cplusplus */
|
||||
#endif
|
||||
#endif /* _BAC_TIME_VALUE_H_ */
|
||||
|
||||
Reference in New Issue
Block a user