Merge pull request #183 from RADAR-base/release-0.5.3

Release 0.5.3

commons/connector/fitbit/fitbit_intraday_calories.avsc

@@ -0,0 +1,14 @@
+{
+  "namespace": "org.radarcns.connector.fitbit",
+  "type": "record",
+  "name": "FitbitIntradayCalories",
+  "doc": "Intra day calories and activity level data from fitbit device.",
+  "fields": [
+    { "name": "time", "type": "double", "doc": "Device timestamp in UTC (s)." },
+    { "name": "timeReceived", "type": "double", "doc": "Time that the data was received from the Fitbit API (seconds since the Unix Epoch)." },
+    { "name": "timeInterval", "type": "int", "doc": "Chronological window size (s)." },
+    { "name": "calories", "type": "double", "doc": "Calories in this period."},
+    { "name": "level", "type": "int", "doc": "Level of activity: 0 - sedentary; 1 - lightly active; 2 - fairly active; 3 - very active."},
+    { "name": "mets", "type": "double", "doc": "The metabolic equivalent of task (MET) -  https://en.wikipedia.org/wiki/Metabolic_equivalent_of_task."}
+  ]
+}

commons/connector/upload/altoida/altoida_acceleration.avsc

@@ -0,0 +1,13 @@
+{
+  "namespace": "org.radarcns.connector.upload.altoida",
+  "type": "record",
+  "name": "AltoidaAcceleration",
+  "doc": "Data from 3-axis accelerometer sensor with gravitational constant g as unit.",
+  "fields": [
+    {"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": "x", "type": "float", "doc": "Acceleration in the x-axis (g)."},
+    {"name": "y", "type": "float", "doc": "Acceleration in the y-axis (g)."},
+    {"name": "z", "type": "float", "doc": "Acceleration in the z-axis (g)."}
+  ]
+}

commons/connector/upload/altoida/altoida_action.avsc

@@ -0,0 +1,12 @@
+{
+  "namespace": "org.radarcns.connector.upload.altoida",
+  "type": "record",
+  "name": "AltoidaAction",
+  "doc": "Logs of actions taken.",
+  "fields": [
+    {"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": "action", "type": "string", "doc": "Log of actions taken during test."},
+    {"name": "extraInfo", "type": "string", "doc": "Extra information about action taken."}
+  ]
+}

commons/connector/upload/altoida/altoida_attitude.avsc

@@ -0,0 +1,13 @@
+{
+  "namespace": "org.radarcns.connector.upload.altoida",
+  "type": "record",
+  "name": "AltoidaAttitude",
+  "doc": "Data from 3-axis, the attitude sensor provides the rotational position of the device in radians as unit.",
+  "fields": [
+    {"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": "pitch", "type": "float", "doc": "Rotation of the x-axis (radians)."},
+    {"name": "roll", "type": "float", "doc": "Rotation of the y-axis (radians)."},
+    {"name": "yaw", "type": "float", "doc": "Rotation of the z-axis (radians)."}
+  ]
+}

commons/connector/upload/altoida/altoida_diagnostics.avsc

@@ -0,0 +1,12 @@
+{
+   "namespace": "org.radarcns.connector.upload.altoida",
+   "type": "record",
+   "name": "AltoidaDiagnostics",
+   "doc": "Data indicating what object was placed or found.",
+   "fields": [
+     {"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": "objectAction", "type": "string", "doc": "Indicates whether the object is placed or found."},
+     {"name": "objectType", "type": "string", "doc": "Name of the object: star, heart or teddy."}
+   ]
+ }

commons/connector/upload/altoida/altoida_gravity.avsc

@@ -0,0 +1,13 @@
+{
+  "namespace": "org.radarcns.connector.upload.altoida",
+  "type": "record",
+  "name": "AltoidaGravity",
+  "doc": "Data from 3-axis gravity sensor gravitational constant g as unit.",
+  "fields": [
+    {"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": "x", "type": "float", "doc": "Force of gravity along the x-axis (g)."},
+    {"name": "y", "type": "float", "doc": "Force of gravity along the y-axis (g)."},
+    {"name": "z", "type": "float", "doc": "Force of gravity along the z-axis (g)."}
+  ]
+}

