diff --git a/packages/carp_movesense_package/CHANGELOG.md b/packages/carp_movesense_package/CHANGELOG.md index 12b7dc15..6600541e 100644 --- a/packages/carp_movesense_package/CHANGELOG.md +++ b/packages/carp_movesense_package/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.7.3 + +* fix of [#455](https://github.com/cph-cachet/carp.sensing-flutter/issues/455) + ## 1.7.2 * added device information measure and probe to get the device information from connected Movesense devices diff --git a/packages/carp_movesense_package/lib/carp_movesense_package.g.dart b/packages/carp_movesense_package/lib/carp_movesense_package.g.dart index 02988afb..89669108 100644 --- a/packages/carp_movesense_package/lib/carp_movesense_package.g.dart +++ b/packages/carp_movesense_package/lib/carp_movesense_package.g.dart @@ -29,32 +29,28 @@ MovesenseDeviceInformation _$MovesenseDeviceInformationFromJson( : Data.fromJson(json['sensorSpecificData'] as Map); Map _$MovesenseDeviceInformationToJson( - MovesenseDeviceInformation instance) { - final val = {}; - - void writeNotNull(String key, dynamic value) { - if (value != null) { - val[key] = value; - } - } - - writeNotNull('__type', instance.$type); - writeNotNull('sensorSpecificData', instance.sensorSpecificData); - writeNotNull('manufacturerName', instance.manufacturerName); - writeNotNull('brandName', instance.brandName); - writeNotNull('productName', instance.productName); - writeNotNull('variant', instance.variant); - writeNotNull('design', instance.design); - writeNotNull('hardwareCompatibilityId', instance.hardwareCompatibilityId); - writeNotNull('serial', instance.serial); - writeNotNull('pcbaSerial', instance.pcbaSerial); - writeNotNull('softwareVersion', instance.softwareVersion); - writeNotNull('hardwareType', instance.hardwareType); - writeNotNull('additionalVersionInfo', instance.additionalVersionInfo); - writeNotNull('apiLevel', instance.apiLevel); - writeNotNull('address', instance.address); - return val; -} + MovesenseDeviceInformation instance) => + { + if (instance.$type case final value?) '__type': value, + if (instance.sensorSpecificData case final value?) + 'sensorSpecificData': value, + if (instance.manufacturerName case final value?) + 'manufacturerName': value, + if (instance.brandName case final value?) 'brandName': value, + if (instance.productName case final value?) 'productName': value, + if (instance.variant case final value?) 'variant': value, + if (instance.design case final value?) 'design': value, + if (instance.hardwareCompatibilityId case final value?) + 'hardwareCompatibilityId': value, + if (instance.serial case final value?) 'serial': value, + if (instance.pcbaSerial case final value?) 'pcbaSerial': value, + if (instance.softwareVersion case final value?) 'softwareVersion': value, + if (instance.hardwareType case final value?) 'hardwareType': value, + if (instance.additionalVersionInfo case final value?) + 'additionalVersionInfo': value, + if (instance.apiLevel case final value?) 'apiLevel': value, + if (instance.address case final value?) 'address': value, + }; MovesenseStateChange _$MovesenseStateChangeFromJson( Map json) => @@ -68,21 +64,14 @@ MovesenseStateChange _$MovesenseStateChangeFromJson( : Data.fromJson(json['sensorSpecificData'] as Map); Map _$MovesenseStateChangeToJson( - MovesenseStateChange instance) { - final val = {}; - - void writeNotNull(String key, dynamic value) { - if (value != null) { - val[key] = value; - } - } - - writeNotNull('__type', instance.$type); - writeNotNull('sensorSpecificData', instance.sensorSpecificData); - val['state'] = _$MovesenseDeviceStateEnumMap[instance.state]!; - val['timestamp'] = instance.timestamp; - return val; -} + MovesenseStateChange instance) => + { + if (instance.$type case final value?) '__type': value, + if (instance.sensorSpecificData case final value?) + 'sensorSpecificData': value, + 'state': _$MovesenseDeviceStateEnumMap[instance.state]!, + 'timestamp': instance.timestamp, + }; const _$MovesenseDeviceStateEnumMap = { MovesenseDeviceState.unknown: 'unknown', @@ -105,21 +94,14 @@ MovesenseHR _$MovesenseHRFromJson(Map json) => MovesenseHR( ? null : Data.fromJson(json['sensorSpecificData'] as Map); -Map _$MovesenseHRToJson(MovesenseHR instance) { - final val = {}; - - void writeNotNull(String key, dynamic value) { - if (value != null) { - val[key] = value; - } - } - - writeNotNull('__type', instance.$type); - writeNotNull('sensorSpecificData', instance.sensorSpecificData); - val['hr'] = instance.hr; - writeNotNull('rr', instance.rr); - return val; -} +Map _$MovesenseHRToJson(MovesenseHR instance) => + { + if (instance.$type case final value?) '__type': value, + if (instance.sensorSpecificData case final value?) + 'sensorSpecificData': value, + 'hr': instance.hr, + if (instance.rr case final value?) 'rr': value, + }; MovesenseECG _$MovesenseECGFromJson(Map json) => MovesenseECG( (json['timestamp'] as num).toInt(), @@ -132,21 +114,14 @@ MovesenseECG _$MovesenseECGFromJson(Map json) => MovesenseECG( ? null : Data.fromJson(json['sensorSpecificData'] as Map); -Map _$MovesenseECGToJson(MovesenseECG instance) { - final val = {}; - - void writeNotNull(String key, dynamic value) { - if (value != null) { - val[key] = value; - } - } - - writeNotNull('__type', instance.$type); - writeNotNull('sensorSpecificData', instance.sensorSpecificData); - val['timestamp'] = instance.timestamp; - val['samples'] = instance.samples; - return val; -} +Map _$MovesenseECGToJson(MovesenseECG instance) => + { + if (instance.$type case final value?) '__type': value, + if (instance.sensorSpecificData case final value?) + 'sensorSpecificData': value, + 'timestamp': instance.timestamp, + 'samples': instance.samples, + }; MovesenseTemperature _$MovesenseTemperatureFromJson( Map json) => @@ -160,21 +135,14 @@ MovesenseTemperature _$MovesenseTemperatureFromJson( : Data.fromJson(json['sensorSpecificData'] as Map); Map _$MovesenseTemperatureToJson( - MovesenseTemperature instance) { - final val = {}; - - void writeNotNull(String key, dynamic value) { - if (value != null) { - val[key] = value; - } - } - - writeNotNull('__type', instance.$type); - writeNotNull('sensorSpecificData', instance.sensorSpecificData); - val['timestamp'] = instance.timestamp; - val['measurement'] = instance.measurement; - return val; -} + MovesenseTemperature instance) => + { + if (instance.$type case final value?) '__type': value, + if (instance.sensorSpecificData case final value?) + 'sensorSpecificData': value, + 'timestamp': instance.timestamp, + 'measurement': instance.measurement, + }; MovesenseIMU _$MovesenseIMUFromJson(Map json) => MovesenseIMU( (json['timestamp'] as num).toInt(), @@ -196,23 +164,16 @@ MovesenseIMU _$MovesenseIMUFromJson(Map json) => MovesenseIMU( ? null : Data.fromJson(json['sensorSpecificData'] as Map); -Map _$MovesenseIMUToJson(MovesenseIMU instance) { - final val = {}; - - void writeNotNull(String key, dynamic value) { - if (value != null) { - val[key] = value; - } - } - - writeNotNull('__type', instance.$type); - writeNotNull('sensorSpecificData', instance.sensorSpecificData); - val['timestamp'] = instance.timestamp; - val['accelerometer'] = instance.accelerometer; - val['gyroscope'] = instance.gyroscope; - val['magnetometer'] = instance.magnetometer; - return val; -} +Map _$MovesenseIMUToJson(MovesenseIMU instance) => + { + if (instance.$type case final value?) '__type': value, + if (instance.sensorSpecificData case final value?) + 'sensorSpecificData': value, + 'timestamp': instance.timestamp, + 'accelerometer': instance.accelerometer, + 'gyroscope': instance.gyroscope, + 'magnetometer': instance.magnetometer, + }; MovesenseAccelerometerSample _$MovesenseAccelerometerSampleFromJson( Map json) => @@ -281,26 +242,18 @@ MovesenseDevice _$MovesenseDeviceFromJson(Map json) => k, SamplingConfiguration.fromJson(e as Map)), ); -Map _$MovesenseDeviceToJson(MovesenseDevice instance) { - final val = {}; - - void writeNotNull(String key, dynamic value) { - if (value != null) { - val[key] = value; - } - } - - writeNotNull('__type', instance.$type); - val['roleName'] = instance.roleName; - writeNotNull('isOptional', instance.isOptional); - writeNotNull( - 'defaultSamplingConfiguration', instance.defaultSamplingConfiguration); - writeNotNull('address', instance.address); - writeNotNull('serial', instance.serial); - writeNotNull('name', instance.name); - val['deviceType'] = _$MovesenseDeviceTypeEnumMap[instance.deviceType]!; - return val; -} +Map _$MovesenseDeviceToJson(MovesenseDevice instance) => + { + if (instance.$type case final value?) '__type': value, + 'roleName': instance.roleName, + if (instance.isOptional case final value?) 'isOptional': value, + if (instance.defaultSamplingConfiguration case final value?) + 'defaultSamplingConfiguration': value, + if (instance.address case final value?) 'address': value, + if (instance.serial case final value?) 'serial': value, + if (instance.name case final value?) 'name': value, + 'deviceType': _$MovesenseDeviceTypeEnumMap[instance.deviceType]!, + }; const _$MovesenseDeviceTypeEnumMap = { MovesenseDeviceType.UNKNOWN: 'UNKNOWN', diff --git a/packages/carp_movesense_package/lib/movesense_device_manager.dart b/packages/carp_movesense_package/lib/movesense_device_manager.dart index d05deb49..4ecd2faa 100644 --- a/packages/carp_movesense_package/lib/movesense_device_manager.dart +++ b/packages/carp_movesense_package/lib/movesense_device_manager.dart @@ -155,6 +155,9 @@ class MovesenseDeviceManager extends BTLEDeviceManager { status = DeviceStatus.initialized; } }, + // onBleConnected + // - for now we ignore this callback + (_) {}, ); return status; diff --git a/packages/carp_movesense_package/pubspec.yaml b/packages/carp_movesense_package/pubspec.yaml index 5ca5fbdf..1b66406d 100644 --- a/packages/carp_movesense_package/pubspec.yaml +++ b/packages/carp_movesense_package/pubspec.yaml @@ -1,7 +1,7 @@ name: carp_movesense_package description: The CARP Movesense sampling package. Samples sensor data from the Movesense MD and ACTIVE (HR+, HR2) devices. homepage: https://github.com/cph-cachet/carp.sensing-flutter -version: 1.7.2 +version: 1.7.3 environment: sdk: ">=3.2.0 <4.0.0"