diff --git a/.flutter_version b/.flutter_version index cac6068c..faf0dcbb 100644 --- a/.flutter_version +++ b/.flutter_version @@ -1 +1 @@ -3.32.0 +3.44.0 diff --git a/.pubignore b/.pubignore new file mode 100644 index 00000000..033a1a10 --- /dev/null +++ b/.pubignore @@ -0,0 +1,3 @@ +build/ +**/__pycache__/ +*.pyc diff --git a/example/lib/widgets/fota/firmware_select/firmware_list.dart b/example/lib/widgets/fota/firmware_select/firmware_list.dart index 1c8c8225..fce06c19 100644 --- a/example/lib/widgets/fota/firmware_select/firmware_list.dart +++ b/example/lib/widgets/fota/firmware_select/firmware_list.dart @@ -20,7 +20,7 @@ class FirmwareList extends StatelessWidget { floatingActionButton: FloatingActionButton( onPressed: () async { // Navigator.pop(context, 'Firmware'); - FilePickerResult? result = await FilePicker.platform.pickFiles( + FilePickerResult? result = await FilePicker.pickFiles( type: FileType.custom, allowedExtensions: ['zip', 'bin'], ); diff --git a/example/pubspec.lock b/example/pubspec.lock index 8a77d9fb..30301d6c 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -157,10 +157,10 @@ packages: dependency: "direct main" description: name: file_picker - sha256: "57d9a1dd5063f85fa3107fb42d1faffda52fdc948cefd5fe5ea85267a5fc7343" + sha256: f13a03000d942e476bc1ff0a736d2e9de711d2f89a95cd4c1d88f861c3348387 url: "https://pub.dev" source: hosted - version: "10.3.10" + version: "11.0.2" fixnum: dependency: transitive description: @@ -210,10 +210,10 @@ packages: dependency: "direct main" description: name: flutter_platform_widgets - sha256: "22a86564cb6cc0b93637c813ca91b0b1f61c2681a31e0f9d77590c1fa9f12020" + sha256: aa110ef638076831d060047911a62810d02b4695db58e7682b716c4c4eee65bc url: "https://pub.dev" source: hosted - version: "9.0.0" + version: "10.0.1" flutter_plugin_android_lifecycle: dependency: transitive description: @@ -372,18 +372,18 @@ packages: dependency: "direct main" description: name: mcumgr_flutter - sha256: "8165dd611941cabfa0b3c1c3fb7f57fda26a86a2336c896ea263fd0f0c04c605" + sha256: ad2647f188cb8ecbc5c5da1fc136e47103e1956706fdc343a5774ace797be160 url: "https://pub.dev" source: hosted - version: "0.9.0" + version: "0.9.1" meta: dependency: "direct main" description: name: meta - sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394" + sha256: "1741988757a65eb6b36abe716829688cf01910bbf91c34354ff7ec1c3de2b349" url: "https://pub.dev" source: hosted - version: "1.17.0" + version: "1.18.0" native_toolchain_c: dependency: transitive description: @@ -414,7 +414,7 @@ packages: path: ".." relative: true source: path - version: "2.3.6" + version: "2.3.7" package_config: dependency: transitive description: @@ -571,10 +571,10 @@ packages: dependency: transitive description: name: protobuf - sha256: "75ec242d22e950bdcc79ee38dd520ce4ee0bc491d7fadc4ea47694604d22bf06" + sha256: "2fcc8a202ca7ec17dab7c97d6b6d91cf03aa07fe6f65f8afbb6dfa52cc5bd902" url: "https://pub.dev" source: hosted - version: "6.0.0" + version: "5.1.0" provider: dependency: "direct main" description: @@ -656,10 +656,10 @@ packages: dependency: transitive description: name: test_api - sha256: "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a" + sha256: "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e" url: "https://pub.dev" source: hosted - version: "0.7.10" + version: "0.7.11" tuple: dependency: transitive description: @@ -680,10 +680,10 @@ packages: dependency: transitive description: name: universal_ble - sha256: "6a5c6c1fb295015934a5aef3dc751ae7e00721535275f8478bfe74db77b238c5" + sha256: "8e5f4e2827375900b805fe3eb6cb8a305ade2303289d9a5cba0d09a3a37fea29" url: "https://pub.dev" source: hosted - version: "0.21.1" + version: "2.0.1" uuid: dependency: transitive description: @@ -696,10 +696,10 @@ packages: dependency: transitive description: name: vector_graphics - sha256: "4d35a36400983c3457c289d4d553b5308f506ea84f7e51c7a564651b5525209a" + sha256: "2306c03da2ba81724afeb589c351ebbc0aa7d86005925be8f8735856dbe5e42d" url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.2.2" vector_graphics_codec: dependency: transitive description: @@ -712,10 +712,10 @@ packages: dependency: transitive description: name: vector_graphics_compiler - sha256: "98e7e94de127b46a86ef46197fff84ff99f3d3b80a708390d717ad731efef598" + sha256: b9b3f391857781aa96acacef96066f2f49b4cd03cf9fce3ca4d8da2ef5ea129e url: "https://pub.dev" source: hosted - version: "1.2.2" + version: "1.2.3" vector_math: dependency: transitive description: @@ -773,5 +773,5 @@ packages: source: hosted version: "3.1.3" sdks: - dart: ">=3.10.3 <4.0.0" + dart: ">=3.11.4 <4.0.0" flutter: ">=3.38.4" diff --git a/example/pubspec.yaml b/example/pubspec.yaml index e188ae40..e0788693 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -42,13 +42,13 @@ dependencies: # Use with the CupertinoIcons class for iOS style icons. cupertino_icons: ^1.0.2 flutter_colorpicker: ^1.1.0 - flutter_platform_widgets: ^9.0.0 + flutter_platform_widgets: ^10.0.1 meta: ^1.16.0 bloc: ^9.1.0 flutter_svg: ^2.0.17 provider: ^6.1.5 - file_picker: ^10.3.7 - mcumgr_flutter: ^0.9.0 + file_picker: ^11.0.2 + mcumgr_flutter: ^0.9.1 flutter_bloc: ^9.1.1 dev_dependencies: diff --git a/lib/src/fota/utils/device.dart b/lib/src/fota/utils/device.dart deleted file mode 100644 index e69de29b..00000000 diff --git a/lib/src/managers/ble_manager.dart b/lib/src/managers/ble_manager.dart index de50c86b..a8a73f16 100644 --- a/lib/src/managers/ble_manager.dart +++ b/lib/src/managers/ble_manager.dart @@ -77,6 +77,7 @@ class BleManager extends BleGattManager { String deviceId, String characteristicId, Uint8List value, + int? timestamp, ) { String streamIdentifier = _getCharacteristicKey(deviceId, characteristicId); diff --git a/pubspec.yaml b/pubspec.yaml index f33e62c7..9c32a858 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -21,16 +21,16 @@ dependencies: typed_data: ^1.3.2 convert: ^3.1.1 permission_handler: ^12.0.1 - universal_ble: ^0.21.1 + universal_ble: ^2.0.1 logger: ^2.5.0 # for fota: equatable: ^2.0.5 - file_picker: ^10.3.7 + file_picker: ^11.0.2 flutter_archive: ^6.0.0 flutter_bloc: ^9.1.1 http: ^1.1.2 json_annotation: ^4.8.1 - mcumgr_flutter: ^0.9.0 + mcumgr_flutter: ^0.9.1 path_provider: ^2.1.1 provider: ^6.1.1 rxdart: ^0.28.0