From 372d5c6a09d5858b4a32d0979729b662a71191bf Mon Sep 17 00:00:00 2001 From: rtrimana Date: Fri, 27 Jul 2018 15:38:02 -0700 Subject: [PATCH] Adding tutorial stuff for adding a new subtype for the phone app. --- .../drivers/Java/DlinkAlarm/DlinkAlarm.config | 11 ++++++----- .../SupportedDevices/AddressInformation.config | 13 +++++++++++++ localconfig/SupportedDevices/driversList.config | 6 ++++++ 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/benchmarks/drivers/Java/DlinkAlarm/DlinkAlarm.config b/benchmarks/drivers/Java/DlinkAlarm/DlinkAlarm.config index 988901a..4ffab09 100644 --- a/benchmarks/drivers/Java/DlinkAlarm/DlinkAlarm.config +++ b/benchmarks/drivers/Java/DlinkAlarm/DlinkAlarm.config @@ -7,11 +7,12 @@ INTERFACE_STUB_CLASS=AlarmSmart LANGUAGE=Java # Phone app/C++ instrumentation -FIELD_NUMBER=1 -FIELD_0=alm_Addresses -FIELD_CLASS_0=IoTDeviceAddress -FIELD_TYPE_0=IoTSet -FIELD_INDEPENDENT_0=TRUE +# See Section 6 in the Vigilia manual +#FIELD_NUMBER=1 +#FIELD_0=alm_Addresses +#FIELD_CLASS_0=IoTDeviceAddress +#FIELD_TYPE_0=IoTSet +#FIELD_INDEPENDENT_0=TRUE # Tomoyo ADDITIONAL_MAC_POLICY=No diff --git a/localconfig/SupportedDevices/AddressInformation.config b/localconfig/SupportedDevices/AddressInformation.config index d108b4d..95edf36 100644 --- a/localconfig/SupportedDevices/AddressInformation.config +++ b/localconfig/SupportedDevices/AddressInformation.config @@ -240,3 +240,16 @@ TYPE_13_0_NUM_OF_ZBADDRESSES=0 TYPE_13_0_NUM_OF_ADDRESSES=0 TYPE_13_0_NUM_OF_DEVICE_INFO=0 +# See Section 6 in the Vigilia manual +#TYPE_14=AlarmSmart +#TAG_14=AL +#SUBTYPE_14=2 +#TYPE_14_0=DlinkAlarm +#TYPE_14_0_NUM_OF_ZBADDRESSES=0 +#TYPE_14_0_NUM_OF_ADDRESSES=1 +#TYPE_14_0_ADDRESS_FIELDS=PORTNUMBER PROTOCOL DEVICEADDRESS +#PORTNUMBER_14_0_ADD_0=80 +#PROTOCOL_14_0_ADD_0=tcpgw +#DEVICEADDRESS_14_0_ADD_0=USER +#TYPE_14_0_NUM_OF_DEVICE_INFO=0 + diff --git a/localconfig/SupportedDevices/driversList.config b/localconfig/SupportedDevices/driversList.config index 72343e2..3c0e99f 100644 --- a/localconfig/SupportedDevices/driversList.config +++ b/localconfig/SupportedDevices/driversList.config @@ -1,3 +1,4 @@ +# The following FIELD_NUMBER has to be incremented every time we add a new subtype FIELD_NUMBER=14 COMMAND_PREFIX=cat ~/iot2/benchmarks/drivers/Java/ FIELD_0=AmcrestCamera @@ -28,3 +29,8 @@ FIELD_12=WaterLeakSensor WaterLeakSensor=WaterLeakSensor/WaterLeakSensor.config FIELD_13=WeatherPhoneGateway WeatherPhoneGateway=WeatherPhoneGateway/WeatherPhoneGateway.config +# See Section 6 in the Vigilia manual +# Do not forget to increment the FIELD_NUMBER from 14 to 15 +# i.e., FIELD_NUMBER=15 +#FIELD_14=DlinkAlarm +#DlinkAlarm=DlinkAlarm/DlinkAlarm.config -- 2.34.1