Skip to content

Commit

Permalink
Merge pull request #361 from RADAR-base/release-0.8.6
Browse files Browse the repository at this point in the history
Release 0.8.6
  • Loading branch information
mpgxvii committed Nov 28, 2023
2 parents ce766c0 + d235d8d commit f8523a5
Show file tree
Hide file tree
Showing 119 changed files with 3,792 additions and 5,643 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/publish_snapshots.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:

- name: Has SNAPSHOT version
id: is-snapshot
run: grep 'version = ".*-SNAPSHOT"' build.gradle.kts
run: grep 'const val project = ".*-SNAPSHOT"' buildSrc/src/main/kotlin/Versions.kt

- uses: actions/setup-java@v3
with:
Expand Down
9 changes: 5 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
FROM --platform=$BUILDPLATFORM gradle:7.5-jdk17 as builder
FROM --platform=$BUILDPLATFORM gradle:8.3-jdk17 as builder

RUN mkdir -p /code/java-sdk
WORKDIR /code/java-sdk
ENV GRADLE_USER_HOME=/code/.gradlecache \
GRADLE_OPTS=-Djdk.lang.Process.launchMechanism=vfork
GRADLE_OPTS="-Djdk.lang.Process.launchMechanism=vfork -Dorg.gradle.vfs.watch=false"

COPY java-sdk/buildSrc /code/java-sdk/buildSrc
COPY java-sdk/*.gradle.kts java-sdk/gradle.properties /code/java-sdk/
COPY java-sdk/radar-schemas-commons/build.gradle.kts /code/java-sdk/radar-schemas-commons/
COPY java-sdk/radar-schemas-core/build.gradle.kts /code/java-sdk/radar-schemas-core/
COPY java-sdk/radar-schemas-registration/build.gradle.kts /code/java-sdk/radar-schemas-registration/
COPY java-sdk/radar-schemas-tools/build.gradle.kts /code/java-sdk/radar-schemas-tools/
COPY java-sdk/radar-catalog-server/build.gradle.kts /code/java-sdk/radar-catalog-server/
RUN gradle downloadDependencies copyDependencies startScripts --no-watch-fs
RUN gradle downloadDependencies copyDependencies startScripts

COPY commons /code/commons
COPY specifications /code/specifications
Expand All @@ -22,7 +23,7 @@ COPY java-sdk/radar-schemas-registration/src /code/java-sdk/radar-schemas-regist
COPY java-sdk/radar-schemas-tools/src /code/java-sdk/radar-schemas-tools/src
COPY java-sdk/radar-catalog-server/src /code/java-sdk/radar-catalog-server/src

RUN gradle jar --no-watch-fs
RUN gradle jar

FROM eclipse-temurin:17-jre

Expand Down
14 changes: 14 additions & 0 deletions commons/connector/fitbit/fitbit_breathing_rate.avsc
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"namespace": "org.radarcns.connector.fitbit",
"type": "record",
"name": "FitbitBreathingRate",
"doc": "Breathing rate (BR) data from fitbit device. BR measures the average breathing rate throughout the day and categories your breathing rate by sleep stage. Sleep stages vary between light sleep, deep sleep, REM sleep, and full sleep.",
"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": "lightSleep", "type": "float", "doc": "Average number of breaths taken per minute when the user was in light sleep."},
{ "name": "deepSleep", "type": "float", "doc": "Average number of breaths taken per minute when the user was in deep sleep."},
{ "name": "remSleep", "type": "float", "doc": "Average number of breaths taken per minute when the user was in rem sleep."},
{ "name": "fullSleep", "type": "float", "doc": "Average number of breaths taken per minute throughout the entire period of sleep which you can compare to the sleep stage-specific measurements."}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"namespace": "org.radarcns.connector.fitbit",
"type": "record",
"name": "FitbitIntradayHeartRateVariability",
"doc": "Intra day heart rate variability (HRV) data from fitbit device. HRV data applies specifically to a user’s “main sleep,” which is the longest single period of time asleep on a given date.",
"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": "rmssd", "type": "float", "doc": "The Root Mean Square of Successive Differences (RMSSD) between heart beats. It measures short-term variability in the user’s heart rate in milliseconds (ms)."},
{ "name": "coverage", "type": "float", "doc": "Data completeness in terms of the number of interbeat intervals (0-1)."},
{ "name": "highFrequency", "type": "float", "doc": "The power in interbeat interval fluctuations within the high frequency band (0.15 Hz - 0.4 Hz)."},
{ "name": "lowFrequency", "type": "float", "doc": "The power in interbeat interval fluctuations within the low frequency band (0.04 Hz - 0.15 Hz)."}
]
}
12 changes: 12 additions & 0 deletions commons/connector/fitbit/fitbit_skin_temperature.avsc
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"namespace": "org.radarcns.connector.fitbit",
"type": "record",
"name": "FitbitSkinTemperature",
"doc": "Skin temperature (tempSkin) data from fitbit device. tempSkin measures skin temperature data for a date range. It only returns a value for dates on which the Fitbit device was able to record Temperature (skin) data and the maximum date range cannot exceed 30 days. Temperature (Skin) data applies specifically to a user’s “main sleep,” which is the longest single period of time asleep on a given date.",
"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": "relativeTemperature", "type": "float", "doc": "The user's average temperature during a period of sleep. It is displayed to the user as a delta from their baseline temperature in degrees Celsius."},
{ "name": "logType", "type": { "name": "FitbitSkinTemperatureLogType", "type": "enum", "symbols": ["DEDICATED_TEMP_SENSOR", "OTHER_SENSORS", "UNKNOWN"], "doc": "The type of skin temperature log created."}, "doc": "The type of skin temperature log created.", "default": "UNKNOWN"}
]
}
13 changes: 13 additions & 0 deletions commons/passive/phone/phone_bluetooth_device_scanned.avsc
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"namespace": "org.radarcns.passive.phone",
"type": "record",
"name": "PhoneBluetoothDeviceScanned",
"doc": "Phone Bluetooth device info.",
"fields": [
{"name": "time", "type": "double", "doc": "Device timestamp in UTC (s)."},
{"name": "timeReceived", "type": "double", "doc": "Device receiver timestamp in UTC (s)."},
{"name": "macAddressHash", "type": ["null", "bytes"], "default": null, "doc":"Hash of Nearby Bluetooth device MAC address."},
{"name": "hashSaltReference", "type": ["null", "int"], "doc": "Random identifier associated with the device or installation of the app. If the app gets reinstalled or installed on another device, it's clear during analysis that the mac addresses between iterations are not comparable.", "default": null},
{"name": "isPaired", "type": ["null","boolean"], "doc": "Whether the bluetooth device is paired.", "default": null}
]
}
Loading

0 comments on commit f8523a5

Please sign in to comment.