diff --git a/commons/connector/upload/altoida/altoida_summary.avsc b/commons/connector/upload/altoida/altoida_summary.avsc index a1812d1b..a0741f0f 100644 --- a/commons/connector/upload/altoida/altoida_summary.avsc +++ b/commons/connector/upload/altoida/altoida_summary.avsc @@ -7,8 +7,8 @@ {"name": "time", "type": "double", "doc": "Timestamp in unix time acquired locally from the device."}, {"name": "timeReceived", "type": "double", "doc": "Timestamp in unix time received from Altoida API."}, {"name": "label", "type": "string", "doc": "Label name of session as entered in the app."}, - {"name": "age", "type": "int", "doc": "Age of the participant in years."}, - {"name": "yearsOfEducation", "type": "int", "doc": "Years of education in years."}, + {"name": "age", "type": ["null","int"], "doc": "Age of the participant in years.", "default": null}, + {"name": "yearsOfEducation", "type": ["null","int"], "doc": "Years of education in years.", "default": null}, {"name": "gender", "type": { "name": "GenderType", "type": "enum", diff --git a/commons/passive/carl/fibaro_consumption.avsc b/commons/passive/carl/fibaro_consumption.avsc new file mode 100644 index 00000000..3c6c42fe --- /dev/null +++ b/commons/passive/carl/fibaro_consumption.avsc @@ -0,0 +1,14 @@ +{ + "namespace": "org.radarcns.passive.carl", + "type": "record", + "name": "FibaroConsumption", + "doc": "Record of wattage that a home device consumed at a point in time.", + "fields": [ + {"name": "time", "type": "double", "doc": "Time since the Unix Epoch (seconds), represents the time that an Event was registered."}, + {"name": "timeReceived", "type": "double", "doc": "Time since the Unix Epoch (seconds), represents the time this record was received."}, + {"name": "id", "type": "double", "doc": "A unique ID of a consumption record."}, + {"name": "deviceId", "type": "int", "doc": "Unique ID of the device that corresponding to this record."}, + {"name": "watt", "type": "double", "doc": "Wattage recorded at this point in time."} + + ] +} diff --git a/commons/passive/carl/fibaro_device.avsc b/commons/passive/carl/fibaro_device.avsc new file mode 100644 index 00000000..1c43ad97 --- /dev/null +++ b/commons/passive/carl/fibaro_device.avsc @@ -0,0 +1,33 @@ +{ + "namespace": "org.radarcns.passive.carl", + "type": "record", + "name": "FibaroDevice", + "doc": "A Fibaro Device, capturing multiple variables for a specific Fibaro device. More information can be found https://www.fibaro.com/.", + "fields": [ + {"name": "time", "type": "double", "doc": "Time since the Unix Epoch (seconds), represents the time that an Event was registered."}, + {"name": "timeReceived", "type": "double", "doc": "Time since the Unix Epoch (seconds), represents the time this record was received."}, + {"name": "id", "type": "int", "doc": "A unique ID for a Fibaro Device. As registered in Carl Cloud."}, + {"name": "hclId", "type": "int", "doc": "Unique ID for a Fibaro Device. As registered in Home Center Lite's API."}, + {"name": "deviceType", "type": {"type": "enum", "name": "DeviceType", "doc": "PRESENSE_SENSOR: Devices that act as motion sensor, temperature sensor, seismic sensor ,light sensor, accelerometer,DOOR_SENSOR: Devices that register if the door/windows was opened as well as heat changes, FLODD_SENSOR: Devices that registeres flood inside the house, PANIC_BUTTON: Device that when pressed alerts the system, WALLPLUG: Device that measures the electric consumption of a device connected to it.", "symbols":["PRESENSE_SENSOR", "DOOR_SENSOR", "FLOOD_SENSOR", "PANIC_BUTTON", "WALLPLUG"]},"doc": "Type of the device (Presense, Door, Flood, Panic, Wall Plug)."}, + {"name": "serial", "type": "string", "doc": "A serial number for a Fibaro Device."}, + {"name": "make", "type": ["null", "string"], "doc": "The name of a Device's Manufacturer.", "default":null}, + {"name": "model", "type": "string", "doc": "The model name of the Fibaro Device."}, + {"name": "battery", "type": "double", "doc": "The level of Device's Battery."}, + {"name": "lastSyncTime", "type": "double", "doc": "Time since the Unix Epoch (seconds), represent the time of the Fibaro Device's last sync with CARL Cloud."}, + {"name": "mac", "type": ["null", "string"], "doc": "The MAC Addresss of the Fibaro Device.", "default":null}, + {"name": "userId", "type": "int", "doc": "Unique ID for the user who registered the Fibaro Device."}, + {"name": "name", "type": ["null","string"], "doc": "Name of the Fibaro Device.", "default":null}, + {"name": "roomId", "type": "int", "doc": "Unique ID of the Room that the Fibaro Device is registered to."}, + {"name": "enabled", "type": "boolean", "doc": "True if the Fibaro Device is enabled, False if it is not."}, + {"name": "parentId", "type": "int", "doc": "Unique ID of the Fibaro Device where this Fibaro Instance belongs to."}, + {"name": "categories", "type": "string", "doc": "Show the categories in which the Device belongs to."}, + {"name": "configured", "type": "boolean", "doc": "True if the device is configured."}, + {"name": "dead", "type": "boolean", "doc": "True if the device is not found on the network."}, + {"name": "deadReason", "type": ["null","string"], "doc": "The reason that 'dead' field was set as True.", "default":null}, + {"name": "created", "type": "double", "doc": "Time since the Unix Epoch (seconds), represents the time of the Fibaro Device's first sync."}, + {"name": "modified", "type": "double", "doc": "Time since the Unix Epoch (seconds), represents the time of the Fibaro Device's last modification."} + + + ] +} + diff --git a/commons/passive/carl/fibaro_event.avsc b/commons/passive/carl/fibaro_event.avsc new file mode 100644 index 00000000..b020157a --- /dev/null +++ b/commons/passive/carl/fibaro_event.avsc @@ -0,0 +1,18 @@ +{ + "namespace": "org.radarcns.passive.carl", + "type": "record", + "name": "FibaroEvent", + "doc": "An event that was registered with a Fibaro Device that captures the previous value of the last event that was registered with the same device - old and the new value - new.", + "fields": [ + {"name": "time", "type": "double", "doc": "Time since the Unix Epoch (seconds), represents the time that an Event was registered."}, + {"name": "timeReceived", "type": "double", "doc": "Time since the Unix Epoch (seconds), represents the time this record was received."}, + {"name": "id", "type": "int", "doc": "Unique ID for an Event. As registered in Carl Cloud."}, + {"name": "hclId", "type": "int", "doc": "Unique ID for a Event. As registered in Home Center Lite's API."}, + {"name": "type", "type": "string", "doc": "The type of the Event."}, + {"name": "deviceId", "type": "int", "doc": "Unique ID of the device that registered the Event."}, + {"name": "previous", "type": "double", "doc": "The previous value of a similar Event that was registered on with the same Device."}, + {"name": "current", "type": "double", "doc": "The current value that was registered with the Device."}, + {"name": "userId", "type": "int", "doc": "Unique ID for the user who registered the Room."} + ] +} + diff --git a/commons/passive/carl/fibaro_room.avsc b/commons/passive/carl/fibaro_room.avsc new file mode 100644 index 00000000..c8ab6a5e --- /dev/null +++ b/commons/passive/carl/fibaro_room.avsc @@ -0,0 +1,16 @@ +{ + "namespace": "org.radarcns.passive.carl", + "type": "record", + "name": "FibaroRoom", + "doc": "A building Room that has Fibaro Devices assigned to it.", + "fields": [ + {"name": "time", "type": "double", "doc": "Time since the Unix Epoch (seconds), represents the time that this record was registered."}, + {"name": "timeReceived", "type": "double", "doc": "Time since the Unix Epoch (seconds), represents the time that this record was received."}, + {"name": "id", "type": "int", "doc": "Unique ID for a Room. As registered in Carl Cloud."}, + {"name": "hclId", "type": "int", "doc": "Unique ID for a Room. As registered in Home Center Lite's API."}, + {"name": "name", "type": "string", "doc": "Room's Name."}, + {"name": "sectionId", "type": ["null","int"], "doc": "Section's unique ID where the Room belongs to.", "default":null}, + {"name": "userId", "type": "int", "doc": "Unique ID for the user who registered the Room."} + ] +} + diff --git a/commons/passive/carl/fibaro_section.avsc b/commons/passive/carl/fibaro_section.avsc new file mode 100644 index 00000000..1a228400 --- /dev/null +++ b/commons/passive/carl/fibaro_section.avsc @@ -0,0 +1,17 @@ +{ + "namespace": "org.radarcns.passive.carl", + "type": "record", + "name": "FibaroSection", + "doc": "A section of a building that can include one or multiple different rooms.", + "fields": [ + {"name": "time", "type": "double", "doc": "Time since the Unix Epoch (seconds), represents the time that this record was registered."}, + {"name": "timeReceived", "type": "double", "doc": "Time since the Unix Epoch (seconds), represents the time that this record was received."}, + {"name": "id", "type": "int", "doc": "Unique ID for a Section. As registered in Carl Cloud."}, + {"name": "hclId", "type": "int", "doc": "Unique ID for a Section. As registered in Home Center Lite's API."}, + {"name": "name", "type": "string", "doc": "Section's name."}, + {"name": "userId", "type": "int", "doc": "Unique ID for the user who registered the Section."} + + ] + +} + diff --git a/java-sdk/build.gradle b/java-sdk/build.gradle index 3460efa2..59a2193b 100644 --- a/java-sdk/build.gradle +++ b/java-sdk/build.gradle @@ -8,7 +8,7 @@ plugins { } allprojects { - version = '0.7.3' + version = '0.7.4' group = 'org.radarbase' } diff --git a/specifications/passive/carl-cloud-1.0.0.yml b/specifications/passive/carl-cloud-1.0.0.yml new file mode 100644 index 00000000..dc9b9e3a --- /dev/null +++ b/specifications/passive/carl-cloud-1.0.0.yml @@ -0,0 +1,34 @@ +#==================== CARL Cloud Specification ======================# +name: CARLCLoud +vendor: CERTH +model: CARLCLoud +version: 1.0.0 +labels: + assessment_type: APP +doc: CARL CLoud schemas and topics +data: + - type: FIBAROSECTION + doc: A section of a building that can include one or multiple different rooms. + unit: NON_DIMENSIONAL + topic: certh_carl_cloud_fibaro_section + value_schema: .passive.carl.FibaroSection + - type: FIBAROROOM + doc: A building Room that has Fibaro Devices assigned to it. + unit: NON_DIMENSIONAL + topic: certh_carl_cloud_fibaro_room + value_schema: .passive.carl.FibaroRoom + - type: FIBARODEVICE + doc: A Fibaro Device, capturing multiple variables for a specific Fibaro device. More information can be found https://www.fibaro.com/. + unit: NON_DIMENSIONAL + topic: certh_carl_cloud_fibaro_device + value_schema: .passive.carl.FibaroDevice + - type: FIBAROCONSUMPTION + doc: Record of wattage that a home device consumed at a point in time. + unit: NON_DIMENSIONAL + topic: certh_carl_cloud_fibaro_consumption + value_schema: .passive.carl.FibaroConsumption + - type: FIBAROEVENT + doc: An event that was registered with a Fibaro Device that captures the previous value of the last event that was registered with the same device - old and the new value - new. + unit: NON_DIMENSIONAL + topic: certh_carl_cloud_fibaro_section + value_schema: .passive.carl.FibaroEvent