commons/connector/upload/altoida/altoida_magnetometer.avsc

@@ -0,0 +1,14 @@
+{
+  "namespace": "org.radarcns.connector.upload.altoida",
+  "type": "record",
+  "name": "AltoidaMagnetometer",
+  "doc": "Data from 3-axis magnetometer sensor micro Tesla units (µT).",
+  "fields": [
+    {"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": "x", "type": "float", "doc": "Earths magnetic field along the x-axis in µT."},
+    {"name": "y", "type": "float", "doc": "Earths magnetic field along the y-axis in µT."},
+    {"name": "z", "type": "float", "doc": "Earths magnetic field along the z-axis in µT."},
+    {"name": "accuracy", "type": "string", "doc": "Accuracy of measurement magnetometer low, medium, high and uncalibrated."}
+  ]
+}

commons/connector/upload/altoida/altoida_metadata.avsc

@@ -0,0 +1,11 @@
+{
+  "namespace": "org.radarcns.connector.upload.altoida",
+  "type": "record",
+  "name": "AltoidaMetadata",
+  "doc": "Data that contains one column with the version name as type string.",
+  "fields": [
+    {"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": "version", "type": "string", "doc": "Version number."}
+  ]
+}

commons/connector/upload/altoida/altoida_object.avsc

@@ -0,0 +1,14 @@
+{
+  "namespace": "org.radarcns.connector.upload.altoida",
+  "type": "record",
+  "name": "AltoidaObject",
+  "doc": "Data from 3-axis indicating the orientation of the placed object.",
+  "fields": [
+    {"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": "object", "type": "string", "doc": "Name of object: star, heart or teddy."},
+    {"name": "x", "type": "float", "doc": "Rotation of the x-axis (radians)."},
+    {"name": "y", "type": "float", "doc": "Rotation of the y-axis (radians)."},
+    {"name": "z", "type": "float", "doc": "Rotation of the z-axis (radians)."}
+  ]
+}

commons/connector/upload/altoida/altoida_path.avsc

@@ -0,0 +1,13 @@
+{
+  "namespace": "org.radarcns.connector.upload.altoida",
+  "type": "record",
+  "name": "AltoidaPath",
+  "doc": "Data of 3-axis distance to an object in meters(m).",
+  "fields": [
+    {"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": "x", "type": "float", "doc": "Distance to fixed point along the x axis (m)."},
+    {"name": "y", "type": "float", "doc": "Distance to fixed point along the y axis (m)."},
+    {"name": "z", "type": "float", "doc": "Distance to fixed point along the z axis (m)."}
+  ]
+}

commons/connector/upload/altoida/altoida_rotation.avsc

@@ -0,0 +1,13 @@
+{
+  "namespace": "org.radarcns.connector.upload.altoida",
+  "type": "record",
+  "name": "AltoidaRotation",
+  "doc": "Data from 3-axis rotation sensor with radians as unit.",
+  "fields": [
+    {"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": "x", "type": "float", "doc": "Rotation of the x-axis in radians."},
+    {"name": "y", "type": "float", "doc": "Rotation of the y-axis in radians."},
+    {"name": "z", "type": "float", "doc": "Rotation of the z-axis in radians."}
+  ]
+}

commons/connector/upload/altoida/altoida_touchscreen.avsc

@@ -0,0 +1,12 @@
+{
+  "namespace": "org.radarcns.connector.upload.altoida",
+  "type": "record",
+  "name": "AltoidaTouchscreen",
+  "doc": "Data of location where the user touched the touchscreen on an x and y axis. These values are calculated from the center of the screen in centimeters (cm).",
+  "fields": [
+    {"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": "x", "type": "double", "doc": "Location where the touchscreen was touched along the x axis (cm)."},
+    {"name": "y", "type": "double", "doc": "Location where the touchscreen was touched along the y axis (cm)."}
+  ]
+}

java-sdk/build.gradle

