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

apps - allow text strings for object-type and property arguments. (#8)

Browse Source 
The existing method of calling various example apps requires the user to
know the enumeration value for the object-type and property values. This
patch enhances to allow the object-type and property arguments to be
specified as strings, using the strings as defined in the spec. It does
not remove the old behaviour.

Current:
  bacrp 1234 3 1 85

New:
  bacrp 1234 binary-input 1 present-value

This change does not currently apply to the property arguments of the
readm and writem applications.
This commit is contained in:
Roger Light
2020-01-15 05:18:30 +00:00
committed by Steve Karg
parent ed3f0982a3
commit 5a7049557b
10 changed files with 193 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/whohas/main.c
+9 -3
View File
@@ -117,7 +117,7 @@ static void print_help(char *filename)
"The device-instance-min or max can be 0 to %d.\r\n"
"\r\n"
"Use either:\r\n"
"The object-type can be 0 to %d.\r\n"
"The object-type can be 0 to %d, or a string e.g. analog-output.\r\n"
"The object-instance can be 0 to %d.\r\n"
"or:\r\n"
"The object-name can be any string of characters.\r\n",
@@ -157,7 +157,10 @@ int main(int argc, char *argv[])
} else if (argc < 4) {
/* bacwh 8 1234 */
Target_Object_Instance_Min = Target_Object_Instance_Max = -1;
Target_Object_Type = strtol(argv[1], NULL, 0);
if (bactext_object_type_strtol(argv[1], &Target_Object_Type) == false) {
fprintf(stderr, "object-type=%s invalid\n", argv[1]);
return 1;
}
Target_Object_Instance = strtol(argv[2], NULL, 0);
} else if (argc < 5) {
/* bacwh 0 4194303 "name" */
@@ -169,7 +172,10 @@ int main(int argc, char *argv[])
/* bacwh 0 4194303 8 1234 */
Target_Object_Instance_Min = strtol(argv[1], NULL, 0);
Target_Object_Instance_Max = strtol(argv[2], NULL, 0);
Target_Object_Type = strtol(argv[3], NULL, 0);
if (bactext_object_type_strtol(argv[3], &Target_Object_Type) == false) {
fprintf(stderr, "object-type=%s invalid\n", argv[3]);
return 1;
}
Target_Object_Instance = strtol(argv[4], NULL, 0);
} else {
print_usage(filename_remove_path(argv[0]));