diff --git a/carp.common/src/commonMain/kotlin/dk/cachet/carp/common/application/devices/AltBeacon.kt b/carp.common/src/commonMain/kotlin/dk/cachet/carp/common/application/devices/AltBeacon.kt index 74e60a14a..63435e17c 100644 --- a/carp.common/src/commonMain/kotlin/dk/cachet/carp/common/application/devices/AltBeacon.kt +++ b/carp.common/src/commonMain/kotlin/dk/cachet/carp/common/application/devices/AltBeacon.kt @@ -2,6 +2,7 @@ package dk.cachet.carp.common.application.devices +import dk.cachet.carp.common.application.ApplicationData import dk.cachet.carp.common.application.Trilean import dk.cachet.carp.common.application.UUID import dk.cachet.carp.common.application.data.CarpDataTypes @@ -78,7 +79,8 @@ data class AltBeaconDeviceRegistration( */ val referenceRssi: Short, @Required - override val deviceDisplayName: String? = null // TODO: We could map known manufacturerId's to display names. + override val deviceDisplayName: String? = null, // TODO: We could map known manufacturerId's to display names. + override val additionalSpecifications: ApplicationData? = null ) : DeviceRegistration() { companion object @@ -134,6 +136,7 @@ class AltBeaconDeviceRegistrationBuilder : DeviceRegistrationBuilder */ var deviceDisplayName: String? = null + /** + * Additional device specifications which may be relevant to the researcher when interpreting collected data. + * E.g., brand/model name, operating system version, or any other relevant information. + */ + var additionalSpecifications: ApplicationData? = null + /** * Build the immutable [DeviceRegistration] using the current configuration of this [DeviceRegistrationBuilder]. */ diff --git a/carp.common/src/commonMain/kotlin/dk/cachet/carp/common/application/devices/MACAddressDeviceRegistration.kt b/carp.common/src/commonMain/kotlin/dk/cachet/carp/common/application/devices/MACAddressDeviceRegistration.kt index 6825872f3..824e41b67 100644 --- a/carp.common/src/commonMain/kotlin/dk/cachet/carp/common/application/devices/MACAddressDeviceRegistration.kt +++ b/carp.common/src/commonMain/kotlin/dk/cachet/carp/common/application/devices/MACAddressDeviceRegistration.kt @@ -1,5 +1,6 @@ package dk.cachet.carp.common.application.devices +import dk.cachet.carp.common.application.ApplicationData import dk.cachet.carp.common.application.MACAddress import dk.cachet.carp.common.infrastructure.serialization.NotSerializable import kotlinx.serialization.* @@ -14,7 +15,8 @@ import kotlin.js.JsExport data class MACAddressDeviceRegistration( val macAddress: MACAddress, @Required - override val deviceDisplayName: String? = null + override val deviceDisplayName: String? = null, + override val additionalSpecifications: ApplicationData? = null ) : DeviceRegistration() { @Required @@ -30,5 +32,5 @@ class MACAddressDeviceRegistrationBuilder : DeviceRegistrationBuilder