@@ -17,7 +17,7 @@ subprojects {
     apply plugin: 'idea'
 
     // Configuration
-    version = '0.5.2'
+    version = '0.5.3'
     group = 'org.radarcns'
     ext.githubRepoName = 'RADAR-base/RADAR-Schemas'
 

java-sdk/radar-schemas-tools/src/main/java/org/radarcns/schema/validation/ValidationHelper.java

@@ -77,8 +77,8 @@ public static String getNamespace(Path root, Path schemaPath, Scope scope) {
 
         StringBuilder builder = new StringBuilder(50);
         builder.append(getProjectGroup()).append('.').append(scope.getLower());
-        if (relativePath.getNameCount() > 1) {
-            builder.append('.').append(relativePath.getName(0));
+        for (int i = 0; i < relativePath.getNameCount() - 1; i++) {
+            builder.append('.').append(relativePath.getName(i));
         }
         return builder.toString();
     }

specifications/connector/radar-altoida-connector.yml

@@ -0,0 +1,46 @@
+#====================================== Altoida Phone Sensors =====================================#
+name: RADAR-ALTOIDA-CONNECTOR
+vendor: Altoida
+model: altoida.app
+version: 1.0.0
+doc: Spec for RADAR-base altoida connector. Schemas should be registered in the connector.
+data:
+  - doc: Data from 3-axis accelerometer sensor with gravitational constant g as unit. Original file name ends with _ACC.csv
+    topic: connect_upload_altoida_acceleration
+    value_schema: .connector.upload.altoida.AltoidaAcceleration
+  - doc: Data from 3-axis, the attitude sensor provides the orientation of the device (with respect to the north pole) with radians as unit. Original file name ends with _ATT.csv
+    topic: connect_upload_altoida_attitude
+    value_schema: .connector.upload.altoida.AltoidaAttitude
+  - doc: Data from 3-axis gravity sensor with gravitational constant g as unit. Original file name ends with _GRA.csv
+    topic: connect_upload_altoida_gravity
+    value_schema: .connector.upload.altoida.AltoidaGravity
+  - doc: Data from 3-axis magnetometer sensor in micro Tesla. Original file name ends with _MAG.csv
+    topic: connect_upload_altoida_magnetometer
+    value_schema: .connector.upload.altoida.AltoidaMagnetometer
+  - doc: Data of location where the user touched the touchscreen on an x and y axis. These values are calculated from the center of the screen in centimeters (cm). Original file name ends with _NORMAL.csv
+    topic: connect_upload_altoida_touchscreen
+    value_schema: .connector.upload.altoida.AltoidaTouchscreen
+  - doc: Data from 3-axis rotation sensor with radians as unit. Original file name ends with _ROT.csv
+    topic: connect_upload_altoida_rotation
+    value_schema: .connector.upload.altoida.AltoidaRotation
+
+  # Object information
+  - doc: Data indicating what object was placed or found. Orginal file name ends with _DIAG.csv
+    topic: connect_upload_altoida_diagnostics
+    value_schema: .connector.upload.altoida.AltoidaDiagnostics
+  - doc: Data from 3-axis indicating the orientation of the placed object. Orginal file name ends with _OBJECTS.csv
+    topic: connect_upload_altoida_object
+    value_schema: .connector.upload.altoida.AltoidaObject
+  - doc: Data of 3-axis distance to an object in meters(m). Orginal file name ends with _PATH.csv
+    topic: connect_upload_altoida_path
+    value_schema: .connector.upload.altoida.AltoidaPath
+
+  # Action
+  - doc: Logs of actions taken. Original file name ends with _TAG.csv
+    topic: connect_upload_altoida_action
+    value_schema: .connector.upload.altoida.AltoidaAction
+
+  # Version
+  - doc: Data that contains one column with the version name as type string. Original file name ends with _VERSION.csv
+    topic: connect_upload_altoida_metadata
+    value_schema: .connector.upload.altoida.AltoidaMetadata

specifications/connector/radar-fitbit-connector.yml

@@ -22,3 +22,6 @@ data:
   - doc: Aggregate activity log.
     topic: connect_fitbit_activity_log
     value_schema: .connector.fitbit.FitbitActivityLogRecord
+  - doc: The intraday time series for Calories. Also includes Activity Level and METS.
+    topic: connect_fitbit_intraday_calories
+    value_schema: .connector.fitbit.FitbitIntradayCalories