Skip to content

Commit

Permalink
Merge branch 'dev' into release-0.3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
blootsvoets committed Jan 29, 2018
2 parents 6d778df + dcbe93e commit 0297e9f
Show file tree
Hide file tree
Showing 7 changed files with 101 additions and 0 deletions.
1 change: 1 addition & 0 deletions commons/catalogue/unit.avsc
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"RADAIAN_PER_SEC",
"RMSSD_IN_MILLI_SEC",
"SECOND",
"MICRO_VOLT",
"UNKNOWN"
]
}
13 changes: 13 additions & 0 deletions commons/passive/emotion/emotion_faros_acceleration.avsc
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"namespace": "org.radarcns.passive.emotion",
"type": "record",
"name": "EmotionFarosAcceleration",
"doc": "Data from 3-axis accelerometer sensor of a eMotion Faros device.",
"fields": [
{ "name": "time", "type": "double", "doc": "Device timestamp in UTC (s)." },
{ "name": "timeReceived", "type": "double", "doc": "Device receiver timestamp in UTC (s)." } ,
{ "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)." }
]
}
11 changes: 11 additions & 0 deletions commons/passive/emotion/emotion_faros_battery_level.avsc
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"namespace": "org.radarcns.passive.emotion",
"type": "record",
"name": "EmotionFarosBatteryLevel",
"doc": "Battery level of a eMotion Faros device.",
"fields": [
{ "name": "time", "type": "double", "doc": "Device timestamp in UTC (s)." },
{ "name": "timeReceived", "type": "double", "doc": "Device receiver timestamp in UTC (s)." },
{ "name": "batteryLevel", "type": "float", "doc": "Battery level from 0 to 1. Note that the battery level is a rough estimate." }
]
}
13 changes: 13 additions & 0 deletions commons/passive/emotion/emotion_faros_ecg.avsc
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"namespace": "org.radarcns.passive.emotion",
"type": "record",
"name": "EmotionFarosEcg",
"doc": "Data from eMotion Faros' multi-channel electrocardiography electrodes. Not all Faros models possess the same number of channels, so the second and third channels are optional.",
"fields": [
{ "name": "time", "type": "double", "doc": "Device timestamp in UTC (s)." },
{ "name": "timeReceived", "type": "double", "doc": "Device receiver timestamp in UTC (s)." } ,
{ "name": "ecgChannel1", "type": "float", "doc": "ECG signal from the first channel (µV)." },
{ "name": "ecgChannel2", "type": ["null", "float"], "doc": "ECG signal from the second channel (µV). Null if the device does not have at least two channels.", "default": null },
{ "name": "ecgChannel3", "type": ["null", "float"], "doc": "ECG signal from the first channel (µV). Null if the device does not have at least two three channels.", "default": null }
]
}
11 changes: 11 additions & 0 deletions commons/passive/emotion/emotion_faros_inter_beat_interval.avsc
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"namespace": "org.radarcns.passive.emotion",
"type": "record",
"name": "EmotionFarosInterBeatInterval",
"doc": "Time between two successive R-peaks (RR-interval), as calculated by a eMotion Faros device from the ECG signal. You can compute the heart rate as (60 / ibi).",
"fields": [
{"name": "time", "type": "double", "doc": "Device timestamp in UTC (s)." },
{"name": "timeReceived", "type": "double", "doc": "Device receiver timestamp in UTC (s)." },
{"name": "interBeatInterval", "type": "float", "doc": "Duration (s) of the detected inter beat interval." }
]
}
11 changes: 11 additions & 0 deletions commons/passive/emotion/emotion_faros_temperature.avsc
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"namespace": "org.radarcns.passive.emotion",
"type": "record",
"name": "EmotionFarosTemperature",
"doc": "Data from an eMotion Faros' temperature sensor.",
"fields": [
{"name": "time", "type": "double", "doc": "Device timestamp in UTC (s)." },
{"name": "timeReceived", "type": "double", "doc": "Device receiver timestamp in UTC (s)." },
{"name": "temperature", "type": "float", "doc": "Skin temperature (°C) converted from analog-to-digital converter (ADC) values. Conversion is reliable between 35 and 45 degrees Celcius." }
]
}
41 changes: 41 additions & 0 deletions specifications/passive/emotion_faros-1.0.0.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
#====================================== Empatica E4 Wristband =====================================#
vendor: eMotion
model: Faros
version: 1.0.0
app_provider: .emotion.FarosServiceProvider
data:
- type: ACCELEROMETER
sample_rate:
dynamic: true
unit: G
processing_state: RAW
topic: android_emotion_faros_acceleration
value_schema: .passive.emotion.EmotionFarosAcceleration
- type: BATTERY
sample_rate:
dynamic: true
unit: PERCENTAGE
processing_state: RAW
topic: android_emotion_faros_battery_level
value_schema: .passive.empatica.EmpaticaE4BatteryLevel
- type: ECG
sample_rate:
dynamic: true
unit: MICRO_VOLT
processing_state: RAW
topic: android_emotion_faros_ecg
value_schema: .passive.emotion.EmotionFarosEcg
- type: INTER_BEAT_INTERVAL
sample_rate:
dynamic: true
unit: SECOND
processing_state: VENDOR
topic: android_emotion_faros_inter_beat_interval
value_schema: .passive.emotion.EmotionFarosInterBeatInterval
- type: THERMOMETER
sample_rate:
dynamic: true
unit: CELSIUS
processing_state: VENDOR
topic: android_emotion_faros_acceleration
value_schema: .passive.emotion.EmotionFarosTemperature

0 comments on commit 0297e9f

Please sign in to comment.