From 9905a342529caaf1c613fcd17ab4adffff12b750 Mon Sep 17 00:00:00 2001 From: Barabas Raffai Date: Sat, 3 Aug 2024 14:27:22 +0100 Subject: [PATCH 01/14] WIP refactor --- dart/.gitignore | 6 + {frontend => dart/frontend}/.gitignore | 0 {frontend => dart/frontend}/.metadata | 0 .../frontend}/.run/All tests.run.xml | 0 .../frontend}/.run/main.dart (Debug).run.xml | 0 .../.run/main.dart (Profile).run.xml | 0 .../frontend}/all_lint_rules.yaml | 0 .../frontend}/analysis_options.yaml | 0 {frontend => dart/frontend}/dart_test.yaml | 0 .../frontend}/devtools_options.yaml | 0 .../frontend}/google_fonts/NotoSans-Black.ttf | Bin .../google_fonts/NotoSans-BlackItalic.ttf | Bin .../frontend}/google_fonts/NotoSans-Bold.ttf | Bin .../google_fonts/NotoSans-BoldItalic.ttf | Bin .../google_fonts/NotoSans-ExtraBold.ttf | Bin .../google_fonts/NotoSans-ExtraBoldItalic.ttf | Bin .../google_fonts/NotoSans-ExtraLight.ttf | Bin .../NotoSans-ExtraLightItalic.ttf | Bin .../google_fonts/NotoSans-Italic.ttf | Bin .../frontend}/google_fonts/NotoSans-Light.ttf | Bin .../google_fonts/NotoSans-LightItalic.ttf | Bin .../google_fonts/NotoSans-Medium.ttf | Bin .../google_fonts/NotoSans-MediumItalic.ttf | Bin .../google_fonts/NotoSans-Regular.ttf | Bin .../google_fonts/NotoSans-SemiBold.ttf | Bin .../google_fonts/NotoSans-SemiBoldItalic.ttf | Bin .../frontend}/google_fonts/NotoSans-Thin.ttf | Bin .../google_fonts/NotoSans-ThinItalic.ttf | Bin .../frontend}/google_fonts/OFL.txt | 0 .../integration_test/simple_test.dart | 4 +- .../frontend}/lib/amplifier.dart | 0 .../frontend}/lib/api/api_websocket.dart | 37 +- dart/frontend/lib/api_data/api_message.dart | 33 + .../lib/api_data/audio_event_message.dart | 10 + .../frontend/lib/api_data}/generate.sh | 2 +- .../api_data/generated/audio_events.pb.dart | 167 ++++ .../generated/audio_events.pbenum.dart | 1 + .../generated/audio_events.pbjson.dart | 29 +- .../generated/audio_events.pbserver.dart | 1 + .../api_data/generated/cmd_handling.pb.dart | 202 +++++ .../generated/cmd_handling.pbenum.dart | 1 + .../generated/cmd_handling.pbjson.dart | 25 +- .../generated/cmd_handling.pbserver.dart | 1 + .../api_data}/generated/midi_mapping.pb.dart | 853 +++++++----------- .../generated/midi_mapping.pbenum.dart | 17 +- .../generated/midi_mapping.pbjson.dart | 170 +--- .../generated/midi_mapping.pbserver.dart | 1 + .../lib/api_data}/generated/presets.pb.dart | 588 +++++------- .../api_data}/generated/presets.pbenum.dart | 1 + .../api_data}/generated/presets.pbjson.dart | 144 +-- .../api_data}/generated/presets.pbserver.dart | 1 + .../generated/selected_preset.pb.dart | 251 ++++++ .../generated/selected_preset.pbenum.dart | 1 + .../generated/selected_preset.pbjson.dart | 42 +- .../generated/selected_preset.pbserver.dart | 1 + .../lib/api_data}/generated/shrapnel.pb.dart | 105 +-- .../api_data}/generated/shrapnel.pbenum.dart | 0 .../api_data}/generated/shrapnel.pbjson.dart | 50 +- .../generated/shrapnel.pbserver.dart | 0 .../lib/api_data/midi_api_message.dart | 2 +- .../lib/api_data/parameter_message.dart | 23 + .../lib/api_data/presets_message.dart | 53 ++ .../lib/api_data}/proto_extension.dart | 12 +- .../lib/api_data/selected_preset_data.dart | 14 + .../frontend}/lib/audio_events.dart | 10 +- {frontend => dart/frontend}/lib/chorus.dart | 0 .../frontend}/lib/core/message_transport.dart | 0 .../frontend}/lib/core/stream_extensions.dart | 0 .../frontend}/lib/fake_provisioning.dart | 0 .../frontend}/lib/heavy_metal.dart | 0 {frontend => dart/frontend}/lib/knob.dart | 0 .../frontend}/lib/knob_with_label.dart | 0 {frontend => dart/frontend}/lib/main.dart | 2 + .../lib/midi_mapping/model/midi_learn.dart | 2 +- .../midi_mapping/model/midi_learn_state.dart | 2 +- .../lib/midi_mapping/model/service.dart | 3 +- .../lib/midi_mapping/view/midi_learn.dart | 0 .../lib/midi_mapping/view/midi_mapping.dart | 2 +- .../frontend}/lib/noise_gate.dart | 0 .../frontend}/lib/parameter.dart | 22 +- .../frontend}/lib/pedalboard.dart | 0 .../frontend}/lib/presets/model/presets.dart | 0 .../lib/presets/model/presets_client.dart | 62 +- .../lib/presets/model/presets_repository.dart | 0 .../lib/presets/model/presets_service.dart | 0 .../presets/model/selected_preset_client.dart | 16 +- .../model/selected_preset_repository.dart | 0 .../frontend}/lib/presets/view/presets.dart | 0 .../frontend}/lib/robust_websocket.dart | 0 .../frontend}/lib/status/data/status.dart | 0 .../lib/status/model/websocket_status.dart | 0 .../lib/status/view/websocket_status.dart | 0 {frontend => dart/frontend}/lib/stompbox.dart | 0 .../frontend}/lib/tube_screamer.dart | 0 .../lib/util/conditional_parent.dart | 0 .../frontend}/lib/valvestate.dart | 0 {frontend => dart/frontend}/lib/wah.dart | 0 .../frontend}/lib/wifi_provisioning.dart | 0 {frontend => dart/frontend}/lint.sh | 0 {frontend => dart/frontend}/linux/.gitignore | 0 .../frontend}/linux/CMakeLists.txt | 0 .../frontend}/linux/flutter/CMakeLists.txt | 0 .../flutter/generated_plugin_registrant.cc | 0 .../flutter/generated_plugin_registrant.h | 0 .../linux/flutter/generated_plugins.cmake | 0 {frontend => dart/frontend}/linux/main.cc | 0 .../frontend}/linux/my_application.cc | 0 .../frontend}/linux/my_application.h | 0 {frontend => dart/frontend}/pubspec.lock | 0 {frontend => dart/frontend}/pubspec.yaml | 0 {frontend => dart/frontend}/run_api_test.sh | 0 .../frontend}/run_integration_test.sh | 0 .../frontend}/test/all_test.dart | 1 - .../test/core/button_page_object.dart | 0 .../firmware_api_test/firmware_api_test.dart | 2 +- .../frontend}/test/home_page_object.dart | 0 .../midi_mapping_page_object.dart | 2 +- .../test/midi_mapping/model/service_test.dart | 3 +- .../midi_mapping/view/midi_mapping_test.dart | 3 +- .../frontend}/test/parameter_test.dart | 0 .../test/presets/presets_page_object.dart | 0 .../frontend}/test/presets/presets_test.dart | 2 + {frontend => dart/frontend}/test/util.dart | 0 .../test/wifi_provisioning_page_object.dart | 0 .../test/wifi_provisioning_test.dart | 0 {frontend => dart/frontend}/web/favicon.png | Bin .../frontend}/web/icons/Icon-192.png | Bin .../frontend}/web/icons/Icon-512.png | Bin .../frontend}/web/icons/Icon-maskable-192.png | Bin .../frontend}/web/icons/Icon-maskable-512.png | Bin {frontend => dart/frontend}/web/index.html | 0 {frontend => dart/frontend}/web/manifest.json | 0 dart/melos.yaml | 7 + dart/pubspec.lock | 341 +++++++ dart/pubspec.yaml | 6 + dart/shrapnel_common/.gitignore | 7 + dart/shrapnel_common/CHANGELOG.md | 3 + dart/shrapnel_common/README.md | 39 + dart/shrapnel_common/analysis_options.yaml | 30 + .../example/shrapnel_common_example.dart | 6 + dart/shrapnel_common/lib/shrapnel_common.dart | 8 + .../lib/src/shrapnel_common_base.dart | 6 + dart/shrapnel_common/pubspec.yaml | 15 + .../test/shrapnel_common_test.dart | 16 + dart/shrapnel_test_lib/.gitignore | 7 + dart/shrapnel_test_lib/CHANGELOG.md | 3 + dart/shrapnel_test_lib/README.md | 39 + dart/shrapnel_test_lib/analysis_options.yaml | 30 + .../lib/shrapnel_test_lib.dart | 4 + .../lib/src/shrapnel_test_lib_base.dart | 66 +- dart/shrapnel_test_lib/pubspec.yaml | 19 + .../test/shrapnel_test_lib_test.dart | 7 +- dart/shrapnel_test_tool/.gitignore | 3 + dart/shrapnel_test_tool/CHANGELOG.md | 3 + dart/shrapnel_test_tool/README.md | 2 + dart/shrapnel_test_tool/analysis_options.yaml | 30 + .../bin/shrapnel_test_tool.dart | 5 + .../lib/shrapnel_test_tool.dart | 3 + dart/shrapnel_test_tool/pubspec.lock | 381 ++++++++ dart/shrapnel_test_tool/pubspec.yaml | 15 + .../test/shrapnel_test_tool_test.dart | 8 + .../lib/api/generated/analysis_options.yaml | 1 - .../lib/api/generated/audio_events.pb.dart | 196 ---- .../lib/api/generated/cmd_handling.pb.dart | 232 ----- .../lib/api/generated/selected_preset.pb.dart | 289 ------ 165 files changed, 2516 insertions(+), 2293 deletions(-) create mode 100644 dart/.gitignore rename {frontend => dart/frontend}/.gitignore (100%) rename {frontend => dart/frontend}/.metadata (100%) rename {frontend => dart/frontend}/.run/All tests.run.xml (100%) rename {frontend => dart/frontend}/.run/main.dart (Debug).run.xml (100%) rename {frontend => dart/frontend}/.run/main.dart (Profile).run.xml (100%) rename {frontend => dart/frontend}/all_lint_rules.yaml (100%) rename {frontend => dart/frontend}/analysis_options.yaml (100%) rename {frontend => dart/frontend}/dart_test.yaml (100%) rename {frontend => dart/frontend}/devtools_options.yaml (100%) rename {frontend => dart/frontend}/google_fonts/NotoSans-Black.ttf (100%) rename {frontend => dart/frontend}/google_fonts/NotoSans-BlackItalic.ttf (100%) rename {frontend => dart/frontend}/google_fonts/NotoSans-Bold.ttf (100%) rename {frontend => dart/frontend}/google_fonts/NotoSans-BoldItalic.ttf (100%) rename {frontend => dart/frontend}/google_fonts/NotoSans-ExtraBold.ttf (100%) rename {frontend => dart/frontend}/google_fonts/NotoSans-ExtraBoldItalic.ttf (100%) rename {frontend => dart/frontend}/google_fonts/NotoSans-ExtraLight.ttf (100%) rename {frontend => dart/frontend}/google_fonts/NotoSans-ExtraLightItalic.ttf (100%) rename {frontend => dart/frontend}/google_fonts/NotoSans-Italic.ttf (100%) rename {frontend => dart/frontend}/google_fonts/NotoSans-Light.ttf (100%) rename {frontend => dart/frontend}/google_fonts/NotoSans-LightItalic.ttf (100%) rename {frontend => dart/frontend}/google_fonts/NotoSans-Medium.ttf (100%) rename {frontend => dart/frontend}/google_fonts/NotoSans-MediumItalic.ttf (100%) rename {frontend => dart/frontend}/google_fonts/NotoSans-Regular.ttf (100%) rename {frontend => dart/frontend}/google_fonts/NotoSans-SemiBold.ttf (100%) rename {frontend => dart/frontend}/google_fonts/NotoSans-SemiBoldItalic.ttf (100%) rename {frontend => dart/frontend}/google_fonts/NotoSans-Thin.ttf (100%) rename {frontend => dart/frontend}/google_fonts/NotoSans-ThinItalic.ttf (100%) rename {frontend => dart/frontend}/google_fonts/OFL.txt (100%) rename {frontend => dart/frontend}/integration_test/simple_test.dart (98%) rename {frontend => dart/frontend}/lib/amplifier.dart (100%) rename {frontend => dart/frontend}/lib/api/api_websocket.dart (65%) create mode 100644 dart/frontend/lib/api_data/api_message.dart create mode 100644 dart/frontend/lib/api_data/audio_event_message.dart rename {frontend/lib/api => dart/frontend/lib/api_data}/generate.sh (91%) create mode 100644 dart/frontend/lib/api_data/generated/audio_events.pb.dart rename {frontend/lib/api => dart/frontend/lib/api_data}/generated/audio_events.pbenum.dart (99%) rename {frontend/lib/api => dart/frontend/lib/api_data}/generated/audio_events.pbjson.dart (71%) rename {frontend/lib/api => dart/frontend/lib/api_data}/generated/audio_events.pbserver.dart (99%) create mode 100644 dart/frontend/lib/api_data/generated/cmd_handling.pb.dart rename {frontend/lib/api => dart/frontend/lib/api_data}/generated/cmd_handling.pbenum.dart (99%) rename {frontend/lib/api => dart/frontend/lib/api_data}/generated/cmd_handling.pbjson.dart (79%) rename {frontend/lib/api => dart/frontend/lib/api_data}/generated/cmd_handling.pbserver.dart (99%) rename {frontend/lib/api => dart/frontend/lib/api_data}/generated/midi_mapping.pb.dart (50%) rename {frontend/lib/api => dart/frontend/lib/api_data}/generated/midi_mapping.pbenum.dart (62%) rename {frontend/lib/api => dart/frontend/lib/api_data}/generated/midi_mapping.pbjson.dart (70%) rename {frontend/lib/api => dart/frontend/lib/api_data}/generated/midi_mapping.pbserver.dart (99%) rename {frontend/lib/api => dart/frontend/lib/api_data}/generated/presets.pb.dart (55%) rename {frontend/lib/api => dart/frontend/lib/api_data}/generated/presets.pbenum.dart (99%) rename {frontend/lib/api => dart/frontend/lib/api_data}/generated/presets.pbjson.dart (72%) rename {frontend/lib/api => dart/frontend/lib/api_data}/generated/presets.pbserver.dart (99%) create mode 100644 dart/frontend/lib/api_data/generated/selected_preset.pb.dart rename {frontend/lib/api => dart/frontend/lib/api_data}/generated/selected_preset.pbenum.dart (99%) rename {frontend/lib/api => dart/frontend/lib/api_data}/generated/selected_preset.pbjson.dart (71%) rename {frontend/lib/api => dart/frontend/lib/api_data}/generated/selected_preset.pbserver.dart (99%) rename {frontend/lib/api => dart/frontend/lib/api_data}/generated/shrapnel.pb.dart (60%) rename {frontend/lib/api => dart/frontend/lib/api_data}/generated/shrapnel.pbenum.dart (100%) rename {frontend/lib/api => dart/frontend/lib/api_data}/generated/shrapnel.pbjson.dart (60%) rename {frontend/lib/api => dart/frontend/lib/api_data}/generated/shrapnel.pbserver.dart (100%) rename frontend/lib/midi_mapping/model/models.dart => dart/frontend/lib/api_data/midi_api_message.dart (98%) create mode 100644 dart/frontend/lib/api_data/parameter_message.dart create mode 100644 dart/frontend/lib/api_data/presets_message.dart rename {frontend/lib/api => dart/frontend/lib/api_data}/proto_extension.dart (98%) create mode 100644 dart/frontend/lib/api_data/selected_preset_data.dart rename {frontend => dart/frontend}/lib/audio_events.dart (86%) rename {frontend => dart/frontend}/lib/chorus.dart (100%) rename {frontend => dart/frontend}/lib/core/message_transport.dart (100%) rename {frontend => dart/frontend}/lib/core/stream_extensions.dart (100%) rename {frontend => dart/frontend}/lib/fake_provisioning.dart (100%) rename {frontend => dart/frontend}/lib/heavy_metal.dart (100%) rename {frontend => dart/frontend}/lib/knob.dart (100%) rename {frontend => dart/frontend}/lib/knob_with_label.dart (100%) rename {frontend => dart/frontend}/lib/main.dart (99%) rename {frontend => dart/frontend}/lib/midi_mapping/model/midi_learn.dart (98%) rename {frontend => dart/frontend}/lib/midi_mapping/model/midi_learn_state.dart (96%) rename {frontend => dart/frontend}/lib/midi_mapping/model/service.dart (98%) rename {frontend => dart/frontend}/lib/midi_mapping/view/midi_learn.dart (100%) rename {frontend => dart/frontend}/lib/midi_mapping/view/midi_mapping.dart (99%) rename {frontend => dart/frontend}/lib/noise_gate.dart (100%) rename {frontend => dart/frontend}/lib/parameter.dart (89%) rename {frontend => dart/frontend}/lib/pedalboard.dart (100%) rename {frontend => dart/frontend}/lib/presets/model/presets.dart (100%) rename {frontend => dart/frontend}/lib/presets/model/presets_client.dart (75%) rename {frontend => dart/frontend}/lib/presets/model/presets_repository.dart (100%) rename {frontend => dart/frontend}/lib/presets/model/presets_service.dart (100%) rename {frontend => dart/frontend}/lib/presets/model/selected_preset_client.dart (85%) rename {frontend => dart/frontend}/lib/presets/model/selected_preset_repository.dart (100%) rename {frontend => dart/frontend}/lib/presets/view/presets.dart (100%) rename {frontend => dart/frontend}/lib/robust_websocket.dart (100%) rename {frontend => dart/frontend}/lib/status/data/status.dart (100%) rename {frontend => dart/frontend}/lib/status/model/websocket_status.dart (100%) rename {frontend => dart/frontend}/lib/status/view/websocket_status.dart (100%) rename {frontend => dart/frontend}/lib/stompbox.dart (100%) rename {frontend => dart/frontend}/lib/tube_screamer.dart (100%) rename {frontend => dart/frontend}/lib/util/conditional_parent.dart (100%) rename {frontend => dart/frontend}/lib/valvestate.dart (100%) rename {frontend => dart/frontend}/lib/wah.dart (100%) rename {frontend => dart/frontend}/lib/wifi_provisioning.dart (100%) rename {frontend => dart/frontend}/lint.sh (100%) rename {frontend => dart/frontend}/linux/.gitignore (100%) rename {frontend => dart/frontend}/linux/CMakeLists.txt (100%) rename {frontend => dart/frontend}/linux/flutter/CMakeLists.txt (100%) rename {frontend => dart/frontend}/linux/flutter/generated_plugin_registrant.cc (100%) rename {frontend => dart/frontend}/linux/flutter/generated_plugin_registrant.h (100%) rename {frontend => dart/frontend}/linux/flutter/generated_plugins.cmake (100%) rename {frontend => dart/frontend}/linux/main.cc (100%) rename {frontend => dart/frontend}/linux/my_application.cc (100%) rename {frontend => dart/frontend}/linux/my_application.h (100%) rename {frontend => dart/frontend}/pubspec.lock (100%) rename {frontend => dart/frontend}/pubspec.yaml (100%) rename {frontend => dart/frontend}/run_api_test.sh (100%) rename {frontend => dart/frontend}/run_integration_test.sh (100%) rename {frontend => dart/frontend}/test/all_test.dart (97%) rename {frontend => dart/frontend}/test/core/button_page_object.dart (100%) rename {frontend => dart/frontend}/test/firmware_api_test/firmware_api_test.dart (98%) rename {frontend => dart/frontend}/test/home_page_object.dart (100%) rename {frontend => dart/frontend}/test/midi_mapping/midi_mapping_page_object.dart (98%) rename {frontend => dart/frontend}/test/midi_mapping/model/service_test.dart (98%) rename {frontend => dart/frontend}/test/midi_mapping/view/midi_mapping_test.dart (99%) rename {frontend => dart/frontend}/test/parameter_test.dart (100%) rename {frontend => dart/frontend}/test/presets/presets_page_object.dart (100%) rename {frontend => dart/frontend}/test/presets/presets_test.dart (99%) rename {frontend => dart/frontend}/test/util.dart (100%) rename {frontend => dart/frontend}/test/wifi_provisioning_page_object.dart (100%) rename {frontend => dart/frontend}/test/wifi_provisioning_test.dart (100%) rename {frontend => dart/frontend}/web/favicon.png (100%) rename {frontend => dart/frontend}/web/icons/Icon-192.png (100%) rename {frontend => dart/frontend}/web/icons/Icon-512.png (100%) rename {frontend => dart/frontend}/web/icons/Icon-maskable-192.png (100%) rename {frontend => dart/frontend}/web/icons/Icon-maskable-512.png (100%) rename {frontend => dart/frontend}/web/index.html (100%) rename {frontend => dart/frontend}/web/manifest.json (100%) create mode 100644 dart/melos.yaml create mode 100644 dart/pubspec.lock create mode 100644 dart/pubspec.yaml create mode 100644 dart/shrapnel_common/.gitignore create mode 100644 dart/shrapnel_common/CHANGELOG.md create mode 100644 dart/shrapnel_common/README.md create mode 100644 dart/shrapnel_common/analysis_options.yaml create mode 100644 dart/shrapnel_common/example/shrapnel_common_example.dart create mode 100644 dart/shrapnel_common/lib/shrapnel_common.dart create mode 100644 dart/shrapnel_common/lib/src/shrapnel_common_base.dart create mode 100644 dart/shrapnel_common/pubspec.yaml create mode 100644 dart/shrapnel_common/test/shrapnel_common_test.dart create mode 100644 dart/shrapnel_test_lib/.gitignore create mode 100644 dart/shrapnel_test_lib/CHANGELOG.md create mode 100644 dart/shrapnel_test_lib/README.md create mode 100644 dart/shrapnel_test_lib/analysis_options.yaml create mode 100644 dart/shrapnel_test_lib/lib/shrapnel_test_lib.dart rename frontend/test/firmware_api_test/util.dart => dart/shrapnel_test_lib/lib/src/shrapnel_test_lib_base.dart (87%) create mode 100644 dart/shrapnel_test_lib/pubspec.yaml rename frontend/test/firmware_api_test/util_test.dart => dart/shrapnel_test_lib/test/shrapnel_test_lib_test.dart (87%) create mode 100644 dart/shrapnel_test_tool/.gitignore create mode 100644 dart/shrapnel_test_tool/CHANGELOG.md create mode 100644 dart/shrapnel_test_tool/README.md create mode 100644 dart/shrapnel_test_tool/analysis_options.yaml create mode 100644 dart/shrapnel_test_tool/bin/shrapnel_test_tool.dart create mode 100644 dart/shrapnel_test_tool/lib/shrapnel_test_tool.dart create mode 100644 dart/shrapnel_test_tool/pubspec.lock create mode 100644 dart/shrapnel_test_tool/pubspec.yaml create mode 100644 dart/shrapnel_test_tool/test/shrapnel_test_tool_test.dart delete mode 100644 frontend/lib/api/generated/analysis_options.yaml delete mode 100644 frontend/lib/api/generated/audio_events.pb.dart delete mode 100644 frontend/lib/api/generated/cmd_handling.pb.dart delete mode 100644 frontend/lib/api/generated/selected_preset.pb.dart diff --git a/dart/.gitignore b/dart/.gitignore new file mode 100644 index 00000000..5919bf76 --- /dev/null +++ b/dart/.gitignore @@ -0,0 +1,6 @@ +# https://dart.dev/guides/libraries/private-files +# Created by `dart pub` +.dart_tool/ + +.idea +*.iml diff --git a/frontend/.gitignore b/dart/frontend/.gitignore similarity index 100% rename from frontend/.gitignore rename to dart/frontend/.gitignore diff --git a/frontend/.metadata b/dart/frontend/.metadata similarity index 100% rename from frontend/.metadata rename to dart/frontend/.metadata diff --git a/frontend/.run/All tests.run.xml b/dart/frontend/.run/All tests.run.xml similarity index 100% rename from frontend/.run/All tests.run.xml rename to dart/frontend/.run/All tests.run.xml diff --git a/frontend/.run/main.dart (Debug).run.xml b/dart/frontend/.run/main.dart (Debug).run.xml similarity index 100% rename from frontend/.run/main.dart (Debug).run.xml rename to dart/frontend/.run/main.dart (Debug).run.xml diff --git a/frontend/.run/main.dart (Profile).run.xml b/dart/frontend/.run/main.dart (Profile).run.xml similarity index 100% rename from frontend/.run/main.dart (Profile).run.xml rename to dart/frontend/.run/main.dart (Profile).run.xml diff --git a/frontend/all_lint_rules.yaml b/dart/frontend/all_lint_rules.yaml similarity index 100% rename from frontend/all_lint_rules.yaml rename to dart/frontend/all_lint_rules.yaml diff --git a/frontend/analysis_options.yaml b/dart/frontend/analysis_options.yaml similarity index 100% rename from frontend/analysis_options.yaml rename to dart/frontend/analysis_options.yaml diff --git a/frontend/dart_test.yaml b/dart/frontend/dart_test.yaml similarity index 100% rename from frontend/dart_test.yaml rename to dart/frontend/dart_test.yaml diff --git a/frontend/devtools_options.yaml b/dart/frontend/devtools_options.yaml similarity index 100% rename from frontend/devtools_options.yaml rename to dart/frontend/devtools_options.yaml diff --git a/frontend/google_fonts/NotoSans-Black.ttf b/dart/frontend/google_fonts/NotoSans-Black.ttf similarity index 100% rename from frontend/google_fonts/NotoSans-Black.ttf rename to dart/frontend/google_fonts/NotoSans-Black.ttf diff --git a/frontend/google_fonts/NotoSans-BlackItalic.ttf b/dart/frontend/google_fonts/NotoSans-BlackItalic.ttf similarity index 100% rename from frontend/google_fonts/NotoSans-BlackItalic.ttf rename to dart/frontend/google_fonts/NotoSans-BlackItalic.ttf diff --git a/frontend/google_fonts/NotoSans-Bold.ttf b/dart/frontend/google_fonts/NotoSans-Bold.ttf similarity index 100% rename from frontend/google_fonts/NotoSans-Bold.ttf rename to dart/frontend/google_fonts/NotoSans-Bold.ttf diff --git a/frontend/google_fonts/NotoSans-BoldItalic.ttf b/dart/frontend/google_fonts/NotoSans-BoldItalic.ttf similarity index 100% rename from frontend/google_fonts/NotoSans-BoldItalic.ttf rename to dart/frontend/google_fonts/NotoSans-BoldItalic.ttf diff --git a/frontend/google_fonts/NotoSans-ExtraBold.ttf b/dart/frontend/google_fonts/NotoSans-ExtraBold.ttf similarity index 100% rename from frontend/google_fonts/NotoSans-ExtraBold.ttf rename to dart/frontend/google_fonts/NotoSans-ExtraBold.ttf diff --git a/frontend/google_fonts/NotoSans-ExtraBoldItalic.ttf b/dart/frontend/google_fonts/NotoSans-ExtraBoldItalic.ttf similarity index 100% rename from frontend/google_fonts/NotoSans-ExtraBoldItalic.ttf rename to dart/frontend/google_fonts/NotoSans-ExtraBoldItalic.ttf diff --git a/frontend/google_fonts/NotoSans-ExtraLight.ttf b/dart/frontend/google_fonts/NotoSans-ExtraLight.ttf similarity index 100% rename from frontend/google_fonts/NotoSans-ExtraLight.ttf rename to dart/frontend/google_fonts/NotoSans-ExtraLight.ttf diff --git a/frontend/google_fonts/NotoSans-ExtraLightItalic.ttf b/dart/frontend/google_fonts/NotoSans-ExtraLightItalic.ttf similarity index 100% rename from frontend/google_fonts/NotoSans-ExtraLightItalic.ttf rename to dart/frontend/google_fonts/NotoSans-ExtraLightItalic.ttf diff --git a/frontend/google_fonts/NotoSans-Italic.ttf b/dart/frontend/google_fonts/NotoSans-Italic.ttf similarity index 100% rename from frontend/google_fonts/NotoSans-Italic.ttf rename to dart/frontend/google_fonts/NotoSans-Italic.ttf diff --git a/frontend/google_fonts/NotoSans-Light.ttf b/dart/frontend/google_fonts/NotoSans-Light.ttf similarity index 100% rename from frontend/google_fonts/NotoSans-Light.ttf rename to dart/frontend/google_fonts/NotoSans-Light.ttf diff --git a/frontend/google_fonts/NotoSans-LightItalic.ttf b/dart/frontend/google_fonts/NotoSans-LightItalic.ttf similarity index 100% rename from frontend/google_fonts/NotoSans-LightItalic.ttf rename to dart/frontend/google_fonts/NotoSans-LightItalic.ttf diff --git a/frontend/google_fonts/NotoSans-Medium.ttf b/dart/frontend/google_fonts/NotoSans-Medium.ttf similarity index 100% rename from frontend/google_fonts/NotoSans-Medium.ttf rename to dart/frontend/google_fonts/NotoSans-Medium.ttf diff --git a/frontend/google_fonts/NotoSans-MediumItalic.ttf b/dart/frontend/google_fonts/NotoSans-MediumItalic.ttf similarity index 100% rename from frontend/google_fonts/NotoSans-MediumItalic.ttf rename to dart/frontend/google_fonts/NotoSans-MediumItalic.ttf diff --git a/frontend/google_fonts/NotoSans-Regular.ttf b/dart/frontend/google_fonts/NotoSans-Regular.ttf similarity index 100% rename from frontend/google_fonts/NotoSans-Regular.ttf rename to dart/frontend/google_fonts/NotoSans-Regular.ttf diff --git a/frontend/google_fonts/NotoSans-SemiBold.ttf b/dart/frontend/google_fonts/NotoSans-SemiBold.ttf similarity index 100% rename from frontend/google_fonts/NotoSans-SemiBold.ttf rename to dart/frontend/google_fonts/NotoSans-SemiBold.ttf diff --git a/frontend/google_fonts/NotoSans-SemiBoldItalic.ttf b/dart/frontend/google_fonts/NotoSans-SemiBoldItalic.ttf similarity index 100% rename from frontend/google_fonts/NotoSans-SemiBoldItalic.ttf rename to dart/frontend/google_fonts/NotoSans-SemiBoldItalic.ttf diff --git a/frontend/google_fonts/NotoSans-Thin.ttf b/dart/frontend/google_fonts/NotoSans-Thin.ttf similarity index 100% rename from frontend/google_fonts/NotoSans-Thin.ttf rename to dart/frontend/google_fonts/NotoSans-Thin.ttf diff --git a/frontend/google_fonts/NotoSans-ThinItalic.ttf b/dart/frontend/google_fonts/NotoSans-ThinItalic.ttf similarity index 100% rename from frontend/google_fonts/NotoSans-ThinItalic.ttf rename to dart/frontend/google_fonts/NotoSans-ThinItalic.ttf diff --git a/frontend/google_fonts/OFL.txt b/dart/frontend/google_fonts/OFL.txt similarity index 100% rename from frontend/google_fonts/OFL.txt rename to dart/frontend/google_fonts/OFL.txt diff --git a/frontend/integration_test/simple_test.dart b/dart/frontend/integration_test/simple_test.dart similarity index 98% rename from frontend/integration_test/simple_test.dart rename to dart/frontend/integration_test/simple_test.dart index 14ea0d64..980c9500 100644 --- a/frontend/integration_test/simple_test.dart +++ b/dart/frontend/integration_test/simple_test.dart @@ -24,10 +24,10 @@ library; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:logging/logging.dart'; +import 'package:shrapnel/api_data/midi_api_message.dart'; import 'package:shrapnel/main.dart'; -import 'package:shrapnel/midi_mapping/model/models.dart'; +import 'package:shrapnel_test_lib/shrapnel_test_lib.dart'; -import '../test/firmware_api_test/util.dart'; import '../test/home_page_object.dart'; import '../test/util.dart'; diff --git a/frontend/lib/amplifier.dart b/dart/frontend/lib/amplifier.dart similarity index 100% rename from frontend/lib/amplifier.dart rename to dart/frontend/lib/amplifier.dart diff --git a/frontend/lib/api/api_websocket.dart b/dart/frontend/lib/api/api_websocket.dart similarity index 65% rename from frontend/lib/api/api_websocket.dart rename to dart/frontend/lib/api/api_websocket.dart index 2e2b0dea..75cae5b0 100644 --- a/frontend/lib/api/api_websocket.dart +++ b/dart/frontend/lib/api/api_websocket.dart @@ -20,49 +20,18 @@ import 'dart:async'; import 'package:async/async.dart'; -import 'package:freezed_annotation/freezed_annotation.dart'; import 'package:logging/logging.dart'; import 'package:rxdart/rxdart.dart'; -import '../audio_events.dart'; +import '../api_data/api_message.dart'; +import '../api_data/generated/shrapnel.pb.dart' as shrapnel_pb; +import '../api_data/proto_extension.dart'; import '../core/message_transport.dart'; import '../core/stream_extensions.dart'; -import '../midi_mapping/model/models.dart'; -import '../parameter.dart'; -import '../presets/model/presets_client.dart'; -import '../presets/model/selected_preset_client.dart'; import '../robust_websocket.dart'; -import 'generated/shrapnel.pb.dart' as shrapnel_pb; -import 'proto_extension.dart'; - -part 'api_websocket.freezed.dart'; final _log = Logger('api_websocket'); -@freezed -sealed class ApiMessage with _$ApiMessage { - const factory ApiMessage.audioEvent({required AudioEventMessage message}) = - ApiMessageAudioEvent; - - const factory ApiMessage.parameterInput({ - required ParameterServiceInputMessage message, - }) = ApiMessageParameterInput; - - const factory ApiMessage.parameterOutput({ - required ParameterServiceOutputMessage message, - }) = ApiMessageParameterOutput; - - const factory ApiMessage.midiMapping({required MidiApiMessage message}) = - ApiMessageMidiMapping; - - const factory ApiMessage.presets({required PresetsMessage message}) = - ApiMessagePresets; - - const factory ApiMessage.selectedPreset({ - required SelectedPresetMessage message, - }) = ApiMessageSelectedPreset; -} - class ApiWebsocket implements ReconnectingMessageTransport { ApiWebsocket({ diff --git a/dart/frontend/lib/api_data/api_message.dart b/dart/frontend/lib/api_data/api_message.dart new file mode 100644 index 00000000..4bdb6bf8 --- /dev/null +++ b/dart/frontend/lib/api_data/api_message.dart @@ -0,0 +1,33 @@ +import 'package:freezed_annotation/freezed_annotation.dart'; + +import 'audio_event_message.dart'; +import 'midi_api_message.dart'; +import 'parameter_message.dart'; +import 'presets_message.dart'; +import 'selected_preset_data.dart'; + +part 'api_message.freezed.dart'; + +@freezed +sealed class ApiMessage with _$ApiMessage { + const factory ApiMessage.audioEvent({required AudioEventMessage message}) = + ApiMessageAudioEvent; + + const factory ApiMessage.parameterInput({ + required ParameterServiceInputMessage message, + }) = ApiMessageParameterInput; + + const factory ApiMessage.parameterOutput({ + required ParameterServiceOutputMessage message, + }) = ApiMessageParameterOutput; + + const factory ApiMessage.midiMapping({required MidiApiMessage message}) = + ApiMessageMidiMapping; + + const factory ApiMessage.presets({required PresetsMessage message}) = + ApiMessagePresets; + + const factory ApiMessage.selectedPreset({ + required SelectedPresetMessage message, + }) = ApiMessageSelectedPreset; +} diff --git a/dart/frontend/lib/api_data/audio_event_message.dart b/dart/frontend/lib/api_data/audio_event_message.dart new file mode 100644 index 00000000..38b7d59a --- /dev/null +++ b/dart/frontend/lib/api_data/audio_event_message.dart @@ -0,0 +1,10 @@ +import 'package:freezed_annotation/freezed_annotation.dart'; + +part 'audio_event_message.freezed.dart'; + +@freezed +sealed class AudioEventMessage with _$AudioEventMessage { + factory AudioEventMessage.inputClipped() = AudioEventMessageInputClipped; + + factory AudioEventMessage.outputClipped() = AudioEventMessageOutputClipped; +} diff --git a/frontend/lib/api/generate.sh b/dart/frontend/lib/api_data/generate.sh similarity index 91% rename from frontend/lib/api/generate.sh rename to dart/frontend/lib/api_data/generate.sh index 00908212..b156cb8e 100644 --- a/frontend/lib/api/generate.sh +++ b/dart/frontend/lib/api_data/generate.sh @@ -3,7 +3,7 @@ set -eo pipefail proto_dir=$(pwd) -cd ../../../proto +cd ../../../../proto protoc --dart_out="$proto_dir/generated" \ audio_events.proto \ cmd_handling.proto \ diff --git a/dart/frontend/lib/api_data/generated/audio_events.pb.dart b/dart/frontend/lib/api_data/generated/audio_events.pb.dart new file mode 100644 index 00000000..9ffb467c --- /dev/null +++ b/dart/frontend/lib/api_data/generated/audio_events.pb.dart @@ -0,0 +1,167 @@ +// +// Generated code. Do not modify. +// source: audio_events.proto +// +// @dart = 2.12 + +// ignore_for_file: annotate_overrides, camel_case_types, comment_references +// ignore_for_file: constant_identifier_names, library_prefixes +// ignore_for_file: non_constant_identifier_names, prefer_final_fields +// ignore_for_file: unnecessary_import, unnecessary_this, unused_import + +import 'dart:core' as $core; + +import 'package:protobuf/protobuf.dart' as $pb; + +/// Sent when the input level is too high, causing clipping +class InputClipped extends $pb.GeneratedMessage { + factory InputClipped() => create(); + InputClipped._() : super(); + factory InputClipped.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); + factory InputClipped.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'InputClipped', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.audio_events'), createEmptyInstance: create) + ..hasRequiredFields = false + ; + + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') + InputClipped clone() => InputClipped()..mergeFromMessage(this); + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + InputClipped copyWith(void Function(InputClipped) updates) => super.copyWith((message) => updates(message as InputClipped)) as InputClipped; + + $pb.BuilderInfo get info_ => _i; + + @$core.pragma('dart2js:noInline') + static InputClipped create() => InputClipped._(); + InputClipped createEmptyInstance() => create(); + static $pb.PbList createRepeated() => $pb.PbList(); + @$core.pragma('dart2js:noInline') + static InputClipped getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static InputClipped? _defaultInstance; +} + +/// Sent when the output level is too high, causing clipping +class OutputClipped extends $pb.GeneratedMessage { + factory OutputClipped() => create(); + OutputClipped._() : super(); + factory OutputClipped.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); + factory OutputClipped.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'OutputClipped', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.audio_events'), createEmptyInstance: create) + ..hasRequiredFields = false + ; + + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') + OutputClipped clone() => OutputClipped()..mergeFromMessage(this); + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + OutputClipped copyWith(void Function(OutputClipped) updates) => super.copyWith((message) => updates(message as OutputClipped)) as OutputClipped; + + $pb.BuilderInfo get info_ => _i; + + @$core.pragma('dart2js:noInline') + static OutputClipped create() => OutputClipped._(); + OutputClipped createEmptyInstance() => create(); + static $pb.PbList createRepeated() => $pb.PbList(); + @$core.pragma('dart2js:noInline') + static OutputClipped getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static OutputClipped? _defaultInstance; +} + +enum Message_Event { + inputClipped, + outputClipped, + notSet +} + +class Message extends $pb.GeneratedMessage { + factory Message({ + InputClipped? inputClipped, + OutputClipped? outputClipped, + }) { + final $result = create(); + if (inputClipped != null) { + $result.inputClipped = inputClipped; + } + if (outputClipped != null) { + $result.outputClipped = outputClipped; + } + return $result; + } + Message._() : super(); + factory Message.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); + factory Message.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); + + static const $core.Map<$core.int, Message_Event> _Message_EventByTag = { + 1 : Message_Event.inputClipped, + 2 : Message_Event.outputClipped, + 0 : Message_Event.notSet + }; + static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Message', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.audio_events'), createEmptyInstance: create) + ..oo(0, [1, 2]) + ..aOM(1, _omitFieldNames ? '' : 'inputClipped', subBuilder: InputClipped.create) + ..aOM(2, _omitFieldNames ? '' : 'outputClipped', subBuilder: OutputClipped.create) + ..hasRequiredFields = false + ; + + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') + Message clone() => Message()..mergeFromMessage(this); + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + Message copyWith(void Function(Message) updates) => super.copyWith((message) => updates(message as Message)) as Message; + + $pb.BuilderInfo get info_ => _i; + + @$core.pragma('dart2js:noInline') + static Message create() => Message._(); + Message createEmptyInstance() => create(); + static $pb.PbList createRepeated() => $pb.PbList(); + @$core.pragma('dart2js:noInline') + static Message getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static Message? _defaultInstance; + + Message_Event whichEvent() => _Message_EventByTag[$_whichOneof(0)]!; + void clearEvent() => clearField($_whichOneof(0)); + + @$pb.TagNumber(1) + InputClipped get inputClipped => $_getN(0); + @$pb.TagNumber(1) + set inputClipped(InputClipped v) { setField(1, v); } + @$pb.TagNumber(1) + $core.bool hasInputClipped() => $_has(0); + @$pb.TagNumber(1) + void clearInputClipped() => clearField(1); + @$pb.TagNumber(1) + InputClipped ensureInputClipped() => $_ensure(0); + + @$pb.TagNumber(2) + OutputClipped get outputClipped => $_getN(1); + @$pb.TagNumber(2) + set outputClipped(OutputClipped v) { setField(2, v); } + @$pb.TagNumber(2) + $core.bool hasOutputClipped() => $_has(1); + @$pb.TagNumber(2) + void clearOutputClipped() => clearField(2); + @$pb.TagNumber(2) + OutputClipped ensureOutputClipped() => $_ensure(1); +} + + +const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names'); +const _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names'); diff --git a/frontend/lib/api/generated/audio_events.pbenum.dart b/dart/frontend/lib/api_data/generated/audio_events.pbenum.dart similarity index 99% rename from frontend/lib/api/generated/audio_events.pbenum.dart rename to dart/frontend/lib/api_data/generated/audio_events.pbenum.dart index 8b314faf..4a6df19f 100644 --- a/frontend/lib/api/generated/audio_events.pbenum.dart +++ b/dart/frontend/lib/api_data/generated/audio_events.pbenum.dart @@ -8,3 +8,4 @@ // ignore_for_file: constant_identifier_names, library_prefixes // ignore_for_file: non_constant_identifier_names, prefer_final_fields // ignore_for_file: unnecessary_import, unnecessary_this, unused_import + diff --git a/frontend/lib/api/generated/audio_events.pbjson.dart b/dart/frontend/lib/api_data/generated/audio_events.pbjson.dart similarity index 71% rename from frontend/lib/api/generated/audio_events.pbjson.dart rename to dart/frontend/lib/api_data/generated/audio_events.pbjson.dart index 41e34eb8..207bbee7 100644 --- a/frontend/lib/api/generated/audio_events.pbjson.dart +++ b/dart/frontend/lib/api_data/generated/audio_events.pbjson.dart @@ -19,8 +19,8 @@ const InputClipped$json = { }; /// Descriptor for `InputClipped`. Decode as a `google.protobuf.DescriptorProto`. -final $typed_data.Uint8List inputClippedDescriptor = - $convert.base64Decode('CgxJbnB1dENsaXBwZWQ='); +final $typed_data.Uint8List inputClippedDescriptor = $convert.base64Decode( + 'CgxJbnB1dENsaXBwZWQ='); @$core.Deprecated('Use outputClippedDescriptor instead') const OutputClipped$json = { @@ -28,31 +28,15 @@ const OutputClipped$json = { }; /// Descriptor for `OutputClipped`. Decode as a `google.protobuf.DescriptorProto`. -final $typed_data.Uint8List outputClippedDescriptor = - $convert.base64Decode('Cg1PdXRwdXRDbGlwcGVk'); +final $typed_data.Uint8List outputClippedDescriptor = $convert.base64Decode( + 'Cg1PdXRwdXRDbGlwcGVk'); @$core.Deprecated('Use messageDescriptor instead') const Message$json = { '1': 'Message', '2': [ - { - '1': 'input_clipped', - '3': 1, - '4': 1, - '5': 11, - '6': '.shrapnel.audio_events.InputClipped', - '9': 0, - '10': 'inputClipped' - }, - { - '1': 'output_clipped', - '3': 2, - '4': 1, - '5': 11, - '6': '.shrapnel.audio_events.OutputClipped', - '9': 0, - '10': 'outputClipped' - }, + {'1': 'input_clipped', '3': 1, '4': 1, '5': 11, '6': '.shrapnel.audio_events.InputClipped', '9': 0, '10': 'inputClipped'}, + {'1': 'output_clipped', '3': 2, '4': 1, '5': 11, '6': '.shrapnel.audio_events.OutputClipped', '9': 0, '10': 'outputClipped'}, ], '8': [ {'1': 'event'}, @@ -65,3 +49,4 @@ final $typed_data.Uint8List messageDescriptor = $convert.base64Decode( 'MuSW5wdXRDbGlwcGVkSABSDGlucHV0Q2xpcHBlZBJNCg5vdXRwdXRfY2xpcHBlZBgCIAEoCzIk' 'LnNocmFwbmVsLmF1ZGlvX2V2ZW50cy5PdXRwdXRDbGlwcGVkSABSDW91dHB1dENsaXBwZWRCBw' 'oFZXZlbnQ='); + diff --git a/frontend/lib/api/generated/audio_events.pbserver.dart b/dart/frontend/lib/api_data/generated/audio_events.pbserver.dart similarity index 99% rename from frontend/lib/api/generated/audio_events.pbserver.dart rename to dart/frontend/lib/api_data/generated/audio_events.pbserver.dart index 5c8ff128..9e3c1871 100644 --- a/frontend/lib/api/generated/audio_events.pbserver.dart +++ b/dart/frontend/lib/api_data/generated/audio_events.pbserver.dart @@ -11,3 +11,4 @@ // ignore_for_file: unnecessary_import, unnecessary_this, unused_import export 'audio_events.pb.dart'; + diff --git a/dart/frontend/lib/api_data/generated/cmd_handling.pb.dart b/dart/frontend/lib/api_data/generated/cmd_handling.pb.dart new file mode 100644 index 00000000..041b3bb7 --- /dev/null +++ b/dart/frontend/lib/api_data/generated/cmd_handling.pb.dart @@ -0,0 +1,202 @@ +// +// Generated code. Do not modify. +// source: cmd_handling.proto +// +// @dart = 2.12 + +// ignore_for_file: annotate_overrides, camel_case_types, comment_references +// ignore_for_file: constant_identifier_names, library_prefixes +// ignore_for_file: non_constant_identifier_names, prefer_final_fields +// ignore_for_file: unnecessary_import, unnecessary_this, unused_import + +import 'dart:core' as $core; + +import 'package:protobuf/protobuf.dart' as $pb; + +/// Firmware: update DSP processing to use the new parameter value. +/// +/// Frontend: Update UI to show new parameter value. +class Update extends $pb.GeneratedMessage { + factory Update({ + $core.String? id, + $core.double? value, + }) { + final $result = create(); + if (id != null) { + $result.id = id; + } + if (value != null) { + $result.value = value; + } + return $result; + } + Update._() : super(); + factory Update.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); + factory Update.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Update', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.cmd_handling'), createEmptyInstance: create) + ..aOS(1, _omitFieldNames ? '' : 'id') + ..a<$core.double>(2, _omitFieldNames ? '' : 'value', $pb.PbFieldType.OF) + ..hasRequiredFields = false + ; + + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') + Update clone() => Update()..mergeFromMessage(this); + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + Update copyWith(void Function(Update) updates) => super.copyWith((message) => updates(message as Update)) as Update; + + $pb.BuilderInfo get info_ => _i; + + @$core.pragma('dart2js:noInline') + static Update create() => Update._(); + Update createEmptyInstance() => create(); + static $pb.PbList createRepeated() => $pb.PbList(); + @$core.pragma('dart2js:noInline') + static Update getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static Update? _defaultInstance; + + @$pb.TagNumber(1) + $core.String get id => $_getSZ(0); + @$pb.TagNumber(1) + set id($core.String v) { $_setString(0, v); } + @$pb.TagNumber(1) + $core.bool hasId() => $_has(0); + @$pb.TagNumber(1) + void clearId() => clearField(1); + + @$pb.TagNumber(2) + $core.double get value => $_getN(1); + @$pb.TagNumber(2) + set value($core.double v) { $_setFloat(1, v); } + @$pb.TagNumber(2) + $core.bool hasValue() => $_has(1); + @$pb.TagNumber(2) + void clearValue() => clearField(2); +} + +/// The firmware will respond by sending a `parameterUpdate` message with the +/// current value of each audio parameter +class Initialise extends $pb.GeneratedMessage { + factory Initialise() => create(); + Initialise._() : super(); + factory Initialise.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); + factory Initialise.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Initialise', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.cmd_handling'), createEmptyInstance: create) + ..hasRequiredFields = false + ; + + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') + Initialise clone() => Initialise()..mergeFromMessage(this); + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + Initialise copyWith(void Function(Initialise) updates) => super.copyWith((message) => updates(message as Initialise)) as Initialise; + + $pb.BuilderInfo get info_ => _i; + + @$core.pragma('dart2js:noInline') + static Initialise create() => Initialise._(); + Initialise createEmptyInstance() => create(); + static $pb.PbList createRepeated() => $pb.PbList(); + @$core.pragma('dart2js:noInline') + static Initialise getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static Initialise? _defaultInstance; +} + +enum Message_Message { + update, + initialise, + notSet +} + +class Message extends $pb.GeneratedMessage { + factory Message({ + Update? update, + Initialise? initialise, + }) { + final $result = create(); + if (update != null) { + $result.update = update; + } + if (initialise != null) { + $result.initialise = initialise; + } + return $result; + } + Message._() : super(); + factory Message.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); + factory Message.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); + + static const $core.Map<$core.int, Message_Message> _Message_MessageByTag = { + 1 : Message_Message.update, + 2 : Message_Message.initialise, + 0 : Message_Message.notSet + }; + static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Message', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.cmd_handling'), createEmptyInstance: create) + ..oo(0, [1, 2]) + ..aOM(1, _omitFieldNames ? '' : 'update', subBuilder: Update.create) + ..aOM(2, _omitFieldNames ? '' : 'initialise', subBuilder: Initialise.create) + ..hasRequiredFields = false + ; + + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') + Message clone() => Message()..mergeFromMessage(this); + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + Message copyWith(void Function(Message) updates) => super.copyWith((message) => updates(message as Message)) as Message; + + $pb.BuilderInfo get info_ => _i; + + @$core.pragma('dart2js:noInline') + static Message create() => Message._(); + Message createEmptyInstance() => create(); + static $pb.PbList createRepeated() => $pb.PbList(); + @$core.pragma('dart2js:noInline') + static Message getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static Message? _defaultInstance; + + Message_Message whichMessage() => _Message_MessageByTag[$_whichOneof(0)]!; + void clearMessage() => clearField($_whichOneof(0)); + + @$pb.TagNumber(1) + Update get update => $_getN(0); + @$pb.TagNumber(1) + set update(Update v) { setField(1, v); } + @$pb.TagNumber(1) + $core.bool hasUpdate() => $_has(0); + @$pb.TagNumber(1) + void clearUpdate() => clearField(1); + @$pb.TagNumber(1) + Update ensureUpdate() => $_ensure(0); + + @$pb.TagNumber(2) + Initialise get initialise => $_getN(1); + @$pb.TagNumber(2) + set initialise(Initialise v) { setField(2, v); } + @$pb.TagNumber(2) + $core.bool hasInitialise() => $_has(1); + @$pb.TagNumber(2) + void clearInitialise() => clearField(2); + @$pb.TagNumber(2) + Initialise ensureInitialise() => $_ensure(1); +} + + +const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names'); +const _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names'); diff --git a/frontend/lib/api/generated/cmd_handling.pbenum.dart b/dart/frontend/lib/api_data/generated/cmd_handling.pbenum.dart similarity index 99% rename from frontend/lib/api/generated/cmd_handling.pbenum.dart rename to dart/frontend/lib/api_data/generated/cmd_handling.pbenum.dart index 70ff03ef..77a1361a 100644 --- a/frontend/lib/api/generated/cmd_handling.pbenum.dart +++ b/dart/frontend/lib/api_data/generated/cmd_handling.pbenum.dart @@ -8,3 +8,4 @@ // ignore_for_file: constant_identifier_names, library_prefixes // ignore_for_file: non_constant_identifier_names, prefer_final_fields // ignore_for_file: unnecessary_import, unnecessary_this, unused_import + diff --git a/frontend/lib/api/generated/cmd_handling.pbjson.dart b/dart/frontend/lib/api_data/generated/cmd_handling.pbjson.dart similarity index 79% rename from frontend/lib/api/generated/cmd_handling.pbjson.dart rename to dart/frontend/lib/api_data/generated/cmd_handling.pbjson.dart index be2a35ba..afde9ddd 100644 --- a/frontend/lib/api/generated/cmd_handling.pbjson.dart +++ b/dart/frontend/lib/api_data/generated/cmd_handling.pbjson.dart @@ -32,31 +32,15 @@ const Initialise$json = { }; /// Descriptor for `Initialise`. Decode as a `google.protobuf.DescriptorProto`. -final $typed_data.Uint8List initialiseDescriptor = - $convert.base64Decode('CgpJbml0aWFsaXNl'); +final $typed_data.Uint8List initialiseDescriptor = $convert.base64Decode( + 'CgpJbml0aWFsaXNl'); @$core.Deprecated('Use messageDescriptor instead') const Message$json = { '1': 'Message', '2': [ - { - '1': 'update', - '3': 1, - '4': 1, - '5': 11, - '6': '.shrapnel.cmd_handling.Update', - '9': 0, - '10': 'update' - }, - { - '1': 'initialise', - '3': 2, - '4': 1, - '5': 11, - '6': '.shrapnel.cmd_handling.Initialise', - '9': 0, - '10': 'initialise' - }, + {'1': 'update', '3': 1, '4': 1, '5': 11, '6': '.shrapnel.cmd_handling.Update', '9': 0, '10': 'update'}, + {'1': 'initialise', '3': 2, '4': 1, '5': 11, '6': '.shrapnel.cmd_handling.Initialise', '9': 0, '10': 'initialise'}, ], '8': [ {'1': 'message'}, @@ -68,3 +52,4 @@ final $typed_data.Uint8List messageDescriptor = $convert.base64Decode( 'CgdNZXNzYWdlEjcKBnVwZGF0ZRgBIAEoCzIdLnNocmFwbmVsLmNtZF9oYW5kbGluZy5VcGRhdG' 'VIAFIGdXBkYXRlEkMKCmluaXRpYWxpc2UYAiABKAsyIS5zaHJhcG5lbC5jbWRfaGFuZGxpbmcu' 'SW5pdGlhbGlzZUgAUgppbml0aWFsaXNlQgkKB21lc3NhZ2U='); + diff --git a/frontend/lib/api/generated/cmd_handling.pbserver.dart b/dart/frontend/lib/api_data/generated/cmd_handling.pbserver.dart similarity index 99% rename from frontend/lib/api/generated/cmd_handling.pbserver.dart rename to dart/frontend/lib/api_data/generated/cmd_handling.pbserver.dart index 31bcdf6a..9186bf5d 100644 --- a/frontend/lib/api/generated/cmd_handling.pbserver.dart +++ b/dart/frontend/lib/api_data/generated/cmd_handling.pbserver.dart @@ -11,3 +11,4 @@ // ignore_for_file: unnecessary_import, unnecessary_this, unused_import export 'cmd_handling.pb.dart'; + diff --git a/frontend/lib/api/generated/midi_mapping.pb.dart b/dart/frontend/lib/api_data/generated/midi_mapping.pb.dart similarity index 50% rename from frontend/lib/api/generated/midi_mapping.pb.dart rename to dart/frontend/lib/api_data/generated/midi_mapping.pb.dart index 02a4beee..fc8f7268 100644 --- a/frontend/lib/api/generated/midi_mapping.pb.dart +++ b/dart/frontend/lib/api_data/generated/midi_mapping.pb.dart @@ -44,37 +44,28 @@ class Mapping extends $pb.GeneratedMessage { return $result; } Mapping._() : super(); - factory Mapping.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory Mapping.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo( - _omitMessageNames ? '' : 'Mapping', - package: const $pb.PackageName( - _omitMessageNames ? '' : 'shrapnel.midi_mapping'), - createEmptyInstance: create) + factory Mapping.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); + factory Mapping.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Mapping', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.midi_mapping'), createEmptyInstance: create) ..a<$core.int>(1, _omitFieldNames ? '' : 'midiChannel', $pb.PbFieldType.OU3) ..a<$core.int>(2, _omitFieldNames ? '' : 'ccNumber', $pb.PbFieldType.OU3) - ..e(3, _omitFieldNames ? '' : 'mode', $pb.PbFieldType.OE, - defaultOrMaker: Mapping_Mode.parameter, - valueOf: Mapping_Mode.valueOf, - enumValues: Mapping_Mode.values) + ..e(3, _omitFieldNames ? '' : 'mode', $pb.PbFieldType.OE, defaultOrMaker: Mapping_Mode.parameter, valueOf: Mapping_Mode.valueOf, enumValues: Mapping_Mode.values) ..aOS(4, _omitFieldNames ? '' : 'parameterName') ..a<$core.int>(5, _omitFieldNames ? '' : 'presetId', $pb.PbFieldType.OU3) - ..hasRequiredFields = false; + ..hasRequiredFields = false + ; - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') Mapping clone() => Mapping()..mergeFromMessage(this); - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - Mapping copyWith(void Function(Mapping) updates) => - super.copyWith((message) => updates(message as Mapping)) as Mapping; + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + Mapping copyWith(void Function(Mapping) updates) => super.copyWith((message) => updates(message as Mapping)) as Mapping; $pb.BuilderInfo get info_ => _i; @@ -83,17 +74,13 @@ class Mapping extends $pb.GeneratedMessage { Mapping createEmptyInstance() => create(); static $pb.PbList createRepeated() => $pb.PbList(); @$core.pragma('dart2js:noInline') - static Mapping getDefault() => - _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static Mapping getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); static Mapping? _defaultInstance; @$pb.TagNumber(1) $core.int get midiChannel => $_getIZ(0); @$pb.TagNumber(1) - set midiChannel($core.int v) { - $_setUnsignedInt32(0, v); - } - + set midiChannel($core.int v) { $_setUnsignedInt32(0, v); } @$pb.TagNumber(1) $core.bool hasMidiChannel() => $_has(0); @$pb.TagNumber(1) @@ -102,10 +89,7 @@ class Mapping extends $pb.GeneratedMessage { @$pb.TagNumber(2) $core.int get ccNumber => $_getIZ(1); @$pb.TagNumber(2) - set ccNumber($core.int v) { - $_setUnsignedInt32(1, v); - } - + set ccNumber($core.int v) { $_setUnsignedInt32(1, v); } @$pb.TagNumber(2) $core.bool hasCcNumber() => $_has(1); @$pb.TagNumber(2) @@ -114,10 +98,7 @@ class Mapping extends $pb.GeneratedMessage { @$pb.TagNumber(3) Mapping_Mode get mode => $_getN(2); @$pb.TagNumber(3) - set mode(Mapping_Mode v) { - setField(3, v); - } - + set mode(Mapping_Mode v) { setField(3, v); } @$pb.TagNumber(3) $core.bool hasMode() => $_has(2); @$pb.TagNumber(3) @@ -126,10 +107,7 @@ class Mapping extends $pb.GeneratedMessage { @$pb.TagNumber(4) $core.String get parameterName => $_getSZ(3); @$pb.TagNumber(4) - set parameterName($core.String v) { - $_setString(3, v); - } - + set parameterName($core.String v) { $_setString(3, v); } @$pb.TagNumber(4) $core.bool hasParameterName() => $_has(3); @$pb.TagNumber(4) @@ -138,10 +116,7 @@ class Mapping extends $pb.GeneratedMessage { @$pb.TagNumber(5) $core.int get presetId => $_getIZ(4); @$pb.TagNumber(5) - set presetId($core.int v) { - $_setUnsignedInt32(4, v); - } - + set presetId($core.int v) { $_setUnsignedInt32(4, v); } @$pb.TagNumber(5) $core.bool hasPresetId() => $_has(4); @$pb.TagNumber(5) @@ -163,52 +138,40 @@ class MidiMessage_NoteOn extends $pb.GeneratedMessage { return $result; } MidiMessage_NoteOn._() : super(); - factory MidiMessage_NoteOn.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory MidiMessage_NoteOn.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo( - _omitMessageNames ? '' : 'MidiMessage.NoteOn', - package: const $pb.PackageName( - _omitMessageNames ? '' : 'shrapnel.midi_mapping'), - createEmptyInstance: create) + factory MidiMessage_NoteOn.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); + factory MidiMessage_NoteOn.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'MidiMessage.NoteOn', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.midi_mapping'), createEmptyInstance: create) ..a<$core.int>(1, _omitFieldNames ? '' : 'note', $pb.PbFieldType.OU3) ..a<$core.int>(2, _omitFieldNames ? '' : 'velocity', $pb.PbFieldType.OU3) - ..hasRequiredFields = false; + ..hasRequiredFields = false + ; - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') MidiMessage_NoteOn clone() => MidiMessage_NoteOn()..mergeFromMessage(this); - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - MidiMessage_NoteOn copyWith(void Function(MidiMessage_NoteOn) updates) => - super.copyWith((message) => updates(message as MidiMessage_NoteOn)) - as MidiMessage_NoteOn; + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + MidiMessage_NoteOn copyWith(void Function(MidiMessage_NoteOn) updates) => super.copyWith((message) => updates(message as MidiMessage_NoteOn)) as MidiMessage_NoteOn; $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static MidiMessage_NoteOn create() => MidiMessage_NoteOn._(); MidiMessage_NoteOn createEmptyInstance() => create(); - static $pb.PbList createRepeated() => - $pb.PbList(); + static $pb.PbList createRepeated() => $pb.PbList(); @$core.pragma('dart2js:noInline') - static MidiMessage_NoteOn getDefault() => _defaultInstance ??= - $pb.GeneratedMessage.$_defaultFor(create); + static MidiMessage_NoteOn getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); static MidiMessage_NoteOn? _defaultInstance; @$pb.TagNumber(1) $core.int get note => $_getIZ(0); @$pb.TagNumber(1) - set note($core.int v) { - $_setUnsignedInt32(0, v); - } - + set note($core.int v) { $_setUnsignedInt32(0, v); } @$pb.TagNumber(1) $core.bool hasNote() => $_has(0); @$pb.TagNumber(1) @@ -217,10 +180,7 @@ class MidiMessage_NoteOn extends $pb.GeneratedMessage { @$pb.TagNumber(2) $core.int get velocity => $_getIZ(1); @$pb.TagNumber(2) - set velocity($core.int v) { - $_setUnsignedInt32(1, v); - } - + set velocity($core.int v) { $_setUnsignedInt32(1, v); } @$pb.TagNumber(2) $core.bool hasVelocity() => $_has(1); @$pb.TagNumber(2) @@ -242,52 +202,40 @@ class MidiMessage_NoteOff extends $pb.GeneratedMessage { return $result; } MidiMessage_NoteOff._() : super(); - factory MidiMessage_NoteOff.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory MidiMessage_NoteOff.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo( - _omitMessageNames ? '' : 'MidiMessage.NoteOff', - package: const $pb.PackageName( - _omitMessageNames ? '' : 'shrapnel.midi_mapping'), - createEmptyInstance: create) + factory MidiMessage_NoteOff.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); + factory MidiMessage_NoteOff.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'MidiMessage.NoteOff', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.midi_mapping'), createEmptyInstance: create) ..a<$core.int>(1, _omitFieldNames ? '' : 'note', $pb.PbFieldType.OU3) ..a<$core.int>(2, _omitFieldNames ? '' : 'velocity', $pb.PbFieldType.OU3) - ..hasRequiredFields = false; + ..hasRequiredFields = false + ; - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') MidiMessage_NoteOff clone() => MidiMessage_NoteOff()..mergeFromMessage(this); - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - MidiMessage_NoteOff copyWith(void Function(MidiMessage_NoteOff) updates) => - super.copyWith((message) => updates(message as MidiMessage_NoteOff)) - as MidiMessage_NoteOff; + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + MidiMessage_NoteOff copyWith(void Function(MidiMessage_NoteOff) updates) => super.copyWith((message) => updates(message as MidiMessage_NoteOff)) as MidiMessage_NoteOff; $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static MidiMessage_NoteOff create() => MidiMessage_NoteOff._(); MidiMessage_NoteOff createEmptyInstance() => create(); - static $pb.PbList createRepeated() => - $pb.PbList(); + static $pb.PbList createRepeated() => $pb.PbList(); @$core.pragma('dart2js:noInline') - static MidiMessage_NoteOff getDefault() => _defaultInstance ??= - $pb.GeneratedMessage.$_defaultFor(create); + static MidiMessage_NoteOff getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); static MidiMessage_NoteOff? _defaultInstance; @$pb.TagNumber(1) $core.int get note => $_getIZ(0); @$pb.TagNumber(1) - set note($core.int v) { - $_setUnsignedInt32(0, v); - } - + set note($core.int v) { $_setUnsignedInt32(0, v); } @$pb.TagNumber(1) $core.bool hasNote() => $_has(0); @$pb.TagNumber(1) @@ -296,10 +244,7 @@ class MidiMessage_NoteOff extends $pb.GeneratedMessage { @$pb.TagNumber(2) $core.int get velocity => $_getIZ(1); @$pb.TagNumber(2) - set velocity($core.int v) { - $_setUnsignedInt32(1, v); - } - + set velocity($core.int v) { $_setUnsignedInt32(1, v); } @$pb.TagNumber(2) $core.bool hasVelocity() => $_has(1); @$pb.TagNumber(2) @@ -321,54 +266,40 @@ class MidiMessage_ControlChange extends $pb.GeneratedMessage { return $result; } MidiMessage_ControlChange._() : super(); - factory MidiMessage_ControlChange.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory MidiMessage_ControlChange.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo( - _omitMessageNames ? '' : 'MidiMessage.ControlChange', - package: const $pb.PackageName( - _omitMessageNames ? '' : 'shrapnel.midi_mapping'), - createEmptyInstance: create) + factory MidiMessage_ControlChange.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); + factory MidiMessage_ControlChange.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'MidiMessage.ControlChange', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.midi_mapping'), createEmptyInstance: create) ..a<$core.int>(1, _omitFieldNames ? '' : 'control', $pb.PbFieldType.OU3) ..a<$core.int>(2, _omitFieldNames ? '' : 'value', $pb.PbFieldType.OU3) - ..hasRequiredFields = false; - - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') - MidiMessage_ControlChange clone() => - MidiMessage_ControlChange()..mergeFromMessage(this); - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - MidiMessage_ControlChange copyWith( - void Function(MidiMessage_ControlChange) updates) => - super.copyWith((message) => updates(message as MidiMessage_ControlChange)) - as MidiMessage_ControlChange; + ..hasRequiredFields = false + ; + + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') + MidiMessage_ControlChange clone() => MidiMessage_ControlChange()..mergeFromMessage(this); + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + MidiMessage_ControlChange copyWith(void Function(MidiMessage_ControlChange) updates) => super.copyWith((message) => updates(message as MidiMessage_ControlChange)) as MidiMessage_ControlChange; $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static MidiMessage_ControlChange create() => MidiMessage_ControlChange._(); MidiMessage_ControlChange createEmptyInstance() => create(); - static $pb.PbList createRepeated() => - $pb.PbList(); + static $pb.PbList createRepeated() => $pb.PbList(); @$core.pragma('dart2js:noInline') - static MidiMessage_ControlChange getDefault() => _defaultInstance ??= - $pb.GeneratedMessage.$_defaultFor(create); + static MidiMessage_ControlChange getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); static MidiMessage_ControlChange? _defaultInstance; @$pb.TagNumber(1) $core.int get control => $_getIZ(0); @$pb.TagNumber(1) - set control($core.int v) { - $_setUnsignedInt32(0, v); - } - + set control($core.int v) { $_setUnsignedInt32(0, v); } @$pb.TagNumber(1) $core.bool hasControl() => $_has(0); @$pb.TagNumber(1) @@ -377,10 +308,7 @@ class MidiMessage_ControlChange extends $pb.GeneratedMessage { @$pb.TagNumber(2) $core.int get value => $_getIZ(1); @$pb.TagNumber(2) - set value($core.int v) { - $_setUnsignedInt32(1, v); - } - + set value($core.int v) { $_setUnsignedInt32(1, v); } @$pb.TagNumber(2) $core.bool hasValue() => $_has(1); @$pb.TagNumber(2) @@ -398,53 +326,39 @@ class MidiMessage_ProgramChange extends $pb.GeneratedMessage { return $result; } MidiMessage_ProgramChange._() : super(); - factory MidiMessage_ProgramChange.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory MidiMessage_ProgramChange.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo( - _omitMessageNames ? '' : 'MidiMessage.ProgramChange', - package: const $pb.PackageName( - _omitMessageNames ? '' : 'shrapnel.midi_mapping'), - createEmptyInstance: create) + factory MidiMessage_ProgramChange.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); + factory MidiMessage_ProgramChange.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'MidiMessage.ProgramChange', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.midi_mapping'), createEmptyInstance: create) ..a<$core.int>(1, _omitFieldNames ? '' : 'number', $pb.PbFieldType.OU3) - ..hasRequiredFields = false; - - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') - MidiMessage_ProgramChange clone() => - MidiMessage_ProgramChange()..mergeFromMessage(this); - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - MidiMessage_ProgramChange copyWith( - void Function(MidiMessage_ProgramChange) updates) => - super.copyWith((message) => updates(message as MidiMessage_ProgramChange)) - as MidiMessage_ProgramChange; + ..hasRequiredFields = false + ; + + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') + MidiMessage_ProgramChange clone() => MidiMessage_ProgramChange()..mergeFromMessage(this); + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + MidiMessage_ProgramChange copyWith(void Function(MidiMessage_ProgramChange) updates) => super.copyWith((message) => updates(message as MidiMessage_ProgramChange)) as MidiMessage_ProgramChange; $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static MidiMessage_ProgramChange create() => MidiMessage_ProgramChange._(); MidiMessage_ProgramChange createEmptyInstance() => create(); - static $pb.PbList createRepeated() => - $pb.PbList(); + static $pb.PbList createRepeated() => $pb.PbList(); @$core.pragma('dart2js:noInline') - static MidiMessage_ProgramChange getDefault() => _defaultInstance ??= - $pb.GeneratedMessage.$_defaultFor(create); + static MidiMessage_ProgramChange getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); static MidiMessage_ProgramChange? _defaultInstance; @$pb.TagNumber(1) $core.int get number => $_getIZ(0); @$pb.TagNumber(1) - set number($core.int v) { - $_setUnsignedInt32(0, v); - } - + set number($core.int v) { $_setUnsignedInt32(0, v); } @$pb.TagNumber(1) $core.bool hasNumber() => $_has(0); @$pb.TagNumber(1) @@ -452,10 +366,10 @@ class MidiMessage_ProgramChange extends $pb.GeneratedMessage { } enum MidiMessage_Parameters { - noteOn, - noteOff, - controlChange, - programChange, + noteOn, + noteOff, + controlChange, + programChange, notSet } @@ -487,48 +401,36 @@ class MidiMessage extends $pb.GeneratedMessage { return $result; } MidiMessage._() : super(); - factory MidiMessage.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory MidiMessage.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); - - static const $core.Map<$core.int, MidiMessage_Parameters> - _MidiMessage_ParametersByTag = { - 2: MidiMessage_Parameters.noteOn, - 3: MidiMessage_Parameters.noteOff, - 4: MidiMessage_Parameters.controlChange, - 5: MidiMessage_Parameters.programChange, - 0: MidiMessage_Parameters.notSet + factory MidiMessage.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); + factory MidiMessage.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); + + static const $core.Map<$core.int, MidiMessage_Parameters> _MidiMessage_ParametersByTag = { + 2 : MidiMessage_Parameters.noteOn, + 3 : MidiMessage_Parameters.noteOff, + 4 : MidiMessage_Parameters.controlChange, + 5 : MidiMessage_Parameters.programChange, + 0 : MidiMessage_Parameters.notSet }; - static final $pb.BuilderInfo _i = $pb.BuilderInfo( - _omitMessageNames ? '' : 'MidiMessage', - package: const $pb.PackageName( - _omitMessageNames ? '' : 'shrapnel.midi_mapping'), - createEmptyInstance: create) + static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'MidiMessage', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.midi_mapping'), createEmptyInstance: create) ..oo(0, [2, 3, 4, 5]) ..a<$core.int>(1, _omitFieldNames ? '' : 'channel', $pb.PbFieldType.OU3) - ..aOM(2, _omitFieldNames ? '' : 'noteOn', - subBuilder: MidiMessage_NoteOn.create) - ..aOM(3, _omitFieldNames ? '' : 'noteOff', - subBuilder: MidiMessage_NoteOff.create) - ..aOM(4, _omitFieldNames ? '' : 'controlChange', - subBuilder: MidiMessage_ControlChange.create) - ..aOM(5, _omitFieldNames ? '' : 'programChange', - subBuilder: MidiMessage_ProgramChange.create) - ..hasRequiredFields = false; - - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + ..aOM(2, _omitFieldNames ? '' : 'noteOn', subBuilder: MidiMessage_NoteOn.create) + ..aOM(3, _omitFieldNames ? '' : 'noteOff', subBuilder: MidiMessage_NoteOff.create) + ..aOM(4, _omitFieldNames ? '' : 'controlChange', subBuilder: MidiMessage_ControlChange.create) + ..aOM(5, _omitFieldNames ? '' : 'programChange', subBuilder: MidiMessage_ProgramChange.create) + ..hasRequiredFields = false + ; + + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') MidiMessage clone() => MidiMessage()..mergeFromMessage(this); - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - MidiMessage copyWith(void Function(MidiMessage) updates) => - super.copyWith((message) => updates(message as MidiMessage)) - as MidiMessage; + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + MidiMessage copyWith(void Function(MidiMessage) updates) => super.copyWith((message) => updates(message as MidiMessage)) as MidiMessage; $pb.BuilderInfo get info_ => _i; @@ -537,22 +439,17 @@ class MidiMessage extends $pb.GeneratedMessage { MidiMessage createEmptyInstance() => create(); static $pb.PbList createRepeated() => $pb.PbList(); @$core.pragma('dart2js:noInline') - static MidiMessage getDefault() => _defaultInstance ??= - $pb.GeneratedMessage.$_defaultFor(create); + static MidiMessage getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); static MidiMessage? _defaultInstance; - MidiMessage_Parameters whichParameters() => - _MidiMessage_ParametersByTag[$_whichOneof(0)]!; + MidiMessage_Parameters whichParameters() => _MidiMessage_ParametersByTag[$_whichOneof(0)]!; void clearParameters() => clearField($_whichOneof(0)); /// The MIDI channel where the message was received @$pb.TagNumber(1) $core.int get channel => $_getIZ(0); @$pb.TagNumber(1) - set channel($core.int v) { - $_setUnsignedInt32(0, v); - } - + set channel($core.int v) { $_setUnsignedInt32(0, v); } @$pb.TagNumber(1) $core.bool hasChannel() => $_has(0); @$pb.TagNumber(1) @@ -561,10 +458,7 @@ class MidiMessage extends $pb.GeneratedMessage { @$pb.TagNumber(2) MidiMessage_NoteOn get noteOn => $_getN(1); @$pb.TagNumber(2) - set noteOn(MidiMessage_NoteOn v) { - setField(2, v); - } - + set noteOn(MidiMessage_NoteOn v) { setField(2, v); } @$pb.TagNumber(2) $core.bool hasNoteOn() => $_has(1); @$pb.TagNumber(2) @@ -575,10 +469,7 @@ class MidiMessage extends $pb.GeneratedMessage { @$pb.TagNumber(3) MidiMessage_NoteOff get noteOff => $_getN(2); @$pb.TagNumber(3) - set noteOff(MidiMessage_NoteOff v) { - setField(3, v); - } - + set noteOff(MidiMessage_NoteOff v) { setField(3, v); } @$pb.TagNumber(3) $core.bool hasNoteOff() => $_has(2); @$pb.TagNumber(3) @@ -589,10 +480,7 @@ class MidiMessage extends $pb.GeneratedMessage { @$pb.TagNumber(4) MidiMessage_ControlChange get controlChange => $_getN(3); @$pb.TagNumber(4) - set controlChange(MidiMessage_ControlChange v) { - setField(4, v); - } - + set controlChange(MidiMessage_ControlChange v) { setField(4, v); } @$pb.TagNumber(4) $core.bool hasControlChange() => $_has(3); @$pb.TagNumber(4) @@ -603,10 +491,7 @@ class MidiMessage extends $pb.GeneratedMessage { @$pb.TagNumber(5) MidiMessage_ProgramChange get programChange => $_getN(4); @$pb.TagNumber(5) - set programChange(MidiMessage_ProgramChange v) { - setField(5, v); - } - + set programChange(MidiMessage_ProgramChange v) { setField(5, v); } @$pb.TagNumber(5) $core.bool hasProgramChange() => $_has(4); @$pb.TagNumber(5) @@ -630,53 +515,40 @@ class MappingRecord extends $pb.GeneratedMessage { return $result; } MappingRecord._() : super(); - factory MappingRecord.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory MappingRecord.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo( - _omitMessageNames ? '' : 'MappingRecord', - package: const $pb.PackageName( - _omitMessageNames ? '' : 'shrapnel.midi_mapping'), - createEmptyInstance: create) - ..a<$core.int>(1, _omitFieldNames ? '' : 'id', $pb.PbFieldType.OU3) - ..aOM(2, _omitFieldNames ? '' : 'mapping', - subBuilder: Mapping.create) - ..hasRequiredFields = false; + factory MappingRecord.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); + factory MappingRecord.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'MappingRecord', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.midi_mapping'), createEmptyInstance: create) + ..a<$core.int>(1, _omitFieldNames ? '' : 'id', $pb.PbFieldType.OU3) + ..aOM(2, _omitFieldNames ? '' : 'mapping', subBuilder: Mapping.create) + ..hasRequiredFields = false + ; + + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') MappingRecord clone() => MappingRecord()..mergeFromMessage(this); - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - MappingRecord copyWith(void Function(MappingRecord) updates) => - super.copyWith((message) => updates(message as MappingRecord)) - as MappingRecord; + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + MappingRecord copyWith(void Function(MappingRecord) updates) => super.copyWith((message) => updates(message as MappingRecord)) as MappingRecord; $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static MappingRecord create() => MappingRecord._(); MappingRecord createEmptyInstance() => create(); - static $pb.PbList createRepeated() => - $pb.PbList(); + static $pb.PbList createRepeated() => $pb.PbList(); @$core.pragma('dart2js:noInline') - static MappingRecord getDefault() => _defaultInstance ??= - $pb.GeneratedMessage.$_defaultFor(create); + static MappingRecord getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); static MappingRecord? _defaultInstance; @$pb.TagNumber(1) $core.int get id => $_getIZ(0); @$pb.TagNumber(1) - set id($core.int v) { - $_setUnsignedInt32(0, v); - } - + set id($core.int v) { $_setUnsignedInt32(0, v); } @$pb.TagNumber(1) $core.bool hasId() => $_has(0); @$pb.TagNumber(1) @@ -685,10 +557,7 @@ class MappingRecord extends $pb.GeneratedMessage { @$pb.TagNumber(2) Mapping get mapping => $_getN(1); @$pb.TagNumber(2) - set mapping(Mapping v) { - setField(2, v); - } - + set mapping(Mapping v) { setField(2, v); } @$pb.TagNumber(2) $core.bool hasMapping() => $_has(1); @$pb.TagNumber(2) @@ -702,29 +571,23 @@ class MappingRecord extends $pb.GeneratedMessage { class GetRequest extends $pb.GeneratedMessage { factory GetRequest() => create(); GetRequest._() : super(); - factory GetRequest.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory GetRequest.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo( - _omitMessageNames ? '' : 'GetRequest', - package: const $pb.PackageName( - _omitMessageNames ? '' : 'shrapnel.midi_mapping'), - createEmptyInstance: create) - ..hasRequiredFields = false; - - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + factory GetRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); + factory GetRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.midi_mapping'), createEmptyInstance: create) + ..hasRequiredFields = false + ; + + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') GetRequest clone() => GetRequest()..mergeFromMessage(this); - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - GetRequest copyWith(void Function(GetRequest) updates) => - super.copyWith((message) => updates(message as GetRequest)) as GetRequest; + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + GetRequest copyWith(void Function(GetRequest) updates) => super.copyWith((message) => updates(message as GetRequest)) as GetRequest; $pb.BuilderInfo get info_ => _i; @@ -733,8 +596,7 @@ class GetRequest extends $pb.GeneratedMessage { GetRequest createEmptyInstance() => create(); static $pb.PbList createRepeated() => $pb.PbList(); @$core.pragma('dart2js:noInline') - static GetRequest getDefault() => _defaultInstance ??= - $pb.GeneratedMessage.$_defaultFor(create); + static GetRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); static GetRequest? _defaultInstance; } @@ -750,52 +612,39 @@ class CreateRequest extends $pb.GeneratedMessage { return $result; } CreateRequest._() : super(); - factory CreateRequest.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory CreateRequest.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo( - _omitMessageNames ? '' : 'CreateRequest', - package: const $pb.PackageName( - _omitMessageNames ? '' : 'shrapnel.midi_mapping'), - createEmptyInstance: create) - ..aOM(1, _omitFieldNames ? '' : 'mapping', - subBuilder: Mapping.create) - ..hasRequiredFields = false; - - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + factory CreateRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); + factory CreateRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'CreateRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.midi_mapping'), createEmptyInstance: create) + ..aOM(1, _omitFieldNames ? '' : 'mapping', subBuilder: Mapping.create) + ..hasRequiredFields = false + ; + + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') CreateRequest clone() => CreateRequest()..mergeFromMessage(this); - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - CreateRequest copyWith(void Function(CreateRequest) updates) => - super.copyWith((message) => updates(message as CreateRequest)) - as CreateRequest; + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + CreateRequest copyWith(void Function(CreateRequest) updates) => super.copyWith((message) => updates(message as CreateRequest)) as CreateRequest; $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static CreateRequest create() => CreateRequest._(); CreateRequest createEmptyInstance() => create(); - static $pb.PbList createRepeated() => - $pb.PbList(); + static $pb.PbList createRepeated() => $pb.PbList(); @$core.pragma('dart2js:noInline') - static CreateRequest getDefault() => _defaultInstance ??= - $pb.GeneratedMessage.$_defaultFor(create); + static CreateRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); static CreateRequest? _defaultInstance; @$pb.TagNumber(1) Mapping get mapping => $_getN(0); @$pb.TagNumber(1) - set mapping(Mapping v) { - setField(1, v); - } - + set mapping(Mapping v) { setField(1, v); } @$pb.TagNumber(1) $core.bool hasMapping() => $_has(0); @$pb.TagNumber(1) @@ -816,52 +665,39 @@ class CreateResponse extends $pb.GeneratedMessage { return $result; } CreateResponse._() : super(); - factory CreateResponse.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory CreateResponse.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo( - _omitMessageNames ? '' : 'CreateResponse', - package: const $pb.PackageName( - _omitMessageNames ? '' : 'shrapnel.midi_mapping'), - createEmptyInstance: create) - ..aOM(1, _omitFieldNames ? '' : 'mapping', - subBuilder: MappingRecord.create) - ..hasRequiredFields = false; - - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + factory CreateResponse.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); + factory CreateResponse.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'CreateResponse', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.midi_mapping'), createEmptyInstance: create) + ..aOM(1, _omitFieldNames ? '' : 'mapping', subBuilder: MappingRecord.create) + ..hasRequiredFields = false + ; + + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') CreateResponse clone() => CreateResponse()..mergeFromMessage(this); - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - CreateResponse copyWith(void Function(CreateResponse) updates) => - super.copyWith((message) => updates(message as CreateResponse)) - as CreateResponse; + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + CreateResponse copyWith(void Function(CreateResponse) updates) => super.copyWith((message) => updates(message as CreateResponse)) as CreateResponse; $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static CreateResponse create() => CreateResponse._(); CreateResponse createEmptyInstance() => create(); - static $pb.PbList createRepeated() => - $pb.PbList(); + static $pb.PbList createRepeated() => $pb.PbList(); @$core.pragma('dart2js:noInline') - static CreateResponse getDefault() => _defaultInstance ??= - $pb.GeneratedMessage.$_defaultFor(create); + static CreateResponse getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); static CreateResponse? _defaultInstance; @$pb.TagNumber(1) MappingRecord get mapping => $_getN(0); @$pb.TagNumber(1) - set mapping(MappingRecord v) { - setField(1, v); - } - + set mapping(MappingRecord v) { setField(1, v); } @$pb.TagNumber(1) $core.bool hasMapping() => $_has(0); @$pb.TagNumber(1) @@ -882,31 +718,24 @@ class Update extends $pb.GeneratedMessage { return $result; } Update._() : super(); - factory Update.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory Update.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo( - _omitMessageNames ? '' : 'Update', - package: const $pb.PackageName( - _omitMessageNames ? '' : 'shrapnel.midi_mapping'), - createEmptyInstance: create) - ..aOM(1, _omitFieldNames ? '' : 'mapping', - subBuilder: MappingRecord.create) - ..hasRequiredFields = false; - - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + factory Update.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); + factory Update.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Update', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.midi_mapping'), createEmptyInstance: create) + ..aOM(1, _omitFieldNames ? '' : 'mapping', subBuilder: MappingRecord.create) + ..hasRequiredFields = false + ; + + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') Update clone() => Update()..mergeFromMessage(this); - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - Update copyWith(void Function(Update) updates) => - super.copyWith((message) => updates(message as Update)) as Update; + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + Update copyWith(void Function(Update) updates) => super.copyWith((message) => updates(message as Update)) as Update; $pb.BuilderInfo get info_ => _i; @@ -915,17 +744,13 @@ class Update extends $pb.GeneratedMessage { Update createEmptyInstance() => create(); static $pb.PbList createRepeated() => $pb.PbList(); @$core.pragma('dart2js:noInline') - static Update getDefault() => - _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static Update getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); static Update? _defaultInstance; @$pb.TagNumber(1) MappingRecord get mapping => $_getN(0); @$pb.TagNumber(1) - set mapping(MappingRecord v) { - setField(1, v); - } - + set mapping(MappingRecord v) { setField(1, v); } @$pb.TagNumber(1) $core.bool hasMapping() => $_has(0); @$pb.TagNumber(1) @@ -946,30 +771,24 @@ class Remove extends $pb.GeneratedMessage { return $result; } Remove._() : super(); - factory Remove.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory Remove.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo( - _omitMessageNames ? '' : 'Remove', - package: const $pb.PackageName( - _omitMessageNames ? '' : 'shrapnel.midi_mapping'), - createEmptyInstance: create) + factory Remove.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); + factory Remove.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Remove', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.midi_mapping'), createEmptyInstance: create) ..a<$core.int>(1, _omitFieldNames ? '' : 'id', $pb.PbFieldType.OU3) - ..hasRequiredFields = false; + ..hasRequiredFields = false + ; - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') Remove clone() => Remove()..mergeFromMessage(this); - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - Remove copyWith(void Function(Remove) updates) => - super.copyWith((message) => updates(message as Remove)) as Remove; + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + Remove copyWith(void Function(Remove) updates) => super.copyWith((message) => updates(message as Remove)) as Remove; $pb.BuilderInfo get info_ => _i; @@ -978,17 +797,13 @@ class Remove extends $pb.GeneratedMessage { Remove createEmptyInstance() => create(); static $pb.PbList createRepeated() => $pb.PbList(); @$core.pragma('dart2js:noInline') - static Remove getDefault() => - _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static Remove getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); static Remove? _defaultInstance; @$pb.TagNumber(1) $core.int get id => $_getIZ(0); @$pb.TagNumber(1) - set id($core.int v) { - $_setUnsignedInt32(0, v); - } - + set id($core.int v) { $_setUnsignedInt32(0, v); } @$pb.TagNumber(1) $core.bool hasId() => $_has(0); @$pb.TagNumber(1) @@ -1009,52 +824,39 @@ class MessageReceived extends $pb.GeneratedMessage { return $result; } MessageReceived._() : super(); - factory MessageReceived.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory MessageReceived.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo( - _omitMessageNames ? '' : 'MessageReceived', - package: const $pb.PackageName( - _omitMessageNames ? '' : 'shrapnel.midi_mapping'), - createEmptyInstance: create) - ..aOM(1, _omitFieldNames ? '' : 'receivedMessage', - subBuilder: MidiMessage.create) - ..hasRequiredFields = false; - - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + factory MessageReceived.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); + factory MessageReceived.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'MessageReceived', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.midi_mapping'), createEmptyInstance: create) + ..aOM(1, _omitFieldNames ? '' : 'receivedMessage', subBuilder: MidiMessage.create) + ..hasRequiredFields = false + ; + + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') MessageReceived clone() => MessageReceived()..mergeFromMessage(this); - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - MessageReceived copyWith(void Function(MessageReceived) updates) => - super.copyWith((message) => updates(message as MessageReceived)) - as MessageReceived; + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + MessageReceived copyWith(void Function(MessageReceived) updates) => super.copyWith((message) => updates(message as MessageReceived)) as MessageReceived; $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static MessageReceived create() => MessageReceived._(); MessageReceived createEmptyInstance() => create(); - static $pb.PbList createRepeated() => - $pb.PbList(); + static $pb.PbList createRepeated() => $pb.PbList(); @$core.pragma('dart2js:noInline') - static MessageReceived getDefault() => _defaultInstance ??= - $pb.GeneratedMessage.$_defaultFor(create); + static MessageReceived getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); static MessageReceived? _defaultInstance; @$pb.TagNumber(1) MidiMessage get receivedMessage => $_getN(0); @$pb.TagNumber(1) - set receivedMessage(MidiMessage v) { - setField(1, v); - } - + set receivedMessage(MidiMessage v) { setField(1, v); } @$pb.TagNumber(1) $core.bool hasReceivedMessage() => $_has(0); @$pb.TagNumber(1) @@ -1064,12 +866,12 @@ class MessageReceived extends $pb.GeneratedMessage { } enum Message_Message { - getRequest, - createRequest, - createResponse, - update, - remove, - messageReceived, + getRequest, + createRequest, + createResponse, + update, + remove, + messageReceived, notSet } @@ -1104,49 +906,39 @@ class Message extends $pb.GeneratedMessage { return $result; } Message._() : super(); - factory Message.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory Message.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); + factory Message.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); + factory Message.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); static const $core.Map<$core.int, Message_Message> _Message_MessageByTag = { - 1: Message_Message.getRequest, - 2: Message_Message.createRequest, - 3: Message_Message.createResponse, - 4: Message_Message.update, - 5: Message_Message.remove, - 6: Message_Message.messageReceived, - 0: Message_Message.notSet + 1 : Message_Message.getRequest, + 2 : Message_Message.createRequest, + 3 : Message_Message.createResponse, + 4 : Message_Message.update, + 5 : Message_Message.remove, + 6 : Message_Message.messageReceived, + 0 : Message_Message.notSet }; - static final $pb.BuilderInfo _i = $pb.BuilderInfo( - _omitMessageNames ? '' : 'Message', - package: const $pb.PackageName( - _omitMessageNames ? '' : 'shrapnel.midi_mapping'), - createEmptyInstance: create) + static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Message', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.midi_mapping'), createEmptyInstance: create) ..oo(0, [1, 2, 3, 4, 5, 6]) - ..aOM(1, _omitFieldNames ? '' : 'getRequest', - subBuilder: GetRequest.create) - ..aOM(2, _omitFieldNames ? '' : 'createRequest', - subBuilder: CreateRequest.create) - ..aOM(3, _omitFieldNames ? '' : 'createResponse', - subBuilder: CreateResponse.create) + ..aOM(1, _omitFieldNames ? '' : 'getRequest', subBuilder: GetRequest.create) + ..aOM(2, _omitFieldNames ? '' : 'createRequest', subBuilder: CreateRequest.create) + ..aOM(3, _omitFieldNames ? '' : 'createResponse', subBuilder: CreateResponse.create) ..aOM(4, _omitFieldNames ? '' : 'update', subBuilder: Update.create) ..aOM(5, _omitFieldNames ? '' : 'remove', subBuilder: Remove.create) - ..aOM(6, _omitFieldNames ? '' : 'messageReceived', - subBuilder: MessageReceived.create) - ..hasRequiredFields = false; - - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + ..aOM(6, _omitFieldNames ? '' : 'messageReceived', subBuilder: MessageReceived.create) + ..hasRequiredFields = false + ; + + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') Message clone() => Message()..mergeFromMessage(this); - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - Message copyWith(void Function(Message) updates) => - super.copyWith((message) => updates(message as Message)) as Message; + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + Message copyWith(void Function(Message) updates) => super.copyWith((message) => updates(message as Message)) as Message; $pb.BuilderInfo get info_ => _i; @@ -1155,8 +947,7 @@ class Message extends $pb.GeneratedMessage { Message createEmptyInstance() => create(); static $pb.PbList createRepeated() => $pb.PbList(); @$core.pragma('dart2js:noInline') - static Message getDefault() => - _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static Message getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); static Message? _defaultInstance; Message_Message whichMessage() => _Message_MessageByTag[$_whichOneof(0)]!; @@ -1165,10 +956,7 @@ class Message extends $pb.GeneratedMessage { @$pb.TagNumber(1) GetRequest get getRequest => $_getN(0); @$pb.TagNumber(1) - set getRequest(GetRequest v) { - setField(1, v); - } - + set getRequest(GetRequest v) { setField(1, v); } @$pb.TagNumber(1) $core.bool hasGetRequest() => $_has(0); @$pb.TagNumber(1) @@ -1179,10 +967,7 @@ class Message extends $pb.GeneratedMessage { @$pb.TagNumber(2) CreateRequest get createRequest => $_getN(1); @$pb.TagNumber(2) - set createRequest(CreateRequest v) { - setField(2, v); - } - + set createRequest(CreateRequest v) { setField(2, v); } @$pb.TagNumber(2) $core.bool hasCreateRequest() => $_has(1); @$pb.TagNumber(2) @@ -1193,10 +978,7 @@ class Message extends $pb.GeneratedMessage { @$pb.TagNumber(3) CreateResponse get createResponse => $_getN(2); @$pb.TagNumber(3) - set createResponse(CreateResponse v) { - setField(3, v); - } - + set createResponse(CreateResponse v) { setField(3, v); } @$pb.TagNumber(3) $core.bool hasCreateResponse() => $_has(2); @$pb.TagNumber(3) @@ -1207,10 +989,7 @@ class Message extends $pb.GeneratedMessage { @$pb.TagNumber(4) Update get update => $_getN(3); @$pb.TagNumber(4) - set update(Update v) { - setField(4, v); - } - + set update(Update v) { setField(4, v); } @$pb.TagNumber(4) $core.bool hasUpdate() => $_has(3); @$pb.TagNumber(4) @@ -1221,10 +1000,7 @@ class Message extends $pb.GeneratedMessage { @$pb.TagNumber(5) Remove get remove => $_getN(4); @$pb.TagNumber(5) - set remove(Remove v) { - setField(5, v); - } - + set remove(Remove v) { setField(5, v); } @$pb.TagNumber(5) $core.bool hasRemove() => $_has(4); @$pb.TagNumber(5) @@ -1235,10 +1011,7 @@ class Message extends $pb.GeneratedMessage { @$pb.TagNumber(6) MessageReceived get messageReceived => $_getN(5); @$pb.TagNumber(6) - set messageReceived(MessageReceived v) { - setField(6, v); - } - + set messageReceived(MessageReceived v) { setField(6, v); } @$pb.TagNumber(6) $core.bool hasMessageReceived() => $_has(5); @$pb.TagNumber(6) @@ -1247,6 +1020,6 @@ class Message extends $pb.GeneratedMessage { MessageReceived ensureMessageReceived() => $_ensure(5); } + const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names'); -const _omitMessageNames = - $core.bool.fromEnvironment('protobuf.omit_message_names'); +const _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names'); diff --git a/frontend/lib/api/generated/midi_mapping.pbenum.dart b/dart/frontend/lib/api_data/generated/midi_mapping.pbenum.dart similarity index 62% rename from frontend/lib/api/generated/midi_mapping.pbenum.dart rename to dart/frontend/lib/api_data/generated/midi_mapping.pbenum.dart index 2faa4b9e..a61eae4c 100644 --- a/frontend/lib/api/generated/midi_mapping.pbenum.dart +++ b/dart/frontend/lib/api_data/generated/midi_mapping.pbenum.dart @@ -14,24 +14,21 @@ import 'dart:core' as $core; import 'package:protobuf/protobuf.dart' as $pb; class Mapping_Mode extends $pb.ProtobufEnum { - static const Mapping_Mode parameter = - Mapping_Mode._(0, _omitEnumNames ? '' : 'parameter'); - static const Mapping_Mode toggle = - Mapping_Mode._(1, _omitEnumNames ? '' : 'toggle'); - static const Mapping_Mode button = - Mapping_Mode._(2, _omitEnumNames ? '' : 'button'); - - static const $core.List values = [ + static const Mapping_Mode parameter = Mapping_Mode._(0, _omitEnumNames ? '' : 'parameter'); + static const Mapping_Mode toggle = Mapping_Mode._(1, _omitEnumNames ? '' : 'toggle'); + static const Mapping_Mode button = Mapping_Mode._(2, _omitEnumNames ? '' : 'button'); + + static const $core.List values = [ parameter, toggle, button, ]; - static final $core.Map<$core.int, Mapping_Mode> _byValue = - $pb.ProtobufEnum.initByValue(values); + static final $core.Map<$core.int, Mapping_Mode> _byValue = $pb.ProtobufEnum.initByValue(values); static Mapping_Mode? valueOf($core.int value) => _byValue[value]; const Mapping_Mode._($core.int v, $core.String n) : super(v, n); } + const _omitEnumNames = $core.bool.fromEnvironment('protobuf.omit_enum_names'); diff --git a/frontend/lib/api/generated/midi_mapping.pbjson.dart b/dart/frontend/lib/api_data/generated/midi_mapping.pbjson.dart similarity index 70% rename from frontend/lib/api/generated/midi_mapping.pbjson.dart rename to dart/frontend/lib/api_data/generated/midi_mapping.pbjson.dart index 24adc6e8..d1de1d3f 100644 --- a/frontend/lib/api/generated/midi_mapping.pbjson.dart +++ b/dart/frontend/lib/api_data/generated/midi_mapping.pbjson.dart @@ -19,14 +19,7 @@ const Mapping$json = { '2': [ {'1': 'midi_channel', '3': 1, '4': 1, '5': 13, '10': 'midiChannel'}, {'1': 'cc_number', '3': 2, '4': 1, '5': 13, '10': 'ccNumber'}, - { - '1': 'mode', - '3': 3, - '4': 1, - '5': 14, - '6': '.shrapnel.midi_mapping.Mapping.Mode', - '10': 'mode' - }, + {'1': 'mode', '3': 3, '4': 1, '5': 14, '6': '.shrapnel.midi_mapping.Mapping.Mode', '10': 'mode'}, {'1': 'parameter_name', '3': 4, '4': 1, '5': 9, '10': 'parameterName'}, {'1': 'preset_id', '3': 5, '4': 1, '5': 13, '10': 'presetId'}, ], @@ -56,49 +49,12 @@ const MidiMessage$json = { '1': 'MidiMessage', '2': [ {'1': 'channel', '3': 1, '4': 1, '5': 13, '10': 'channel'}, - { - '1': 'note_on', - '3': 2, - '4': 1, - '5': 11, - '6': '.shrapnel.midi_mapping.MidiMessage.NoteOn', - '9': 0, - '10': 'noteOn' - }, - { - '1': 'note_off', - '3': 3, - '4': 1, - '5': 11, - '6': '.shrapnel.midi_mapping.MidiMessage.NoteOff', - '9': 0, - '10': 'noteOff' - }, - { - '1': 'control_change', - '3': 4, - '4': 1, - '5': 11, - '6': '.shrapnel.midi_mapping.MidiMessage.ControlChange', - '9': 0, - '10': 'controlChange' - }, - { - '1': 'program_change', - '3': 5, - '4': 1, - '5': 11, - '6': '.shrapnel.midi_mapping.MidiMessage.ProgramChange', - '9': 0, - '10': 'programChange' - }, - ], - '3': [ - MidiMessage_NoteOn$json, - MidiMessage_NoteOff$json, - MidiMessage_ControlChange$json, - MidiMessage_ProgramChange$json + {'1': 'note_on', '3': 2, '4': 1, '5': 11, '6': '.shrapnel.midi_mapping.MidiMessage.NoteOn', '9': 0, '10': 'noteOn'}, + {'1': 'note_off', '3': 3, '4': 1, '5': 11, '6': '.shrapnel.midi_mapping.MidiMessage.NoteOff', '9': 0, '10': 'noteOff'}, + {'1': 'control_change', '3': 4, '4': 1, '5': 11, '6': '.shrapnel.midi_mapping.MidiMessage.ControlChange', '9': 0, '10': 'controlChange'}, + {'1': 'program_change', '3': 5, '4': 1, '5': 11, '6': '.shrapnel.midi_mapping.MidiMessage.ProgramChange', '9': 0, '10': 'programChange'}, ], + '3': [MidiMessage_NoteOn$json, MidiMessage_NoteOff$json, MidiMessage_ControlChange$json, MidiMessage_ProgramChange$json], '8': [ {'1': 'parameters'}, ], @@ -158,14 +114,7 @@ const MappingRecord$json = { '1': 'MappingRecord', '2': [ {'1': 'id', '3': 1, '4': 1, '5': 13, '10': 'id'}, - { - '1': 'mapping', - '3': 2, - '4': 1, - '5': 11, - '6': '.shrapnel.midi_mapping.Mapping', - '10': 'mapping' - }, + {'1': 'mapping', '3': 2, '4': 1, '5': 11, '6': '.shrapnel.midi_mapping.Mapping', '10': 'mapping'}, ], }; @@ -180,21 +129,14 @@ const GetRequest$json = { }; /// Descriptor for `GetRequest`. Decode as a `google.protobuf.DescriptorProto`. -final $typed_data.Uint8List getRequestDescriptor = - $convert.base64Decode('CgpHZXRSZXF1ZXN0'); +final $typed_data.Uint8List getRequestDescriptor = $convert.base64Decode( + 'CgpHZXRSZXF1ZXN0'); @$core.Deprecated('Use createRequestDescriptor instead') const CreateRequest$json = { '1': 'CreateRequest', '2': [ - { - '1': 'mapping', - '3': 1, - '4': 1, - '5': 11, - '6': '.shrapnel.midi_mapping.Mapping', - '10': 'mapping' - }, + {'1': 'mapping', '3': 1, '4': 1, '5': 11, '6': '.shrapnel.midi_mapping.Mapping', '10': 'mapping'}, ], }; @@ -207,14 +149,7 @@ final $typed_data.Uint8List createRequestDescriptor = $convert.base64Decode( const CreateResponse$json = { '1': 'CreateResponse', '2': [ - { - '1': 'mapping', - '3': 1, - '4': 1, - '5': 11, - '6': '.shrapnel.midi_mapping.MappingRecord', - '10': 'mapping' - }, + {'1': 'mapping', '3': 1, '4': 1, '5': 11, '6': '.shrapnel.midi_mapping.MappingRecord', '10': 'mapping'}, ], }; @@ -227,14 +162,7 @@ final $typed_data.Uint8List createResponseDescriptor = $convert.base64Decode( const Update$json = { '1': 'Update', '2': [ - { - '1': 'mapping', - '3': 1, - '4': 1, - '5': 11, - '6': '.shrapnel.midi_mapping.MappingRecord', - '10': 'mapping' - }, + {'1': 'mapping', '3': 1, '4': 1, '5': 11, '6': '.shrapnel.midi_mapping.MappingRecord', '10': 'mapping'}, ], }; @@ -252,21 +180,14 @@ const Remove$json = { }; /// Descriptor for `Remove`. Decode as a `google.protobuf.DescriptorProto`. -final $typed_data.Uint8List removeDescriptor = - $convert.base64Decode('CgZSZW1vdmUSDgoCaWQYASABKA1SAmlk'); +final $typed_data.Uint8List removeDescriptor = $convert.base64Decode( + 'CgZSZW1vdmUSDgoCaWQYASABKA1SAmlk'); @$core.Deprecated('Use messageReceivedDescriptor instead') const MessageReceived$json = { '1': 'MessageReceived', '2': [ - { - '1': 'received_message', - '3': 1, - '4': 1, - '5': 11, - '6': '.shrapnel.midi_mapping.MidiMessage', - '10': 'receivedMessage' - }, + {'1': 'received_message', '3': 1, '4': 1, '5': 11, '6': '.shrapnel.midi_mapping.MidiMessage', '10': 'receivedMessage'}, ], }; @@ -279,60 +200,12 @@ final $typed_data.Uint8List messageReceivedDescriptor = $convert.base64Decode( const Message$json = { '1': 'Message', '2': [ - { - '1': 'get_request', - '3': 1, - '4': 1, - '5': 11, - '6': '.shrapnel.midi_mapping.GetRequest', - '9': 0, - '10': 'getRequest' - }, - { - '1': 'create_request', - '3': 2, - '4': 1, - '5': 11, - '6': '.shrapnel.midi_mapping.CreateRequest', - '9': 0, - '10': 'createRequest' - }, - { - '1': 'create_response', - '3': 3, - '4': 1, - '5': 11, - '6': '.shrapnel.midi_mapping.CreateResponse', - '9': 0, - '10': 'createResponse' - }, - { - '1': 'update', - '3': 4, - '4': 1, - '5': 11, - '6': '.shrapnel.midi_mapping.Update', - '9': 0, - '10': 'update' - }, - { - '1': 'remove', - '3': 5, - '4': 1, - '5': 11, - '6': '.shrapnel.midi_mapping.Remove', - '9': 0, - '10': 'remove' - }, - { - '1': 'message_received', - '3': 6, - '4': 1, - '5': 11, - '6': '.shrapnel.midi_mapping.MessageReceived', - '9': 0, - '10': 'messageReceived' - }, + {'1': 'get_request', '3': 1, '4': 1, '5': 11, '6': '.shrapnel.midi_mapping.GetRequest', '9': 0, '10': 'getRequest'}, + {'1': 'create_request', '3': 2, '4': 1, '5': 11, '6': '.shrapnel.midi_mapping.CreateRequest', '9': 0, '10': 'createRequest'}, + {'1': 'create_response', '3': 3, '4': 1, '5': 11, '6': '.shrapnel.midi_mapping.CreateResponse', '9': 0, '10': 'createResponse'}, + {'1': 'update', '3': 4, '4': 1, '5': 11, '6': '.shrapnel.midi_mapping.Update', '9': 0, '10': 'update'}, + {'1': 'remove', '3': 5, '4': 1, '5': 11, '6': '.shrapnel.midi_mapping.Remove', '9': 0, '10': 'remove'}, + {'1': 'message_received', '3': 6, '4': 1, '5': 11, '6': '.shrapnel.midi_mapping.MessageReceived', '9': 0, '10': 'messageReceived'}, ], '8': [ {'1': 'message'}, @@ -350,3 +223,4 @@ final $typed_data.Uint8List messageDescriptor = $convert.base64Decode( 'cGluZy5SZW1vdmVIAFIGcmVtb3ZlElMKEG1lc3NhZ2VfcmVjZWl2ZWQYBiABKAsyJi5zaHJhcG' '5lbC5taWRpX21hcHBpbmcuTWVzc2FnZVJlY2VpdmVkSABSD21lc3NhZ2VSZWNlaXZlZEIJCgdt' 'ZXNzYWdl'); + diff --git a/frontend/lib/api/generated/midi_mapping.pbserver.dart b/dart/frontend/lib/api_data/generated/midi_mapping.pbserver.dart similarity index 99% rename from frontend/lib/api/generated/midi_mapping.pbserver.dart rename to dart/frontend/lib/api_data/generated/midi_mapping.pbserver.dart index ff2db38c..519159b1 100644 --- a/frontend/lib/api/generated/midi_mapping.pbserver.dart +++ b/dart/frontend/lib/api_data/generated/midi_mapping.pbserver.dart @@ -11,3 +11,4 @@ // ignore_for_file: unnecessary_import, unnecessary_this, unused_import export 'midi_mapping.pb.dart'; + diff --git a/frontend/lib/api/generated/presets.pb.dart b/dart/frontend/lib/api_data/generated/presets.pb.dart similarity index 55% rename from frontend/lib/api/generated/presets.pb.dart rename to dart/frontend/lib/api_data/generated/presets.pb.dart index f478fa82..97a1efc4 100644 --- a/frontend/lib/api/generated/presets.pb.dart +++ b/dart/frontend/lib/api_data/generated/presets.pb.dart @@ -100,18 +100,10 @@ class PresetParameters extends $pb.GeneratedMessage { return $result; } PresetParameters._() : super(); - factory PresetParameters.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory PresetParameters.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo( - _omitMessageNames ? '' : 'PresetParameters', - package: - const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.presets'), - createEmptyInstance: create) + factory PresetParameters.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); + factory PresetParameters.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'PresetParameters', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.presets'), createEmptyInstance: create) ..a<$core.int>(1, _omitFieldNames ? '' : 'ampGain', $pb.PbFieldType.O3) ..a<$core.int>(2, _omitFieldNames ? '' : 'ampChannel', $pb.PbFieldType.O3) ..a<$core.int>(3, _omitFieldNames ? '' : 'bass', $pb.PbFieldType.O3) @@ -119,58 +111,47 @@ class PresetParameters extends $pb.GeneratedMessage { ..a<$core.int>(5, _omitFieldNames ? '' : 'treble', $pb.PbFieldType.O3) ..a<$core.int>(6, _omitFieldNames ? '' : 'contour', $pb.PbFieldType.O3) ..a<$core.int>(7, _omitFieldNames ? '' : 'volume', $pb.PbFieldType.O3) - ..a<$core.int>( - 8, _omitFieldNames ? '' : 'noiseGateThreshold', $pb.PbFieldType.O3) - ..a<$core.int>( - 9, _omitFieldNames ? '' : 'noiseGateHysteresis', $pb.PbFieldType.O3) - ..a<$core.int>( - 10, _omitFieldNames ? '' : 'noiseGateAttack', $pb.PbFieldType.O3) - ..a<$core.int>( - 11, _omitFieldNames ? '' : 'noiseGateHold', $pb.PbFieldType.O3) - ..a<$core.int>( - 12, _omitFieldNames ? '' : 'noiseGateRelease', $pb.PbFieldType.O3) - ..a<$core.int>( - 13, _omitFieldNames ? '' : 'noiseGateBypass', $pb.PbFieldType.O3) + ..a<$core.int>(8, _omitFieldNames ? '' : 'noiseGateThreshold', $pb.PbFieldType.O3) + ..a<$core.int>(9, _omitFieldNames ? '' : 'noiseGateHysteresis', $pb.PbFieldType.O3) + ..a<$core.int>(10, _omitFieldNames ? '' : 'noiseGateAttack', $pb.PbFieldType.O3) + ..a<$core.int>(11, _omitFieldNames ? '' : 'noiseGateHold', $pb.PbFieldType.O3) + ..a<$core.int>(12, _omitFieldNames ? '' : 'noiseGateRelease', $pb.PbFieldType.O3) + ..a<$core.int>(13, _omitFieldNames ? '' : 'noiseGateBypass', $pb.PbFieldType.O3) ..a<$core.int>(14, _omitFieldNames ? '' : 'chorusRate', $pb.PbFieldType.O3) ..a<$core.int>(15, _omitFieldNames ? '' : 'chorusDepth', $pb.PbFieldType.O3) ..a<$core.int>(16, _omitFieldNames ? '' : 'chorusMix', $pb.PbFieldType.O3) - ..a<$core.int>( - 17, _omitFieldNames ? '' : 'chorusBypass', $pb.PbFieldType.O3) + ..a<$core.int>(17, _omitFieldNames ? '' : 'chorusBypass', $pb.PbFieldType.O3) ..a<$core.int>(18, _omitFieldNames ? '' : 'wahPosition', $pb.PbFieldType.O3) ..a<$core.int>(19, _omitFieldNames ? '' : 'wahVocal', $pb.PbFieldType.O3) ..a<$core.int>(20, _omitFieldNames ? '' : 'wahBypass', $pb.PbFieldType.O3) - ..hasRequiredFields = false; + ..hasRequiredFields = false + ; - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') PresetParameters clone() => PresetParameters()..mergeFromMessage(this); - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - PresetParameters copyWith(void Function(PresetParameters) updates) => - super.copyWith((message) => updates(message as PresetParameters)) - as PresetParameters; + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + PresetParameters copyWith(void Function(PresetParameters) updates) => super.copyWith((message) => updates(message as PresetParameters)) as PresetParameters; $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static PresetParameters create() => PresetParameters._(); PresetParameters createEmptyInstance() => create(); - static $pb.PbList createRepeated() => - $pb.PbList(); + static $pb.PbList createRepeated() => $pb.PbList(); @$core.pragma('dart2js:noInline') - static PresetParameters getDefault() => _defaultInstance ??= - $pb.GeneratedMessage.$_defaultFor(create); + static PresetParameters getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); static PresetParameters? _defaultInstance; @$pb.TagNumber(1) $core.int get ampGain => $_getIZ(0); @$pb.TagNumber(1) - set ampGain($core.int v) { - $_setSignedInt32(0, v); - } - + set ampGain($core.int v) { $_setSignedInt32(0, v); } @$pb.TagNumber(1) $core.bool hasAmpGain() => $_has(0); @$pb.TagNumber(1) @@ -179,10 +160,7 @@ class PresetParameters extends $pb.GeneratedMessage { @$pb.TagNumber(2) $core.int get ampChannel => $_getIZ(1); @$pb.TagNumber(2) - set ampChannel($core.int v) { - $_setSignedInt32(1, v); - } - + set ampChannel($core.int v) { $_setSignedInt32(1, v); } @$pb.TagNumber(2) $core.bool hasAmpChannel() => $_has(1); @$pb.TagNumber(2) @@ -191,10 +169,7 @@ class PresetParameters extends $pb.GeneratedMessage { @$pb.TagNumber(3) $core.int get bass => $_getIZ(2); @$pb.TagNumber(3) - set bass($core.int v) { - $_setSignedInt32(2, v); - } - + set bass($core.int v) { $_setSignedInt32(2, v); } @$pb.TagNumber(3) $core.bool hasBass() => $_has(2); @$pb.TagNumber(3) @@ -203,10 +178,7 @@ class PresetParameters extends $pb.GeneratedMessage { @$pb.TagNumber(4) $core.int get middle => $_getIZ(3); @$pb.TagNumber(4) - set middle($core.int v) { - $_setSignedInt32(3, v); - } - + set middle($core.int v) { $_setSignedInt32(3, v); } @$pb.TagNumber(4) $core.bool hasMiddle() => $_has(3); @$pb.TagNumber(4) @@ -215,10 +187,7 @@ class PresetParameters extends $pb.GeneratedMessage { @$pb.TagNumber(5) $core.int get treble => $_getIZ(4); @$pb.TagNumber(5) - set treble($core.int v) { - $_setSignedInt32(4, v); - } - + set treble($core.int v) { $_setSignedInt32(4, v); } @$pb.TagNumber(5) $core.bool hasTreble() => $_has(4); @$pb.TagNumber(5) @@ -227,10 +196,7 @@ class PresetParameters extends $pb.GeneratedMessage { @$pb.TagNumber(6) $core.int get contour => $_getIZ(5); @$pb.TagNumber(6) - set contour($core.int v) { - $_setSignedInt32(5, v); - } - + set contour($core.int v) { $_setSignedInt32(5, v); } @$pb.TagNumber(6) $core.bool hasContour() => $_has(5); @$pb.TagNumber(6) @@ -239,10 +205,7 @@ class PresetParameters extends $pb.GeneratedMessage { @$pb.TagNumber(7) $core.int get volume => $_getIZ(6); @$pb.TagNumber(7) - set volume($core.int v) { - $_setSignedInt32(6, v); - } - + set volume($core.int v) { $_setSignedInt32(6, v); } @$pb.TagNumber(7) $core.bool hasVolume() => $_has(6); @$pb.TagNumber(7) @@ -251,10 +214,7 @@ class PresetParameters extends $pb.GeneratedMessage { @$pb.TagNumber(8) $core.int get noiseGateThreshold => $_getIZ(7); @$pb.TagNumber(8) - set noiseGateThreshold($core.int v) { - $_setSignedInt32(7, v); - } - + set noiseGateThreshold($core.int v) { $_setSignedInt32(7, v); } @$pb.TagNumber(8) $core.bool hasNoiseGateThreshold() => $_has(7); @$pb.TagNumber(8) @@ -263,10 +223,7 @@ class PresetParameters extends $pb.GeneratedMessage { @$pb.TagNumber(9) $core.int get noiseGateHysteresis => $_getIZ(8); @$pb.TagNumber(9) - set noiseGateHysteresis($core.int v) { - $_setSignedInt32(8, v); - } - + set noiseGateHysteresis($core.int v) { $_setSignedInt32(8, v); } @$pb.TagNumber(9) $core.bool hasNoiseGateHysteresis() => $_has(8); @$pb.TagNumber(9) @@ -275,10 +232,7 @@ class PresetParameters extends $pb.GeneratedMessage { @$pb.TagNumber(10) $core.int get noiseGateAttack => $_getIZ(9); @$pb.TagNumber(10) - set noiseGateAttack($core.int v) { - $_setSignedInt32(9, v); - } - + set noiseGateAttack($core.int v) { $_setSignedInt32(9, v); } @$pb.TagNumber(10) $core.bool hasNoiseGateAttack() => $_has(9); @$pb.TagNumber(10) @@ -287,10 +241,7 @@ class PresetParameters extends $pb.GeneratedMessage { @$pb.TagNumber(11) $core.int get noiseGateHold => $_getIZ(10); @$pb.TagNumber(11) - set noiseGateHold($core.int v) { - $_setSignedInt32(10, v); - } - + set noiseGateHold($core.int v) { $_setSignedInt32(10, v); } @$pb.TagNumber(11) $core.bool hasNoiseGateHold() => $_has(10); @$pb.TagNumber(11) @@ -299,10 +250,7 @@ class PresetParameters extends $pb.GeneratedMessage { @$pb.TagNumber(12) $core.int get noiseGateRelease => $_getIZ(11); @$pb.TagNumber(12) - set noiseGateRelease($core.int v) { - $_setSignedInt32(11, v); - } - + set noiseGateRelease($core.int v) { $_setSignedInt32(11, v); } @$pb.TagNumber(12) $core.bool hasNoiseGateRelease() => $_has(11); @$pb.TagNumber(12) @@ -311,10 +259,7 @@ class PresetParameters extends $pb.GeneratedMessage { @$pb.TagNumber(13) $core.int get noiseGateBypass => $_getIZ(12); @$pb.TagNumber(13) - set noiseGateBypass($core.int v) { - $_setSignedInt32(12, v); - } - + set noiseGateBypass($core.int v) { $_setSignedInt32(12, v); } @$pb.TagNumber(13) $core.bool hasNoiseGateBypass() => $_has(12); @$pb.TagNumber(13) @@ -323,10 +268,7 @@ class PresetParameters extends $pb.GeneratedMessage { @$pb.TagNumber(14) $core.int get chorusRate => $_getIZ(13); @$pb.TagNumber(14) - set chorusRate($core.int v) { - $_setSignedInt32(13, v); - } - + set chorusRate($core.int v) { $_setSignedInt32(13, v); } @$pb.TagNumber(14) $core.bool hasChorusRate() => $_has(13); @$pb.TagNumber(14) @@ -335,10 +277,7 @@ class PresetParameters extends $pb.GeneratedMessage { @$pb.TagNumber(15) $core.int get chorusDepth => $_getIZ(14); @$pb.TagNumber(15) - set chorusDepth($core.int v) { - $_setSignedInt32(14, v); - } - + set chorusDepth($core.int v) { $_setSignedInt32(14, v); } @$pb.TagNumber(15) $core.bool hasChorusDepth() => $_has(14); @$pb.TagNumber(15) @@ -347,10 +286,7 @@ class PresetParameters extends $pb.GeneratedMessage { @$pb.TagNumber(16) $core.int get chorusMix => $_getIZ(15); @$pb.TagNumber(16) - set chorusMix($core.int v) { - $_setSignedInt32(15, v); - } - + set chorusMix($core.int v) { $_setSignedInt32(15, v); } @$pb.TagNumber(16) $core.bool hasChorusMix() => $_has(15); @$pb.TagNumber(16) @@ -359,10 +295,7 @@ class PresetParameters extends $pb.GeneratedMessage { @$pb.TagNumber(17) $core.int get chorusBypass => $_getIZ(16); @$pb.TagNumber(17) - set chorusBypass($core.int v) { - $_setSignedInt32(16, v); - } - + set chorusBypass($core.int v) { $_setSignedInt32(16, v); } @$pb.TagNumber(17) $core.bool hasChorusBypass() => $_has(16); @$pb.TagNumber(17) @@ -371,10 +304,7 @@ class PresetParameters extends $pb.GeneratedMessage { @$pb.TagNumber(18) $core.int get wahPosition => $_getIZ(17); @$pb.TagNumber(18) - set wahPosition($core.int v) { - $_setSignedInt32(17, v); - } - + set wahPosition($core.int v) { $_setSignedInt32(17, v); } @$pb.TagNumber(18) $core.bool hasWahPosition() => $_has(17); @$pb.TagNumber(18) @@ -383,10 +313,7 @@ class PresetParameters extends $pb.GeneratedMessage { @$pb.TagNumber(19) $core.int get wahVocal => $_getIZ(18); @$pb.TagNumber(19) - set wahVocal($core.int v) { - $_setSignedInt32(18, v); - } - + set wahVocal($core.int v) { $_setSignedInt32(18, v); } @$pb.TagNumber(19) $core.bool hasWahVocal() => $_has(18); @$pb.TagNumber(19) @@ -395,10 +322,7 @@ class PresetParameters extends $pb.GeneratedMessage { @$pb.TagNumber(20) $core.int get wahBypass => $_getIZ(19); @$pb.TagNumber(20) - set wahBypass($core.int v) { - $_setSignedInt32(19, v); - } - + set wahBypass($core.int v) { $_setSignedInt32(19, v); } @$pb.TagNumber(20) $core.bool hasWahBypass() => $_has(19); @$pb.TagNumber(20) @@ -420,32 +344,25 @@ class Preset extends $pb.GeneratedMessage { return $result; } Preset._() : super(); - factory Preset.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory Preset.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo( - _omitMessageNames ? '' : 'Preset', - package: - const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.presets'), - createEmptyInstance: create) - ..aOS(1, _omitFieldNames ? '' : 'name') - ..aOM(2, _omitFieldNames ? '' : 'parameters', - subBuilder: PresetParameters.create) - ..hasRequiredFields = false; + factory Preset.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); + factory Preset.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Preset', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.presets'), createEmptyInstance: create) + ..aOS(1, _omitFieldNames ? '' : 'name') + ..aOM(2, _omitFieldNames ? '' : 'parameters', subBuilder: PresetParameters.create) + ..hasRequiredFields = false + ; + + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') Preset clone() => Preset()..mergeFromMessage(this); - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - Preset copyWith(void Function(Preset) updates) => - super.copyWith((message) => updates(message as Preset)) as Preset; + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + Preset copyWith(void Function(Preset) updates) => super.copyWith((message) => updates(message as Preset)) as Preset; $pb.BuilderInfo get info_ => _i; @@ -454,18 +371,14 @@ class Preset extends $pb.GeneratedMessage { Preset createEmptyInstance() => create(); static $pb.PbList createRepeated() => $pb.PbList(); @$core.pragma('dart2js:noInline') - static Preset getDefault() => - _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static Preset getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); static Preset? _defaultInstance; /// The name given by the user to the preset @$pb.TagNumber(1) $core.String get name => $_getSZ(0); @$pb.TagNumber(1) - set name($core.String v) { - $_setString(0, v); - } - + set name($core.String v) { $_setString(0, v); } @$pb.TagNumber(1) $core.bool hasName() => $_has(0); @$pb.TagNumber(1) @@ -475,10 +388,7 @@ class Preset extends $pb.GeneratedMessage { @$pb.TagNumber(2) PresetParameters get parameters => $_getN(1); @$pb.TagNumber(2) - set parameters(PresetParameters v) { - setField(2, v); - } - + set parameters(PresetParameters v) { setField(2, v); } @$pb.TagNumber(2) $core.bool hasParameters() => $_has(1); @$pb.TagNumber(2) @@ -502,53 +412,41 @@ class PresetRecord extends $pb.GeneratedMessage { return $result; } PresetRecord._() : super(); - factory PresetRecord.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory PresetRecord.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo( - _omitMessageNames ? '' : 'PresetRecord', - package: - const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.presets'), - createEmptyInstance: create) + factory PresetRecord.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); + factory PresetRecord.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'PresetRecord', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.presets'), createEmptyInstance: create) ..a<$core.int>(1, _omitFieldNames ? '' : 'id', $pb.PbFieldType.OU3) ..aOM(2, _omitFieldNames ? '' : 'preset', subBuilder: Preset.create) - ..hasRequiredFields = false; + ..hasRequiredFields = false + ; - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') PresetRecord clone() => PresetRecord()..mergeFromMessage(this); - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - PresetRecord copyWith(void Function(PresetRecord) updates) => - super.copyWith((message) => updates(message as PresetRecord)) - as PresetRecord; + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + PresetRecord copyWith(void Function(PresetRecord) updates) => super.copyWith((message) => updates(message as PresetRecord)) as PresetRecord; $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static PresetRecord create() => PresetRecord._(); PresetRecord createEmptyInstance() => create(); - static $pb.PbList createRepeated() => - $pb.PbList(); + static $pb.PbList createRepeated() => $pb.PbList(); @$core.pragma('dart2js:noInline') - static PresetRecord getDefault() => _defaultInstance ??= - $pb.GeneratedMessage.$_defaultFor(create); + static PresetRecord getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); static PresetRecord? _defaultInstance; /// A number used to identify the preset @$pb.TagNumber(1) $core.int get id => $_getIZ(0); @$pb.TagNumber(1) - set id($core.int v) { - $_setUnsignedInt32(0, v); - } - + set id($core.int v) { $_setUnsignedInt32(0, v); } @$pb.TagNumber(1) $core.bool hasId() => $_has(0); @$pb.TagNumber(1) @@ -557,10 +455,7 @@ class PresetRecord extends $pb.GeneratedMessage { @$pb.TagNumber(2) Preset get preset => $_getN(1); @$pb.TagNumber(2) - set preset(Preset v) { - setField(2, v); - } - + set preset(Preset v) { setField(2, v); } @$pb.TagNumber(2) $core.bool hasPreset() => $_has(1); @$pb.TagNumber(2) @@ -572,29 +467,23 @@ class PresetRecord extends $pb.GeneratedMessage { class Initialise extends $pb.GeneratedMessage { factory Initialise() => create(); Initialise._() : super(); - factory Initialise.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory Initialise.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo( - _omitMessageNames ? '' : 'Initialise', - package: - const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.presets'), - createEmptyInstance: create) - ..hasRequiredFields = false; - - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + factory Initialise.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); + factory Initialise.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Initialise', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.presets'), createEmptyInstance: create) + ..hasRequiredFields = false + ; + + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') Initialise clone() => Initialise()..mergeFromMessage(this); - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - Initialise copyWith(void Function(Initialise) updates) => - super.copyWith((message) => updates(message as Initialise)) as Initialise; + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + Initialise copyWith(void Function(Initialise) updates) => super.copyWith((message) => updates(message as Initialise)) as Initialise; $pb.BuilderInfo get info_ => _i; @@ -603,8 +492,7 @@ class Initialise extends $pb.GeneratedMessage { Initialise createEmptyInstance() => create(); static $pb.PbList createRepeated() => $pb.PbList(); @$core.pragma('dart2js:noInline') - static Initialise getDefault() => _defaultInstance ??= - $pb.GeneratedMessage.$_defaultFor(create); + static Initialise getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); static Initialise? _defaultInstance; } @@ -619,31 +507,24 @@ class Notify extends $pb.GeneratedMessage { return $result; } Notify._() : super(); - factory Notify.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory Notify.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo( - _omitMessageNames ? '' : 'Notify', - package: - const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.presets'), - createEmptyInstance: create) - ..aOM(1, _omitFieldNames ? '' : 'preset', - subBuilder: PresetRecord.create) - ..hasRequiredFields = false; - - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + factory Notify.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); + factory Notify.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Notify', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.presets'), createEmptyInstance: create) + ..aOM(1, _omitFieldNames ? '' : 'preset', subBuilder: PresetRecord.create) + ..hasRequiredFields = false + ; + + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') Notify clone() => Notify()..mergeFromMessage(this); - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - Notify copyWith(void Function(Notify) updates) => - super.copyWith((message) => updates(message as Notify)) as Notify; + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + Notify copyWith(void Function(Notify) updates) => super.copyWith((message) => updates(message as Notify)) as Notify; $pb.BuilderInfo get info_ => _i; @@ -652,17 +533,13 @@ class Notify extends $pb.GeneratedMessage { Notify createEmptyInstance() => create(); static $pb.PbList createRepeated() => $pb.PbList(); @$core.pragma('dart2js:noInline') - static Notify getDefault() => - _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static Notify getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); static Notify? _defaultInstance; @$pb.TagNumber(1) PresetRecord get preset => $_getN(0); @$pb.TagNumber(1) - set preset(PresetRecord v) { - setField(1, v); - } - + set preset(PresetRecord v) { setField(1, v); } @$pb.TagNumber(1) $core.bool hasPreset() => $_has(0); @$pb.TagNumber(1) @@ -682,30 +559,24 @@ class Create extends $pb.GeneratedMessage { return $result; } Create._() : super(); - factory Create.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory Create.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo( - _omitMessageNames ? '' : 'Create', - package: - const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.presets'), - createEmptyInstance: create) + factory Create.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); + factory Create.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Create', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.presets'), createEmptyInstance: create) ..aOM(1, _omitFieldNames ? '' : 'preset', subBuilder: Preset.create) - ..hasRequiredFields = false; + ..hasRequiredFields = false + ; - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') Create clone() => Create()..mergeFromMessage(this); - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - Create copyWith(void Function(Create) updates) => - super.copyWith((message) => updates(message as Create)) as Create; + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + Create copyWith(void Function(Create) updates) => super.copyWith((message) => updates(message as Create)) as Create; $pb.BuilderInfo get info_ => _i; @@ -714,17 +585,13 @@ class Create extends $pb.GeneratedMessage { Create createEmptyInstance() => create(); static $pb.PbList createRepeated() => $pb.PbList(); @$core.pragma('dart2js:noInline') - static Create getDefault() => - _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static Create getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); static Create? _defaultInstance; @$pb.TagNumber(1) Preset get preset => $_getN(0); @$pb.TagNumber(1) - set preset(Preset v) { - setField(1, v); - } - + set preset(Preset v) { setField(1, v); } @$pb.TagNumber(1) $core.bool hasPreset() => $_has(0); @$pb.TagNumber(1) @@ -744,31 +611,24 @@ class Update extends $pb.GeneratedMessage { return $result; } Update._() : super(); - factory Update.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory Update.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo( - _omitMessageNames ? '' : 'Update', - package: - const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.presets'), - createEmptyInstance: create) - ..aOM(1, _omitFieldNames ? '' : 'preset', - subBuilder: PresetRecord.create) - ..hasRequiredFields = false; - - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + factory Update.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); + factory Update.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Update', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.presets'), createEmptyInstance: create) + ..aOM(1, _omitFieldNames ? '' : 'preset', subBuilder: PresetRecord.create) + ..hasRequiredFields = false + ; + + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') Update clone() => Update()..mergeFromMessage(this); - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - Update copyWith(void Function(Update) updates) => - super.copyWith((message) => updates(message as Update)) as Update; + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + Update copyWith(void Function(Update) updates) => super.copyWith((message) => updates(message as Update)) as Update; $pb.BuilderInfo get info_ => _i; @@ -777,17 +637,13 @@ class Update extends $pb.GeneratedMessage { Update createEmptyInstance() => create(); static $pb.PbList createRepeated() => $pb.PbList(); @$core.pragma('dart2js:noInline') - static Update getDefault() => - _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static Update getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); static Update? _defaultInstance; @$pb.TagNumber(1) PresetRecord get preset => $_getN(0); @$pb.TagNumber(1) - set preset(PresetRecord v) { - setField(1, v); - } - + set preset(PresetRecord v) { setField(1, v); } @$pb.TagNumber(1) $core.bool hasPreset() => $_has(0); @$pb.TagNumber(1) @@ -807,30 +663,24 @@ class Remove extends $pb.GeneratedMessage { return $result; } Remove._() : super(); - factory Remove.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory Remove.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo( - _omitMessageNames ? '' : 'Remove', - package: - const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.presets'), - createEmptyInstance: create) + factory Remove.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); + factory Remove.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Remove', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.presets'), createEmptyInstance: create) ..a<$core.int>(1, _omitFieldNames ? '' : 'id', $pb.PbFieldType.OU3) - ..hasRequiredFields = false; + ..hasRequiredFields = false + ; - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') Remove clone() => Remove()..mergeFromMessage(this); - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - Remove copyWith(void Function(Remove) updates) => - super.copyWith((message) => updates(message as Remove)) as Remove; + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + Remove copyWith(void Function(Remove) updates) => super.copyWith((message) => updates(message as Remove)) as Remove; $pb.BuilderInfo get info_ => _i; @@ -839,24 +689,27 @@ class Remove extends $pb.GeneratedMessage { Remove createEmptyInstance() => create(); static $pb.PbList createRepeated() => $pb.PbList(); @$core.pragma('dart2js:noInline') - static Remove getDefault() => - _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static Remove getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); static Remove? _defaultInstance; @$pb.TagNumber(1) $core.int get id => $_getIZ(0); @$pb.TagNumber(1) - set id($core.int v) { - $_setUnsignedInt32(0, v); - } - + set id($core.int v) { $_setUnsignedInt32(0, v); } @$pb.TagNumber(1) $core.bool hasId() => $_has(0); @$pb.TagNumber(1) void clearId() => clearField(1); } -enum Message_Message { initialise, notify, create_3, update, remove, notSet } +enum Message_Message { + initialise, + notify, + create_3, + update, + remove, + notSet +} class Message extends $pb.GeneratedMessage { factory Message({ @@ -885,44 +738,37 @@ class Message extends $pb.GeneratedMessage { return $result; } Message._() : super(); - factory Message.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory Message.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); + factory Message.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); + factory Message.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); static const $core.Map<$core.int, Message_Message> _Message_MessageByTag = { - 1: Message_Message.initialise, - 2: Message_Message.notify, - 3: Message_Message.create_3, - 4: Message_Message.update, - 5: Message_Message.remove, - 0: Message_Message.notSet + 1 : Message_Message.initialise, + 2 : Message_Message.notify, + 3 : Message_Message.create_3, + 4 : Message_Message.update, + 5 : Message_Message.remove, + 0 : Message_Message.notSet }; - static final $pb.BuilderInfo _i = $pb.BuilderInfo( - _omitMessageNames ? '' : 'Message', - package: - const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.presets'), - createEmptyInstance: create) + static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Message', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.presets'), createEmptyInstance: create) ..oo(0, [1, 2, 3, 4, 5]) - ..aOM(1, _omitFieldNames ? '' : 'initialise', - subBuilder: Initialise.create) + ..aOM(1, _omitFieldNames ? '' : 'initialise', subBuilder: Initialise.create) ..aOM(2, _omitFieldNames ? '' : 'notify', subBuilder: Notify.create) ..aOM(3, _omitFieldNames ? '' : 'create', subBuilder: Create.create) ..aOM(4, _omitFieldNames ? '' : 'update', subBuilder: Update.create) ..aOM(5, _omitFieldNames ? '' : 'remove', subBuilder: Remove.create) - ..hasRequiredFields = false; + ..hasRequiredFields = false + ; - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') Message clone() => Message()..mergeFromMessage(this); - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - Message copyWith(void Function(Message) updates) => - super.copyWith((message) => updates(message as Message)) as Message; + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + Message copyWith(void Function(Message) updates) => super.copyWith((message) => updates(message as Message)) as Message; $pb.BuilderInfo get info_ => _i; @@ -931,8 +777,7 @@ class Message extends $pb.GeneratedMessage { Message createEmptyInstance() => create(); static $pb.PbList createRepeated() => $pb.PbList(); @$core.pragma('dart2js:noInline') - static Message getDefault() => - _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static Message getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); static Message? _defaultInstance; Message_Message whichMessage() => _Message_MessageByTag[$_whichOneof(0)]!; @@ -941,10 +786,7 @@ class Message extends $pb.GeneratedMessage { @$pb.TagNumber(1) Initialise get initialise => $_getN(0); @$pb.TagNumber(1) - set initialise(Initialise v) { - setField(1, v); - } - + set initialise(Initialise v) { setField(1, v); } @$pb.TagNumber(1) $core.bool hasInitialise() => $_has(0); @$pb.TagNumber(1) @@ -955,10 +797,7 @@ class Message extends $pb.GeneratedMessage { @$pb.TagNumber(2) Notify get notify => $_getN(1); @$pb.TagNumber(2) - set notify(Notify v) { - setField(2, v); - } - + set notify(Notify v) { setField(2, v); } @$pb.TagNumber(2) $core.bool hasNotify() => $_has(1); @$pb.TagNumber(2) @@ -969,10 +808,7 @@ class Message extends $pb.GeneratedMessage { @$pb.TagNumber(3) Create get create_3 => $_getN(2); @$pb.TagNumber(3) - set create_3(Create v) { - setField(3, v); - } - + set create_3(Create v) { setField(3, v); } @$pb.TagNumber(3) $core.bool hasCreate_3() => $_has(2); @$pb.TagNumber(3) @@ -983,10 +819,7 @@ class Message extends $pb.GeneratedMessage { @$pb.TagNumber(4) Update get update => $_getN(3); @$pb.TagNumber(4) - set update(Update v) { - setField(4, v); - } - + set update(Update v) { setField(4, v); } @$pb.TagNumber(4) $core.bool hasUpdate() => $_has(3); @$pb.TagNumber(4) @@ -997,10 +830,7 @@ class Message extends $pb.GeneratedMessage { @$pb.TagNumber(5) Remove get remove => $_getN(4); @$pb.TagNumber(5) - set remove(Remove v) { - setField(5, v); - } - + set remove(Remove v) { setField(5, v); } @$pb.TagNumber(5) $core.bool hasRemove() => $_has(4); @$pb.TagNumber(5) @@ -1009,6 +839,6 @@ class Message extends $pb.GeneratedMessage { Remove ensureRemove() => $_ensure(4); } + const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names'); -const _omitMessageNames = - $core.bool.fromEnvironment('protobuf.omit_message_names'); +const _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names'); diff --git a/frontend/lib/api/generated/presets.pbenum.dart b/dart/frontend/lib/api_data/generated/presets.pbenum.dart similarity index 99% rename from frontend/lib/api/generated/presets.pbenum.dart rename to dart/frontend/lib/api_data/generated/presets.pbenum.dart index bc37d711..f7be615d 100644 --- a/frontend/lib/api/generated/presets.pbenum.dart +++ b/dart/frontend/lib/api_data/generated/presets.pbenum.dart @@ -8,3 +8,4 @@ // ignore_for_file: constant_identifier_names, library_prefixes // ignore_for_file: non_constant_identifier_names, prefer_final_fields // ignore_for_file: unnecessary_import, unnecessary_this, unused_import + diff --git a/frontend/lib/api/generated/presets.pbjson.dart b/dart/frontend/lib/api_data/generated/presets.pbjson.dart similarity index 72% rename from frontend/lib/api/generated/presets.pbjson.dart rename to dart/frontend/lib/api_data/generated/presets.pbjson.dart index 932d87e3..fe5f58a4 100644 --- a/frontend/lib/api/generated/presets.pbjson.dart +++ b/dart/frontend/lib/api_data/generated/presets.pbjson.dart @@ -24,42 +24,12 @@ const PresetParameters$json = { {'1': 'treble', '3': 5, '4': 1, '5': 5, '10': 'treble'}, {'1': 'contour', '3': 6, '4': 1, '5': 5, '10': 'contour'}, {'1': 'volume', '3': 7, '4': 1, '5': 5, '10': 'volume'}, - { - '1': 'noise_gate_threshold', - '3': 8, - '4': 1, - '5': 5, - '10': 'noiseGateThreshold' - }, - { - '1': 'noise_gate_hysteresis', - '3': 9, - '4': 1, - '5': 5, - '10': 'noiseGateHysteresis' - }, - { - '1': 'noise_gate_attack', - '3': 10, - '4': 1, - '5': 5, - '10': 'noiseGateAttack' - }, + {'1': 'noise_gate_threshold', '3': 8, '4': 1, '5': 5, '10': 'noiseGateThreshold'}, + {'1': 'noise_gate_hysteresis', '3': 9, '4': 1, '5': 5, '10': 'noiseGateHysteresis'}, + {'1': 'noise_gate_attack', '3': 10, '4': 1, '5': 5, '10': 'noiseGateAttack'}, {'1': 'noise_gate_hold', '3': 11, '4': 1, '5': 5, '10': 'noiseGateHold'}, - { - '1': 'noise_gate_release', - '3': 12, - '4': 1, - '5': 5, - '10': 'noiseGateRelease' - }, - { - '1': 'noise_gate_bypass', - '3': 13, - '4': 1, - '5': 5, - '10': 'noiseGateBypass' - }, + {'1': 'noise_gate_release', '3': 12, '4': 1, '5': 5, '10': 'noiseGateRelease'}, + {'1': 'noise_gate_bypass', '3': 13, '4': 1, '5': 5, '10': 'noiseGateBypass'}, {'1': 'chorus_rate', '3': 14, '4': 1, '5': 5, '10': 'chorusRate'}, {'1': 'chorus_depth', '3': 15, '4': 1, '5': 5, '10': 'chorusDepth'}, {'1': 'chorus_mix', '3': 16, '4': 1, '5': 5, '10': 'chorusMix'}, @@ -91,14 +61,7 @@ const Preset$json = { '1': 'Preset', '2': [ {'1': 'name', '3': 1, '4': 1, '5': 9, '10': 'name'}, - { - '1': 'parameters', - '3': 2, - '4': 1, - '5': 11, - '6': '.shrapnel.presets.PresetParameters', - '10': 'parameters' - }, + {'1': 'parameters', '3': 2, '4': 1, '5': 11, '6': '.shrapnel.presets.PresetParameters', '10': 'parameters'}, ], }; @@ -112,14 +75,7 @@ const PresetRecord$json = { '1': 'PresetRecord', '2': [ {'1': 'id', '3': 1, '4': 1, '5': 13, '10': 'id'}, - { - '1': 'preset', - '3': 2, - '4': 1, - '5': 11, - '6': '.shrapnel.presets.Preset', - '10': 'preset' - }, + {'1': 'preset', '3': 2, '4': 1, '5': 11, '6': '.shrapnel.presets.Preset', '10': 'preset'}, ], }; @@ -134,21 +90,14 @@ const Initialise$json = { }; /// Descriptor for `Initialise`. Decode as a `google.protobuf.DescriptorProto`. -final $typed_data.Uint8List initialiseDescriptor = - $convert.base64Decode('CgpJbml0aWFsaXNl'); +final $typed_data.Uint8List initialiseDescriptor = $convert.base64Decode( + 'CgpJbml0aWFsaXNl'); @$core.Deprecated('Use notifyDescriptor instead') const Notify$json = { '1': 'Notify', '2': [ - { - '1': 'preset', - '3': 1, - '4': 1, - '5': 11, - '6': '.shrapnel.presets.PresetRecord', - '10': 'preset' - }, + {'1': 'preset', '3': 1, '4': 1, '5': 11, '6': '.shrapnel.presets.PresetRecord', '10': 'preset'}, ], }; @@ -161,14 +110,7 @@ final $typed_data.Uint8List notifyDescriptor = $convert.base64Decode( const Create$json = { '1': 'Create', '2': [ - { - '1': 'preset', - '3': 1, - '4': 1, - '5': 11, - '6': '.shrapnel.presets.Preset', - '10': 'preset' - }, + {'1': 'preset', '3': 1, '4': 1, '5': 11, '6': '.shrapnel.presets.Preset', '10': 'preset'}, ], }; @@ -181,14 +123,7 @@ final $typed_data.Uint8List createDescriptor = $convert.base64Decode( const Update$json = { '1': 'Update', '2': [ - { - '1': 'preset', - '3': 1, - '4': 1, - '5': 11, - '6': '.shrapnel.presets.PresetRecord', - '10': 'preset' - }, + {'1': 'preset', '3': 1, '4': 1, '5': 11, '6': '.shrapnel.presets.PresetRecord', '10': 'preset'}, ], }; @@ -206,58 +141,18 @@ const Remove$json = { }; /// Descriptor for `Remove`. Decode as a `google.protobuf.DescriptorProto`. -final $typed_data.Uint8List removeDescriptor = - $convert.base64Decode('CgZSZW1vdmUSDgoCaWQYASABKA1SAmlk'); +final $typed_data.Uint8List removeDescriptor = $convert.base64Decode( + 'CgZSZW1vdmUSDgoCaWQYASABKA1SAmlk'); @$core.Deprecated('Use messageDescriptor instead') const Message$json = { '1': 'Message', '2': [ - { - '1': 'initialise', - '3': 1, - '4': 1, - '5': 11, - '6': '.shrapnel.presets.Initialise', - '9': 0, - '10': 'initialise' - }, - { - '1': 'notify', - '3': 2, - '4': 1, - '5': 11, - '6': '.shrapnel.presets.Notify', - '9': 0, - '10': 'notify' - }, - { - '1': 'create', - '3': 3, - '4': 1, - '5': 11, - '6': '.shrapnel.presets.Create', - '9': 0, - '10': 'create' - }, - { - '1': 'update', - '3': 4, - '4': 1, - '5': 11, - '6': '.shrapnel.presets.Update', - '9': 0, - '10': 'update' - }, - { - '1': 'remove', - '3': 5, - '4': 1, - '5': 11, - '6': '.shrapnel.presets.Remove', - '9': 0, - '10': 'remove' - }, + {'1': 'initialise', '3': 1, '4': 1, '5': 11, '6': '.shrapnel.presets.Initialise', '9': 0, '10': 'initialise'}, + {'1': 'notify', '3': 2, '4': 1, '5': 11, '6': '.shrapnel.presets.Notify', '9': 0, '10': 'notify'}, + {'1': 'create', '3': 3, '4': 1, '5': 11, '6': '.shrapnel.presets.Create', '9': 0, '10': 'create'}, + {'1': 'update', '3': 4, '4': 1, '5': 11, '6': '.shrapnel.presets.Update', '9': 0, '10': 'update'}, + {'1': 'remove', '3': 5, '4': 1, '5': 11, '6': '.shrapnel.presets.Remove', '9': 0, '10': 'remove'}, ], '8': [ {'1': 'message'}, @@ -272,3 +167,4 @@ final $typed_data.Uint8List messageDescriptor = $convert.base64Decode( 'VIAFIGY3JlYXRlEjIKBnVwZGF0ZRgEIAEoCzIYLnNocmFwbmVsLnByZXNldHMuVXBkYXRlSABS' 'BnVwZGF0ZRIyCgZyZW1vdmUYBSABKAsyGC5zaHJhcG5lbC5wcmVzZXRzLlJlbW92ZUgAUgZyZW' '1vdmVCCQoHbWVzc2FnZQ=='); + diff --git a/frontend/lib/api/generated/presets.pbserver.dart b/dart/frontend/lib/api_data/generated/presets.pbserver.dart similarity index 99% rename from frontend/lib/api/generated/presets.pbserver.dart rename to dart/frontend/lib/api_data/generated/presets.pbserver.dart index d4c3e511..05e67634 100644 --- a/frontend/lib/api/generated/presets.pbserver.dart +++ b/dart/frontend/lib/api_data/generated/presets.pbserver.dart @@ -11,3 +11,4 @@ // ignore_for_file: unnecessary_import, unnecessary_this, unused_import export 'presets.pb.dart'; + diff --git a/dart/frontend/lib/api_data/generated/selected_preset.pb.dart b/dart/frontend/lib/api_data/generated/selected_preset.pb.dart new file mode 100644 index 00000000..cd657333 --- /dev/null +++ b/dart/frontend/lib/api_data/generated/selected_preset.pb.dart @@ -0,0 +1,251 @@ +// +// Generated code. Do not modify. +// source: selected_preset.proto +// +// @dart = 2.12 + +// ignore_for_file: annotate_overrides, camel_case_types, comment_references +// ignore_for_file: constant_identifier_names, library_prefixes +// ignore_for_file: non_constant_identifier_names, prefer_final_fields +// ignore_for_file: unnecessary_import, unnecessary_this, unused_import + +import 'dart:core' as $core; + +import 'package:protobuf/protobuf.dart' as $pb; + +class Read extends $pb.GeneratedMessage { + factory Read() => create(); + Read._() : super(); + factory Read.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); + factory Read.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Read', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.selected_preset'), createEmptyInstance: create) + ..hasRequiredFields = false + ; + + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') + Read clone() => Read()..mergeFromMessage(this); + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + Read copyWith(void Function(Read) updates) => super.copyWith((message) => updates(message as Read)) as Read; + + $pb.BuilderInfo get info_ => _i; + + @$core.pragma('dart2js:noInline') + static Read create() => Read._(); + Read createEmptyInstance() => create(); + static $pb.PbList createRepeated() => $pb.PbList(); + @$core.pragma('dart2js:noInline') + static Read getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static Read? _defaultInstance; +} + +class Notify extends $pb.GeneratedMessage { + factory Notify({ + $core.int? id, + }) { + final $result = create(); + if (id != null) { + $result.id = id; + } + return $result; + } + Notify._() : super(); + factory Notify.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); + factory Notify.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Notify', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.selected_preset'), createEmptyInstance: create) + ..a<$core.int>(1, _omitFieldNames ? '' : 'id', $pb.PbFieldType.OU3) + ..hasRequiredFields = false + ; + + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') + Notify clone() => Notify()..mergeFromMessage(this); + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + Notify copyWith(void Function(Notify) updates) => super.copyWith((message) => updates(message as Notify)) as Notify; + + $pb.BuilderInfo get info_ => _i; + + @$core.pragma('dart2js:noInline') + static Notify create() => Notify._(); + Notify createEmptyInstance() => create(); + static $pb.PbList createRepeated() => $pb.PbList(); + @$core.pragma('dart2js:noInline') + static Notify getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static Notify? _defaultInstance; + + @$pb.TagNumber(1) + $core.int get id => $_getIZ(0); + @$pb.TagNumber(1) + set id($core.int v) { $_setUnsignedInt32(0, v); } + @$pb.TagNumber(1) + $core.bool hasId() => $_has(0); + @$pb.TagNumber(1) + void clearId() => clearField(1); +} + +class Write extends $pb.GeneratedMessage { + factory Write({ + $core.int? id, + }) { + final $result = create(); + if (id != null) { + $result.id = id; + } + return $result; + } + Write._() : super(); + factory Write.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); + factory Write.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Write', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.selected_preset'), createEmptyInstance: create) + ..a<$core.int>(1, _omitFieldNames ? '' : 'id', $pb.PbFieldType.OU3) + ..hasRequiredFields = false + ; + + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') + Write clone() => Write()..mergeFromMessage(this); + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + Write copyWith(void Function(Write) updates) => super.copyWith((message) => updates(message as Write)) as Write; + + $pb.BuilderInfo get info_ => _i; + + @$core.pragma('dart2js:noInline') + static Write create() => Write._(); + Write createEmptyInstance() => create(); + static $pb.PbList createRepeated() => $pb.PbList(); + @$core.pragma('dart2js:noInline') + static Write getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static Write? _defaultInstance; + + @$pb.TagNumber(1) + $core.int get id => $_getIZ(0); + @$pb.TagNumber(1) + set id($core.int v) { $_setUnsignedInt32(0, v); } + @$pb.TagNumber(1) + $core.bool hasId() => $_has(0); + @$pb.TagNumber(1) + void clearId() => clearField(1); +} + +enum Message_Message { + read, + notify, + write, + notSet +} + +class Message extends $pb.GeneratedMessage { + factory Message({ + Read? read, + Notify? notify, + Write? write, + }) { + final $result = create(); + if (read != null) { + $result.read = read; + } + if (notify != null) { + $result.notify = notify; + } + if (write != null) { + $result.write = write; + } + return $result; + } + Message._() : super(); + factory Message.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); + factory Message.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); + + static const $core.Map<$core.int, Message_Message> _Message_MessageByTag = { + 1 : Message_Message.read, + 2 : Message_Message.notify, + 3 : Message_Message.write, + 0 : Message_Message.notSet + }; + static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Message', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.selected_preset'), createEmptyInstance: create) + ..oo(0, [1, 2, 3]) + ..aOM(1, _omitFieldNames ? '' : 'read', subBuilder: Read.create) + ..aOM(2, _omitFieldNames ? '' : 'notify', subBuilder: Notify.create) + ..aOM(3, _omitFieldNames ? '' : 'write', subBuilder: Write.create) + ..hasRequiredFields = false + ; + + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') + Message clone() => Message()..mergeFromMessage(this); + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + Message copyWith(void Function(Message) updates) => super.copyWith((message) => updates(message as Message)) as Message; + + $pb.BuilderInfo get info_ => _i; + + @$core.pragma('dart2js:noInline') + static Message create() => Message._(); + Message createEmptyInstance() => create(); + static $pb.PbList createRepeated() => $pb.PbList(); + @$core.pragma('dart2js:noInline') + static Message getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static Message? _defaultInstance; + + Message_Message whichMessage() => _Message_MessageByTag[$_whichOneof(0)]!; + void clearMessage() => clearField($_whichOneof(0)); + + @$pb.TagNumber(1) + Read get read => $_getN(0); + @$pb.TagNumber(1) + set read(Read v) { setField(1, v); } + @$pb.TagNumber(1) + $core.bool hasRead() => $_has(0); + @$pb.TagNumber(1) + void clearRead() => clearField(1); + @$pb.TagNumber(1) + Read ensureRead() => $_ensure(0); + + @$pb.TagNumber(2) + Notify get notify => $_getN(1); + @$pb.TagNumber(2) + set notify(Notify v) { setField(2, v); } + @$pb.TagNumber(2) + $core.bool hasNotify() => $_has(1); + @$pb.TagNumber(2) + void clearNotify() => clearField(2); + @$pb.TagNumber(2) + Notify ensureNotify() => $_ensure(1); + + @$pb.TagNumber(3) + Write get write => $_getN(2); + @$pb.TagNumber(3) + set write(Write v) { setField(3, v); } + @$pb.TagNumber(3) + $core.bool hasWrite() => $_has(2); + @$pb.TagNumber(3) + void clearWrite() => clearField(3); + @$pb.TagNumber(3) + Write ensureWrite() => $_ensure(2); +} + + +const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names'); +const _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names'); diff --git a/frontend/lib/api/generated/selected_preset.pbenum.dart b/dart/frontend/lib/api_data/generated/selected_preset.pbenum.dart similarity index 99% rename from frontend/lib/api/generated/selected_preset.pbenum.dart rename to dart/frontend/lib/api_data/generated/selected_preset.pbenum.dart index 0952a0a2..dd68bd34 100644 --- a/frontend/lib/api/generated/selected_preset.pbenum.dart +++ b/dart/frontend/lib/api_data/generated/selected_preset.pbenum.dart @@ -8,3 +8,4 @@ // ignore_for_file: constant_identifier_names, library_prefixes // ignore_for_file: non_constant_identifier_names, prefer_final_fields // ignore_for_file: unnecessary_import, unnecessary_this, unused_import + diff --git a/frontend/lib/api/generated/selected_preset.pbjson.dart b/dart/frontend/lib/api_data/generated/selected_preset.pbjson.dart similarity index 71% rename from frontend/lib/api/generated/selected_preset.pbjson.dart rename to dart/frontend/lib/api_data/generated/selected_preset.pbjson.dart index bcc1c45e..4750e6d2 100644 --- a/frontend/lib/api/generated/selected_preset.pbjson.dart +++ b/dart/frontend/lib/api_data/generated/selected_preset.pbjson.dart @@ -19,7 +19,8 @@ const Read$json = { }; /// Descriptor for `Read`. Decode as a `google.protobuf.DescriptorProto`. -final $typed_data.Uint8List readDescriptor = $convert.base64Decode('CgRSZWFk'); +final $typed_data.Uint8List readDescriptor = $convert.base64Decode( + 'CgRSZWFk'); @$core.Deprecated('Use notifyDescriptor instead') const Notify$json = { @@ -30,8 +31,8 @@ const Notify$json = { }; /// Descriptor for `Notify`. Decode as a `google.protobuf.DescriptorProto`. -final $typed_data.Uint8List notifyDescriptor = - $convert.base64Decode('CgZOb3RpZnkSDgoCaWQYASABKA1SAmlk'); +final $typed_data.Uint8List notifyDescriptor = $convert.base64Decode( + 'CgZOb3RpZnkSDgoCaWQYASABKA1SAmlk'); @$core.Deprecated('Use writeDescriptor instead') const Write$json = { @@ -42,40 +43,16 @@ const Write$json = { }; /// Descriptor for `Write`. Decode as a `google.protobuf.DescriptorProto`. -final $typed_data.Uint8List writeDescriptor = - $convert.base64Decode('CgVXcml0ZRIOCgJpZBgBIAEoDVICaWQ='); +final $typed_data.Uint8List writeDescriptor = $convert.base64Decode( + 'CgVXcml0ZRIOCgJpZBgBIAEoDVICaWQ='); @$core.Deprecated('Use messageDescriptor instead') const Message$json = { '1': 'Message', '2': [ - { - '1': 'read', - '3': 1, - '4': 1, - '5': 11, - '6': '.shrapnel.selected_preset.Read', - '9': 0, - '10': 'read' - }, - { - '1': 'notify', - '3': 2, - '4': 1, - '5': 11, - '6': '.shrapnel.selected_preset.Notify', - '9': 0, - '10': 'notify' - }, - { - '1': 'write', - '3': 3, - '4': 1, - '5': 11, - '6': '.shrapnel.selected_preset.Write', - '9': 0, - '10': 'write' - }, + {'1': 'read', '3': 1, '4': 1, '5': 11, '6': '.shrapnel.selected_preset.Read', '9': 0, '10': 'read'}, + {'1': 'notify', '3': 2, '4': 1, '5': 11, '6': '.shrapnel.selected_preset.Notify', '9': 0, '10': 'notify'}, + {'1': 'write', '3': 3, '4': 1, '5': 11, '6': '.shrapnel.selected_preset.Write', '9': 0, '10': 'write'}, ], '8': [ {'1': 'message'}, @@ -88,3 +65,4 @@ final $typed_data.Uint8List messageDescriptor = $convert.base64Decode( 'gAUgRyZWFkEjoKBm5vdGlmeRgCIAEoCzIgLnNocmFwbmVsLnNlbGVjdGVkX3ByZXNldC5Ob3Rp' 'ZnlIAFIGbm90aWZ5EjcKBXdyaXRlGAMgASgLMh8uc2hyYXBuZWwuc2VsZWN0ZWRfcHJlc2V0Ll' 'dyaXRlSABSBXdyaXRlQgkKB21lc3NhZ2U='); + diff --git a/frontend/lib/api/generated/selected_preset.pbserver.dart b/dart/frontend/lib/api_data/generated/selected_preset.pbserver.dart similarity index 99% rename from frontend/lib/api/generated/selected_preset.pbserver.dart rename to dart/frontend/lib/api_data/generated/selected_preset.pbserver.dart index 23ac5988..438dea8c 100644 --- a/frontend/lib/api/generated/selected_preset.pbserver.dart +++ b/dart/frontend/lib/api_data/generated/selected_preset.pbserver.dart @@ -11,3 +11,4 @@ // ignore_for_file: unnecessary_import, unnecessary_this, unused_import export 'selected_preset.pb.dart'; + diff --git a/frontend/lib/api/generated/shrapnel.pb.dart b/dart/frontend/lib/api_data/generated/shrapnel.pb.dart similarity index 60% rename from frontend/lib/api/generated/shrapnel.pb.dart rename to dart/frontend/lib/api_data/generated/shrapnel.pb.dart index dc87908d..d1041f55 100644 --- a/frontend/lib/api/generated/shrapnel.pb.dart +++ b/dart/frontend/lib/api_data/generated/shrapnel.pb.dart @@ -20,11 +20,11 @@ import 'presets.pb.dart' as $3; import 'selected_preset.pb.dart' as $4; enum Message_Message { - audioEvent, - command, - midiMapping, - preset, - selectedPreset, + audioEvent, + command, + midiMapping, + preset, + selectedPreset, notSet } @@ -55,48 +55,37 @@ class Message extends $pb.GeneratedMessage { return $result; } Message._() : super(); - factory Message.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory Message.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); + factory Message.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); + factory Message.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); static const $core.Map<$core.int, Message_Message> _Message_MessageByTag = { - 1: Message_Message.audioEvent, - 2: Message_Message.command, - 3: Message_Message.midiMapping, - 4: Message_Message.preset, - 5: Message_Message.selectedPreset, - 0: Message_Message.notSet + 1 : Message_Message.audioEvent, + 2 : Message_Message.command, + 3 : Message_Message.midiMapping, + 4 : Message_Message.preset, + 5 : Message_Message.selectedPreset, + 0 : Message_Message.notSet }; - static final $pb.BuilderInfo _i = $pb.BuilderInfo( - _omitMessageNames ? '' : 'Message', - package: - const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.messages'), - createEmptyInstance: create) + static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Message', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.messages'), createEmptyInstance: create) ..oo(0, [1, 2, 3, 4, 5]) - ..aOM<$0.Message>(1, _omitFieldNames ? '' : 'audioEvent', - subBuilder: $0.Message.create) - ..aOM<$1.Message>(2, _omitFieldNames ? '' : 'command', - subBuilder: $1.Message.create) - ..aOM<$2.Message>(3, _omitFieldNames ? '' : 'midiMapping', - subBuilder: $2.Message.create) - ..aOM<$3.Message>(4, _omitFieldNames ? '' : 'preset', - subBuilder: $3.Message.create) - ..aOM<$4.Message>(5, _omitFieldNames ? '' : 'selectedPreset', - subBuilder: $4.Message.create) - ..hasRequiredFields = false; - - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + ..aOM<$0.Message>(1, _omitFieldNames ? '' : 'audioEvent', subBuilder: $0.Message.create) + ..aOM<$1.Message>(2, _omitFieldNames ? '' : 'command', subBuilder: $1.Message.create) + ..aOM<$2.Message>(3, _omitFieldNames ? '' : 'midiMapping', subBuilder: $2.Message.create) + ..aOM<$3.Message>(4, _omitFieldNames ? '' : 'preset', subBuilder: $3.Message.create) + ..aOM<$4.Message>(5, _omitFieldNames ? '' : 'selectedPreset', subBuilder: $4.Message.create) + ..hasRequiredFields = false + ; + + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') Message clone() => Message()..mergeFromMessage(this); - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - Message copyWith(void Function(Message) updates) => - super.copyWith((message) => updates(message as Message)) as Message; + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + Message copyWith(void Function(Message) updates) => super.copyWith((message) => updates(message as Message)) as Message; $pb.BuilderInfo get info_ => _i; @@ -105,8 +94,7 @@ class Message extends $pb.GeneratedMessage { Message createEmptyInstance() => create(); static $pb.PbList createRepeated() => $pb.PbList(); @$core.pragma('dart2js:noInline') - static Message getDefault() => - _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static Message getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); static Message? _defaultInstance; Message_Message whichMessage() => _Message_MessageByTag[$_whichOneof(0)]!; @@ -115,10 +103,7 @@ class Message extends $pb.GeneratedMessage { @$pb.TagNumber(1) $0.Message get audioEvent => $_getN(0); @$pb.TagNumber(1) - set audioEvent($0.Message v) { - setField(1, v); - } - + set audioEvent($0.Message v) { setField(1, v); } @$pb.TagNumber(1) $core.bool hasAudioEvent() => $_has(0); @$pb.TagNumber(1) @@ -129,10 +114,7 @@ class Message extends $pb.GeneratedMessage { @$pb.TagNumber(2) $1.Message get command => $_getN(1); @$pb.TagNumber(2) - set command($1.Message v) { - setField(2, v); - } - + set command($1.Message v) { setField(2, v); } @$pb.TagNumber(2) $core.bool hasCommand() => $_has(1); @$pb.TagNumber(2) @@ -143,10 +125,7 @@ class Message extends $pb.GeneratedMessage { @$pb.TagNumber(3) $2.Message get midiMapping => $_getN(2); @$pb.TagNumber(3) - set midiMapping($2.Message v) { - setField(3, v); - } - + set midiMapping($2.Message v) { setField(3, v); } @$pb.TagNumber(3) $core.bool hasMidiMapping() => $_has(2); @$pb.TagNumber(3) @@ -157,10 +136,7 @@ class Message extends $pb.GeneratedMessage { @$pb.TagNumber(4) $3.Message get preset => $_getN(3); @$pb.TagNumber(4) - set preset($3.Message v) { - setField(4, v); - } - + set preset($3.Message v) { setField(4, v); } @$pb.TagNumber(4) $core.bool hasPreset() => $_has(3); @$pb.TagNumber(4) @@ -171,10 +147,7 @@ class Message extends $pb.GeneratedMessage { @$pb.TagNumber(5) $4.Message get selectedPreset => $_getN(4); @$pb.TagNumber(5) - set selectedPreset($4.Message v) { - setField(5, v); - } - + set selectedPreset($4.Message v) { setField(5, v); } @$pb.TagNumber(5) $core.bool hasSelectedPreset() => $_has(4); @$pb.TagNumber(5) @@ -183,6 +156,6 @@ class Message extends $pb.GeneratedMessage { $4.Message ensureSelectedPreset() => $_ensure(4); } + const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names'); -const _omitMessageNames = - $core.bool.fromEnvironment('protobuf.omit_message_names'); +const _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names'); diff --git a/frontend/lib/api/generated/shrapnel.pbenum.dart b/dart/frontend/lib/api_data/generated/shrapnel.pbenum.dart similarity index 100% rename from frontend/lib/api/generated/shrapnel.pbenum.dart rename to dart/frontend/lib/api_data/generated/shrapnel.pbenum.dart diff --git a/frontend/lib/api/generated/shrapnel.pbjson.dart b/dart/frontend/lib/api_data/generated/shrapnel.pbjson.dart similarity index 60% rename from frontend/lib/api/generated/shrapnel.pbjson.dart rename to dart/frontend/lib/api_data/generated/shrapnel.pbjson.dart index 0af5577a..75482dc3 100644 --- a/frontend/lib/api/generated/shrapnel.pbjson.dart +++ b/dart/frontend/lib/api_data/generated/shrapnel.pbjson.dart @@ -17,51 +17,11 @@ import 'dart:typed_data' as $typed_data; const Message$json = { '1': 'Message', '2': [ - { - '1': 'audio_event', - '3': 1, - '4': 1, - '5': 11, - '6': '.shrapnel.audio_events.Message', - '9': 0, - '10': 'audioEvent' - }, - { - '1': 'command', - '3': 2, - '4': 1, - '5': 11, - '6': '.shrapnel.cmd_handling.Message', - '9': 0, - '10': 'command' - }, - { - '1': 'midi_mapping', - '3': 3, - '4': 1, - '5': 11, - '6': '.shrapnel.midi_mapping.Message', - '9': 0, - '10': 'midiMapping' - }, - { - '1': 'preset', - '3': 4, - '4': 1, - '5': 11, - '6': '.shrapnel.presets.Message', - '9': 0, - '10': 'preset' - }, - { - '1': 'selected_preset', - '3': 5, - '4': 1, - '5': 11, - '6': '.shrapnel.selected_preset.Message', - '9': 0, - '10': 'selectedPreset' - }, + {'1': 'audio_event', '3': 1, '4': 1, '5': 11, '6': '.shrapnel.audio_events.Message', '9': 0, '10': 'audioEvent'}, + {'1': 'command', '3': 2, '4': 1, '5': 11, '6': '.shrapnel.cmd_handling.Message', '9': 0, '10': 'command'}, + {'1': 'midi_mapping', '3': 3, '4': 1, '5': 11, '6': '.shrapnel.midi_mapping.Message', '9': 0, '10': 'midiMapping'}, + {'1': 'preset', '3': 4, '4': 1, '5': 11, '6': '.shrapnel.presets.Message', '9': 0, '10': 'preset'}, + {'1': 'selected_preset', '3': 5, '4': 1, '5': 11, '6': '.shrapnel.selected_preset.Message', '9': 0, '10': 'selectedPreset'}, ], '8': [ {'1': 'message'}, diff --git a/frontend/lib/api/generated/shrapnel.pbserver.dart b/dart/frontend/lib/api_data/generated/shrapnel.pbserver.dart similarity index 100% rename from frontend/lib/api/generated/shrapnel.pbserver.dart rename to dart/frontend/lib/api_data/generated/shrapnel.pbserver.dart diff --git a/frontend/lib/midi_mapping/model/models.dart b/dart/frontend/lib/api_data/midi_api_message.dart similarity index 98% rename from frontend/lib/midi_mapping/model/models.dart rename to dart/frontend/lib/api_data/midi_api_message.dart index 13a94614..8aafcb85 100644 --- a/frontend/lib/midi_mapping/model/models.dart +++ b/dart/frontend/lib/api_data/midi_api_message.dart @@ -19,7 +19,7 @@ import 'package:freezed_annotation/freezed_annotation.dart'; -part 'models.freezed.dart'; +part 'midi_api_message.freezed.dart'; typedef MidiMappingId = int; diff --git a/dart/frontend/lib/api_data/parameter_message.dart b/dart/frontend/lib/api_data/parameter_message.dart new file mode 100644 index 00000000..e39880a4 --- /dev/null +++ b/dart/frontend/lib/api_data/parameter_message.dart @@ -0,0 +1,23 @@ +import 'package:freezed_annotation/freezed_annotation.dart'; + +part 'parameter_message.freezed.dart'; + +@freezed +sealed class ParameterServiceOutputMessage + with _$ParameterServiceOutputMessage { + factory ParameterServiceOutputMessage.requestInitialisation() = + ParameterServiceOutputMessageRequestInitialisation; + + factory ParameterServiceOutputMessage.parameterUpdate({ + required String id, + required double value, + }) = ParameterServiceOutputMessageParameterUpdate; +} + +@freezed +sealed class ParameterServiceInputMessage with _$ParameterServiceInputMessage { + factory ParameterServiceInputMessage.parameterUpdate({ + required String id, + required double value, + }) = ParameterServiceInputMessageParameterUpdate; +} diff --git a/dart/frontend/lib/api_data/presets_message.dart b/dart/frontend/lib/api_data/presets_message.dart new file mode 100644 index 00000000..94378b13 --- /dev/null +++ b/dart/frontend/lib/api_data/presets_message.dart @@ -0,0 +1,53 @@ +import 'package:freezed_annotation/freezed_annotation.dart'; + +part 'presets_message.freezed.dart'; + +@freezed +class PresetParametersData with _$PresetParametersData { + factory PresetParametersData({ + required double ampGain, + required double ampChannel, + required double bass, + required double middle, + required double treble, + required double contour, + required double volume, + required double noiseGateThreshold, + required double noiseGateHysteresis, + required double noiseGateAttack, + required double noiseGateHold, + required double noiseGateRelease, + required double noiseGateBypass, + required double chorusRate, + required double chorusDepth, + required double chorusMix, + required double chorusBypass, + required double wahPosition, + required double wahVocal, + required double wahBypass, + }) = _PresetParametersData; +} + +@freezed +sealed class PresetsMessage with _$PresetsMessage { + factory PresetsMessage.initialise() = PresetsMessageInitialise; + + factory PresetsMessage.notify(int id, PresetData preset) = + PresetsMessageNotify; + + factory PresetsMessage.create(PresetData preset) = PresetsMessageCreate; + + factory PresetsMessage.update(int id, PresetData preset) = + PresetsMessageUpdate; + + factory PresetsMessage.delete(int id) = PresetsMessageDelete; +} + +@freezed +class PresetData with _$PresetData { + factory PresetData({ + required String name, + required PresetParametersData parameters, + }) = _PresetData; + +} diff --git a/frontend/lib/api/proto_extension.dart b/dart/frontend/lib/api_data/proto_extension.dart similarity index 98% rename from frontend/lib/api/proto_extension.dart rename to dart/frontend/lib/api_data/proto_extension.dart index 333a6a19..40bae170 100644 --- a/frontend/lib/api/proto_extension.dart +++ b/dart/frontend/lib/api_data/proto_extension.dart @@ -17,18 +17,18 @@ * ShrapnelDSP. If not, see . */ -import '../audio_events.dart'; -import '../midi_mapping/model/models.dart'; -import '../parameter.dart'; -import '../presets/model/presets_client.dart'; -import '../presets/model/selected_preset_client.dart'; -import 'api_websocket.dart'; +import 'api_message.dart'; +import 'audio_event_message.dart'; import 'generated/audio_events.pb.dart' as audio_events_pb; import 'generated/cmd_handling.pb.dart' as cmd_handling_pb; import 'generated/midi_mapping.pb.dart' as midi_mapping_pb; import 'generated/presets.pb.dart' as presets_pb; import 'generated/selected_preset.pb.dart' as selected_preset_pb; import 'generated/shrapnel.pb.dart' as shrapnel_pb; +import 'midi_api_message.dart'; +import 'parameter_message.dart'; +import 'presets_message.dart'; +import 'selected_preset_data.dart'; class ProtoException implements Exception {} diff --git a/dart/frontend/lib/api_data/selected_preset_data.dart b/dart/frontend/lib/api_data/selected_preset_data.dart new file mode 100644 index 00000000..c9e27a38 --- /dev/null +++ b/dart/frontend/lib/api_data/selected_preset_data.dart @@ -0,0 +1,14 @@ +import 'package:freezed_annotation/freezed_annotation.dart'; + +part 'selected_preset_data.freezed.dart'; + +@freezed +sealed class SelectedPresetMessage with _$SelectedPresetMessage { + factory SelectedPresetMessage.read() = ReadSelectedPresetMessage; + + factory SelectedPresetMessage.notify({required int selectedPreset}) = + NotifySelectedPresetMessage; + + factory SelectedPresetMessage.write({required int selectedPreset}) = + WriteSelectedPresetMessage; +} diff --git a/frontend/lib/audio_events.dart b/dart/frontend/lib/audio_events.dart similarity index 86% rename from frontend/lib/audio_events.dart rename to dart/frontend/lib/audio_events.dart index f4dd3ad3..c6521bcf 100644 --- a/frontend/lib/audio_events.dart +++ b/dart/frontend/lib/audio_events.dart @@ -18,21 +18,13 @@ */ import 'package:flutter/material.dart'; -import 'package:freezed_annotation/freezed_annotation.dart'; import 'package:logging/logging.dart'; import 'package:pausable_timer/pausable_timer.dart'; -part 'audio_events.freezed.dart'; +import 'api_data/audio_event_message.dart'; final _log = Logger('shrapnel.audio_events'); -@freezed -sealed class AudioEventMessage with _$AudioEventMessage { - factory AudioEventMessage.inputClipped() = AudioEventMessageInputClipped; - - factory AudioEventMessage.outputClipped() = AudioEventMessageOutputClipped; -} - class AudioClippingService extends ChangeNotifier { AudioClippingService({required Stream stream}) { _outputClippingTimer = PausableTimer( diff --git a/frontend/lib/chorus.dart b/dart/frontend/lib/chorus.dart similarity index 100% rename from frontend/lib/chorus.dart rename to dart/frontend/lib/chorus.dart diff --git a/frontend/lib/core/message_transport.dart b/dart/frontend/lib/core/message_transport.dart similarity index 100% rename from frontend/lib/core/message_transport.dart rename to dart/frontend/lib/core/message_transport.dart diff --git a/frontend/lib/core/stream_extensions.dart b/dart/frontend/lib/core/stream_extensions.dart similarity index 100% rename from frontend/lib/core/stream_extensions.dart rename to dart/frontend/lib/core/stream_extensions.dart diff --git a/frontend/lib/fake_provisioning.dart b/dart/frontend/lib/fake_provisioning.dart similarity index 100% rename from frontend/lib/fake_provisioning.dart rename to dart/frontend/lib/fake_provisioning.dart diff --git a/frontend/lib/heavy_metal.dart b/dart/frontend/lib/heavy_metal.dart similarity index 100% rename from frontend/lib/heavy_metal.dart rename to dart/frontend/lib/heavy_metal.dart diff --git a/frontend/lib/knob.dart b/dart/frontend/lib/knob.dart similarity index 100% rename from frontend/lib/knob.dart rename to dart/frontend/lib/knob.dart diff --git a/frontend/lib/knob_with_label.dart b/dart/frontend/lib/knob_with_label.dart similarity index 100% rename from frontend/lib/knob_with_label.dart rename to dart/frontend/lib/knob_with_label.dart diff --git a/frontend/lib/main.dart b/dart/frontend/lib/main.dart similarity index 99% rename from frontend/lib/main.dart rename to dart/frontend/lib/main.dart index 9ddbccbc..a7da11d3 100644 --- a/frontend/lib/main.dart +++ b/dart/frontend/lib/main.dart @@ -28,6 +28,8 @@ import 'package:provider/provider.dart'; import 'package:rxdart/rxdart.dart'; import 'api/api_websocket.dart'; +import 'api_data/api_message.dart'; +import 'api_data/parameter_message.dart'; import 'audio_events.dart'; import 'chorus.dart'; import 'core/message_transport.dart'; diff --git a/frontend/lib/midi_mapping/model/midi_learn.dart b/dart/frontend/lib/midi_mapping/model/midi_learn.dart similarity index 98% rename from frontend/lib/midi_mapping/model/midi_learn.dart rename to dart/frontend/lib/midi_mapping/model/midi_learn.dart index 8a45e81c..63d0e13b 100644 --- a/frontend/lib/midi_mapping/model/midi_learn.dart +++ b/dart/frontend/lib/midi_mapping/model/midi_learn.dart @@ -22,8 +22,8 @@ import 'dart:async'; import 'package:logging/logging.dart'; import 'package:state_notifier/state_notifier.dart'; +import '../../api_data/midi_api_message.dart'; import 'midi_learn_state.dart'; -import 'models.dart'; import 'service.dart'; final _log = Logger('shrapnel.midi_mapping.model.midi_learn'); diff --git a/frontend/lib/midi_mapping/model/midi_learn_state.dart b/dart/frontend/lib/midi_mapping/model/midi_learn_state.dart similarity index 96% rename from frontend/lib/midi_mapping/model/midi_learn_state.dart rename to dart/frontend/lib/midi_mapping/model/midi_learn_state.dart index 53d6195b..5d1533ca 100644 --- a/frontend/lib/midi_mapping/model/midi_learn_state.dart +++ b/dart/frontend/lib/midi_mapping/model/midi_learn_state.dart @@ -19,7 +19,7 @@ import 'package:freezed_annotation/freezed_annotation.dart'; -import 'models.dart'; +import '../../api_data/midi_api_message.dart'; part 'midi_learn_state.freezed.dart'; diff --git a/frontend/lib/midi_mapping/model/service.dart b/dart/frontend/lib/midi_mapping/model/service.dart similarity index 98% rename from frontend/lib/midi_mapping/model/service.dart rename to dart/frontend/lib/midi_mapping/model/service.dart index f72e1f0f..403b2c04 100644 --- a/frontend/lib/midi_mapping/model/service.dart +++ b/dart/frontend/lib/midi_mapping/model/service.dart @@ -25,9 +25,10 @@ import 'package:logging/logging.dart'; import 'package:rxdart/rxdart.dart'; import '../../api/api_websocket.dart'; +import '../../api_data/api_message.dart'; +import '../../api_data/midi_api_message.dart'; import '../../core/message_transport.dart'; import '../../core/stream_extensions.dart'; -import '../model/models.dart'; final _log = Logger('midi_mapping_service'); diff --git a/frontend/lib/midi_mapping/view/midi_learn.dart b/dart/frontend/lib/midi_mapping/view/midi_learn.dart similarity index 100% rename from frontend/lib/midi_mapping/view/midi_learn.dart rename to dart/frontend/lib/midi_mapping/view/midi_learn.dart diff --git a/frontend/lib/midi_mapping/view/midi_mapping.dart b/dart/frontend/lib/midi_mapping/view/midi_mapping.dart similarity index 99% rename from frontend/lib/midi_mapping/view/midi_mapping.dart rename to dart/frontend/lib/midi_mapping/view/midi_mapping.dart index d1cf404c..c713aada 100644 --- a/frontend/lib/midi_mapping/view/midi_mapping.dart +++ b/dart/frontend/lib/midi_mapping/view/midi_mapping.dart @@ -22,9 +22,9 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; +import '../../api_data/midi_api_message.dart'; import '../../parameter.dart'; import '../../presets/model/presets.dart'; -import '../model/models.dart'; import '../model/service.dart'; const _requiredValueString = 'A value must be selected'; diff --git a/frontend/lib/noise_gate.dart b/dart/frontend/lib/noise_gate.dart similarity index 100% rename from frontend/lib/noise_gate.dart rename to dart/frontend/lib/noise_gate.dart diff --git a/frontend/lib/parameter.dart b/dart/frontend/lib/parameter.dart similarity index 89% rename from frontend/lib/parameter.dart rename to dart/frontend/lib/parameter.dart index e2168185..8d388396 100644 --- a/frontend/lib/parameter.dart +++ b/dart/frontend/lib/parameter.dart @@ -25,6 +25,8 @@ import 'package:logging/logging.dart'; import 'package:rxdart/rxdart.dart'; import 'api/api_websocket.dart'; +import 'api_data/api_message.dart'; +import 'api_data/parameter_message.dart'; import 'core/message_transport.dart'; part 'parameter.freezed.dart'; @@ -70,26 +72,6 @@ class AudioParameterDoubleModel { ValueStream get value => _controller; } -@freezed -sealed class ParameterServiceOutputMessage - with _$ParameterServiceOutputMessage { - factory ParameterServiceOutputMessage.requestInitialisation() = - ParameterServiceOutputMessageRequestInitialisation; - - factory ParameterServiceOutputMessage.parameterUpdate({ - required String id, - required double value, - }) = ParameterServiceOutputMessageParameterUpdate; -} - -@freezed -sealed class ParameterServiceInputMessage with _$ParameterServiceInputMessage { - factory ParameterServiceInputMessage.parameterUpdate({ - required String id, - required double value, - }) = ParameterServiceInputMessageParameterUpdate; -} - class ParameterTransport implements ReconnectingMessageTransport { PresetsTransport({required this.websocket}) { @@ -205,7 +157,7 @@ class PresetsClient { Future create(presets.PresetState preset) async { _transport.sink - .add(PresetsMessage.create(PresetData.fromPresetState(preset))); + .add(PresetsMessage.create(PresetDataEx.fromPresetState(preset))); } Future delete(int id) async { @@ -216,7 +168,7 @@ class PresetsClient { _transport.sink.add( PresetsMessage.update( preset.id, - PresetData.fromPresetState(preset.preset), + PresetDataEx.fromPresetState(preset.preset), ), ); } diff --git a/frontend/lib/presets/model/presets_repository.dart b/dart/frontend/lib/presets/model/presets_repository.dart similarity index 100% rename from frontend/lib/presets/model/presets_repository.dart rename to dart/frontend/lib/presets/model/presets_repository.dart diff --git a/frontend/lib/presets/model/presets_service.dart b/dart/frontend/lib/presets/model/presets_service.dart similarity index 100% rename from frontend/lib/presets/model/presets_service.dart rename to dart/frontend/lib/presets/model/presets_service.dart diff --git a/frontend/lib/presets/model/selected_preset_client.dart b/dart/frontend/lib/presets/model/selected_preset_client.dart similarity index 85% rename from frontend/lib/presets/model/selected_preset_client.dart rename to dart/frontend/lib/presets/model/selected_preset_client.dart index 26befccc..2572ca6e 100644 --- a/frontend/lib/presets/model/selected_preset_client.dart +++ b/dart/frontend/lib/presets/model/selected_preset_client.dart @@ -19,29 +19,17 @@ import 'dart:async'; -import 'package:freezed_annotation/freezed_annotation.dart'; import 'package:logging/logging.dart'; import 'package:rxdart/rxdart.dart'; import '../../api/api_websocket.dart'; +import '../../api_data/api_message.dart'; +import '../../api_data/selected_preset_data.dart'; import '../../core/message_transport.dart'; import '../../core/stream_extensions.dart'; -part 'selected_preset_client.freezed.dart'; - final _log = Logger('selected_preset_client'); -@freezed -sealed class SelectedPresetMessage with _$SelectedPresetMessage { - factory SelectedPresetMessage.read() = ReadSelectedPresetMessage; - - factory SelectedPresetMessage.notify({required int selectedPreset}) = - NotifySelectedPresetMessage; - - factory SelectedPresetMessage.write({required int selectedPreset}) = - WriteSelectedPresetMessage; -} - class SelectedPresetTransport implements ReconnectingMessageTransport=3.2.0 <4.0.0" diff --git a/dart/pubspec.yaml b/dart/pubspec.yaml new file mode 100644 index 00000000..e7aefd14 --- /dev/null +++ b/dart/pubspec.yaml @@ -0,0 +1,6 @@ +name: shrapnel + +environment: + sdk: '>=3.0.0 <4.0.0' +dev_dependencies: + melos: ^6.1.0 diff --git a/dart/shrapnel_common/.gitignore b/dart/shrapnel_common/.gitignore new file mode 100644 index 00000000..3cceda55 --- /dev/null +++ b/dart/shrapnel_common/.gitignore @@ -0,0 +1,7 @@ +# https://dart.dev/guides/libraries/private-files +# Created by `dart pub` +.dart_tool/ + +# Avoid committing pubspec.lock for library packages; see +# https://dart.dev/guides/libraries/private-files#pubspeclock. +pubspec.lock diff --git a/dart/shrapnel_common/CHANGELOG.md b/dart/shrapnel_common/CHANGELOG.md new file mode 100644 index 00000000..effe43c8 --- /dev/null +++ b/dart/shrapnel_common/CHANGELOG.md @@ -0,0 +1,3 @@ +## 1.0.0 + +- Initial version. diff --git a/dart/shrapnel_common/README.md b/dart/shrapnel_common/README.md new file mode 100644 index 00000000..8b55e735 --- /dev/null +++ b/dart/shrapnel_common/README.md @@ -0,0 +1,39 @@ + + +TODO: Put a short description of the package here that helps potential users +know whether this package might be useful for them. + +## Features + +TODO: List what your package can do. Maybe include images, gifs, or videos. + +## Getting started + +TODO: List prerequisites and provide or point to information on how to +start using the package. + +## Usage + +TODO: Include short and useful examples for package users. Add longer examples +to `/example` folder. + +```dart +const like = 'sample'; +``` + +## Additional information + +TODO: Tell users more about the package: where to find more information, how to +contribute to the package, how to file issues, what response they can expect +from the package authors, and more. diff --git a/dart/shrapnel_common/analysis_options.yaml b/dart/shrapnel_common/analysis_options.yaml new file mode 100644 index 00000000..dee8927a --- /dev/null +++ b/dart/shrapnel_common/analysis_options.yaml @@ -0,0 +1,30 @@ +# This file configures the static analysis results for your project (errors, +# warnings, and lints). +# +# This enables the 'recommended' set of lints from `package:lints`. +# This set helps identify many issues that may lead to problems when running +# or consuming Dart code, and enforces writing Dart using a single, idiomatic +# style and format. +# +# If you want a smaller set of lints you can change this to specify +# 'package:lints/core.yaml'. These are just the most critical lints +# (the recommended set includes the core lints). +# The core lints are also what is used by pub.dev for scoring packages. + +include: package:lints/recommended.yaml + +# Uncomment the following section to specify additional rules. + +# linter: +# rules: +# - camel_case_types + +# analyzer: +# exclude: +# - path/to/excluded/files/** + +# For more information about the core and recommended set of lints, see +# https://dart.dev/go/core-lints + +# For additional information about configuring this file, see +# https://dart.dev/guides/language/analysis-options diff --git a/dart/shrapnel_common/example/shrapnel_common_example.dart b/dart/shrapnel_common/example/shrapnel_common_example.dart new file mode 100644 index 00000000..bfd16bfd --- /dev/null +++ b/dart/shrapnel_common/example/shrapnel_common_example.dart @@ -0,0 +1,6 @@ +import 'package:shrapnel_common/shrapnel_common.dart'; + +void main() { + var awesome = Awesome(); + print('awesome: ${awesome.isAwesome}'); +} diff --git a/dart/shrapnel_common/lib/shrapnel_common.dart b/dart/shrapnel_common/lib/shrapnel_common.dart new file mode 100644 index 00000000..e99e9860 --- /dev/null +++ b/dart/shrapnel_common/lib/shrapnel_common.dart @@ -0,0 +1,8 @@ +/// Support for doing something awesome. +/// +/// More dartdocs go here. +library; + +export 'src/shrapnel_common_base.dart'; + +// TODO: Export any libraries intended for clients of this package. diff --git a/dart/shrapnel_common/lib/src/shrapnel_common_base.dart b/dart/shrapnel_common/lib/src/shrapnel_common_base.dart new file mode 100644 index 00000000..e8a6f159 --- /dev/null +++ b/dart/shrapnel_common/lib/src/shrapnel_common_base.dart @@ -0,0 +1,6 @@ +// TODO: Put public facing types in this file. + +/// Checks if you are awesome. Spoiler: you are. +class Awesome { + bool get isAwesome => true; +} diff --git a/dart/shrapnel_common/pubspec.yaml b/dart/shrapnel_common/pubspec.yaml new file mode 100644 index 00000000..96a63340 --- /dev/null +++ b/dart/shrapnel_common/pubspec.yaml @@ -0,0 +1,15 @@ +name: shrapnel_common +description: A starting point for Dart libraries or applications. +version: 1.0.0 +# repository: https://github.com/my_org/my_repo + +environment: + sdk: ^3.2.6 + +# Add regular dependencies here. +dependencies: + # path: ^1.8.0 + +dev_dependencies: + lints: ^2.1.0 + test: ^1.24.0 diff --git a/dart/shrapnel_common/test/shrapnel_common_test.dart b/dart/shrapnel_common/test/shrapnel_common_test.dart new file mode 100644 index 00000000..235cb719 --- /dev/null +++ b/dart/shrapnel_common/test/shrapnel_common_test.dart @@ -0,0 +1,16 @@ +import 'package:shrapnel_common/shrapnel_common.dart'; +import 'package:test/test.dart'; + +void main() { + group('A group of tests', () { + final awesome = Awesome(); + + setUp(() { + // Additional setup goes here. + }); + + test('First Test', () { + expect(awesome.isAwesome, isTrue); + }); + }); +} diff --git a/dart/shrapnel_test_lib/.gitignore b/dart/shrapnel_test_lib/.gitignore new file mode 100644 index 00000000..3cceda55 --- /dev/null +++ b/dart/shrapnel_test_lib/.gitignore @@ -0,0 +1,7 @@ +# https://dart.dev/guides/libraries/private-files +# Created by `dart pub` +.dart_tool/ + +# Avoid committing pubspec.lock for library packages; see +# https://dart.dev/guides/libraries/private-files#pubspeclock. +pubspec.lock diff --git a/dart/shrapnel_test_lib/CHANGELOG.md b/dart/shrapnel_test_lib/CHANGELOG.md new file mode 100644 index 00000000..effe43c8 --- /dev/null +++ b/dart/shrapnel_test_lib/CHANGELOG.md @@ -0,0 +1,3 @@ +## 1.0.0 + +- Initial version. diff --git a/dart/shrapnel_test_lib/README.md b/dart/shrapnel_test_lib/README.md new file mode 100644 index 00000000..8b55e735 --- /dev/null +++ b/dart/shrapnel_test_lib/README.md @@ -0,0 +1,39 @@ + + +TODO: Put a short description of the package here that helps potential users +know whether this package might be useful for them. + +## Features + +TODO: List what your package can do. Maybe include images, gifs, or videos. + +## Getting started + +TODO: List prerequisites and provide or point to information on how to +start using the package. + +## Usage + +TODO: Include short and useful examples for package users. Add longer examples +to `/example` folder. + +```dart +const like = 'sample'; +``` + +## Additional information + +TODO: Tell users more about the package: where to find more information, how to +contribute to the package, how to file issues, what response they can expect +from the package authors, and more. diff --git a/dart/shrapnel_test_lib/analysis_options.yaml b/dart/shrapnel_test_lib/analysis_options.yaml new file mode 100644 index 00000000..dee8927a --- /dev/null +++ b/dart/shrapnel_test_lib/analysis_options.yaml @@ -0,0 +1,30 @@ +# This file configures the static analysis results for your project (errors, +# warnings, and lints). +# +# This enables the 'recommended' set of lints from `package:lints`. +# This set helps identify many issues that may lead to problems when running +# or consuming Dart code, and enforces writing Dart using a single, idiomatic +# style and format. +# +# If you want a smaller set of lints you can change this to specify +# 'package:lints/core.yaml'. These are just the most critical lints +# (the recommended set includes the core lints). +# The core lints are also what is used by pub.dev for scoring packages. + +include: package:lints/recommended.yaml + +# Uncomment the following section to specify additional rules. + +# linter: +# rules: +# - camel_case_types + +# analyzer: +# exclude: +# - path/to/excluded/files/** + +# For more information about the core and recommended set of lints, see +# https://dart.dev/go/core-lints + +# For additional information about configuring this file, see +# https://dart.dev/guides/language/analysis-options diff --git a/dart/shrapnel_test_lib/lib/shrapnel_test_lib.dart b/dart/shrapnel_test_lib/lib/shrapnel_test_lib.dart new file mode 100644 index 00000000..0fcd688f --- /dev/null +++ b/dart/shrapnel_test_lib/lib/shrapnel_test_lib.dart @@ -0,0 +1,4 @@ +/// Testing utilities. +library; + +export 'src/shrapnel_test_lib_base.dart'; \ No newline at end of file diff --git a/frontend/test/firmware_api_test/util.dart b/dart/shrapnel_test_lib/lib/src/shrapnel_test_lib_base.dart similarity index 87% rename from frontend/test/firmware_api_test/util.dart rename to dart/shrapnel_test_lib/lib/src/shrapnel_test_lib_base.dart index 7f8c7833..f93fe54f 100644 --- a/frontend/test/firmware_api_test/util.dart +++ b/dart/shrapnel_test_lib/lib/src/shrapnel_test_lib_base.dart @@ -25,9 +25,7 @@ import 'package:esp_softap_provisioning/esp_softap_provisioning.dart'; import 'package:flutter_libserialport/flutter_libserialport.dart'; import 'package:logging/logging.dart'; import 'package:path/path.dart' as p; -import 'package:shrapnel/api/proto_extension.dart'; -import 'package:shrapnel/midi_mapping/model/models.dart'; -import 'package:shrapnel/wifi_provisioning.dart'; +import 'package:shrapnel_common/shrapnel_common.dart'; typedef MacAddress = List; @@ -67,7 +65,7 @@ Future setUpWiFi({required String ssid, required String password}) async { }); var success = - await provisioning.sendWifiConfig(ssid: ssid, password: password); + await provisioning.sendWifiConfig(ssid: ssid, password: password); if (!success) { throw StateError('send wifi config failed'); } @@ -101,7 +99,7 @@ Future _eraseFlash({required String port}) async { List _getMacAddressFromEsptoolStdout(String espToolStdout) { final macRegex = - RegExp(r'^MAC: (([0-9a-f]{2}:){5}([0-9a-f]{2}))$', multiLine: true); + RegExp(r'^MAC: (([0-9a-f]{2}:){5}([0-9a-f]{2}))$', multiLine: true); final macString = macRegex.allMatches(espToolStdout).single.group(1)!; return macString.split(':').map((e) => int.parse(e, radix: 16)).toList(); } @@ -172,10 +170,10 @@ Future<(bool, MacAddress)> _checkIfAlreadyFlashed({ // https://docs.espressif.com/projects/esptool/en/latest/esp32/#quick-start const command = 'esptool.py'; final args = '-p $port ' - '-b 2000000 ' - '--before default_reset --after hard_reset ' - '--chip esp32 ' - 'verify_flash 0x10000 $expectedHeaderFilePath' + '-b 2000000 ' + '--before default_reset --after hard_reset ' + '--chip esp32 ' + 'verify_flash 0x10000 $expectedHeaderFilePath' .split(' '); final result = await Process.run(command, args); @@ -188,14 +186,14 @@ Future<(bool, MacAddress)> _checkIfAlreadyFlashed({ _log.info(result.stdout); return ( - switch (result.exitCode) { - 0 => true, - 2 => false, - _ => throw StateError( - 'esptool.py exited with unexpected code ${result.exitCode}', - ), - }, - _getMacAddressFromEsptoolStdout(result.stdout as String) + switch (result.exitCode) { + 0 => true, + 2 => false, + _ => throw StateError( + 'esptool.py exited with unexpected code ${result.exitCode}', + ), + }, + _getMacAddressFromEsptoolStdout(result.stdout as String) ); } @@ -206,13 +204,13 @@ Future _flashFirmware(String path, {required String port}) async { // https://docs.espressif.com/projects/esptool/en/latest/esp32/#quick-start const command = 'esptool.py'; final args = '-p $port ' - '-b 2000000 ' - '--before default_reset --after hard_reset ' - '--chip esp32 ' - 'write_flash --flash_mode dio --flash_size 4MB --flash_freq 80m ' - '0x1000 $path/bootloader.bin ' - '0x8000 $path/partition-table.bin ' - '0x10000 $path/esp32-dsp.bin' + '-b 2000000 ' + '--before default_reset --after hard_reset ' + '--chip esp32 ' + 'write_flash --flash_mode dio --flash_size 4MB --flash_freq 80m ' + '0x1000 $path/bootloader.bin ' + '0x8000 $path/partition-table.bin ' + '0x10000 $path/esp32-dsp.bin' .split(' '); final result = await Process.run(command, args); @@ -230,10 +228,10 @@ Future nvsErase({required String port}) async { // https://docs.espressif.com/projects/esptool/en/latest/esp32/#quick-start const command = 'esptool.py'; final args = '-p $port ' - '-b 2000000 ' - '--before default_reset --after hard_reset ' - '--chip esp32 ' - 'erase_region 0x9000 0x6000' + '-b 2000000 ' + '--before default_reset --after hard_reset ' + '--chip esp32 ' + 'erase_region 0x9000 0x6000' .split(' '); final result = await Process.run(command, args); @@ -251,11 +249,11 @@ Future nvsLoad(String binaryPath, {required String port}) async { // https://docs.espressif.com/projects/esptool/en/latest/esp32/#quick-start const command = 'esptool.py'; final args = '-p $port ' - '-b 2000000 ' - '--before default_reset --after hard_reset ' - '--chip esp32 ' - 'write_flash --flash_mode dio --flash_size 4MB --flash_freq 80m ' - '0x9000 $binaryPath' + '-b 2000000 ' + '--before default_reset --after hard_reset ' + '--chip esp32 ' + 'write_flash --flash_mode dio --flash_size 4MB --flash_freq 80m ' + '0x9000 $binaryPath' .split(' '); final result = await Process.run(command, args); @@ -347,7 +345,7 @@ class ShrapnelUart { String escapeCommandArg(String arg) { return arg.replaceAllMapped( RegExp(r'[\\" ]'), - (match) => '\\${match.group(0)!}', + (match) => '\\${match.group(0)!}', ); } diff --git a/dart/shrapnel_test_lib/pubspec.yaml b/dart/shrapnel_test_lib/pubspec.yaml new file mode 100644 index 00000000..e131f5e3 --- /dev/null +++ b/dart/shrapnel_test_lib/pubspec.yaml @@ -0,0 +1,19 @@ +name: shrapnel_test_lib +description: A starting point for Dart libraries or applications. +version: 1.0.0 + +publish_to: 'none' + +environment: + sdk: ^3.2.6 + +dependencies: + esp_softap_provisioning: + git: + url: https://github.com/ShrapnelDSP/esp_softap_provisioning.git + ref: shrapnel + flutter_libserialport: ^0.4.0 + +dev_dependencies: + lints: ^2.1.0 + test: ^1.24.0 diff --git a/frontend/test/firmware_api_test/util_test.dart b/dart/shrapnel_test_lib/test/shrapnel_test_lib_test.dart similarity index 87% rename from frontend/test/firmware_api_test/util_test.dart rename to dart/shrapnel_test_lib/test/shrapnel_test_lib_test.dart index bede4aae..eb8028f7 100644 --- a/frontend/test/firmware_api_test/util_test.dart +++ b/dart/shrapnel_test_lib/test/shrapnel_test_lib_test.dart @@ -19,9 +19,8 @@ // ignore_for_file: unnecessary_raw_strings -import 'package:flutter_test/flutter_test.dart'; - -import 'util.dart'; +import 'package:shrapnel_test_lib/shrapnel_test_lib.dart'; +import 'package:test/test.dart'; void main() { test('escape spaces', () { @@ -37,7 +36,7 @@ void main() { }; final result = - testCases.map((key, value) => MapEntry(key, escapeCommandArg(key))); + testCases.map((key, value) => MapEntry(key, escapeCommandArg(key))); expect(result, testCases); }); diff --git a/dart/shrapnel_test_tool/.gitignore b/dart/shrapnel_test_tool/.gitignore new file mode 100644 index 00000000..3a857904 --- /dev/null +++ b/dart/shrapnel_test_tool/.gitignore @@ -0,0 +1,3 @@ +# https://dart.dev/guides/libraries/private-files +# Created by `dart pub` +.dart_tool/ diff --git a/dart/shrapnel_test_tool/CHANGELOG.md b/dart/shrapnel_test_tool/CHANGELOG.md new file mode 100644 index 00000000..effe43c8 --- /dev/null +++ b/dart/shrapnel_test_tool/CHANGELOG.md @@ -0,0 +1,3 @@ +## 1.0.0 + +- Initial version. diff --git a/dart/shrapnel_test_tool/README.md b/dart/shrapnel_test_tool/README.md new file mode 100644 index 00000000..3816eca3 --- /dev/null +++ b/dart/shrapnel_test_tool/README.md @@ -0,0 +1,2 @@ +A sample command-line application with an entrypoint in `bin/`, library code +in `lib/`, and example unit test in `test/`. diff --git a/dart/shrapnel_test_tool/analysis_options.yaml b/dart/shrapnel_test_tool/analysis_options.yaml new file mode 100644 index 00000000..dee8927a --- /dev/null +++ b/dart/shrapnel_test_tool/analysis_options.yaml @@ -0,0 +1,30 @@ +# This file configures the static analysis results for your project (errors, +# warnings, and lints). +# +# This enables the 'recommended' set of lints from `package:lints`. +# This set helps identify many issues that may lead to problems when running +# or consuming Dart code, and enforces writing Dart using a single, idiomatic +# style and format. +# +# If you want a smaller set of lints you can change this to specify +# 'package:lints/core.yaml'. These are just the most critical lints +# (the recommended set includes the core lints). +# The core lints are also what is used by pub.dev for scoring packages. + +include: package:lints/recommended.yaml + +# Uncomment the following section to specify additional rules. + +# linter: +# rules: +# - camel_case_types + +# analyzer: +# exclude: +# - path/to/excluded/files/** + +# For more information about the core and recommended set of lints, see +# https://dart.dev/go/core-lints + +# For additional information about configuring this file, see +# https://dart.dev/guides/language/analysis-options diff --git a/dart/shrapnel_test_tool/bin/shrapnel_test_tool.dart b/dart/shrapnel_test_tool/bin/shrapnel_test_tool.dart new file mode 100644 index 00000000..c5a43c5d --- /dev/null +++ b/dart/shrapnel_test_tool/bin/shrapnel_test_tool.dart @@ -0,0 +1,5 @@ +import 'package:shrapnel_test_tool/shrapnel_test_tool.dart' as shrapnel_test_tool; + +void main(List arguments) { + print('Hello world: ${shrapnel_test_tool.calculate()}!'); +} diff --git a/dart/shrapnel_test_tool/lib/shrapnel_test_tool.dart b/dart/shrapnel_test_tool/lib/shrapnel_test_tool.dart new file mode 100644 index 00000000..f64ad726 --- /dev/null +++ b/dart/shrapnel_test_tool/lib/shrapnel_test_tool.dart @@ -0,0 +1,3 @@ +int calculate() { + return 6 * 7; +} diff --git a/dart/shrapnel_test_tool/pubspec.lock b/dart/shrapnel_test_tool/pubspec.lock new file mode 100644 index 00000000..d82c6c75 --- /dev/null +++ b/dart/shrapnel_test_tool/pubspec.lock @@ -0,0 +1,381 @@ +# Generated by pub +# See https://dart.dev/tools/pub/glossary#lockfile +packages: + _fe_analyzer_shared: + dependency: transitive + description: + name: _fe_analyzer_shared + sha256: "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7" + url: "https://pub.dev" + source: hosted + version: "67.0.0" + analyzer: + dependency: transitive + description: + name: analyzer + sha256: "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d" + url: "https://pub.dev" + source: hosted + version: "6.4.1" + args: + dependency: transitive + description: + name: args + sha256: "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a" + url: "https://pub.dev" + source: hosted + version: "2.5.0" + async: + dependency: transitive + description: + name: async + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + url: "https://pub.dev" + source: hosted + version: "2.11.0" + boolean_selector: + dependency: transitive + description: + name: boolean_selector + sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + url: "https://pub.dev" + source: hosted + version: "2.1.1" + collection: + dependency: transitive + description: + name: collection + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + url: "https://pub.dev" + source: hosted + version: "1.18.0" + convert: + dependency: transitive + description: + name: convert + sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592" + url: "https://pub.dev" + source: hosted + version: "3.1.1" + coverage: + dependency: transitive + description: + name: coverage + sha256: "3945034e86ea203af7a056d98e98e42a5518fff200d6e8e6647e1886b07e936e" + url: "https://pub.dev" + source: hosted + version: "1.8.0" + crypto: + dependency: transitive + description: + name: crypto + sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab + url: "https://pub.dev" + source: hosted + version: "3.0.3" + file: + dependency: transitive + description: + name: file + sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c" + url: "https://pub.dev" + source: hosted + version: "7.0.0" + frontend_server_client: + dependency: transitive + description: + name: frontend_server_client + sha256: f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694 + url: "https://pub.dev" + source: hosted + version: "4.0.0" + glob: + dependency: transitive + description: + name: glob + sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63" + url: "https://pub.dev" + source: hosted + version: "2.1.2" + http_multi_server: + dependency: transitive + description: + name: http_multi_server + sha256: "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b" + url: "https://pub.dev" + source: hosted + version: "3.2.1" + http_parser: + dependency: transitive + description: + name: http_parser + sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b" + url: "https://pub.dev" + source: hosted + version: "4.0.2" + io: + dependency: transitive + description: + name: io + sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e" + url: "https://pub.dev" + source: hosted + version: "1.0.4" + js: + dependency: transitive + description: + name: js + sha256: c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf + url: "https://pub.dev" + source: hosted + version: "0.7.1" + lints: + dependency: "direct dev" + description: + name: lints + sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452" + url: "https://pub.dev" + source: hosted + version: "2.1.1" + logging: + dependency: transitive + description: + name: logging + sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340" + url: "https://pub.dev" + source: hosted + version: "1.2.0" + matcher: + dependency: transitive + description: + name: matcher + sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb + url: "https://pub.dev" + source: hosted + version: "0.12.16+1" + meta: + dependency: transitive + description: + name: meta + sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 + url: "https://pub.dev" + source: hosted + version: "1.15.0" + mime: + dependency: transitive + description: + name: mime + sha256: "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2" + url: "https://pub.dev" + source: hosted + version: "1.0.5" + node_preamble: + dependency: transitive + description: + name: node_preamble + sha256: "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db" + url: "https://pub.dev" + source: hosted + version: "2.0.2" + package_config: + dependency: transitive + description: + name: package_config + sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd" + url: "https://pub.dev" + source: hosted + version: "2.1.0" + path: + dependency: transitive + description: + name: path + sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" + url: "https://pub.dev" + source: hosted + version: "1.9.0" + pool: + dependency: transitive + description: + name: pool + sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a" + url: "https://pub.dev" + source: hosted + version: "1.5.1" + pub_semver: + dependency: transitive + description: + name: pub_semver + sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c" + url: "https://pub.dev" + source: hosted + version: "2.1.4" + shelf: + dependency: transitive + description: + name: shelf + sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4 + url: "https://pub.dev" + source: hosted + version: "1.4.1" + shelf_packages_handler: + dependency: transitive + description: + name: shelf_packages_handler + sha256: "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e" + url: "https://pub.dev" + source: hosted + version: "3.0.2" + shelf_static: + dependency: transitive + description: + name: shelf_static + sha256: a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e + url: "https://pub.dev" + source: hosted + version: "1.1.2" + shelf_web_socket: + dependency: transitive + description: + name: shelf_web_socket + sha256: "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611" + url: "https://pub.dev" + source: hosted + version: "2.0.0" + source_map_stack_trace: + dependency: transitive + description: + name: source_map_stack_trace + sha256: "84cf769ad83aa6bb61e0aa5a18e53aea683395f196a6f39c4c881fb90ed4f7ae" + url: "https://pub.dev" + source: hosted + version: "2.1.1" + source_maps: + dependency: transitive + description: + name: source_maps + sha256: "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703" + url: "https://pub.dev" + source: hosted + version: "0.10.12" + source_span: + dependency: transitive + description: + name: source_span + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + url: "https://pub.dev" + source: hosted + version: "1.10.0" + stack_trace: + dependency: transitive + description: + name: stack_trace + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + url: "https://pub.dev" + source: hosted + version: "1.11.1" + stream_channel: + dependency: transitive + description: + name: stream_channel + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + url: "https://pub.dev" + source: hosted + version: "2.1.2" + string_scanner: + dependency: transitive + description: + name: string_scanner + sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3" + url: "https://pub.dev" + source: hosted + version: "1.3.0" + term_glyph: + dependency: transitive + description: + name: term_glyph + sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + url: "https://pub.dev" + source: hosted + version: "1.2.1" + test: + dependency: "direct dev" + description: + name: test + sha256: "7ee44229615f8f642b68120165ae4c2a75fe77ae2065b1e55ae4711f6cf0899e" + url: "https://pub.dev" + source: hosted + version: "1.25.7" + test_api: + dependency: transitive + description: + name: test_api + sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" + url: "https://pub.dev" + source: hosted + version: "0.7.2" + test_core: + dependency: transitive + description: + name: test_core + sha256: "55ea5a652e38a1dfb32943a7973f3681a60f872f8c3a05a14664ad54ef9c6696" + url: "https://pub.dev" + source: hosted + version: "0.6.4" + typed_data: + dependency: transitive + description: + name: typed_data + sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c + url: "https://pub.dev" + source: hosted + version: "1.3.2" + vm_service: + dependency: transitive + description: + name: vm_service + sha256: a2662fb1f114f4296cf3f5a50786a2d888268d7776cf681aa17d660ffa23b246 + url: "https://pub.dev" + source: hosted + version: "14.0.0" + watcher: + dependency: transitive + description: + name: watcher + sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8" + url: "https://pub.dev" + source: hosted + version: "1.1.0" + web: + dependency: transitive + description: + name: web + sha256: "4188706108906f002b3a293509234588823c8c979dc83304e229ff400c996b05" + url: "https://pub.dev" + source: hosted + version: "0.4.2" + web_socket_channel: + dependency: transitive + description: + name: web_socket_channel + sha256: "939ab60734a4f8fa95feacb55804fa278de28bdeef38e616dc08e44a84adea23" + url: "https://pub.dev" + source: hosted + version: "2.4.3" + webkit_inspection_protocol: + dependency: transitive + description: + name: webkit_inspection_protocol + sha256: "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572" + url: "https://pub.dev" + source: hosted + version: "1.2.1" + yaml: + dependency: transitive + description: + name: yaml + sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5" + url: "https://pub.dev" + source: hosted + version: "3.1.2" +sdks: + dart: ">=3.2.6 <4.0.0" diff --git a/dart/shrapnel_test_tool/pubspec.yaml b/dart/shrapnel_test_tool/pubspec.yaml new file mode 100644 index 00000000..db3c5b1f --- /dev/null +++ b/dart/shrapnel_test_tool/pubspec.yaml @@ -0,0 +1,15 @@ +name: shrapnel_test_tool +description: A sample command-line application. +version: 1.0.0 +# repository: https://github.com/my_org/my_repo + +environment: + sdk: ^3.2.6 + +# Add regular dependencies here. +dependencies: + # path: ^1.8.0 + +dev_dependencies: + lints: ^2.1.0 + test: ^1.24.0 diff --git a/dart/shrapnel_test_tool/test/shrapnel_test_tool_test.dart b/dart/shrapnel_test_tool/test/shrapnel_test_tool_test.dart new file mode 100644 index 00000000..77f56eff --- /dev/null +++ b/dart/shrapnel_test_tool/test/shrapnel_test_tool_test.dart @@ -0,0 +1,8 @@ +import 'package:shrapnel_test_tool/shrapnel_test_tool.dart'; +import 'package:test/test.dart'; + +void main() { + test('calculate', () { + expect(calculate(), 42); + }); +} diff --git a/frontend/lib/api/generated/analysis_options.yaml b/frontend/lib/api/generated/analysis_options.yaml deleted file mode 100644 index 83d80e4d..00000000 --- a/frontend/lib/api/generated/analysis_options.yaml +++ /dev/null @@ -1 +0,0 @@ -# empty file disables all lints \ No newline at end of file diff --git a/frontend/lib/api/generated/audio_events.pb.dart b/frontend/lib/api/generated/audio_events.pb.dart deleted file mode 100644 index d32d5a99..00000000 --- a/frontend/lib/api/generated/audio_events.pb.dart +++ /dev/null @@ -1,196 +0,0 @@ -// -// Generated code. Do not modify. -// source: audio_events.proto -// -// @dart = 2.12 - -// ignore_for_file: annotate_overrides, camel_case_types, comment_references -// ignore_for_file: constant_identifier_names, library_prefixes -// ignore_for_file: non_constant_identifier_names, prefer_final_fields -// ignore_for_file: unnecessary_import, unnecessary_this, unused_import - -import 'dart:core' as $core; - -import 'package:protobuf/protobuf.dart' as $pb; - -/// Sent when the input level is too high, causing clipping -class InputClipped extends $pb.GeneratedMessage { - factory InputClipped() => create(); - InputClipped._() : super(); - factory InputClipped.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory InputClipped.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo( - _omitMessageNames ? '' : 'InputClipped', - package: const $pb.PackageName( - _omitMessageNames ? '' : 'shrapnel.audio_events'), - createEmptyInstance: create) - ..hasRequiredFields = false; - - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') - InputClipped clone() => InputClipped()..mergeFromMessage(this); - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - InputClipped copyWith(void Function(InputClipped) updates) => - super.copyWith((message) => updates(message as InputClipped)) - as InputClipped; - - $pb.BuilderInfo get info_ => _i; - - @$core.pragma('dart2js:noInline') - static InputClipped create() => InputClipped._(); - InputClipped createEmptyInstance() => create(); - static $pb.PbList createRepeated() => - $pb.PbList(); - @$core.pragma('dart2js:noInline') - static InputClipped getDefault() => _defaultInstance ??= - $pb.GeneratedMessage.$_defaultFor(create); - static InputClipped? _defaultInstance; -} - -/// Sent when the output level is too high, causing clipping -class OutputClipped extends $pb.GeneratedMessage { - factory OutputClipped() => create(); - OutputClipped._() : super(); - factory OutputClipped.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory OutputClipped.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo( - _omitMessageNames ? '' : 'OutputClipped', - package: const $pb.PackageName( - _omitMessageNames ? '' : 'shrapnel.audio_events'), - createEmptyInstance: create) - ..hasRequiredFields = false; - - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') - OutputClipped clone() => OutputClipped()..mergeFromMessage(this); - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - OutputClipped copyWith(void Function(OutputClipped) updates) => - super.copyWith((message) => updates(message as OutputClipped)) - as OutputClipped; - - $pb.BuilderInfo get info_ => _i; - - @$core.pragma('dart2js:noInline') - static OutputClipped create() => OutputClipped._(); - OutputClipped createEmptyInstance() => create(); - static $pb.PbList createRepeated() => - $pb.PbList(); - @$core.pragma('dart2js:noInline') - static OutputClipped getDefault() => _defaultInstance ??= - $pb.GeneratedMessage.$_defaultFor(create); - static OutputClipped? _defaultInstance; -} - -enum Message_Event { inputClipped, outputClipped, notSet } - -class Message extends $pb.GeneratedMessage { - factory Message({ - InputClipped? inputClipped, - OutputClipped? outputClipped, - }) { - final $result = create(); - if (inputClipped != null) { - $result.inputClipped = inputClipped; - } - if (outputClipped != null) { - $result.outputClipped = outputClipped; - } - return $result; - } - Message._() : super(); - factory Message.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory Message.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); - - static const $core.Map<$core.int, Message_Event> _Message_EventByTag = { - 1: Message_Event.inputClipped, - 2: Message_Event.outputClipped, - 0: Message_Event.notSet - }; - static final $pb.BuilderInfo _i = $pb.BuilderInfo( - _omitMessageNames ? '' : 'Message', - package: const $pb.PackageName( - _omitMessageNames ? '' : 'shrapnel.audio_events'), - createEmptyInstance: create) - ..oo(0, [1, 2]) - ..aOM(1, _omitFieldNames ? '' : 'inputClipped', - subBuilder: InputClipped.create) - ..aOM(2, _omitFieldNames ? '' : 'outputClipped', - subBuilder: OutputClipped.create) - ..hasRequiredFields = false; - - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') - Message clone() => Message()..mergeFromMessage(this); - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - Message copyWith(void Function(Message) updates) => - super.copyWith((message) => updates(message as Message)) as Message; - - $pb.BuilderInfo get info_ => _i; - - @$core.pragma('dart2js:noInline') - static Message create() => Message._(); - Message createEmptyInstance() => create(); - static $pb.PbList createRepeated() => $pb.PbList(); - @$core.pragma('dart2js:noInline') - static Message getDefault() => - _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); - static Message? _defaultInstance; - - Message_Event whichEvent() => _Message_EventByTag[$_whichOneof(0)]!; - void clearEvent() => clearField($_whichOneof(0)); - - @$pb.TagNumber(1) - InputClipped get inputClipped => $_getN(0); - @$pb.TagNumber(1) - set inputClipped(InputClipped v) { - setField(1, v); - } - - @$pb.TagNumber(1) - $core.bool hasInputClipped() => $_has(0); - @$pb.TagNumber(1) - void clearInputClipped() => clearField(1); - @$pb.TagNumber(1) - InputClipped ensureInputClipped() => $_ensure(0); - - @$pb.TagNumber(2) - OutputClipped get outputClipped => $_getN(1); - @$pb.TagNumber(2) - set outputClipped(OutputClipped v) { - setField(2, v); - } - - @$pb.TagNumber(2) - $core.bool hasOutputClipped() => $_has(1); - @$pb.TagNumber(2) - void clearOutputClipped() => clearField(2); - @$pb.TagNumber(2) - OutputClipped ensureOutputClipped() => $_ensure(1); -} - -const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names'); -const _omitMessageNames = - $core.bool.fromEnvironment('protobuf.omit_message_names'); diff --git a/frontend/lib/api/generated/cmd_handling.pb.dart b/frontend/lib/api/generated/cmd_handling.pb.dart deleted file mode 100644 index 35287eb8..00000000 --- a/frontend/lib/api/generated/cmd_handling.pb.dart +++ /dev/null @@ -1,232 +0,0 @@ -// -// Generated code. Do not modify. -// source: cmd_handling.proto -// -// @dart = 2.12 - -// ignore_for_file: annotate_overrides, camel_case_types, comment_references -// ignore_for_file: constant_identifier_names, library_prefixes -// ignore_for_file: non_constant_identifier_names, prefer_final_fields -// ignore_for_file: unnecessary_import, unnecessary_this, unused_import - -import 'dart:core' as $core; - -import 'package:protobuf/protobuf.dart' as $pb; - -/// Firmware: update DSP processing to use the new parameter value. -/// -/// Frontend: Update UI to show new parameter value. -class Update extends $pb.GeneratedMessage { - factory Update({ - $core.String? id, - $core.double? value, - }) { - final $result = create(); - if (id != null) { - $result.id = id; - } - if (value != null) { - $result.value = value; - } - return $result; - } - Update._() : super(); - factory Update.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory Update.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo( - _omitMessageNames ? '' : 'Update', - package: const $pb.PackageName( - _omitMessageNames ? '' : 'shrapnel.cmd_handling'), - createEmptyInstance: create) - ..aOS(1, _omitFieldNames ? '' : 'id') - ..a<$core.double>(2, _omitFieldNames ? '' : 'value', $pb.PbFieldType.OF) - ..hasRequiredFields = false; - - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') - Update clone() => Update()..mergeFromMessage(this); - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - Update copyWith(void Function(Update) updates) => - super.copyWith((message) => updates(message as Update)) as Update; - - $pb.BuilderInfo get info_ => _i; - - @$core.pragma('dart2js:noInline') - static Update create() => Update._(); - Update createEmptyInstance() => create(); - static $pb.PbList createRepeated() => $pb.PbList(); - @$core.pragma('dart2js:noInline') - static Update getDefault() => - _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); - static Update? _defaultInstance; - - @$pb.TagNumber(1) - $core.String get id => $_getSZ(0); - @$pb.TagNumber(1) - set id($core.String v) { - $_setString(0, v); - } - - @$pb.TagNumber(1) - $core.bool hasId() => $_has(0); - @$pb.TagNumber(1) - void clearId() => clearField(1); - - @$pb.TagNumber(2) - $core.double get value => $_getN(1); - @$pb.TagNumber(2) - set value($core.double v) { - $_setFloat(1, v); - } - - @$pb.TagNumber(2) - $core.bool hasValue() => $_has(1); - @$pb.TagNumber(2) - void clearValue() => clearField(2); -} - -/// The firmware will respond by sending a `parameterUpdate` message with the -/// current value of each audio parameter -class Initialise extends $pb.GeneratedMessage { - factory Initialise() => create(); - Initialise._() : super(); - factory Initialise.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory Initialise.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo( - _omitMessageNames ? '' : 'Initialise', - package: const $pb.PackageName( - _omitMessageNames ? '' : 'shrapnel.cmd_handling'), - createEmptyInstance: create) - ..hasRequiredFields = false; - - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') - Initialise clone() => Initialise()..mergeFromMessage(this); - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - Initialise copyWith(void Function(Initialise) updates) => - super.copyWith((message) => updates(message as Initialise)) as Initialise; - - $pb.BuilderInfo get info_ => _i; - - @$core.pragma('dart2js:noInline') - static Initialise create() => Initialise._(); - Initialise createEmptyInstance() => create(); - static $pb.PbList createRepeated() => $pb.PbList(); - @$core.pragma('dart2js:noInline') - static Initialise getDefault() => _defaultInstance ??= - $pb.GeneratedMessage.$_defaultFor(create); - static Initialise? _defaultInstance; -} - -enum Message_Message { update, initialise, notSet } - -class Message extends $pb.GeneratedMessage { - factory Message({ - Update? update, - Initialise? initialise, - }) { - final $result = create(); - if (update != null) { - $result.update = update; - } - if (initialise != null) { - $result.initialise = initialise; - } - return $result; - } - Message._() : super(); - factory Message.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory Message.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); - - static const $core.Map<$core.int, Message_Message> _Message_MessageByTag = { - 1: Message_Message.update, - 2: Message_Message.initialise, - 0: Message_Message.notSet - }; - static final $pb.BuilderInfo _i = $pb.BuilderInfo( - _omitMessageNames ? '' : 'Message', - package: const $pb.PackageName( - _omitMessageNames ? '' : 'shrapnel.cmd_handling'), - createEmptyInstance: create) - ..oo(0, [1, 2]) - ..aOM(1, _omitFieldNames ? '' : 'update', subBuilder: Update.create) - ..aOM(2, _omitFieldNames ? '' : 'initialise', - subBuilder: Initialise.create) - ..hasRequiredFields = false; - - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') - Message clone() => Message()..mergeFromMessage(this); - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - Message copyWith(void Function(Message) updates) => - super.copyWith((message) => updates(message as Message)) as Message; - - $pb.BuilderInfo get info_ => _i; - - @$core.pragma('dart2js:noInline') - static Message create() => Message._(); - Message createEmptyInstance() => create(); - static $pb.PbList createRepeated() => $pb.PbList(); - @$core.pragma('dart2js:noInline') - static Message getDefault() => - _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); - static Message? _defaultInstance; - - Message_Message whichMessage() => _Message_MessageByTag[$_whichOneof(0)]!; - void clearMessage() => clearField($_whichOneof(0)); - - @$pb.TagNumber(1) - Update get update => $_getN(0); - @$pb.TagNumber(1) - set update(Update v) { - setField(1, v); - } - - @$pb.TagNumber(1) - $core.bool hasUpdate() => $_has(0); - @$pb.TagNumber(1) - void clearUpdate() => clearField(1); - @$pb.TagNumber(1) - Update ensureUpdate() => $_ensure(0); - - @$pb.TagNumber(2) - Initialise get initialise => $_getN(1); - @$pb.TagNumber(2) - set initialise(Initialise v) { - setField(2, v); - } - - @$pb.TagNumber(2) - $core.bool hasInitialise() => $_has(1); - @$pb.TagNumber(2) - void clearInitialise() => clearField(2); - @$pb.TagNumber(2) - Initialise ensureInitialise() => $_ensure(1); -} - -const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names'); -const _omitMessageNames = - $core.bool.fromEnvironment('protobuf.omit_message_names'); diff --git a/frontend/lib/api/generated/selected_preset.pb.dart b/frontend/lib/api/generated/selected_preset.pb.dart deleted file mode 100644 index 5487a4a8..00000000 --- a/frontend/lib/api/generated/selected_preset.pb.dart +++ /dev/null @@ -1,289 +0,0 @@ -// -// Generated code. Do not modify. -// source: selected_preset.proto -// -// @dart = 2.12 - -// ignore_for_file: annotate_overrides, camel_case_types, comment_references -// ignore_for_file: constant_identifier_names, library_prefixes -// ignore_for_file: non_constant_identifier_names, prefer_final_fields -// ignore_for_file: unnecessary_import, unnecessary_this, unused_import - -import 'dart:core' as $core; - -import 'package:protobuf/protobuf.dart' as $pb; - -class Read extends $pb.GeneratedMessage { - factory Read() => create(); - Read._() : super(); - factory Read.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory Read.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo( - _omitMessageNames ? '' : 'Read', - package: const $pb.PackageName( - _omitMessageNames ? '' : 'shrapnel.selected_preset'), - createEmptyInstance: create) - ..hasRequiredFields = false; - - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') - Read clone() => Read()..mergeFromMessage(this); - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - Read copyWith(void Function(Read) updates) => - super.copyWith((message) => updates(message as Read)) as Read; - - $pb.BuilderInfo get info_ => _i; - - @$core.pragma('dart2js:noInline') - static Read create() => Read._(); - Read createEmptyInstance() => create(); - static $pb.PbList createRepeated() => $pb.PbList(); - @$core.pragma('dart2js:noInline') - static Read getDefault() => - _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); - static Read? _defaultInstance; -} - -class Notify extends $pb.GeneratedMessage { - factory Notify({ - $core.int? id, - }) { - final $result = create(); - if (id != null) { - $result.id = id; - } - return $result; - } - Notify._() : super(); - factory Notify.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory Notify.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo( - _omitMessageNames ? '' : 'Notify', - package: const $pb.PackageName( - _omitMessageNames ? '' : 'shrapnel.selected_preset'), - createEmptyInstance: create) - ..a<$core.int>(1, _omitFieldNames ? '' : 'id', $pb.PbFieldType.OU3) - ..hasRequiredFields = false; - - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') - Notify clone() => Notify()..mergeFromMessage(this); - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - Notify copyWith(void Function(Notify) updates) => - super.copyWith((message) => updates(message as Notify)) as Notify; - - $pb.BuilderInfo get info_ => _i; - - @$core.pragma('dart2js:noInline') - static Notify create() => Notify._(); - Notify createEmptyInstance() => create(); - static $pb.PbList createRepeated() => $pb.PbList(); - @$core.pragma('dart2js:noInline') - static Notify getDefault() => - _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); - static Notify? _defaultInstance; - - @$pb.TagNumber(1) - $core.int get id => $_getIZ(0); - @$pb.TagNumber(1) - set id($core.int v) { - $_setUnsignedInt32(0, v); - } - - @$pb.TagNumber(1) - $core.bool hasId() => $_has(0); - @$pb.TagNumber(1) - void clearId() => clearField(1); -} - -class Write extends $pb.GeneratedMessage { - factory Write({ - $core.int? id, - }) { - final $result = create(); - if (id != null) { - $result.id = id; - } - return $result; - } - Write._() : super(); - factory Write.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory Write.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo( - _omitMessageNames ? '' : 'Write', - package: const $pb.PackageName( - _omitMessageNames ? '' : 'shrapnel.selected_preset'), - createEmptyInstance: create) - ..a<$core.int>(1, _omitFieldNames ? '' : 'id', $pb.PbFieldType.OU3) - ..hasRequiredFields = false; - - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') - Write clone() => Write()..mergeFromMessage(this); - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - Write copyWith(void Function(Write) updates) => - super.copyWith((message) => updates(message as Write)) as Write; - - $pb.BuilderInfo get info_ => _i; - - @$core.pragma('dart2js:noInline') - static Write create() => Write._(); - Write createEmptyInstance() => create(); - static $pb.PbList createRepeated() => $pb.PbList(); - @$core.pragma('dart2js:noInline') - static Write getDefault() => - _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); - static Write? _defaultInstance; - - @$pb.TagNumber(1) - $core.int get id => $_getIZ(0); - @$pb.TagNumber(1) - set id($core.int v) { - $_setUnsignedInt32(0, v); - } - - @$pb.TagNumber(1) - $core.bool hasId() => $_has(0); - @$pb.TagNumber(1) - void clearId() => clearField(1); -} - -enum Message_Message { read, notify, write, notSet } - -class Message extends $pb.GeneratedMessage { - factory Message({ - Read? read, - Notify? notify, - Write? write, - }) { - final $result = create(); - if (read != null) { - $result.read = read; - } - if (notify != null) { - $result.notify = notify; - } - if (write != null) { - $result.write = write; - } - return $result; - } - Message._() : super(); - factory Message.fromBuffer($core.List<$core.int> i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromBuffer(i, r); - factory Message.fromJson($core.String i, - [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => - create()..mergeFromJson(i, r); - - static const $core.Map<$core.int, Message_Message> _Message_MessageByTag = { - 1: Message_Message.read, - 2: Message_Message.notify, - 3: Message_Message.write, - 0: Message_Message.notSet - }; - static final $pb.BuilderInfo _i = $pb.BuilderInfo( - _omitMessageNames ? '' : 'Message', - package: const $pb.PackageName( - _omitMessageNames ? '' : 'shrapnel.selected_preset'), - createEmptyInstance: create) - ..oo(0, [1, 2, 3]) - ..aOM(1, _omitFieldNames ? '' : 'read', subBuilder: Read.create) - ..aOM(2, _omitFieldNames ? '' : 'notify', subBuilder: Notify.create) - ..aOM(3, _omitFieldNames ? '' : 'write', subBuilder: Write.create) - ..hasRequiredFields = false; - - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') - Message clone() => Message()..mergeFromMessage(this); - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - Message copyWith(void Function(Message) updates) => - super.copyWith((message) => updates(message as Message)) as Message; - - $pb.BuilderInfo get info_ => _i; - - @$core.pragma('dart2js:noInline') - static Message create() => Message._(); - Message createEmptyInstance() => create(); - static $pb.PbList createRepeated() => $pb.PbList(); - @$core.pragma('dart2js:noInline') - static Message getDefault() => - _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); - static Message? _defaultInstance; - - Message_Message whichMessage() => _Message_MessageByTag[$_whichOneof(0)]!; - void clearMessage() => clearField($_whichOneof(0)); - - @$pb.TagNumber(1) - Read get read => $_getN(0); - @$pb.TagNumber(1) - set read(Read v) { - setField(1, v); - } - - @$pb.TagNumber(1) - $core.bool hasRead() => $_has(0); - @$pb.TagNumber(1) - void clearRead() => clearField(1); - @$pb.TagNumber(1) - Read ensureRead() => $_ensure(0); - - @$pb.TagNumber(2) - Notify get notify => $_getN(1); - @$pb.TagNumber(2) - set notify(Notify v) { - setField(2, v); - } - - @$pb.TagNumber(2) - $core.bool hasNotify() => $_has(1); - @$pb.TagNumber(2) - void clearNotify() => clearField(2); - @$pb.TagNumber(2) - Notify ensureNotify() => $_ensure(1); - - @$pb.TagNumber(3) - Write get write => $_getN(2); - @$pb.TagNumber(3) - set write(Write v) { - setField(3, v); - } - - @$pb.TagNumber(3) - $core.bool hasWrite() => $_has(2); - @$pb.TagNumber(3) - void clearWrite() => clearField(3); - @$pb.TagNumber(3) - Write ensureWrite() => $_ensure(2); -} - -const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names'); -const _omitMessageNames = - $core.bool.fromEnvironment('protobuf.omit_message_names'); From cde1423d09ba64f861c76c606c6e4009bd26dad4 Mon Sep 17 00:00:00 2001 From: Barabas Raffai Date: Sat, 3 Aug 2024 14:41:15 +0100 Subject: [PATCH 02/14] WIP --- .../api_data/generated/analysis_options.yaml | 1 + dart/frontend/lib/wifi_provisioning.dart | 46 +--------------- dart/frontend/pubspec.lock | 16 +++++- dart/frontend/pubspec.yaml | 4 ++ .../example/shrapnel_common_example.dart | 6 -- .../lib/src/shrapnel_common_base.dart | 55 +++++++++++++++++-- dart/shrapnel_common/pubspec.yaml | 9 ++- .../test/shrapnel_common_test.dart | 13 +---- dart/shrapnel_test_lib/pubspec.yaml | 4 ++ 9 files changed, 83 insertions(+), 71 deletions(-) create mode 100644 dart/frontend/lib/api_data/generated/analysis_options.yaml delete mode 100644 dart/shrapnel_common/example/shrapnel_common_example.dart diff --git a/dart/frontend/lib/api_data/generated/analysis_options.yaml b/dart/frontend/lib/api_data/generated/analysis_options.yaml new file mode 100644 index 00000000..83d80e4d --- /dev/null +++ b/dart/frontend/lib/api_data/generated/analysis_options.yaml @@ -0,0 +1 @@ +# empty file disables all lints \ No newline at end of file diff --git a/dart/frontend/lib/wifi_provisioning.dart b/dart/frontend/lib/wifi_provisioning.dart index 486d6fd4..9ca9cc44 100644 --- a/dart/frontend/lib/wifi_provisioning.dart +++ b/dart/frontend/lib/wifi_provisioning.dart @@ -27,6 +27,7 @@ import 'package:esp_softap_provisioning/src/connection_models.dart'; import 'package:flutter/material.dart'; import 'package:logging/logging.dart'; import 'package:provider/provider.dart'; +import 'package:shrapnel_common/shrapnel_common.dart'; class _Strings { static const initialMessage = @@ -726,48 +727,3 @@ class WifiProvisioningService extends ChangeNotifier { _state = WifiProvisioningState.initial; } } - -extension ShrapnelAdditions on ConnectionStatus? { - bool isTerminal() { - if (this == null) { - return true; - } - - final state = this!.state; - - return state == WifiConnectionState.Connected || - state == WifiConnectionState.Disconnected || - state == WifiConnectionState.ConnectionFailed; - } - - bool isSuccess() { - if (this == null) { - return false; - } - - return this!.state == WifiConnectionState.Connected; - } -} - -extension StatusPollEx on Provisioning { - Future pollStatus(Duration timeout) async { - var keepGoing = true; - final timer = Timer(timeout, () { - _log.warning('Connection to provisioned access point timed out'); - keepGoing = false; - }); - ConnectionStatus? status; - - while (keepGoing) { - status = await getStatus(); - - if (status.isTerminal()) { - timer.cancel(); - return status; - } - await Future.delayed(const Duration(seconds: 1)); - } - - return status; - } -} diff --git a/dart/frontend/pubspec.lock b/dart/frontend/pubspec.lock index b070e291..0c4e3215 100644 --- a/dart/frontend/pubspec.lock +++ b/dart/frontend/pubspec.lock @@ -603,6 +603,20 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.4" + shrapnel_common: + dependency: "direct main" + description: + path: "../shrapnel_common" + relative: true + source: path + version: "1.0.0" + shrapnel_test_lib: + dependency: "direct dev" + description: + path: "../shrapnel_test_lib" + relative: true + source: path + version: "1.0.0" sky_engine: dependency: transitive description: flutter @@ -793,5 +807,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.2.0 <4.0.0" + dart: ">=3.2.6 <4.0.0" flutter: ">=3.7.0" diff --git a/dart/frontend/pubspec.yaml b/dart/frontend/pubspec.yaml index 4b4f2279..55384858 100644 --- a/dart/frontend/pubspec.yaml +++ b/dart/frontend/pubspec.yaml @@ -26,6 +26,8 @@ dependencies: provider: ^6.0.0 remove_from_coverage: ^2.0.0 rxdart: ^0.27.7 + shrapnel_common: + path: ../shrapnel_common state_notifier: ^1.0.0 vector_math: ^2.0.0 web_socket_channel: ^2.1.0 @@ -40,6 +42,8 @@ dev_dependencies: sdk: flutter libserialport: ^0.3.0+1 mockito: ^5.1.0 + shrapnel_test_lib: + path: ../shrapnel_test_lib flutter: uses-material-design: true diff --git a/dart/shrapnel_common/example/shrapnel_common_example.dart b/dart/shrapnel_common/example/shrapnel_common_example.dart deleted file mode 100644 index bfd16bfd..00000000 --- a/dart/shrapnel_common/example/shrapnel_common_example.dart +++ /dev/null @@ -1,6 +0,0 @@ -import 'package:shrapnel_common/shrapnel_common.dart'; - -void main() { - var awesome = Awesome(); - print('awesome: ${awesome.isAwesome}'); -} diff --git a/dart/shrapnel_common/lib/src/shrapnel_common_base.dart b/dart/shrapnel_common/lib/src/shrapnel_common_base.dart index e8a6f159..85650ffb 100644 --- a/dart/shrapnel_common/lib/src/shrapnel_common_base.dart +++ b/dart/shrapnel_common/lib/src/shrapnel_common_base.dart @@ -1,6 +1,53 @@ -// TODO: Put public facing types in this file. +import 'dart:async'; -/// Checks if you are awesome. Spoiler: you are. -class Awesome { - bool get isAwesome => true; +import 'package:esp_softap_provisioning/esp_softap_provisioning.dart'; +// ignore: implementation_imports +import 'package:esp_softap_provisioning/src/connection_models.dart'; +import 'package:logging/logging.dart'; + +final _log = Logger('shrapnel.common'); + +extension StatusPollEx on Provisioning { + Future pollStatus(Duration timeout) async { + var keepGoing = true; + final timer = Timer(timeout, () { + _log.warning('Connection to provisioned access point timed out'); + keepGoing = false; + }); + ConnectionStatus? status; + + while (keepGoing) { + status = await getStatus(); + + if (status.isTerminal()) { + timer.cancel(); + return status; + } + await Future.delayed(const Duration(seconds: 1)); + } + + return status; + } +} + +extension ShrapnelAdditions on ConnectionStatus? { + bool isTerminal() { + if (this == null) { + return true; + } + + final state = this!.state; + + return state == WifiConnectionState.Connected || + state == WifiConnectionState.Disconnected || + state == WifiConnectionState.ConnectionFailed; + } + + bool isSuccess() { + if (this == null) { + return false; + } + + return this!.state == WifiConnectionState.Connected; + } } diff --git a/dart/shrapnel_common/pubspec.yaml b/dart/shrapnel_common/pubspec.yaml index 96a63340..8455b0a0 100644 --- a/dart/shrapnel_common/pubspec.yaml +++ b/dart/shrapnel_common/pubspec.yaml @@ -1,14 +1,17 @@ name: shrapnel_common description: A starting point for Dart libraries or applications. version: 1.0.0 -# repository: https://github.com/my_org/my_repo +publish_to: 'none' environment: sdk: ^3.2.6 -# Add regular dependencies here. dependencies: - # path: ^1.8.0 + esp_softap_provisioning: + git: + url: https://github.com/ShrapnelDSP/esp_softap_provisioning.git + ref: shrapnel + logging: ^1.2.0 dev_dependencies: lints: ^2.1.0 diff --git a/dart/shrapnel_common/test/shrapnel_common_test.dart b/dart/shrapnel_common/test/shrapnel_common_test.dart index 235cb719..13880f99 100644 --- a/dart/shrapnel_common/test/shrapnel_common_test.dart +++ b/dart/shrapnel_common/test/shrapnel_common_test.dart @@ -1,16 +1,5 @@ -import 'package:shrapnel_common/shrapnel_common.dart'; import 'package:test/test.dart'; void main() { - group('A group of tests', () { - final awesome = Awesome(); - - setUp(() { - // Additional setup goes here. - }); - - test('First Test', () { - expect(awesome.isAwesome, isTrue); - }); - }); + test('dummy', () {}); } diff --git a/dart/shrapnel_test_lib/pubspec.yaml b/dart/shrapnel_test_lib/pubspec.yaml index e131f5e3..d01b3ac7 100644 --- a/dart/shrapnel_test_lib/pubspec.yaml +++ b/dart/shrapnel_test_lib/pubspec.yaml @@ -13,6 +13,10 @@ dependencies: url: https://github.com/ShrapnelDSP/esp_softap_provisioning.git ref: shrapnel flutter_libserialport: ^0.4.0 + logging: ^1.2.0 + path: ^1.9.0 + shrapnel_common: + path: ../shrapnel_common dev_dependencies: lints: ^2.1.0 From da927a299cb2ec55fdbcc98cfa482fd692cc4d34 Mon Sep 17 00:00:00 2001 From: Barabas Raffai Date: Sat, 3 Aug 2024 15:07:04 +0100 Subject: [PATCH 03/14] refactor done --- dart/frontend/integration_test/simple_test.dart | 2 +- dart/frontend/lib/api/api_websocket.dart | 6 +++--- dart/frontend/lib/audio_events.dart | 2 +- dart/frontend/lib/main.dart | 4 ++-- dart/frontend/lib/midi_mapping/model/midi_learn.dart | 2 +- dart/frontend/lib/midi_mapping/model/midi_learn_state.dart | 2 +- dart/frontend/lib/midi_mapping/model/service.dart | 4 ++-- dart/frontend/lib/midi_mapping/view/midi_mapping.dart | 2 +- dart/frontend/lib/parameter.dart | 4 ++-- dart/frontend/lib/presets/model/presets_client.dart | 4 ++-- .../frontend/lib/presets/model/selected_preset_client.dart | 4 ++-- dart/frontend/pubspec.lock | 4 ++-- .../test/midi_mapping/midi_mapping_page_object.dart | 2 +- dart/frontend/test/midi_mapping/model/service_test.dart | 2 +- .../frontend/test/midi_mapping/view/midi_mapping_test.dart | 4 ++-- dart/frontend/test/presets/presets_test.dart | 4 ++-- dart/shrapnel_common/.gitignore | 7 +++++++ .../lib/api_data/api_message.dart | 0 .../lib/api_data/audio_event_message.dart | 0 .../{frontend => shrapnel_common}/lib/api_data/generate.sh | 0 .../lib/api_data/generated/analysis_options.yaml | 0 .../lib/api_data/generated/audio_events.pb.dart | 0 .../lib/api_data/generated/audio_events.pbenum.dart | 0 .../lib/api_data/generated/audio_events.pbjson.dart | 0 .../lib/api_data/generated/audio_events.pbserver.dart | 0 .../lib/api_data/generated/cmd_handling.pb.dart | 0 .../lib/api_data/generated/cmd_handling.pbenum.dart | 0 .../lib/api_data/generated/cmd_handling.pbjson.dart | 0 .../lib/api_data/generated/cmd_handling.pbserver.dart | 0 .../lib/api_data/generated/midi_mapping.pb.dart | 0 .../lib/api_data/generated/midi_mapping.pbenum.dart | 0 .../lib/api_data/generated/midi_mapping.pbjson.dart | 0 .../lib/api_data/generated/midi_mapping.pbserver.dart | 0 .../lib/api_data/generated/presets.pb.dart | 0 .../lib/api_data/generated/presets.pbenum.dart | 0 .../lib/api_data/generated/presets.pbjson.dart | 0 .../lib/api_data/generated/presets.pbserver.dart | 0 .../lib/api_data/generated/selected_preset.pb.dart | 0 .../lib/api_data/generated/selected_preset.pbenum.dart | 0 .../lib/api_data/generated/selected_preset.pbjson.dart | 0 .../lib/api_data/generated/selected_preset.pbserver.dart | 0 .../lib/api_data/generated/shrapnel.pb.dart | 0 .../lib/api_data/generated/shrapnel.pbenum.dart | 1 + .../lib/api_data/generated/shrapnel.pbjson.dart | 1 + .../lib/api_data/generated/shrapnel.pbserver.dart | 1 + .../lib/api_data/midi_api_message.dart | 0 .../lib/api_data/parameter_message.dart | 0 .../lib/api_data/presets_message.dart | 0 .../lib/api_data/proto_extension.dart | 0 .../lib/api_data/selected_preset_data.dart | 0 dart/shrapnel_common/pubspec.yaml | 3 +++ dart/shrapnel_test_lib/.gitignore | 3 +++ dart/shrapnel_test_lib/lib/src/shrapnel_test_lib_base.dart | 2 ++ dart/shrapnel_test_lib/pubspec.yaml | 2 +- dart/shrapnel_test_tool/.gitignore | 7 +++++++ 55 files changed, 52 insertions(+), 27 deletions(-) rename dart/{frontend => shrapnel_common}/lib/api_data/api_message.dart (100%) rename dart/{frontend => shrapnel_common}/lib/api_data/audio_event_message.dart (100%) rename dart/{frontend => shrapnel_common}/lib/api_data/generate.sh (100%) rename dart/{frontend => shrapnel_common}/lib/api_data/generated/analysis_options.yaml (100%) rename dart/{frontend => shrapnel_common}/lib/api_data/generated/audio_events.pb.dart (100%) rename dart/{frontend => shrapnel_common}/lib/api_data/generated/audio_events.pbenum.dart (100%) rename dart/{frontend => shrapnel_common}/lib/api_data/generated/audio_events.pbjson.dart (100%) rename dart/{frontend => shrapnel_common}/lib/api_data/generated/audio_events.pbserver.dart (100%) rename dart/{frontend => shrapnel_common}/lib/api_data/generated/cmd_handling.pb.dart (100%) rename dart/{frontend => shrapnel_common}/lib/api_data/generated/cmd_handling.pbenum.dart (100%) rename dart/{frontend => shrapnel_common}/lib/api_data/generated/cmd_handling.pbjson.dart (100%) rename dart/{frontend => shrapnel_common}/lib/api_data/generated/cmd_handling.pbserver.dart (100%) rename dart/{frontend => shrapnel_common}/lib/api_data/generated/midi_mapping.pb.dart (100%) rename dart/{frontend => shrapnel_common}/lib/api_data/generated/midi_mapping.pbenum.dart (100%) rename dart/{frontend => shrapnel_common}/lib/api_data/generated/midi_mapping.pbjson.dart (100%) rename dart/{frontend => shrapnel_common}/lib/api_data/generated/midi_mapping.pbserver.dart (100%) rename dart/{frontend => shrapnel_common}/lib/api_data/generated/presets.pb.dart (100%) rename dart/{frontend => shrapnel_common}/lib/api_data/generated/presets.pbenum.dart (100%) rename dart/{frontend => shrapnel_common}/lib/api_data/generated/presets.pbjson.dart (100%) rename dart/{frontend => shrapnel_common}/lib/api_data/generated/presets.pbserver.dart (100%) rename dart/{frontend => shrapnel_common}/lib/api_data/generated/selected_preset.pb.dart (100%) rename dart/{frontend => shrapnel_common}/lib/api_data/generated/selected_preset.pbenum.dart (100%) rename dart/{frontend => shrapnel_common}/lib/api_data/generated/selected_preset.pbjson.dart (100%) rename dart/{frontend => shrapnel_common}/lib/api_data/generated/selected_preset.pbserver.dart (100%) rename dart/{frontend => shrapnel_common}/lib/api_data/generated/shrapnel.pb.dart (100%) rename dart/{frontend => shrapnel_common}/lib/api_data/generated/shrapnel.pbenum.dart (99%) rename dart/{frontend => shrapnel_common}/lib/api_data/generated/shrapnel.pbjson.dart (99%) rename dart/{frontend => shrapnel_common}/lib/api_data/generated/shrapnel.pbserver.dart (99%) rename dart/{frontend => shrapnel_common}/lib/api_data/midi_api_message.dart (100%) rename dart/{frontend => shrapnel_common}/lib/api_data/parameter_message.dart (100%) rename dart/{frontend => shrapnel_common}/lib/api_data/presets_message.dart (100%) rename dart/{frontend => shrapnel_common}/lib/api_data/proto_extension.dart (100%) rename dart/{frontend => shrapnel_common}/lib/api_data/selected_preset_data.dart (100%) diff --git a/dart/frontend/integration_test/simple_test.dart b/dart/frontend/integration_test/simple_test.dart index 980c9500..9906bc56 100644 --- a/dart/frontend/integration_test/simple_test.dart +++ b/dart/frontend/integration_test/simple_test.dart @@ -24,8 +24,8 @@ library; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:logging/logging.dart'; -import 'package:shrapnel/api_data/midi_api_message.dart'; import 'package:shrapnel/main.dart'; +import 'package:shrapnel_common/api_data/midi_api_message.dart'; import 'package:shrapnel_test_lib/shrapnel_test_lib.dart'; import '../test/home_page_object.dart'; diff --git a/dart/frontend/lib/api/api_websocket.dart b/dart/frontend/lib/api/api_websocket.dart index 75cae5b0..dafd6a62 100644 --- a/dart/frontend/lib/api/api_websocket.dart +++ b/dart/frontend/lib/api/api_websocket.dart @@ -23,9 +23,9 @@ import 'package:async/async.dart'; import 'package:logging/logging.dart'; import 'package:rxdart/rxdart.dart'; -import '../api_data/api_message.dart'; -import '../api_data/generated/shrapnel.pb.dart' as shrapnel_pb; -import '../api_data/proto_extension.dart'; +import 'package:shrapnel_common/api_data/api_message.dart'; +import 'package:shrapnel_common/api_data/generated/shrapnel.pb.dart' as shrapnel_pb; +import 'package:shrapnel_common/api_data/proto_extension.dart'; import '../core/message_transport.dart'; import '../core/stream_extensions.dart'; import '../robust_websocket.dart'; diff --git a/dart/frontend/lib/audio_events.dart b/dart/frontend/lib/audio_events.dart index c6521bcf..9e40bb7e 100644 --- a/dart/frontend/lib/audio_events.dart +++ b/dart/frontend/lib/audio_events.dart @@ -21,7 +21,7 @@ import 'package:flutter/material.dart'; import 'package:logging/logging.dart'; import 'package:pausable_timer/pausable_timer.dart'; -import 'api_data/audio_event_message.dart'; +import 'package:shrapnel_common/api_data/audio_event_message.dart'; final _log = Logger('shrapnel.audio_events'); diff --git a/dart/frontend/lib/main.dart b/dart/frontend/lib/main.dart index a7da11d3..6baf38da 100644 --- a/dart/frontend/lib/main.dart +++ b/dart/frontend/lib/main.dart @@ -26,10 +26,10 @@ import 'package:google_fonts/google_fonts.dart'; import 'package:logging/logging.dart'; import 'package:provider/provider.dart'; import 'package:rxdart/rxdart.dart'; +import 'package:shrapnel_common/api_data/api_message.dart'; +import 'package:shrapnel_common/api_data/parameter_message.dart'; import 'api/api_websocket.dart'; -import 'api_data/api_message.dart'; -import 'api_data/parameter_message.dart'; import 'audio_events.dart'; import 'chorus.dart'; import 'core/message_transport.dart'; diff --git a/dart/frontend/lib/midi_mapping/model/midi_learn.dart b/dart/frontend/lib/midi_mapping/model/midi_learn.dart index 63d0e13b..69c04f42 100644 --- a/dart/frontend/lib/midi_mapping/model/midi_learn.dart +++ b/dart/frontend/lib/midi_mapping/model/midi_learn.dart @@ -20,9 +20,9 @@ import 'dart:async'; import 'package:logging/logging.dart'; +import 'package:shrapnel_common/api_data/midi_api_message.dart'; import 'package:state_notifier/state_notifier.dart'; -import '../../api_data/midi_api_message.dart'; import 'midi_learn_state.dart'; import 'service.dart'; diff --git a/dart/frontend/lib/midi_mapping/model/midi_learn_state.dart b/dart/frontend/lib/midi_mapping/model/midi_learn_state.dart index 5d1533ca..9792c214 100644 --- a/dart/frontend/lib/midi_mapping/model/midi_learn_state.dart +++ b/dart/frontend/lib/midi_mapping/model/midi_learn_state.dart @@ -19,7 +19,7 @@ import 'package:freezed_annotation/freezed_annotation.dart'; -import '../../api_data/midi_api_message.dart'; +import 'package:shrapnel_common/api_data/midi_api_message.dart'; part 'midi_learn_state.freezed.dart'; diff --git a/dart/frontend/lib/midi_mapping/model/service.dart b/dart/frontend/lib/midi_mapping/model/service.dart index 403b2c04..d84ea6bb 100644 --- a/dart/frontend/lib/midi_mapping/model/service.dart +++ b/dart/frontend/lib/midi_mapping/model/service.dart @@ -23,10 +23,10 @@ import 'dart:collection'; import 'package:flutter/material.dart'; import 'package:logging/logging.dart'; import 'package:rxdart/rxdart.dart'; +import 'package:shrapnel_common/api_data/api_message.dart'; +import 'package:shrapnel_common/api_data/midi_api_message.dart'; import '../../api/api_websocket.dart'; -import '../../api_data/api_message.dart'; -import '../../api_data/midi_api_message.dart'; import '../../core/message_transport.dart'; import '../../core/stream_extensions.dart'; diff --git a/dart/frontend/lib/midi_mapping/view/midi_mapping.dart b/dart/frontend/lib/midi_mapping/view/midi_mapping.dart index c713aada..04b3354c 100644 --- a/dart/frontend/lib/midi_mapping/view/midi_mapping.dart +++ b/dart/frontend/lib/midi_mapping/view/midi_mapping.dart @@ -22,7 +22,7 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import '../../api_data/midi_api_message.dart'; +import 'package:shrapnel_common/api_data/midi_api_message.dart'; import '../../parameter.dart'; import '../../presets/model/presets.dart'; import '../model/service.dart'; diff --git a/dart/frontend/lib/parameter.dart b/dart/frontend/lib/parameter.dart index 8d388396..ea4ee366 100644 --- a/dart/frontend/lib/parameter.dart +++ b/dart/frontend/lib/parameter.dart @@ -23,10 +23,10 @@ import 'package:flutter/widgets.dart'; import 'package:freezed_annotation/freezed_annotation.dart'; import 'package:logging/logging.dart'; import 'package:rxdart/rxdart.dart'; +import 'package:shrapnel_common/api_data/api_message.dart'; +import 'package:shrapnel_common/api_data/parameter_message.dart'; import 'api/api_websocket.dart'; -import 'api_data/api_message.dart'; -import 'api_data/parameter_message.dart'; import 'core/message_transport.dart'; part 'parameter.freezed.dart'; diff --git a/dart/frontend/lib/presets/model/presets_client.dart b/dart/frontend/lib/presets/model/presets_client.dart index a629ec5f..80d13aa0 100644 --- a/dart/frontend/lib/presets/model/presets_client.dart +++ b/dart/frontend/lib/presets/model/presets_client.dart @@ -21,10 +21,10 @@ import 'dart:async'; import 'package:logging/logging.dart'; import 'package:rxdart/rxdart.dart'; +import 'package:shrapnel_common/api_data/api_message.dart'; +import 'package:shrapnel_common/api_data/presets_message.dart'; import '../../api/api_websocket.dart'; -import '../../api_data/api_message.dart'; -import '../../api_data/presets_message.dart'; import '../../core/message_transport.dart'; import '../../core/stream_extensions.dart'; import 'presets.dart' as presets; diff --git a/dart/frontend/lib/presets/model/selected_preset_client.dart b/dart/frontend/lib/presets/model/selected_preset_client.dart index 2572ca6e..8d9911e5 100644 --- a/dart/frontend/lib/presets/model/selected_preset_client.dart +++ b/dart/frontend/lib/presets/model/selected_preset_client.dart @@ -21,10 +21,10 @@ import 'dart:async'; import 'package:logging/logging.dart'; import 'package:rxdart/rxdart.dart'; +import 'package:shrapnel_common/api_data/api_message.dart'; +import 'package:shrapnel_common/api_data/selected_preset_data.dart'; import '../../api/api_websocket.dart'; -import '../../api_data/api_message.dart'; -import '../../api_data/selected_preset_data.dart'; import '../../core/message_transport.dart'; import '../../core/stream_extensions.dart'; diff --git a/dart/frontend/pubspec.lock b/dart/frontend/pubspec.lock index 0c4e3215..dd977108 100644 --- a/dart/frontend/pubspec.lock +++ b/dart/frontend/pubspec.lock @@ -269,10 +269,10 @@ packages: dependency: "direct main" description: name: freezed_annotation - sha256: c3fd9336eb55a38cc1bbd79ab17573113a8deccd0ecbbf926cca3c62803b5c2d + sha256: c2e2d632dd9b8a2b7751117abcfc2b4888ecfe181bd9fca7170d9ef02e595fe2 url: "https://pub.dev" source: hosted - version: "2.4.1" + version: "2.4.4" frontend_server_client: dependency: transitive description: diff --git a/dart/frontend/test/midi_mapping/midi_mapping_page_object.dart b/dart/frontend/test/midi_mapping/midi_mapping_page_object.dart index 2e929a89..144df003 100644 --- a/dart/frontend/test/midi_mapping/midi_mapping_page_object.dart +++ b/dart/frontend/test/midi_mapping/midi_mapping_page_object.dart @@ -19,8 +19,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:shrapnel/api_data/midi_api_message.dart'; import 'package:shrapnel/midi_mapping/view/midi_mapping.dart'; +import 'package:shrapnel_common/api_data/midi_api_message.dart'; class MidiMappingPageObject { const MidiMappingPageObject(this.tester); diff --git a/dart/frontend/test/midi_mapping/model/service_test.dart b/dart/frontend/test/midi_mapping/model/service_test.dart index f9147962..989372f8 100644 --- a/dart/frontend/test/midi_mapping/model/service_test.dart +++ b/dart/frontend/test/midi_mapping/model/service_test.dart @@ -23,9 +23,9 @@ import 'dart:collection'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/annotations.dart'; import 'package:mockito/mockito.dart'; -import 'package:shrapnel/api_data/midi_api_message.dart'; import 'package:shrapnel/core/message_transport.dart'; import 'package:shrapnel/midi_mapping/model/service.dart'; +import 'package:shrapnel_common/api_data/midi_api_message.dart'; import 'service_test.mocks.dart'; diff --git a/dart/frontend/test/midi_mapping/view/midi_mapping_test.dart b/dart/frontend/test/midi_mapping/view/midi_mapping_test.dart index dc5ffc7c..38d28df7 100644 --- a/dart/frontend/test/midi_mapping/view/midi_mapping_test.dart +++ b/dart/frontend/test/midi_mapping/view/midi_mapping_test.dart @@ -24,11 +24,11 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/annotations.dart'; import 'package:mockito/mockito.dart'; import 'package:shrapnel/api/api_websocket.dart'; -import 'package:shrapnel/api_data/api_message.dart'; -import 'package:shrapnel/api_data/midi_api_message.dart'; import 'package:shrapnel/audio_events.dart'; import 'package:shrapnel/main.dart'; import 'package:shrapnel/robust_websocket.dart'; +import 'package:shrapnel_common/api_data/api_message.dart'; +import 'package:shrapnel_common/api_data/midi_api_message.dart'; import '../../home_page_object.dart'; import 'midi_mapping_test.mocks.dart'; diff --git a/dart/frontend/test/presets/presets_test.dart b/dart/frontend/test/presets/presets_test.dart index eb86bd5b..3bbb24ee 100644 --- a/dart/frontend/test/presets/presets_test.dart +++ b/dart/frontend/test/presets/presets_test.dart @@ -27,14 +27,14 @@ import 'package:mockito/annotations.dart'; import 'package:mockito/mockito.dart'; import 'package:rxdart/rxdart.dart'; import 'package:shrapnel/api/api_websocket.dart'; -import 'package:shrapnel/api_data/api_message.dart'; -import 'package:shrapnel/api_data/parameter_message.dart'; import 'package:shrapnel/audio_events.dart'; import 'package:shrapnel/main.dart'; import 'package:shrapnel/parameter.dart'; import 'package:shrapnel/presets/model/presets.dart'; import 'package:shrapnel/presets/model/presets_service.dart'; import 'package:shrapnel/robust_websocket.dart'; +import 'package:shrapnel_common/api_data/api_message.dart'; +import 'package:shrapnel_common/api_data/parameter_message.dart'; import '../home_page_object.dart'; import 'presets_test.mocks.dart'; diff --git a/dart/shrapnel_common/.gitignore b/dart/shrapnel_common/.gitignore index 3cceda55..88f7e10b 100644 --- a/dart/shrapnel_common/.gitignore +++ b/dart/shrapnel_common/.gitignore @@ -5,3 +5,10 @@ # Avoid committing pubspec.lock for library packages; see # https://dart.dev/guides/libraries/private-files#pubspeclock. pubspec.lock + +.flutter-plugins +.flutter-plugins-dependencies + +*.g.dart +*.mocks.dart +*.freezed.dart diff --git a/dart/frontend/lib/api_data/api_message.dart b/dart/shrapnel_common/lib/api_data/api_message.dart similarity index 100% rename from dart/frontend/lib/api_data/api_message.dart rename to dart/shrapnel_common/lib/api_data/api_message.dart diff --git a/dart/frontend/lib/api_data/audio_event_message.dart b/dart/shrapnel_common/lib/api_data/audio_event_message.dart similarity index 100% rename from dart/frontend/lib/api_data/audio_event_message.dart rename to dart/shrapnel_common/lib/api_data/audio_event_message.dart diff --git a/dart/frontend/lib/api_data/generate.sh b/dart/shrapnel_common/lib/api_data/generate.sh similarity index 100% rename from dart/frontend/lib/api_data/generate.sh rename to dart/shrapnel_common/lib/api_data/generate.sh diff --git a/dart/frontend/lib/api_data/generated/analysis_options.yaml b/dart/shrapnel_common/lib/api_data/generated/analysis_options.yaml similarity index 100% rename from dart/frontend/lib/api_data/generated/analysis_options.yaml rename to dart/shrapnel_common/lib/api_data/generated/analysis_options.yaml diff --git a/dart/frontend/lib/api_data/generated/audio_events.pb.dart b/dart/shrapnel_common/lib/api_data/generated/audio_events.pb.dart similarity index 100% rename from dart/frontend/lib/api_data/generated/audio_events.pb.dart rename to dart/shrapnel_common/lib/api_data/generated/audio_events.pb.dart diff --git a/dart/frontend/lib/api_data/generated/audio_events.pbenum.dart b/dart/shrapnel_common/lib/api_data/generated/audio_events.pbenum.dart similarity index 100% rename from dart/frontend/lib/api_data/generated/audio_events.pbenum.dart rename to dart/shrapnel_common/lib/api_data/generated/audio_events.pbenum.dart diff --git a/dart/frontend/lib/api_data/generated/audio_events.pbjson.dart b/dart/shrapnel_common/lib/api_data/generated/audio_events.pbjson.dart similarity index 100% rename from dart/frontend/lib/api_data/generated/audio_events.pbjson.dart rename to dart/shrapnel_common/lib/api_data/generated/audio_events.pbjson.dart diff --git a/dart/frontend/lib/api_data/generated/audio_events.pbserver.dart b/dart/shrapnel_common/lib/api_data/generated/audio_events.pbserver.dart similarity index 100% rename from dart/frontend/lib/api_data/generated/audio_events.pbserver.dart rename to dart/shrapnel_common/lib/api_data/generated/audio_events.pbserver.dart diff --git a/dart/frontend/lib/api_data/generated/cmd_handling.pb.dart b/dart/shrapnel_common/lib/api_data/generated/cmd_handling.pb.dart similarity index 100% rename from dart/frontend/lib/api_data/generated/cmd_handling.pb.dart rename to dart/shrapnel_common/lib/api_data/generated/cmd_handling.pb.dart diff --git a/dart/frontend/lib/api_data/generated/cmd_handling.pbenum.dart b/dart/shrapnel_common/lib/api_data/generated/cmd_handling.pbenum.dart similarity index 100% rename from dart/frontend/lib/api_data/generated/cmd_handling.pbenum.dart rename to dart/shrapnel_common/lib/api_data/generated/cmd_handling.pbenum.dart diff --git a/dart/frontend/lib/api_data/generated/cmd_handling.pbjson.dart b/dart/shrapnel_common/lib/api_data/generated/cmd_handling.pbjson.dart similarity index 100% rename from dart/frontend/lib/api_data/generated/cmd_handling.pbjson.dart rename to dart/shrapnel_common/lib/api_data/generated/cmd_handling.pbjson.dart diff --git a/dart/frontend/lib/api_data/generated/cmd_handling.pbserver.dart b/dart/shrapnel_common/lib/api_data/generated/cmd_handling.pbserver.dart similarity index 100% rename from dart/frontend/lib/api_data/generated/cmd_handling.pbserver.dart rename to dart/shrapnel_common/lib/api_data/generated/cmd_handling.pbserver.dart diff --git a/dart/frontend/lib/api_data/generated/midi_mapping.pb.dart b/dart/shrapnel_common/lib/api_data/generated/midi_mapping.pb.dart similarity index 100% rename from dart/frontend/lib/api_data/generated/midi_mapping.pb.dart rename to dart/shrapnel_common/lib/api_data/generated/midi_mapping.pb.dart diff --git a/dart/frontend/lib/api_data/generated/midi_mapping.pbenum.dart b/dart/shrapnel_common/lib/api_data/generated/midi_mapping.pbenum.dart similarity index 100% rename from dart/frontend/lib/api_data/generated/midi_mapping.pbenum.dart rename to dart/shrapnel_common/lib/api_data/generated/midi_mapping.pbenum.dart diff --git a/dart/frontend/lib/api_data/generated/midi_mapping.pbjson.dart b/dart/shrapnel_common/lib/api_data/generated/midi_mapping.pbjson.dart similarity index 100% rename from dart/frontend/lib/api_data/generated/midi_mapping.pbjson.dart rename to dart/shrapnel_common/lib/api_data/generated/midi_mapping.pbjson.dart diff --git a/dart/frontend/lib/api_data/generated/midi_mapping.pbserver.dart b/dart/shrapnel_common/lib/api_data/generated/midi_mapping.pbserver.dart similarity index 100% rename from dart/frontend/lib/api_data/generated/midi_mapping.pbserver.dart rename to dart/shrapnel_common/lib/api_data/generated/midi_mapping.pbserver.dart diff --git a/dart/frontend/lib/api_data/generated/presets.pb.dart b/dart/shrapnel_common/lib/api_data/generated/presets.pb.dart similarity index 100% rename from dart/frontend/lib/api_data/generated/presets.pb.dart rename to dart/shrapnel_common/lib/api_data/generated/presets.pb.dart diff --git a/dart/frontend/lib/api_data/generated/presets.pbenum.dart b/dart/shrapnel_common/lib/api_data/generated/presets.pbenum.dart similarity index 100% rename from dart/frontend/lib/api_data/generated/presets.pbenum.dart rename to dart/shrapnel_common/lib/api_data/generated/presets.pbenum.dart diff --git a/dart/frontend/lib/api_data/generated/presets.pbjson.dart b/dart/shrapnel_common/lib/api_data/generated/presets.pbjson.dart similarity index 100% rename from dart/frontend/lib/api_data/generated/presets.pbjson.dart rename to dart/shrapnel_common/lib/api_data/generated/presets.pbjson.dart diff --git a/dart/frontend/lib/api_data/generated/presets.pbserver.dart b/dart/shrapnel_common/lib/api_data/generated/presets.pbserver.dart similarity index 100% rename from dart/frontend/lib/api_data/generated/presets.pbserver.dart rename to dart/shrapnel_common/lib/api_data/generated/presets.pbserver.dart diff --git a/dart/frontend/lib/api_data/generated/selected_preset.pb.dart b/dart/shrapnel_common/lib/api_data/generated/selected_preset.pb.dart similarity index 100% rename from dart/frontend/lib/api_data/generated/selected_preset.pb.dart rename to dart/shrapnel_common/lib/api_data/generated/selected_preset.pb.dart diff --git a/dart/frontend/lib/api_data/generated/selected_preset.pbenum.dart b/dart/shrapnel_common/lib/api_data/generated/selected_preset.pbenum.dart similarity index 100% rename from dart/frontend/lib/api_data/generated/selected_preset.pbenum.dart rename to dart/shrapnel_common/lib/api_data/generated/selected_preset.pbenum.dart diff --git a/dart/frontend/lib/api_data/generated/selected_preset.pbjson.dart b/dart/shrapnel_common/lib/api_data/generated/selected_preset.pbjson.dart similarity index 100% rename from dart/frontend/lib/api_data/generated/selected_preset.pbjson.dart rename to dart/shrapnel_common/lib/api_data/generated/selected_preset.pbjson.dart diff --git a/dart/frontend/lib/api_data/generated/selected_preset.pbserver.dart b/dart/shrapnel_common/lib/api_data/generated/selected_preset.pbserver.dart similarity index 100% rename from dart/frontend/lib/api_data/generated/selected_preset.pbserver.dart rename to dart/shrapnel_common/lib/api_data/generated/selected_preset.pbserver.dart diff --git a/dart/frontend/lib/api_data/generated/shrapnel.pb.dart b/dart/shrapnel_common/lib/api_data/generated/shrapnel.pb.dart similarity index 100% rename from dart/frontend/lib/api_data/generated/shrapnel.pb.dart rename to dart/shrapnel_common/lib/api_data/generated/shrapnel.pb.dart diff --git a/dart/frontend/lib/api_data/generated/shrapnel.pbenum.dart b/dart/shrapnel_common/lib/api_data/generated/shrapnel.pbenum.dart similarity index 99% rename from dart/frontend/lib/api_data/generated/shrapnel.pbenum.dart rename to dart/shrapnel_common/lib/api_data/generated/shrapnel.pbenum.dart index f2b397ae..e50c4f7f 100644 --- a/dart/frontend/lib/api_data/generated/shrapnel.pbenum.dart +++ b/dart/shrapnel_common/lib/api_data/generated/shrapnel.pbenum.dart @@ -8,3 +8,4 @@ // ignore_for_file: constant_identifier_names, library_prefixes // ignore_for_file: non_constant_identifier_names, prefer_final_fields // ignore_for_file: unnecessary_import, unnecessary_this, unused_import + diff --git a/dart/frontend/lib/api_data/generated/shrapnel.pbjson.dart b/dart/shrapnel_common/lib/api_data/generated/shrapnel.pbjson.dart similarity index 99% rename from dart/frontend/lib/api_data/generated/shrapnel.pbjson.dart rename to dart/shrapnel_common/lib/api_data/generated/shrapnel.pbjson.dart index 75482dc3..1e36640e 100644 --- a/dart/frontend/lib/api_data/generated/shrapnel.pbjson.dart +++ b/dart/shrapnel_common/lib/api_data/generated/shrapnel.pbjson.dart @@ -37,3 +37,4 @@ final $typed_data.Uint8List messageDescriptor = $convert.base64Decode( 'GS5zaHJhcG5lbC5wcmVzZXRzLk1lc3NhZ2VIAFIGcHJlc2V0EkwKD3NlbGVjdGVkX3ByZXNldB' 'gFIAEoCzIhLnNocmFwbmVsLnNlbGVjdGVkX3ByZXNldC5NZXNzYWdlSABSDnNlbGVjdGVkUHJl' 'c2V0QgkKB21lc3NhZ2U='); + diff --git a/dart/frontend/lib/api_data/generated/shrapnel.pbserver.dart b/dart/shrapnel_common/lib/api_data/generated/shrapnel.pbserver.dart similarity index 99% rename from dart/frontend/lib/api_data/generated/shrapnel.pbserver.dart rename to dart/shrapnel_common/lib/api_data/generated/shrapnel.pbserver.dart index 0a0e78f2..de6ed7e7 100644 --- a/dart/frontend/lib/api_data/generated/shrapnel.pbserver.dart +++ b/dart/shrapnel_common/lib/api_data/generated/shrapnel.pbserver.dart @@ -11,3 +11,4 @@ // ignore_for_file: unnecessary_import, unnecessary_this, unused_import export 'shrapnel.pb.dart'; + diff --git a/dart/frontend/lib/api_data/midi_api_message.dart b/dart/shrapnel_common/lib/api_data/midi_api_message.dart similarity index 100% rename from dart/frontend/lib/api_data/midi_api_message.dart rename to dart/shrapnel_common/lib/api_data/midi_api_message.dart diff --git a/dart/frontend/lib/api_data/parameter_message.dart b/dart/shrapnel_common/lib/api_data/parameter_message.dart similarity index 100% rename from dart/frontend/lib/api_data/parameter_message.dart rename to dart/shrapnel_common/lib/api_data/parameter_message.dart diff --git a/dart/frontend/lib/api_data/presets_message.dart b/dart/shrapnel_common/lib/api_data/presets_message.dart similarity index 100% rename from dart/frontend/lib/api_data/presets_message.dart rename to dart/shrapnel_common/lib/api_data/presets_message.dart diff --git a/dart/frontend/lib/api_data/proto_extension.dart b/dart/shrapnel_common/lib/api_data/proto_extension.dart similarity index 100% rename from dart/frontend/lib/api_data/proto_extension.dart rename to dart/shrapnel_common/lib/api_data/proto_extension.dart diff --git a/dart/frontend/lib/api_data/selected_preset_data.dart b/dart/shrapnel_common/lib/api_data/selected_preset_data.dart similarity index 100% rename from dart/frontend/lib/api_data/selected_preset_data.dart rename to dart/shrapnel_common/lib/api_data/selected_preset_data.dart diff --git a/dart/shrapnel_common/pubspec.yaml b/dart/shrapnel_common/pubspec.yaml index 8455b0a0..2209c902 100644 --- a/dart/shrapnel_common/pubspec.yaml +++ b/dart/shrapnel_common/pubspec.yaml @@ -11,8 +11,11 @@ dependencies: git: url: https://github.com/ShrapnelDSP/esp_softap_provisioning.git ref: shrapnel + freezed_annotation: ^2.4.4 logging: ^1.2.0 dev_dependencies: + build_runner: ^2.4.9 + freezed: ^2.5.2 lints: ^2.1.0 test: ^1.24.0 diff --git a/dart/shrapnel_test_lib/.gitignore b/dart/shrapnel_test_lib/.gitignore index 3cceda55..3f8172af 100644 --- a/dart/shrapnel_test_lib/.gitignore +++ b/dart/shrapnel_test_lib/.gitignore @@ -5,3 +5,6 @@ # Avoid committing pubspec.lock for library packages; see # https://dart.dev/guides/libraries/private-files#pubspeclock. pubspec.lock + +.flutter-plugins +.flutter-plugins-dependencies diff --git a/dart/shrapnel_test_lib/lib/src/shrapnel_test_lib_base.dart b/dart/shrapnel_test_lib/lib/src/shrapnel_test_lib_base.dart index f93fe54f..2f107753 100644 --- a/dart/shrapnel_test_lib/lib/src/shrapnel_test_lib_base.dart +++ b/dart/shrapnel_test_lib/lib/src/shrapnel_test_lib_base.dart @@ -25,6 +25,8 @@ import 'package:esp_softap_provisioning/esp_softap_provisioning.dart'; import 'package:flutter_libserialport/flutter_libserialport.dart'; import 'package:logging/logging.dart'; import 'package:path/path.dart' as p; +import 'package:shrapnel_common/api_data/midi_api_message.dart'; +import 'package:shrapnel_common/api_data/proto_extension.dart'; import 'package:shrapnel_common/shrapnel_common.dart'; typedef MacAddress = List; diff --git a/dart/shrapnel_test_lib/pubspec.yaml b/dart/shrapnel_test_lib/pubspec.yaml index d01b3ac7..ca0b019c 100644 --- a/dart/shrapnel_test_lib/pubspec.yaml +++ b/dart/shrapnel_test_lib/pubspec.yaml @@ -14,7 +14,7 @@ dependencies: ref: shrapnel flutter_libserialport: ^0.4.0 logging: ^1.2.0 - path: ^1.9.0 + path: ^1.8.0 shrapnel_common: path: ../shrapnel_common diff --git a/dart/shrapnel_test_tool/.gitignore b/dart/shrapnel_test_tool/.gitignore index 3a857904..5c2eea91 100644 --- a/dart/shrapnel_test_tool/.gitignore +++ b/dart/shrapnel_test_tool/.gitignore @@ -1,3 +1,10 @@ # https://dart.dev/guides/libraries/private-files # Created by `dart pub` .dart_tool/ + +.flutter-plugins +.flutter-plugins-dependencies + +*.g.dart +*.mocks.dart +*.freezed.dart From 08973157cca0fbf7d2e834fa8d87503987867c7e Mon Sep 17 00:00:00 2001 From: Barabas Raffai Date: Sat, 3 Aug 2024 18:23:59 +0100 Subject: [PATCH 04/14] Implement nvs save tool It does not work because esp provisioning and flutter_libserialport depend on Flutter. We should be able to replace both with pure dart versions. --- .../lib/src/shrapnel_test_lib_base.dart | 22 ++ .../bin/shrapnel_test_tool.dart | 2 +- .../lib/shrapnel_test_tool.dart | 13 +- dart/shrapnel_test_tool/pubspec.lock | 212 ++++++++++++++++-- dart/shrapnel_test_tool/pubspec.yaml | 8 +- .../test/shrapnel_test_tool_test.dart | 5 +- 6 files changed, 231 insertions(+), 31 deletions(-) diff --git a/dart/shrapnel_test_lib/lib/src/shrapnel_test_lib_base.dart b/dart/shrapnel_test_lib/lib/src/shrapnel_test_lib_base.dart index 2f107753..c13876f9 100644 --- a/dart/shrapnel_test_lib/lib/src/shrapnel_test_lib_base.dart +++ b/dart/shrapnel_test_lib/lib/src/shrapnel_test_lib_base.dart @@ -266,6 +266,28 @@ Future nvsLoad(String binaryPath, {required String port}) async { _log.info(result.stdout); } +Future nvsSave(String binaryPath, {required String port}) async { + _log.info('Saving NVS partition'); + + // pip can be used to install esptool into the global environment: + // https://docs.espressif.com/projects/esptool/en/latest/esp32/#quick-start + const command = 'esptool.py'; + final args = '-p $port ' + '-b 2000000 ' + '--before default_reset --after hard_reset ' + '--chip esp32 ' + 'read_flash --flash_mode dio --flash_size 4MB --flash_freq 80m ' + '0x9000 0x6000 $binaryPath' + .split(' '); + + final result = await Process.run(command, args); + + _log.info(result.exitCode); + _log.info(result.pid); + _log.info(result.stderr); + _log.info(result.stdout); +} + /// UART driver class ShrapnelUart { ShrapnelUart._(this.port, this.reader) { diff --git a/dart/shrapnel_test_tool/bin/shrapnel_test_tool.dart b/dart/shrapnel_test_tool/bin/shrapnel_test_tool.dart index c5a43c5d..b1228ac0 100644 --- a/dart/shrapnel_test_tool/bin/shrapnel_test_tool.dart +++ b/dart/shrapnel_test_tool/bin/shrapnel_test_tool.dart @@ -1,5 +1,5 @@ import 'package:shrapnel_test_tool/shrapnel_test_tool.dart' as shrapnel_test_tool; void main(List arguments) { - print('Hello world: ${shrapnel_test_tool.calculate()}!'); + shrapnel_test_tool.main(arguments); } diff --git a/dart/shrapnel_test_tool/lib/shrapnel_test_tool.dart b/dart/shrapnel_test_tool/lib/shrapnel_test_tool.dart index f64ad726..4855abca 100644 --- a/dart/shrapnel_test_tool/lib/shrapnel_test_tool.dart +++ b/dart/shrapnel_test_tool/lib/shrapnel_test_tool.dart @@ -1,3 +1,12 @@ -int calculate() { - return 6 * 7; +import 'package:logging/logging.dart'; +import 'package:shrapnel_test_lib/shrapnel_test_lib.dart'; + +final _log = Logger('shrapnel.test_tool'); + +void main(List arguments) { + hierarchicalLoggingEnabled = true; + Logger.root.onRecord.listen(print); + + _log.info('hello $arguments'); + nvsSave('nvs_${DateTime.now().toIso8601String()}.bin', port: '/dev/ttyUSB0'); } diff --git a/dart/shrapnel_test_tool/pubspec.lock b/dart/shrapnel_test_tool/pubspec.lock index d82c6c75..40973551 100644 --- a/dart/shrapnel_test_tool/pubspec.lock +++ b/dart/shrapnel_test_tool/pubspec.lock @@ -5,18 +5,18 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7" + sha256: eb376e9acf6938204f90eb3b1f00b578640d3188b4c8a8ec054f9f479af8d051 url: "https://pub.dev" source: hosted - version: "67.0.0" + version: "64.0.0" analyzer: dependency: transitive description: name: analyzer - sha256: "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d" + sha256: "69f54f967773f6c26c7dcb13e93d7ccee8b17a641689da39e878d5cf13b06893" url: "https://pub.dev" source: hosted - version: "6.4.1" + version: "6.2.0" args: dependency: transitive description: @@ -41,6 +41,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.1" + characters: + dependency: transitive + description: + name: characters + sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + url: "https://pub.dev" + source: hosted + version: "1.3.0" collection: dependency: transitive description: @@ -73,6 +81,39 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.3" + cryptography: + dependency: transitive + description: + name: cryptography + sha256: d146b76d33d94548cf035233fbc2f4338c1242fa119013bead807d033fc4ae05 + url: "https://pub.dev" + source: hosted + version: "2.7.0" + dylib: + dependency: transitive + description: + name: dylib + sha256: bf609b3eb6492a3309b3d1dbe8f83a4031de5535dd7686be33487051cc760bb0 + url: "https://pub.dev" + source: hosted + version: "0.3.3" + esp_softap_provisioning: + dependency: transitive + description: + path: "." + ref: shrapnel + resolved-ref: f4d5fc671568f50753fc90c3e9b99bc2165c6a39 + url: "https://github.com/ShrapnelDSP/esp_softap_provisioning.git" + source: git + version: "1.0.1" + ffi: + dependency: transitive + description: + name: ffi + sha256: "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878" + url: "https://pub.dev" + source: hosted + version: "2.1.0" file: dependency: transitive description: @@ -81,6 +122,35 @@ packages: url: "https://pub.dev" source: hosted version: "7.0.0" + fixnum: + dependency: transitive + description: + name: fixnum + sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1" + url: "https://pub.dev" + source: hosted + version: "1.1.0" + flutter: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" + flutter_libserialport: + dependency: transitive + description: + name: flutter_libserialport + sha256: "20c320dcde8592a16f9badc0cacad61b1fb283dbec647b6ebfc1020f8274c67b" + url: "https://pub.dev" + source: hosted + version: "0.4.0" + freezed_annotation: + dependency: transitive + description: + name: freezed_annotation + sha256: c2e2d632dd9b8a2b7751117abcfc2b4888ecfe181bd9fca7170d9ef02e595fe2 + url: "https://pub.dev" + source: hosted + version: "2.4.4" frontend_server_client: dependency: transitive description: @@ -97,6 +167,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.2" + http: + dependency: transitive + description: + name: http + sha256: a2bbf9d017fcced29139daa8ed2bba4ece450ab222871df93ca9eec6f80c34ba + url: "https://pub.dev" + source: hosted + version: "1.2.0" http_multi_server: dependency: transitive description: @@ -125,10 +203,26 @@ packages: dependency: transitive description: name: js - sha256: c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf + sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 + url: "https://pub.dev" + source: hosted + version: "0.6.7" + json_annotation: + dependency: transitive + description: + name: json_annotation + sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1" + url: "https://pub.dev" + source: hosted + version: "4.9.0" + libserialport: + dependency: transitive + description: + name: libserialport + sha256: "392e1592def65282429832ec66fa25e9e163d3b37716b97691482e2406720727" url: "https://pub.dev" source: hosted - version: "0.7.1" + version: "0.3.0+1" lints: dependency: "direct dev" description: @@ -137,8 +231,16 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.1" - logging: + logger: dependency: transitive + description: + name: logger + sha256: "697d067c60c20999686a0add96cf6aba723b3aa1f83ecf806a8097231529ec32" + url: "https://pub.dev" + source: hosted + version: "2.4.0" + logging: + dependency: "direct main" description: name: logging sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340" @@ -153,14 +255,22 @@ packages: url: "https://pub.dev" source: hosted version: "0.12.16+1" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" + url: "https://pub.dev" + source: hosted + version: "0.5.0" meta: dependency: transitive description: name: meta - sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e url: "https://pub.dev" source: hosted - version: "1.15.0" + version: "1.10.0" mime: dependency: transitive description: @@ -193,6 +303,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.9.0" + platform: + dependency: transitive + description: + name: platform + sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65" + url: "https://pub.dev" + source: hosted + version: "3.1.5" pool: dependency: transitive description: @@ -201,6 +319,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.5.1" + protobuf: + dependency: transitive + description: + name: protobuf + sha256: "68645b24e0716782e58948f8467fd42a880f255096a821f9e7d0ec625b00c84d" + url: "https://pub.dev" + source: hosted + version: "3.1.0" pub_semver: dependency: transitive description: @@ -237,10 +363,29 @@ packages: dependency: transitive description: name: shelf_web_socket - sha256: "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611" + sha256: "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1" url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "1.0.4" + shrapnel_common: + dependency: transitive + description: + path: "../shrapnel_common" + relative: true + source: path + version: "1.0.0" + shrapnel_test_lib: + dependency: "direct main" + description: + path: "../shrapnel_test_lib" + relative: true + source: path + version: "1.0.0" + sky_engine: + dependency: transitive + description: flutter + source: sdk + version: "0.0.99" source_map_stack_trace: dependency: transitive description: @@ -289,6 +434,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.0" + string_validator: + dependency: transitive + description: + name: string_validator + sha256: a278d038104aa2df15d0e09c47cb39a49f907260732067d0034dc2f2e4e2ac94 + url: "https://pub.dev" + source: hosted + version: "1.1.0" term_glyph: dependency: transitive description: @@ -301,26 +454,26 @@ packages: dependency: "direct dev" description: name: test - sha256: "7ee44229615f8f642b68120165ae4c2a75fe77ae2065b1e55ae4711f6cf0899e" + sha256: "7ee446762c2c50b3bd4ea96fe13ffac69919352bd3b4b17bac3f3465edc58073" url: "https://pub.dev" source: hosted - version: "1.25.7" + version: "1.25.2" test_api: dependency: transitive description: name: test_api - sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" + sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" url: "https://pub.dev" source: hosted - version: "0.7.2" + version: "0.7.0" test_core: dependency: transitive description: name: test_core - sha256: "55ea5a652e38a1dfb32943a7973f3681a60f872f8c3a05a14664ad54ef9c6696" + sha256: "2bc4b4ecddd75309300d8096f781c0e3280ca1ef85beda558d33fcbedc2eead4" url: "https://pub.dev" source: hosted - version: "0.6.4" + version: "0.6.0" typed_data: dependency: transitive description: @@ -329,6 +482,22 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.2" + universal_io: + dependency: transitive + description: + name: universal_io + sha256: "1722b2dcc462b4b2f3ee7d188dad008b6eb4c40bbd03a3de451d82c78bba9aad" + url: "https://pub.dev" + source: hosted + version: "2.2.2" + vector_math: + dependency: transitive + description: + name: vector_math + sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + url: "https://pub.dev" + source: hosted + version: "2.1.4" vm_service: dependency: transitive description: @@ -349,18 +518,18 @@ packages: dependency: transitive description: name: web - sha256: "4188706108906f002b3a293509234588823c8c979dc83304e229ff400c996b05" + sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 url: "https://pub.dev" source: hosted - version: "0.4.2" + version: "0.3.0" web_socket_channel: dependency: transitive description: name: web_socket_channel - sha256: "939ab60734a4f8fa95feacb55804fa278de28bdeef38e616dc08e44a84adea23" + sha256: d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b url: "https://pub.dev" source: hosted - version: "2.4.3" + version: "2.4.0" webkit_inspection_protocol: dependency: transitive description: @@ -379,3 +548,4 @@ packages: version: "3.1.2" sdks: dart: ">=3.2.6 <4.0.0" + flutter: ">=3.0.0" diff --git a/dart/shrapnel_test_tool/pubspec.yaml b/dart/shrapnel_test_tool/pubspec.yaml index db3c5b1f..86c532a3 100644 --- a/dart/shrapnel_test_tool/pubspec.yaml +++ b/dart/shrapnel_test_tool/pubspec.yaml @@ -1,14 +1,16 @@ name: shrapnel_test_tool description: A sample command-line application. version: 1.0.0 -# repository: https://github.com/my_org/my_repo + +publish_to: 'none' environment: sdk: ^3.2.6 -# Add regular dependencies here. dependencies: - # path: ^1.8.0 + logging: ^1.2.0 + shrapnel_test_lib: + path: ../shrapnel_test_lib dev_dependencies: lints: ^2.1.0 diff --git a/dart/shrapnel_test_tool/test/shrapnel_test_tool_test.dart b/dart/shrapnel_test_tool/test/shrapnel_test_tool_test.dart index 77f56eff..13880f99 100644 --- a/dart/shrapnel_test_tool/test/shrapnel_test_tool_test.dart +++ b/dart/shrapnel_test_tool/test/shrapnel_test_tool_test.dart @@ -1,8 +1,5 @@ -import 'package:shrapnel_test_tool/shrapnel_test_tool.dart'; import 'package:test/test.dart'; void main() { - test('calculate', () { - expect(calculate(), 42); - }); + test('dummy', () {}); } From c727ebd4ff7eaa6422644c9f46be81801410948e Mon Sep 17 00:00:00 2001 From: Barabas Raffai Date: Sat, 3 Aug 2024 20:07:01 +0100 Subject: [PATCH 05/14] fix flutter dependency --- dart/shrapnel_common/pubspec.yaml | 2 +- .../lib/src/shrapnel_test_lib_base.dart | 2 +- dart/shrapnel_test_lib/pubspec.yaml | 2 +- dart/shrapnel_test_tool/lib/shrapnel_test_tool.dart | 2 ++ dart/shrapnel_test_tool/pubspec.lock | 12 ++---------- 5 files changed, 7 insertions(+), 13 deletions(-) diff --git a/dart/shrapnel_common/pubspec.yaml b/dart/shrapnel_common/pubspec.yaml index 2209c902..60f24e80 100644 --- a/dart/shrapnel_common/pubspec.yaml +++ b/dart/shrapnel_common/pubspec.yaml @@ -10,7 +10,7 @@ dependencies: esp_softap_provisioning: git: url: https://github.com/ShrapnelDSP/esp_softap_provisioning.git - ref: shrapnel + ref: no-flutter freezed_annotation: ^2.4.4 logging: ^1.2.0 diff --git a/dart/shrapnel_test_lib/lib/src/shrapnel_test_lib_base.dart b/dart/shrapnel_test_lib/lib/src/shrapnel_test_lib_base.dart index c13876f9..9c505102 100644 --- a/dart/shrapnel_test_lib/lib/src/shrapnel_test_lib_base.dart +++ b/dart/shrapnel_test_lib/lib/src/shrapnel_test_lib_base.dart @@ -276,7 +276,7 @@ Future nvsSave(String binaryPath, {required String port}) async { '-b 2000000 ' '--before default_reset --after hard_reset ' '--chip esp32 ' - 'read_flash --flash_mode dio --flash_size 4MB --flash_freq 80m ' + 'read_flash ' '0x9000 0x6000 $binaryPath' .split(' '); diff --git a/dart/shrapnel_test_lib/pubspec.yaml b/dart/shrapnel_test_lib/pubspec.yaml index ca0b019c..9239c634 100644 --- a/dart/shrapnel_test_lib/pubspec.yaml +++ b/dart/shrapnel_test_lib/pubspec.yaml @@ -11,7 +11,7 @@ dependencies: esp_softap_provisioning: git: url: https://github.com/ShrapnelDSP/esp_softap_provisioning.git - ref: shrapnel + ref: no-flutter flutter_libserialport: ^0.4.0 logging: ^1.2.0 path: ^1.8.0 diff --git a/dart/shrapnel_test_tool/lib/shrapnel_test_tool.dart b/dart/shrapnel_test_tool/lib/shrapnel_test_tool.dart index 4855abca..9b44f469 100644 --- a/dart/shrapnel_test_tool/lib/shrapnel_test_tool.dart +++ b/dart/shrapnel_test_tool/lib/shrapnel_test_tool.dart @@ -9,4 +9,6 @@ void main(List arguments) { _log.info('hello $arguments'); nvsSave('nvs_${DateTime.now().toIso8601String()}.bin', port: '/dev/ttyUSB0'); + + // TODO Add command to reload from file } diff --git a/dart/shrapnel_test_tool/pubspec.lock b/dart/shrapnel_test_tool/pubspec.lock index 40973551..4a4d05c4 100644 --- a/dart/shrapnel_test_tool/pubspec.lock +++ b/dart/shrapnel_test_tool/pubspec.lock @@ -101,8 +101,8 @@ packages: dependency: transitive description: path: "." - ref: shrapnel - resolved-ref: f4d5fc671568f50753fc90c3e9b99bc2165c6a39 + ref: no-flutter + resolved-ref: "9edee663e053efb8668dd591b09a0c989b0a21c6" url: "https://github.com/ShrapnelDSP/esp_softap_provisioning.git" source: git version: "1.0.1" @@ -482,14 +482,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.2" - universal_io: - dependency: transitive - description: - name: universal_io - sha256: "1722b2dcc462b4b2f3ee7d188dad008b6eb4c40bbd03a3de451d82c78bba9aad" - url: "https://pub.dev" - source: hosted - version: "2.2.2" vector_math: dependency: transitive description: From 056ea5092be8e4079577b1878b5cd59dea78e579 Mon Sep 17 00:00:00 2001 From: Barabas Raffai Date: Sat, 3 Aug 2024 20:24:12 +0100 Subject: [PATCH 06/14] Update ref --- dart/.gitignore | 3 +++ dart/frontend/pubspec.lock | 2 +- dart/frontend/pubspec_overrides.yaml | 6 ++++++ dart/shrapnel_common/pubspec.yaml | 2 +- dart/shrapnel_test_lib/pubspec.yaml | 2 +- dart/shrapnel_test_tool/pubspec.lock | 6 +++--- 6 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 dart/frontend/pubspec_overrides.yaml diff --git a/dart/.gitignore b/dart/.gitignore index 5919bf76..d8d06263 100644 --- a/dart/.gitignore +++ b/dart/.gitignore @@ -4,3 +4,6 @@ .idea *.iml + +# https://melos.invertase.dev/getting-started#configure-the-workspace +pubspec_overrides.yaml diff --git a/dart/frontend/pubspec.lock b/dart/frontend/pubspec.lock index dd977108..d85d3e25 100644 --- a/dart/frontend/pubspec.lock +++ b/dart/frontend/pubspec.lock @@ -807,5 +807,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.2.6 <4.0.0" + dart: ">=3.2.0 <4.0.0" flutter: ">=3.7.0" diff --git a/dart/frontend/pubspec_overrides.yaml b/dart/frontend/pubspec_overrides.yaml new file mode 100644 index 00000000..a25737a2 --- /dev/null +++ b/dart/frontend/pubspec_overrides.yaml @@ -0,0 +1,6 @@ +# melos_managed_dependency_overrides: shrapnel_common,shrapnel_test_lib +dependency_overrides: + shrapnel_common: + path: ../shrapnel_common + shrapnel_test_lib: + path: ../shrapnel_test_lib diff --git a/dart/shrapnel_common/pubspec.yaml b/dart/shrapnel_common/pubspec.yaml index 60f24e80..2209c902 100644 --- a/dart/shrapnel_common/pubspec.yaml +++ b/dart/shrapnel_common/pubspec.yaml @@ -10,7 +10,7 @@ dependencies: esp_softap_provisioning: git: url: https://github.com/ShrapnelDSP/esp_softap_provisioning.git - ref: no-flutter + ref: shrapnel freezed_annotation: ^2.4.4 logging: ^1.2.0 diff --git a/dart/shrapnel_test_lib/pubspec.yaml b/dart/shrapnel_test_lib/pubspec.yaml index 9239c634..ca0b019c 100644 --- a/dart/shrapnel_test_lib/pubspec.yaml +++ b/dart/shrapnel_test_lib/pubspec.yaml @@ -11,7 +11,7 @@ dependencies: esp_softap_provisioning: git: url: https://github.com/ShrapnelDSP/esp_softap_provisioning.git - ref: no-flutter + ref: shrapnel flutter_libserialport: ^0.4.0 logging: ^1.2.0 path: ^1.8.0 diff --git a/dart/shrapnel_test_tool/pubspec.lock b/dart/shrapnel_test_tool/pubspec.lock index 4a4d05c4..02eecc07 100644 --- a/dart/shrapnel_test_tool/pubspec.lock +++ b/dart/shrapnel_test_tool/pubspec.lock @@ -101,8 +101,8 @@ packages: dependency: transitive description: path: "." - ref: no-flutter - resolved-ref: "9edee663e053efb8668dd591b09a0c989b0a21c6" + ref: shrapnel + resolved-ref: "8ea4d4b87d31f19a6a14d10193df2b8d44204cf2" url: "https://github.com/ShrapnelDSP/esp_softap_provisioning.git" source: git version: "1.0.1" @@ -368,7 +368,7 @@ packages: source: hosted version: "1.0.4" shrapnel_common: - dependency: transitive + dependency: "direct overridden" description: path: "../shrapnel_common" relative: true From 43537e816473a3a22ecb3f59db1bc0bf600665e8 Mon Sep 17 00:00:00 2001 From: Barabas Raffai Date: Sat, 3 Aug 2024 20:34:32 +0100 Subject: [PATCH 07/14] clean up --- .../flutter/generated_plugin_registrant.cc | 4 - .../linux/flutter/generated_plugins.cmake | 1 - dart/frontend/pubspec.lock | 10 +- dart/frontend/pubspec.yaml | 2 - dart/frontend/pubspec_overrides.yaml | 6 - dart/shrapnel_common/.gitignore | 3 - dart/shrapnel_common/lib/api_data/generate.sh | 1 + .../api_data/generated/audio_events.pb.dart | 161 ++-- .../generated/audio_events.pbenum.dart | 1 - .../generated/audio_events.pbjson.dart | 29 +- .../generated/audio_events.pbserver.dart | 1 - .../api_data/generated/cmd_handling.pb.dart | 158 ++-- .../generated/cmd_handling.pbenum.dart | 1 - .../generated/cmd_handling.pbjson.dart | 25 +- .../generated/cmd_handling.pbserver.dart | 1 - .../api_data/generated/midi_mapping.pb.dart | 853 +++++++++++------- .../generated/midi_mapping.pbenum.dart | 17 +- .../generated/midi_mapping.pbjson.dart | 170 +++- .../generated/midi_mapping.pbserver.dart | 1 - .../lib/api_data/generated/presets.pb.dart | 588 +++++++----- .../api_data/generated/presets.pbenum.dart | 1 - .../api_data/generated/presets.pbjson.dart | 144 ++- .../api_data/generated/presets.pbserver.dart | 1 - .../generated/selected_preset.pb.dart | 200 ++-- .../generated/selected_preset.pbenum.dart | 1 - .../generated/selected_preset.pbjson.dart | 42 +- .../generated/selected_preset.pbserver.dart | 1 - .../lib/api_data/generated/shrapnel.pb.dart | 105 ++- .../api_data/generated/shrapnel.pbenum.dart | 1 - .../api_data/generated/shrapnel.pbjson.dart | 51 +- .../api_data/generated/shrapnel.pbserver.dart | 1 - dart/shrapnel_test_lib/.gitignore | 3 - dart/shrapnel_test_lib/pubspec.yaml | 2 +- dart/shrapnel_test_tool/.gitignore | 3 - dart/shrapnel_test_tool/pubspec.lock | 43 - 35 files changed, 1697 insertions(+), 935 deletions(-) delete mode 100644 dart/frontend/pubspec_overrides.yaml diff --git a/dart/frontend/linux/flutter/generated_plugin_registrant.cc b/dart/frontend/linux/flutter/generated_plugin_registrant.cc index 103991d0..e71a16d2 100644 --- a/dart/frontend/linux/flutter/generated_plugin_registrant.cc +++ b/dart/frontend/linux/flutter/generated_plugin_registrant.cc @@ -6,10 +6,6 @@ #include "generated_plugin_registrant.h" -#include void fl_register_plugins(FlPluginRegistry* registry) { - g_autoptr(FlPluginRegistrar) flutter_libserialport_registrar = - fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterLibserialportPlugin"); - flutter_libserialport_plugin_register_with_registrar(flutter_libserialport_registrar); } diff --git a/dart/frontend/linux/flutter/generated_plugins.cmake b/dart/frontend/linux/flutter/generated_plugins.cmake index ed2dd966..2e1de87a 100644 --- a/dart/frontend/linux/flutter/generated_plugins.cmake +++ b/dart/frontend/linux/flutter/generated_plugins.cmake @@ -3,7 +3,6 @@ # list(APPEND FLUTTER_PLUGIN_LIST - flutter_libserialport ) list(APPEND FLUTTER_FFI_PLUGIN_LIST diff --git a/dart/frontend/pubspec.lock b/dart/frontend/pubspec.lock index d85d3e25..8f1c79d1 100644 --- a/dart/frontend/pubspec.lock +++ b/dart/frontend/pubspec.lock @@ -236,14 +236,6 @@ packages: description: flutter source: sdk version: "0.0.0" - flutter_libserialport: - dependency: "direct dev" - description: - name: flutter_libserialport - sha256: "20c320dcde8592a16f9badc0cacad61b1fb283dbec647b6ebfc1020f8274c67b" - url: "https://pub.dev" - source: hosted - version: "0.4.0" flutter_state_notifier: dependency: "direct main" description: @@ -364,7 +356,7 @@ packages: source: hosted version: "4.8.1" libserialport: - dependency: "direct dev" + dependency: transitive description: name: libserialport sha256: "392e1592def65282429832ec66fa25e9e163d3b37716b97691482e2406720727" diff --git a/dart/frontend/pubspec.yaml b/dart/frontend/pubspec.yaml index 55384858..7c8dbafb 100644 --- a/dart/frontend/pubspec.yaml +++ b/dart/frontend/pubspec.yaml @@ -34,13 +34,11 @@ dependencies: dev_dependencies: build_runner: ^2.1.7 - flutter_libserialport: ^0.4.0 flutter_test: sdk: flutter freezed: ^2.2.1 integration_test: sdk: flutter - libserialport: ^0.3.0+1 mockito: ^5.1.0 shrapnel_test_lib: path: ../shrapnel_test_lib diff --git a/dart/frontend/pubspec_overrides.yaml b/dart/frontend/pubspec_overrides.yaml deleted file mode 100644 index a25737a2..00000000 --- a/dart/frontend/pubspec_overrides.yaml +++ /dev/null @@ -1,6 +0,0 @@ -# melos_managed_dependency_overrides: shrapnel_common,shrapnel_test_lib -dependency_overrides: - shrapnel_common: - path: ../shrapnel_common - shrapnel_test_lib: - path: ../shrapnel_test_lib diff --git a/dart/shrapnel_common/.gitignore b/dart/shrapnel_common/.gitignore index 88f7e10b..9daf4fef 100644 --- a/dart/shrapnel_common/.gitignore +++ b/dart/shrapnel_common/.gitignore @@ -6,9 +6,6 @@ # https://dart.dev/guides/libraries/private-files#pubspeclock. pubspec.lock -.flutter-plugins -.flutter-plugins-dependencies - *.g.dart *.mocks.dart *.freezed.dart diff --git a/dart/shrapnel_common/lib/api_data/generate.sh b/dart/shrapnel_common/lib/api_data/generate.sh index b156cb8e..6b63d5c2 100644 --- a/dart/shrapnel_common/lib/api_data/generate.sh +++ b/dart/shrapnel_common/lib/api_data/generate.sh @@ -11,3 +11,4 @@ protoc --dart_out="$proto_dir/generated" \ presets.proto \ selected_preset.proto \ shrapnel.proto +dart format "$proto_dir/generated" \ No newline at end of file diff --git a/dart/shrapnel_common/lib/api_data/generated/audio_events.pb.dart b/dart/shrapnel_common/lib/api_data/generated/audio_events.pb.dart index 9ffb467c..d32d5a99 100644 --- a/dart/shrapnel_common/lib/api_data/generated/audio_events.pb.dart +++ b/dart/shrapnel_common/lib/api_data/generated/audio_events.pb.dart @@ -17,32 +17,41 @@ import 'package:protobuf/protobuf.dart' as $pb; class InputClipped extends $pb.GeneratedMessage { factory InputClipped() => create(); InputClipped._() : super(); - factory InputClipped.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); - factory InputClipped.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'InputClipped', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.audio_events'), createEmptyInstance: create) - ..hasRequiredFields = false - ; - - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + factory InputClipped.fromBuffer($core.List<$core.int> i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(i, r); + factory InputClipped.fromJson($core.String i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo( + _omitMessageNames ? '' : 'InputClipped', + package: const $pb.PackageName( + _omitMessageNames ? '' : 'shrapnel.audio_events'), + createEmptyInstance: create) + ..hasRequiredFields = false; + + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') InputClipped clone() => InputClipped()..mergeFromMessage(this); - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - InputClipped copyWith(void Function(InputClipped) updates) => super.copyWith((message) => updates(message as InputClipped)) as InputClipped; + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + InputClipped copyWith(void Function(InputClipped) updates) => + super.copyWith((message) => updates(message as InputClipped)) + as InputClipped; $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static InputClipped create() => InputClipped._(); InputClipped createEmptyInstance() => create(); - static $pb.PbList createRepeated() => $pb.PbList(); + static $pb.PbList createRepeated() => + $pb.PbList(); @$core.pragma('dart2js:noInline') - static InputClipped getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static InputClipped getDefault() => _defaultInstance ??= + $pb.GeneratedMessage.$_defaultFor(create); static InputClipped? _defaultInstance; } @@ -50,40 +59,45 @@ class InputClipped extends $pb.GeneratedMessage { class OutputClipped extends $pb.GeneratedMessage { factory OutputClipped() => create(); OutputClipped._() : super(); - factory OutputClipped.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); - factory OutputClipped.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'OutputClipped', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.audio_events'), createEmptyInstance: create) - ..hasRequiredFields = false - ; - - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + factory OutputClipped.fromBuffer($core.List<$core.int> i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(i, r); + factory OutputClipped.fromJson($core.String i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo( + _omitMessageNames ? '' : 'OutputClipped', + package: const $pb.PackageName( + _omitMessageNames ? '' : 'shrapnel.audio_events'), + createEmptyInstance: create) + ..hasRequiredFields = false; + + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') OutputClipped clone() => OutputClipped()..mergeFromMessage(this); - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - OutputClipped copyWith(void Function(OutputClipped) updates) => super.copyWith((message) => updates(message as OutputClipped)) as OutputClipped; + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + OutputClipped copyWith(void Function(OutputClipped) updates) => + super.copyWith((message) => updates(message as OutputClipped)) + as OutputClipped; $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static OutputClipped create() => OutputClipped._(); OutputClipped createEmptyInstance() => create(); - static $pb.PbList createRepeated() => $pb.PbList(); + static $pb.PbList createRepeated() => + $pb.PbList(); @$core.pragma('dart2js:noInline') - static OutputClipped getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static OutputClipped getDefault() => _defaultInstance ??= + $pb.GeneratedMessage.$_defaultFor(create); static OutputClipped? _defaultInstance; } -enum Message_Event { - inputClipped, - outputClipped, - notSet -} +enum Message_Event { inputClipped, outputClipped, notSet } class Message extends $pb.GeneratedMessage { factory Message({ @@ -100,31 +114,39 @@ class Message extends $pb.GeneratedMessage { return $result; } Message._() : super(); - factory Message.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); - factory Message.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); + factory Message.fromBuffer($core.List<$core.int> i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(i, r); + factory Message.fromJson($core.String i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(i, r); static const $core.Map<$core.int, Message_Event> _Message_EventByTag = { - 1 : Message_Event.inputClipped, - 2 : Message_Event.outputClipped, - 0 : Message_Event.notSet + 1: Message_Event.inputClipped, + 2: Message_Event.outputClipped, + 0: Message_Event.notSet }; - static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Message', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.audio_events'), createEmptyInstance: create) + static final $pb.BuilderInfo _i = $pb.BuilderInfo( + _omitMessageNames ? '' : 'Message', + package: const $pb.PackageName( + _omitMessageNames ? '' : 'shrapnel.audio_events'), + createEmptyInstance: create) ..oo(0, [1, 2]) - ..aOM(1, _omitFieldNames ? '' : 'inputClipped', subBuilder: InputClipped.create) - ..aOM(2, _omitFieldNames ? '' : 'outputClipped', subBuilder: OutputClipped.create) - ..hasRequiredFields = false - ; - - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + ..aOM(1, _omitFieldNames ? '' : 'inputClipped', + subBuilder: InputClipped.create) + ..aOM(2, _omitFieldNames ? '' : 'outputClipped', + subBuilder: OutputClipped.create) + ..hasRequiredFields = false; + + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') Message clone() => Message()..mergeFromMessage(this); - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - Message copyWith(void Function(Message) updates) => super.copyWith((message) => updates(message as Message)) as Message; + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + Message copyWith(void Function(Message) updates) => + super.copyWith((message) => updates(message as Message)) as Message; $pb.BuilderInfo get info_ => _i; @@ -133,7 +155,8 @@ class Message extends $pb.GeneratedMessage { Message createEmptyInstance() => create(); static $pb.PbList createRepeated() => $pb.PbList(); @$core.pragma('dart2js:noInline') - static Message getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static Message getDefault() => + _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); static Message? _defaultInstance; Message_Event whichEvent() => _Message_EventByTag[$_whichOneof(0)]!; @@ -142,7 +165,10 @@ class Message extends $pb.GeneratedMessage { @$pb.TagNumber(1) InputClipped get inputClipped => $_getN(0); @$pb.TagNumber(1) - set inputClipped(InputClipped v) { setField(1, v); } + set inputClipped(InputClipped v) { + setField(1, v); + } + @$pb.TagNumber(1) $core.bool hasInputClipped() => $_has(0); @$pb.TagNumber(1) @@ -153,7 +179,10 @@ class Message extends $pb.GeneratedMessage { @$pb.TagNumber(2) OutputClipped get outputClipped => $_getN(1); @$pb.TagNumber(2) - set outputClipped(OutputClipped v) { setField(2, v); } + set outputClipped(OutputClipped v) { + setField(2, v); + } + @$pb.TagNumber(2) $core.bool hasOutputClipped() => $_has(1); @$pb.TagNumber(2) @@ -162,6 +191,6 @@ class Message extends $pb.GeneratedMessage { OutputClipped ensureOutputClipped() => $_ensure(1); } - const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names'); -const _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names'); +const _omitMessageNames = + $core.bool.fromEnvironment('protobuf.omit_message_names'); diff --git a/dart/shrapnel_common/lib/api_data/generated/audio_events.pbenum.dart b/dart/shrapnel_common/lib/api_data/generated/audio_events.pbenum.dart index 4a6df19f..8b314faf 100644 --- a/dart/shrapnel_common/lib/api_data/generated/audio_events.pbenum.dart +++ b/dart/shrapnel_common/lib/api_data/generated/audio_events.pbenum.dart @@ -8,4 +8,3 @@ // ignore_for_file: constant_identifier_names, library_prefixes // ignore_for_file: non_constant_identifier_names, prefer_final_fields // ignore_for_file: unnecessary_import, unnecessary_this, unused_import - diff --git a/dart/shrapnel_common/lib/api_data/generated/audio_events.pbjson.dart b/dart/shrapnel_common/lib/api_data/generated/audio_events.pbjson.dart index 207bbee7..41e34eb8 100644 --- a/dart/shrapnel_common/lib/api_data/generated/audio_events.pbjson.dart +++ b/dart/shrapnel_common/lib/api_data/generated/audio_events.pbjson.dart @@ -19,8 +19,8 @@ const InputClipped$json = { }; /// Descriptor for `InputClipped`. Decode as a `google.protobuf.DescriptorProto`. -final $typed_data.Uint8List inputClippedDescriptor = $convert.base64Decode( - 'CgxJbnB1dENsaXBwZWQ='); +final $typed_data.Uint8List inputClippedDescriptor = + $convert.base64Decode('CgxJbnB1dENsaXBwZWQ='); @$core.Deprecated('Use outputClippedDescriptor instead') const OutputClipped$json = { @@ -28,15 +28,31 @@ const OutputClipped$json = { }; /// Descriptor for `OutputClipped`. Decode as a `google.protobuf.DescriptorProto`. -final $typed_data.Uint8List outputClippedDescriptor = $convert.base64Decode( - 'Cg1PdXRwdXRDbGlwcGVk'); +final $typed_data.Uint8List outputClippedDescriptor = + $convert.base64Decode('Cg1PdXRwdXRDbGlwcGVk'); @$core.Deprecated('Use messageDescriptor instead') const Message$json = { '1': 'Message', '2': [ - {'1': 'input_clipped', '3': 1, '4': 1, '5': 11, '6': '.shrapnel.audio_events.InputClipped', '9': 0, '10': 'inputClipped'}, - {'1': 'output_clipped', '3': 2, '4': 1, '5': 11, '6': '.shrapnel.audio_events.OutputClipped', '9': 0, '10': 'outputClipped'}, + { + '1': 'input_clipped', + '3': 1, + '4': 1, + '5': 11, + '6': '.shrapnel.audio_events.InputClipped', + '9': 0, + '10': 'inputClipped' + }, + { + '1': 'output_clipped', + '3': 2, + '4': 1, + '5': 11, + '6': '.shrapnel.audio_events.OutputClipped', + '9': 0, + '10': 'outputClipped' + }, ], '8': [ {'1': 'event'}, @@ -49,4 +65,3 @@ final $typed_data.Uint8List messageDescriptor = $convert.base64Decode( 'MuSW5wdXRDbGlwcGVkSABSDGlucHV0Q2xpcHBlZBJNCg5vdXRwdXRfY2xpcHBlZBgCIAEoCzIk' 'LnNocmFwbmVsLmF1ZGlvX2V2ZW50cy5PdXRwdXRDbGlwcGVkSABSDW91dHB1dENsaXBwZWRCBw' 'oFZXZlbnQ='); - diff --git a/dart/shrapnel_common/lib/api_data/generated/audio_events.pbserver.dart b/dart/shrapnel_common/lib/api_data/generated/audio_events.pbserver.dart index 9e3c1871..5c8ff128 100644 --- a/dart/shrapnel_common/lib/api_data/generated/audio_events.pbserver.dart +++ b/dart/shrapnel_common/lib/api_data/generated/audio_events.pbserver.dart @@ -11,4 +11,3 @@ // ignore_for_file: unnecessary_import, unnecessary_this, unused_import export 'audio_events.pb.dart'; - diff --git a/dart/shrapnel_common/lib/api_data/generated/cmd_handling.pb.dart b/dart/shrapnel_common/lib/api_data/generated/cmd_handling.pb.dart index 041b3bb7..35287eb8 100644 --- a/dart/shrapnel_common/lib/api_data/generated/cmd_handling.pb.dart +++ b/dart/shrapnel_common/lib/api_data/generated/cmd_handling.pb.dart @@ -31,25 +31,31 @@ class Update extends $pb.GeneratedMessage { return $result; } Update._() : super(); - factory Update.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); - factory Update.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Update', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.cmd_handling'), createEmptyInstance: create) + factory Update.fromBuffer($core.List<$core.int> i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(i, r); + factory Update.fromJson($core.String i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo( + _omitMessageNames ? '' : 'Update', + package: const $pb.PackageName( + _omitMessageNames ? '' : 'shrapnel.cmd_handling'), + createEmptyInstance: create) ..aOS(1, _omitFieldNames ? '' : 'id') ..a<$core.double>(2, _omitFieldNames ? '' : 'value', $pb.PbFieldType.OF) - ..hasRequiredFields = false - ; + ..hasRequiredFields = false; - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') Update clone() => Update()..mergeFromMessage(this); - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - Update copyWith(void Function(Update) updates) => super.copyWith((message) => updates(message as Update)) as Update; + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + Update copyWith(void Function(Update) updates) => + super.copyWith((message) => updates(message as Update)) as Update; $pb.BuilderInfo get info_ => _i; @@ -58,13 +64,17 @@ class Update extends $pb.GeneratedMessage { Update createEmptyInstance() => create(); static $pb.PbList createRepeated() => $pb.PbList(); @$core.pragma('dart2js:noInline') - static Update getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static Update getDefault() => + _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); static Update? _defaultInstance; @$pb.TagNumber(1) $core.String get id => $_getSZ(0); @$pb.TagNumber(1) - set id($core.String v) { $_setString(0, v); } + set id($core.String v) { + $_setString(0, v); + } + @$pb.TagNumber(1) $core.bool hasId() => $_has(0); @$pb.TagNumber(1) @@ -73,7 +83,10 @@ class Update extends $pb.GeneratedMessage { @$pb.TagNumber(2) $core.double get value => $_getN(1); @$pb.TagNumber(2) - set value($core.double v) { $_setFloat(1, v); } + set value($core.double v) { + $_setFloat(1, v); + } + @$pb.TagNumber(2) $core.bool hasValue() => $_has(1); @$pb.TagNumber(2) @@ -85,23 +98,29 @@ class Update extends $pb.GeneratedMessage { class Initialise extends $pb.GeneratedMessage { factory Initialise() => create(); Initialise._() : super(); - factory Initialise.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); - factory Initialise.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Initialise', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.cmd_handling'), createEmptyInstance: create) - ..hasRequiredFields = false - ; - - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + factory Initialise.fromBuffer($core.List<$core.int> i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(i, r); + factory Initialise.fromJson($core.String i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo( + _omitMessageNames ? '' : 'Initialise', + package: const $pb.PackageName( + _omitMessageNames ? '' : 'shrapnel.cmd_handling'), + createEmptyInstance: create) + ..hasRequiredFields = false; + + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') Initialise clone() => Initialise()..mergeFromMessage(this); - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - Initialise copyWith(void Function(Initialise) updates) => super.copyWith((message) => updates(message as Initialise)) as Initialise; + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + Initialise copyWith(void Function(Initialise) updates) => + super.copyWith((message) => updates(message as Initialise)) as Initialise; $pb.BuilderInfo get info_ => _i; @@ -110,15 +129,12 @@ class Initialise extends $pb.GeneratedMessage { Initialise createEmptyInstance() => create(); static $pb.PbList createRepeated() => $pb.PbList(); @$core.pragma('dart2js:noInline') - static Initialise getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static Initialise getDefault() => _defaultInstance ??= + $pb.GeneratedMessage.$_defaultFor(create); static Initialise? _defaultInstance; } -enum Message_Message { - update, - initialise, - notSet -} +enum Message_Message { update, initialise, notSet } class Message extends $pb.GeneratedMessage { factory Message({ @@ -135,31 +151,38 @@ class Message extends $pb.GeneratedMessage { return $result; } Message._() : super(); - factory Message.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); - factory Message.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); + factory Message.fromBuffer($core.List<$core.int> i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(i, r); + factory Message.fromJson($core.String i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(i, r); static const $core.Map<$core.int, Message_Message> _Message_MessageByTag = { - 1 : Message_Message.update, - 2 : Message_Message.initialise, - 0 : Message_Message.notSet + 1: Message_Message.update, + 2: Message_Message.initialise, + 0: Message_Message.notSet }; - static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Message', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.cmd_handling'), createEmptyInstance: create) + static final $pb.BuilderInfo _i = $pb.BuilderInfo( + _omitMessageNames ? '' : 'Message', + package: const $pb.PackageName( + _omitMessageNames ? '' : 'shrapnel.cmd_handling'), + createEmptyInstance: create) ..oo(0, [1, 2]) ..aOM(1, _omitFieldNames ? '' : 'update', subBuilder: Update.create) - ..aOM(2, _omitFieldNames ? '' : 'initialise', subBuilder: Initialise.create) - ..hasRequiredFields = false - ; - - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + ..aOM(2, _omitFieldNames ? '' : 'initialise', + subBuilder: Initialise.create) + ..hasRequiredFields = false; + + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') Message clone() => Message()..mergeFromMessage(this); - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - Message copyWith(void Function(Message) updates) => super.copyWith((message) => updates(message as Message)) as Message; + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + Message copyWith(void Function(Message) updates) => + super.copyWith((message) => updates(message as Message)) as Message; $pb.BuilderInfo get info_ => _i; @@ -168,7 +191,8 @@ class Message extends $pb.GeneratedMessage { Message createEmptyInstance() => create(); static $pb.PbList createRepeated() => $pb.PbList(); @$core.pragma('dart2js:noInline') - static Message getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static Message getDefault() => + _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); static Message? _defaultInstance; Message_Message whichMessage() => _Message_MessageByTag[$_whichOneof(0)]!; @@ -177,7 +201,10 @@ class Message extends $pb.GeneratedMessage { @$pb.TagNumber(1) Update get update => $_getN(0); @$pb.TagNumber(1) - set update(Update v) { setField(1, v); } + set update(Update v) { + setField(1, v); + } + @$pb.TagNumber(1) $core.bool hasUpdate() => $_has(0); @$pb.TagNumber(1) @@ -188,7 +215,10 @@ class Message extends $pb.GeneratedMessage { @$pb.TagNumber(2) Initialise get initialise => $_getN(1); @$pb.TagNumber(2) - set initialise(Initialise v) { setField(2, v); } + set initialise(Initialise v) { + setField(2, v); + } + @$pb.TagNumber(2) $core.bool hasInitialise() => $_has(1); @$pb.TagNumber(2) @@ -197,6 +227,6 @@ class Message extends $pb.GeneratedMessage { Initialise ensureInitialise() => $_ensure(1); } - const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names'); -const _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names'); +const _omitMessageNames = + $core.bool.fromEnvironment('protobuf.omit_message_names'); diff --git a/dart/shrapnel_common/lib/api_data/generated/cmd_handling.pbenum.dart b/dart/shrapnel_common/lib/api_data/generated/cmd_handling.pbenum.dart index 77a1361a..70ff03ef 100644 --- a/dart/shrapnel_common/lib/api_data/generated/cmd_handling.pbenum.dart +++ b/dart/shrapnel_common/lib/api_data/generated/cmd_handling.pbenum.dart @@ -8,4 +8,3 @@ // ignore_for_file: constant_identifier_names, library_prefixes // ignore_for_file: non_constant_identifier_names, prefer_final_fields // ignore_for_file: unnecessary_import, unnecessary_this, unused_import - diff --git a/dart/shrapnel_common/lib/api_data/generated/cmd_handling.pbjson.dart b/dart/shrapnel_common/lib/api_data/generated/cmd_handling.pbjson.dart index afde9ddd..be2a35ba 100644 --- a/dart/shrapnel_common/lib/api_data/generated/cmd_handling.pbjson.dart +++ b/dart/shrapnel_common/lib/api_data/generated/cmd_handling.pbjson.dart @@ -32,15 +32,31 @@ const Initialise$json = { }; /// Descriptor for `Initialise`. Decode as a `google.protobuf.DescriptorProto`. -final $typed_data.Uint8List initialiseDescriptor = $convert.base64Decode( - 'CgpJbml0aWFsaXNl'); +final $typed_data.Uint8List initialiseDescriptor = + $convert.base64Decode('CgpJbml0aWFsaXNl'); @$core.Deprecated('Use messageDescriptor instead') const Message$json = { '1': 'Message', '2': [ - {'1': 'update', '3': 1, '4': 1, '5': 11, '6': '.shrapnel.cmd_handling.Update', '9': 0, '10': 'update'}, - {'1': 'initialise', '3': 2, '4': 1, '5': 11, '6': '.shrapnel.cmd_handling.Initialise', '9': 0, '10': 'initialise'}, + { + '1': 'update', + '3': 1, + '4': 1, + '5': 11, + '6': '.shrapnel.cmd_handling.Update', + '9': 0, + '10': 'update' + }, + { + '1': 'initialise', + '3': 2, + '4': 1, + '5': 11, + '6': '.shrapnel.cmd_handling.Initialise', + '9': 0, + '10': 'initialise' + }, ], '8': [ {'1': 'message'}, @@ -52,4 +68,3 @@ final $typed_data.Uint8List messageDescriptor = $convert.base64Decode( 'CgdNZXNzYWdlEjcKBnVwZGF0ZRgBIAEoCzIdLnNocmFwbmVsLmNtZF9oYW5kbGluZy5VcGRhdG' 'VIAFIGdXBkYXRlEkMKCmluaXRpYWxpc2UYAiABKAsyIS5zaHJhcG5lbC5jbWRfaGFuZGxpbmcu' 'SW5pdGlhbGlzZUgAUgppbml0aWFsaXNlQgkKB21lc3NhZ2U='); - diff --git a/dart/shrapnel_common/lib/api_data/generated/cmd_handling.pbserver.dart b/dart/shrapnel_common/lib/api_data/generated/cmd_handling.pbserver.dart index 9186bf5d..31bcdf6a 100644 --- a/dart/shrapnel_common/lib/api_data/generated/cmd_handling.pbserver.dart +++ b/dart/shrapnel_common/lib/api_data/generated/cmd_handling.pbserver.dart @@ -11,4 +11,3 @@ // ignore_for_file: unnecessary_import, unnecessary_this, unused_import export 'cmd_handling.pb.dart'; - diff --git a/dart/shrapnel_common/lib/api_data/generated/midi_mapping.pb.dart b/dart/shrapnel_common/lib/api_data/generated/midi_mapping.pb.dart index fc8f7268..02a4beee 100644 --- a/dart/shrapnel_common/lib/api_data/generated/midi_mapping.pb.dart +++ b/dart/shrapnel_common/lib/api_data/generated/midi_mapping.pb.dart @@ -44,28 +44,37 @@ class Mapping extends $pb.GeneratedMessage { return $result; } Mapping._() : super(); - factory Mapping.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); - factory Mapping.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Mapping', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.midi_mapping'), createEmptyInstance: create) + factory Mapping.fromBuffer($core.List<$core.int> i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(i, r); + factory Mapping.fromJson($core.String i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo( + _omitMessageNames ? '' : 'Mapping', + package: const $pb.PackageName( + _omitMessageNames ? '' : 'shrapnel.midi_mapping'), + createEmptyInstance: create) ..a<$core.int>(1, _omitFieldNames ? '' : 'midiChannel', $pb.PbFieldType.OU3) ..a<$core.int>(2, _omitFieldNames ? '' : 'ccNumber', $pb.PbFieldType.OU3) - ..e(3, _omitFieldNames ? '' : 'mode', $pb.PbFieldType.OE, defaultOrMaker: Mapping_Mode.parameter, valueOf: Mapping_Mode.valueOf, enumValues: Mapping_Mode.values) + ..e(3, _omitFieldNames ? '' : 'mode', $pb.PbFieldType.OE, + defaultOrMaker: Mapping_Mode.parameter, + valueOf: Mapping_Mode.valueOf, + enumValues: Mapping_Mode.values) ..aOS(4, _omitFieldNames ? '' : 'parameterName') ..a<$core.int>(5, _omitFieldNames ? '' : 'presetId', $pb.PbFieldType.OU3) - ..hasRequiredFields = false - ; + ..hasRequiredFields = false; - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') Mapping clone() => Mapping()..mergeFromMessage(this); - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - Mapping copyWith(void Function(Mapping) updates) => super.copyWith((message) => updates(message as Mapping)) as Mapping; + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + Mapping copyWith(void Function(Mapping) updates) => + super.copyWith((message) => updates(message as Mapping)) as Mapping; $pb.BuilderInfo get info_ => _i; @@ -74,13 +83,17 @@ class Mapping extends $pb.GeneratedMessage { Mapping createEmptyInstance() => create(); static $pb.PbList createRepeated() => $pb.PbList(); @$core.pragma('dart2js:noInline') - static Mapping getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static Mapping getDefault() => + _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); static Mapping? _defaultInstance; @$pb.TagNumber(1) $core.int get midiChannel => $_getIZ(0); @$pb.TagNumber(1) - set midiChannel($core.int v) { $_setUnsignedInt32(0, v); } + set midiChannel($core.int v) { + $_setUnsignedInt32(0, v); + } + @$pb.TagNumber(1) $core.bool hasMidiChannel() => $_has(0); @$pb.TagNumber(1) @@ -89,7 +102,10 @@ class Mapping extends $pb.GeneratedMessage { @$pb.TagNumber(2) $core.int get ccNumber => $_getIZ(1); @$pb.TagNumber(2) - set ccNumber($core.int v) { $_setUnsignedInt32(1, v); } + set ccNumber($core.int v) { + $_setUnsignedInt32(1, v); + } + @$pb.TagNumber(2) $core.bool hasCcNumber() => $_has(1); @$pb.TagNumber(2) @@ -98,7 +114,10 @@ class Mapping extends $pb.GeneratedMessage { @$pb.TagNumber(3) Mapping_Mode get mode => $_getN(2); @$pb.TagNumber(3) - set mode(Mapping_Mode v) { setField(3, v); } + set mode(Mapping_Mode v) { + setField(3, v); + } + @$pb.TagNumber(3) $core.bool hasMode() => $_has(2); @$pb.TagNumber(3) @@ -107,7 +126,10 @@ class Mapping extends $pb.GeneratedMessage { @$pb.TagNumber(4) $core.String get parameterName => $_getSZ(3); @$pb.TagNumber(4) - set parameterName($core.String v) { $_setString(3, v); } + set parameterName($core.String v) { + $_setString(3, v); + } + @$pb.TagNumber(4) $core.bool hasParameterName() => $_has(3); @$pb.TagNumber(4) @@ -116,7 +138,10 @@ class Mapping extends $pb.GeneratedMessage { @$pb.TagNumber(5) $core.int get presetId => $_getIZ(4); @$pb.TagNumber(5) - set presetId($core.int v) { $_setUnsignedInt32(4, v); } + set presetId($core.int v) { + $_setUnsignedInt32(4, v); + } + @$pb.TagNumber(5) $core.bool hasPresetId() => $_has(4); @$pb.TagNumber(5) @@ -138,40 +163,52 @@ class MidiMessage_NoteOn extends $pb.GeneratedMessage { return $result; } MidiMessage_NoteOn._() : super(); - factory MidiMessage_NoteOn.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); - factory MidiMessage_NoteOn.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'MidiMessage.NoteOn', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.midi_mapping'), createEmptyInstance: create) + factory MidiMessage_NoteOn.fromBuffer($core.List<$core.int> i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(i, r); + factory MidiMessage_NoteOn.fromJson($core.String i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo( + _omitMessageNames ? '' : 'MidiMessage.NoteOn', + package: const $pb.PackageName( + _omitMessageNames ? '' : 'shrapnel.midi_mapping'), + createEmptyInstance: create) ..a<$core.int>(1, _omitFieldNames ? '' : 'note', $pb.PbFieldType.OU3) ..a<$core.int>(2, _omitFieldNames ? '' : 'velocity', $pb.PbFieldType.OU3) - ..hasRequiredFields = false - ; + ..hasRequiredFields = false; - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') MidiMessage_NoteOn clone() => MidiMessage_NoteOn()..mergeFromMessage(this); - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - MidiMessage_NoteOn copyWith(void Function(MidiMessage_NoteOn) updates) => super.copyWith((message) => updates(message as MidiMessage_NoteOn)) as MidiMessage_NoteOn; + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + MidiMessage_NoteOn copyWith(void Function(MidiMessage_NoteOn) updates) => + super.copyWith((message) => updates(message as MidiMessage_NoteOn)) + as MidiMessage_NoteOn; $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static MidiMessage_NoteOn create() => MidiMessage_NoteOn._(); MidiMessage_NoteOn createEmptyInstance() => create(); - static $pb.PbList createRepeated() => $pb.PbList(); + static $pb.PbList createRepeated() => + $pb.PbList(); @$core.pragma('dart2js:noInline') - static MidiMessage_NoteOn getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static MidiMessage_NoteOn getDefault() => _defaultInstance ??= + $pb.GeneratedMessage.$_defaultFor(create); static MidiMessage_NoteOn? _defaultInstance; @$pb.TagNumber(1) $core.int get note => $_getIZ(0); @$pb.TagNumber(1) - set note($core.int v) { $_setUnsignedInt32(0, v); } + set note($core.int v) { + $_setUnsignedInt32(0, v); + } + @$pb.TagNumber(1) $core.bool hasNote() => $_has(0); @$pb.TagNumber(1) @@ -180,7 +217,10 @@ class MidiMessage_NoteOn extends $pb.GeneratedMessage { @$pb.TagNumber(2) $core.int get velocity => $_getIZ(1); @$pb.TagNumber(2) - set velocity($core.int v) { $_setUnsignedInt32(1, v); } + set velocity($core.int v) { + $_setUnsignedInt32(1, v); + } + @$pb.TagNumber(2) $core.bool hasVelocity() => $_has(1); @$pb.TagNumber(2) @@ -202,40 +242,52 @@ class MidiMessage_NoteOff extends $pb.GeneratedMessage { return $result; } MidiMessage_NoteOff._() : super(); - factory MidiMessage_NoteOff.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); - factory MidiMessage_NoteOff.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'MidiMessage.NoteOff', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.midi_mapping'), createEmptyInstance: create) + factory MidiMessage_NoteOff.fromBuffer($core.List<$core.int> i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(i, r); + factory MidiMessage_NoteOff.fromJson($core.String i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo( + _omitMessageNames ? '' : 'MidiMessage.NoteOff', + package: const $pb.PackageName( + _omitMessageNames ? '' : 'shrapnel.midi_mapping'), + createEmptyInstance: create) ..a<$core.int>(1, _omitFieldNames ? '' : 'note', $pb.PbFieldType.OU3) ..a<$core.int>(2, _omitFieldNames ? '' : 'velocity', $pb.PbFieldType.OU3) - ..hasRequiredFields = false - ; + ..hasRequiredFields = false; - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') MidiMessage_NoteOff clone() => MidiMessage_NoteOff()..mergeFromMessage(this); - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - MidiMessage_NoteOff copyWith(void Function(MidiMessage_NoteOff) updates) => super.copyWith((message) => updates(message as MidiMessage_NoteOff)) as MidiMessage_NoteOff; + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + MidiMessage_NoteOff copyWith(void Function(MidiMessage_NoteOff) updates) => + super.copyWith((message) => updates(message as MidiMessage_NoteOff)) + as MidiMessage_NoteOff; $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static MidiMessage_NoteOff create() => MidiMessage_NoteOff._(); MidiMessage_NoteOff createEmptyInstance() => create(); - static $pb.PbList createRepeated() => $pb.PbList(); + static $pb.PbList createRepeated() => + $pb.PbList(); @$core.pragma('dart2js:noInline') - static MidiMessage_NoteOff getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static MidiMessage_NoteOff getDefault() => _defaultInstance ??= + $pb.GeneratedMessage.$_defaultFor(create); static MidiMessage_NoteOff? _defaultInstance; @$pb.TagNumber(1) $core.int get note => $_getIZ(0); @$pb.TagNumber(1) - set note($core.int v) { $_setUnsignedInt32(0, v); } + set note($core.int v) { + $_setUnsignedInt32(0, v); + } + @$pb.TagNumber(1) $core.bool hasNote() => $_has(0); @$pb.TagNumber(1) @@ -244,7 +296,10 @@ class MidiMessage_NoteOff extends $pb.GeneratedMessage { @$pb.TagNumber(2) $core.int get velocity => $_getIZ(1); @$pb.TagNumber(2) - set velocity($core.int v) { $_setUnsignedInt32(1, v); } + set velocity($core.int v) { + $_setUnsignedInt32(1, v); + } + @$pb.TagNumber(2) $core.bool hasVelocity() => $_has(1); @$pb.TagNumber(2) @@ -266,40 +321,54 @@ class MidiMessage_ControlChange extends $pb.GeneratedMessage { return $result; } MidiMessage_ControlChange._() : super(); - factory MidiMessage_ControlChange.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); - factory MidiMessage_ControlChange.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'MidiMessage.ControlChange', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.midi_mapping'), createEmptyInstance: create) + factory MidiMessage_ControlChange.fromBuffer($core.List<$core.int> i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(i, r); + factory MidiMessage_ControlChange.fromJson($core.String i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo( + _omitMessageNames ? '' : 'MidiMessage.ControlChange', + package: const $pb.PackageName( + _omitMessageNames ? '' : 'shrapnel.midi_mapping'), + createEmptyInstance: create) ..a<$core.int>(1, _omitFieldNames ? '' : 'control', $pb.PbFieldType.OU3) ..a<$core.int>(2, _omitFieldNames ? '' : 'value', $pb.PbFieldType.OU3) - ..hasRequiredFields = false - ; - - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') - MidiMessage_ControlChange clone() => MidiMessage_ControlChange()..mergeFromMessage(this); - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - MidiMessage_ControlChange copyWith(void Function(MidiMessage_ControlChange) updates) => super.copyWith((message) => updates(message as MidiMessage_ControlChange)) as MidiMessage_ControlChange; + ..hasRequiredFields = false; + + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') + MidiMessage_ControlChange clone() => + MidiMessage_ControlChange()..mergeFromMessage(this); + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + MidiMessage_ControlChange copyWith( + void Function(MidiMessage_ControlChange) updates) => + super.copyWith((message) => updates(message as MidiMessage_ControlChange)) + as MidiMessage_ControlChange; $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static MidiMessage_ControlChange create() => MidiMessage_ControlChange._(); MidiMessage_ControlChange createEmptyInstance() => create(); - static $pb.PbList createRepeated() => $pb.PbList(); + static $pb.PbList createRepeated() => + $pb.PbList(); @$core.pragma('dart2js:noInline') - static MidiMessage_ControlChange getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static MidiMessage_ControlChange getDefault() => _defaultInstance ??= + $pb.GeneratedMessage.$_defaultFor(create); static MidiMessage_ControlChange? _defaultInstance; @$pb.TagNumber(1) $core.int get control => $_getIZ(0); @$pb.TagNumber(1) - set control($core.int v) { $_setUnsignedInt32(0, v); } + set control($core.int v) { + $_setUnsignedInt32(0, v); + } + @$pb.TagNumber(1) $core.bool hasControl() => $_has(0); @$pb.TagNumber(1) @@ -308,7 +377,10 @@ class MidiMessage_ControlChange extends $pb.GeneratedMessage { @$pb.TagNumber(2) $core.int get value => $_getIZ(1); @$pb.TagNumber(2) - set value($core.int v) { $_setUnsignedInt32(1, v); } + set value($core.int v) { + $_setUnsignedInt32(1, v); + } + @$pb.TagNumber(2) $core.bool hasValue() => $_has(1); @$pb.TagNumber(2) @@ -326,39 +398,53 @@ class MidiMessage_ProgramChange extends $pb.GeneratedMessage { return $result; } MidiMessage_ProgramChange._() : super(); - factory MidiMessage_ProgramChange.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); - factory MidiMessage_ProgramChange.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'MidiMessage.ProgramChange', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.midi_mapping'), createEmptyInstance: create) + factory MidiMessage_ProgramChange.fromBuffer($core.List<$core.int> i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(i, r); + factory MidiMessage_ProgramChange.fromJson($core.String i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo( + _omitMessageNames ? '' : 'MidiMessage.ProgramChange', + package: const $pb.PackageName( + _omitMessageNames ? '' : 'shrapnel.midi_mapping'), + createEmptyInstance: create) ..a<$core.int>(1, _omitFieldNames ? '' : 'number', $pb.PbFieldType.OU3) - ..hasRequiredFields = false - ; - - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') - MidiMessage_ProgramChange clone() => MidiMessage_ProgramChange()..mergeFromMessage(this); - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - MidiMessage_ProgramChange copyWith(void Function(MidiMessage_ProgramChange) updates) => super.copyWith((message) => updates(message as MidiMessage_ProgramChange)) as MidiMessage_ProgramChange; + ..hasRequiredFields = false; + + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') + MidiMessage_ProgramChange clone() => + MidiMessage_ProgramChange()..mergeFromMessage(this); + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + MidiMessage_ProgramChange copyWith( + void Function(MidiMessage_ProgramChange) updates) => + super.copyWith((message) => updates(message as MidiMessage_ProgramChange)) + as MidiMessage_ProgramChange; $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static MidiMessage_ProgramChange create() => MidiMessage_ProgramChange._(); MidiMessage_ProgramChange createEmptyInstance() => create(); - static $pb.PbList createRepeated() => $pb.PbList(); + static $pb.PbList createRepeated() => + $pb.PbList(); @$core.pragma('dart2js:noInline') - static MidiMessage_ProgramChange getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static MidiMessage_ProgramChange getDefault() => _defaultInstance ??= + $pb.GeneratedMessage.$_defaultFor(create); static MidiMessage_ProgramChange? _defaultInstance; @$pb.TagNumber(1) $core.int get number => $_getIZ(0); @$pb.TagNumber(1) - set number($core.int v) { $_setUnsignedInt32(0, v); } + set number($core.int v) { + $_setUnsignedInt32(0, v); + } + @$pb.TagNumber(1) $core.bool hasNumber() => $_has(0); @$pb.TagNumber(1) @@ -366,10 +452,10 @@ class MidiMessage_ProgramChange extends $pb.GeneratedMessage { } enum MidiMessage_Parameters { - noteOn, - noteOff, - controlChange, - programChange, + noteOn, + noteOff, + controlChange, + programChange, notSet } @@ -401,36 +487,48 @@ class MidiMessage extends $pb.GeneratedMessage { return $result; } MidiMessage._() : super(); - factory MidiMessage.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); - factory MidiMessage.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); - - static const $core.Map<$core.int, MidiMessage_Parameters> _MidiMessage_ParametersByTag = { - 2 : MidiMessage_Parameters.noteOn, - 3 : MidiMessage_Parameters.noteOff, - 4 : MidiMessage_Parameters.controlChange, - 5 : MidiMessage_Parameters.programChange, - 0 : MidiMessage_Parameters.notSet + factory MidiMessage.fromBuffer($core.List<$core.int> i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(i, r); + factory MidiMessage.fromJson($core.String i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(i, r); + + static const $core.Map<$core.int, MidiMessage_Parameters> + _MidiMessage_ParametersByTag = { + 2: MidiMessage_Parameters.noteOn, + 3: MidiMessage_Parameters.noteOff, + 4: MidiMessage_Parameters.controlChange, + 5: MidiMessage_Parameters.programChange, + 0: MidiMessage_Parameters.notSet }; - static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'MidiMessage', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.midi_mapping'), createEmptyInstance: create) + static final $pb.BuilderInfo _i = $pb.BuilderInfo( + _omitMessageNames ? '' : 'MidiMessage', + package: const $pb.PackageName( + _omitMessageNames ? '' : 'shrapnel.midi_mapping'), + createEmptyInstance: create) ..oo(0, [2, 3, 4, 5]) ..a<$core.int>(1, _omitFieldNames ? '' : 'channel', $pb.PbFieldType.OU3) - ..aOM(2, _omitFieldNames ? '' : 'noteOn', subBuilder: MidiMessage_NoteOn.create) - ..aOM(3, _omitFieldNames ? '' : 'noteOff', subBuilder: MidiMessage_NoteOff.create) - ..aOM(4, _omitFieldNames ? '' : 'controlChange', subBuilder: MidiMessage_ControlChange.create) - ..aOM(5, _omitFieldNames ? '' : 'programChange', subBuilder: MidiMessage_ProgramChange.create) - ..hasRequiredFields = false - ; - - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + ..aOM(2, _omitFieldNames ? '' : 'noteOn', + subBuilder: MidiMessage_NoteOn.create) + ..aOM(3, _omitFieldNames ? '' : 'noteOff', + subBuilder: MidiMessage_NoteOff.create) + ..aOM(4, _omitFieldNames ? '' : 'controlChange', + subBuilder: MidiMessage_ControlChange.create) + ..aOM(5, _omitFieldNames ? '' : 'programChange', + subBuilder: MidiMessage_ProgramChange.create) + ..hasRequiredFields = false; + + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') MidiMessage clone() => MidiMessage()..mergeFromMessage(this); - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - MidiMessage copyWith(void Function(MidiMessage) updates) => super.copyWith((message) => updates(message as MidiMessage)) as MidiMessage; + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + MidiMessage copyWith(void Function(MidiMessage) updates) => + super.copyWith((message) => updates(message as MidiMessage)) + as MidiMessage; $pb.BuilderInfo get info_ => _i; @@ -439,17 +537,22 @@ class MidiMessage extends $pb.GeneratedMessage { MidiMessage createEmptyInstance() => create(); static $pb.PbList createRepeated() => $pb.PbList(); @$core.pragma('dart2js:noInline') - static MidiMessage getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static MidiMessage getDefault() => _defaultInstance ??= + $pb.GeneratedMessage.$_defaultFor(create); static MidiMessage? _defaultInstance; - MidiMessage_Parameters whichParameters() => _MidiMessage_ParametersByTag[$_whichOneof(0)]!; + MidiMessage_Parameters whichParameters() => + _MidiMessage_ParametersByTag[$_whichOneof(0)]!; void clearParameters() => clearField($_whichOneof(0)); /// The MIDI channel where the message was received @$pb.TagNumber(1) $core.int get channel => $_getIZ(0); @$pb.TagNumber(1) - set channel($core.int v) { $_setUnsignedInt32(0, v); } + set channel($core.int v) { + $_setUnsignedInt32(0, v); + } + @$pb.TagNumber(1) $core.bool hasChannel() => $_has(0); @$pb.TagNumber(1) @@ -458,7 +561,10 @@ class MidiMessage extends $pb.GeneratedMessage { @$pb.TagNumber(2) MidiMessage_NoteOn get noteOn => $_getN(1); @$pb.TagNumber(2) - set noteOn(MidiMessage_NoteOn v) { setField(2, v); } + set noteOn(MidiMessage_NoteOn v) { + setField(2, v); + } + @$pb.TagNumber(2) $core.bool hasNoteOn() => $_has(1); @$pb.TagNumber(2) @@ -469,7 +575,10 @@ class MidiMessage extends $pb.GeneratedMessage { @$pb.TagNumber(3) MidiMessage_NoteOff get noteOff => $_getN(2); @$pb.TagNumber(3) - set noteOff(MidiMessage_NoteOff v) { setField(3, v); } + set noteOff(MidiMessage_NoteOff v) { + setField(3, v); + } + @$pb.TagNumber(3) $core.bool hasNoteOff() => $_has(2); @$pb.TagNumber(3) @@ -480,7 +589,10 @@ class MidiMessage extends $pb.GeneratedMessage { @$pb.TagNumber(4) MidiMessage_ControlChange get controlChange => $_getN(3); @$pb.TagNumber(4) - set controlChange(MidiMessage_ControlChange v) { setField(4, v); } + set controlChange(MidiMessage_ControlChange v) { + setField(4, v); + } + @$pb.TagNumber(4) $core.bool hasControlChange() => $_has(3); @$pb.TagNumber(4) @@ -491,7 +603,10 @@ class MidiMessage extends $pb.GeneratedMessage { @$pb.TagNumber(5) MidiMessage_ProgramChange get programChange => $_getN(4); @$pb.TagNumber(5) - set programChange(MidiMessage_ProgramChange v) { setField(5, v); } + set programChange(MidiMessage_ProgramChange v) { + setField(5, v); + } + @$pb.TagNumber(5) $core.bool hasProgramChange() => $_has(4); @$pb.TagNumber(5) @@ -515,40 +630,53 @@ class MappingRecord extends $pb.GeneratedMessage { return $result; } MappingRecord._() : super(); - factory MappingRecord.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); - factory MappingRecord.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'MappingRecord', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.midi_mapping'), createEmptyInstance: create) + factory MappingRecord.fromBuffer($core.List<$core.int> i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(i, r); + factory MappingRecord.fromJson($core.String i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo( + _omitMessageNames ? '' : 'MappingRecord', + package: const $pb.PackageName( + _omitMessageNames ? '' : 'shrapnel.midi_mapping'), + createEmptyInstance: create) ..a<$core.int>(1, _omitFieldNames ? '' : 'id', $pb.PbFieldType.OU3) - ..aOM(2, _omitFieldNames ? '' : 'mapping', subBuilder: Mapping.create) - ..hasRequiredFields = false - ; - - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + ..aOM(2, _omitFieldNames ? '' : 'mapping', + subBuilder: Mapping.create) + ..hasRequiredFields = false; + + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') MappingRecord clone() => MappingRecord()..mergeFromMessage(this); - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - MappingRecord copyWith(void Function(MappingRecord) updates) => super.copyWith((message) => updates(message as MappingRecord)) as MappingRecord; + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + MappingRecord copyWith(void Function(MappingRecord) updates) => + super.copyWith((message) => updates(message as MappingRecord)) + as MappingRecord; $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static MappingRecord create() => MappingRecord._(); MappingRecord createEmptyInstance() => create(); - static $pb.PbList createRepeated() => $pb.PbList(); + static $pb.PbList createRepeated() => + $pb.PbList(); @$core.pragma('dart2js:noInline') - static MappingRecord getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static MappingRecord getDefault() => _defaultInstance ??= + $pb.GeneratedMessage.$_defaultFor(create); static MappingRecord? _defaultInstance; @$pb.TagNumber(1) $core.int get id => $_getIZ(0); @$pb.TagNumber(1) - set id($core.int v) { $_setUnsignedInt32(0, v); } + set id($core.int v) { + $_setUnsignedInt32(0, v); + } + @$pb.TagNumber(1) $core.bool hasId() => $_has(0); @$pb.TagNumber(1) @@ -557,7 +685,10 @@ class MappingRecord extends $pb.GeneratedMessage { @$pb.TagNumber(2) Mapping get mapping => $_getN(1); @$pb.TagNumber(2) - set mapping(Mapping v) { setField(2, v); } + set mapping(Mapping v) { + setField(2, v); + } + @$pb.TagNumber(2) $core.bool hasMapping() => $_has(1); @$pb.TagNumber(2) @@ -571,23 +702,29 @@ class MappingRecord extends $pb.GeneratedMessage { class GetRequest extends $pb.GeneratedMessage { factory GetRequest() => create(); GetRequest._() : super(); - factory GetRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); - factory GetRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.midi_mapping'), createEmptyInstance: create) - ..hasRequiredFields = false - ; - - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + factory GetRequest.fromBuffer($core.List<$core.int> i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(i, r); + factory GetRequest.fromJson($core.String i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo( + _omitMessageNames ? '' : 'GetRequest', + package: const $pb.PackageName( + _omitMessageNames ? '' : 'shrapnel.midi_mapping'), + createEmptyInstance: create) + ..hasRequiredFields = false; + + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') GetRequest clone() => GetRequest()..mergeFromMessage(this); - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - GetRequest copyWith(void Function(GetRequest) updates) => super.copyWith((message) => updates(message as GetRequest)) as GetRequest; + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + GetRequest copyWith(void Function(GetRequest) updates) => + super.copyWith((message) => updates(message as GetRequest)) as GetRequest; $pb.BuilderInfo get info_ => _i; @@ -596,7 +733,8 @@ class GetRequest extends $pb.GeneratedMessage { GetRequest createEmptyInstance() => create(); static $pb.PbList createRepeated() => $pb.PbList(); @$core.pragma('dart2js:noInline') - static GetRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static GetRequest getDefault() => _defaultInstance ??= + $pb.GeneratedMessage.$_defaultFor(create); static GetRequest? _defaultInstance; } @@ -612,39 +750,52 @@ class CreateRequest extends $pb.GeneratedMessage { return $result; } CreateRequest._() : super(); - factory CreateRequest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); - factory CreateRequest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'CreateRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.midi_mapping'), createEmptyInstance: create) - ..aOM(1, _omitFieldNames ? '' : 'mapping', subBuilder: Mapping.create) - ..hasRequiredFields = false - ; - - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + factory CreateRequest.fromBuffer($core.List<$core.int> i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(i, r); + factory CreateRequest.fromJson($core.String i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo( + _omitMessageNames ? '' : 'CreateRequest', + package: const $pb.PackageName( + _omitMessageNames ? '' : 'shrapnel.midi_mapping'), + createEmptyInstance: create) + ..aOM(1, _omitFieldNames ? '' : 'mapping', + subBuilder: Mapping.create) + ..hasRequiredFields = false; + + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') CreateRequest clone() => CreateRequest()..mergeFromMessage(this); - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - CreateRequest copyWith(void Function(CreateRequest) updates) => super.copyWith((message) => updates(message as CreateRequest)) as CreateRequest; + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + CreateRequest copyWith(void Function(CreateRequest) updates) => + super.copyWith((message) => updates(message as CreateRequest)) + as CreateRequest; $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static CreateRequest create() => CreateRequest._(); CreateRequest createEmptyInstance() => create(); - static $pb.PbList createRepeated() => $pb.PbList(); + static $pb.PbList createRepeated() => + $pb.PbList(); @$core.pragma('dart2js:noInline') - static CreateRequest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static CreateRequest getDefault() => _defaultInstance ??= + $pb.GeneratedMessage.$_defaultFor(create); static CreateRequest? _defaultInstance; @$pb.TagNumber(1) Mapping get mapping => $_getN(0); @$pb.TagNumber(1) - set mapping(Mapping v) { setField(1, v); } + set mapping(Mapping v) { + setField(1, v); + } + @$pb.TagNumber(1) $core.bool hasMapping() => $_has(0); @$pb.TagNumber(1) @@ -665,39 +816,52 @@ class CreateResponse extends $pb.GeneratedMessage { return $result; } CreateResponse._() : super(); - factory CreateResponse.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); - factory CreateResponse.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'CreateResponse', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.midi_mapping'), createEmptyInstance: create) - ..aOM(1, _omitFieldNames ? '' : 'mapping', subBuilder: MappingRecord.create) - ..hasRequiredFields = false - ; - - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + factory CreateResponse.fromBuffer($core.List<$core.int> i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(i, r); + factory CreateResponse.fromJson($core.String i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo( + _omitMessageNames ? '' : 'CreateResponse', + package: const $pb.PackageName( + _omitMessageNames ? '' : 'shrapnel.midi_mapping'), + createEmptyInstance: create) + ..aOM(1, _omitFieldNames ? '' : 'mapping', + subBuilder: MappingRecord.create) + ..hasRequiredFields = false; + + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') CreateResponse clone() => CreateResponse()..mergeFromMessage(this); - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - CreateResponse copyWith(void Function(CreateResponse) updates) => super.copyWith((message) => updates(message as CreateResponse)) as CreateResponse; + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + CreateResponse copyWith(void Function(CreateResponse) updates) => + super.copyWith((message) => updates(message as CreateResponse)) + as CreateResponse; $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static CreateResponse create() => CreateResponse._(); CreateResponse createEmptyInstance() => create(); - static $pb.PbList createRepeated() => $pb.PbList(); + static $pb.PbList createRepeated() => + $pb.PbList(); @$core.pragma('dart2js:noInline') - static CreateResponse getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static CreateResponse getDefault() => _defaultInstance ??= + $pb.GeneratedMessage.$_defaultFor(create); static CreateResponse? _defaultInstance; @$pb.TagNumber(1) MappingRecord get mapping => $_getN(0); @$pb.TagNumber(1) - set mapping(MappingRecord v) { setField(1, v); } + set mapping(MappingRecord v) { + setField(1, v); + } + @$pb.TagNumber(1) $core.bool hasMapping() => $_has(0); @$pb.TagNumber(1) @@ -718,24 +882,31 @@ class Update extends $pb.GeneratedMessage { return $result; } Update._() : super(); - factory Update.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); - factory Update.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Update', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.midi_mapping'), createEmptyInstance: create) - ..aOM(1, _omitFieldNames ? '' : 'mapping', subBuilder: MappingRecord.create) - ..hasRequiredFields = false - ; - - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + factory Update.fromBuffer($core.List<$core.int> i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(i, r); + factory Update.fromJson($core.String i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo( + _omitMessageNames ? '' : 'Update', + package: const $pb.PackageName( + _omitMessageNames ? '' : 'shrapnel.midi_mapping'), + createEmptyInstance: create) + ..aOM(1, _omitFieldNames ? '' : 'mapping', + subBuilder: MappingRecord.create) + ..hasRequiredFields = false; + + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') Update clone() => Update()..mergeFromMessage(this); - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - Update copyWith(void Function(Update) updates) => super.copyWith((message) => updates(message as Update)) as Update; + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + Update copyWith(void Function(Update) updates) => + super.copyWith((message) => updates(message as Update)) as Update; $pb.BuilderInfo get info_ => _i; @@ -744,13 +915,17 @@ class Update extends $pb.GeneratedMessage { Update createEmptyInstance() => create(); static $pb.PbList createRepeated() => $pb.PbList(); @$core.pragma('dart2js:noInline') - static Update getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static Update getDefault() => + _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); static Update? _defaultInstance; @$pb.TagNumber(1) MappingRecord get mapping => $_getN(0); @$pb.TagNumber(1) - set mapping(MappingRecord v) { setField(1, v); } + set mapping(MappingRecord v) { + setField(1, v); + } + @$pb.TagNumber(1) $core.bool hasMapping() => $_has(0); @$pb.TagNumber(1) @@ -771,24 +946,30 @@ class Remove extends $pb.GeneratedMessage { return $result; } Remove._() : super(); - factory Remove.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); - factory Remove.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Remove', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.midi_mapping'), createEmptyInstance: create) + factory Remove.fromBuffer($core.List<$core.int> i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(i, r); + factory Remove.fromJson($core.String i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo( + _omitMessageNames ? '' : 'Remove', + package: const $pb.PackageName( + _omitMessageNames ? '' : 'shrapnel.midi_mapping'), + createEmptyInstance: create) ..a<$core.int>(1, _omitFieldNames ? '' : 'id', $pb.PbFieldType.OU3) - ..hasRequiredFields = false - ; + ..hasRequiredFields = false; - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') Remove clone() => Remove()..mergeFromMessage(this); - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - Remove copyWith(void Function(Remove) updates) => super.copyWith((message) => updates(message as Remove)) as Remove; + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + Remove copyWith(void Function(Remove) updates) => + super.copyWith((message) => updates(message as Remove)) as Remove; $pb.BuilderInfo get info_ => _i; @@ -797,13 +978,17 @@ class Remove extends $pb.GeneratedMessage { Remove createEmptyInstance() => create(); static $pb.PbList createRepeated() => $pb.PbList(); @$core.pragma('dart2js:noInline') - static Remove getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static Remove getDefault() => + _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); static Remove? _defaultInstance; @$pb.TagNumber(1) $core.int get id => $_getIZ(0); @$pb.TagNumber(1) - set id($core.int v) { $_setUnsignedInt32(0, v); } + set id($core.int v) { + $_setUnsignedInt32(0, v); + } + @$pb.TagNumber(1) $core.bool hasId() => $_has(0); @$pb.TagNumber(1) @@ -824,39 +1009,52 @@ class MessageReceived extends $pb.GeneratedMessage { return $result; } MessageReceived._() : super(); - factory MessageReceived.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); - factory MessageReceived.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'MessageReceived', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.midi_mapping'), createEmptyInstance: create) - ..aOM(1, _omitFieldNames ? '' : 'receivedMessage', subBuilder: MidiMessage.create) - ..hasRequiredFields = false - ; - - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + factory MessageReceived.fromBuffer($core.List<$core.int> i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(i, r); + factory MessageReceived.fromJson($core.String i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo( + _omitMessageNames ? '' : 'MessageReceived', + package: const $pb.PackageName( + _omitMessageNames ? '' : 'shrapnel.midi_mapping'), + createEmptyInstance: create) + ..aOM(1, _omitFieldNames ? '' : 'receivedMessage', + subBuilder: MidiMessage.create) + ..hasRequiredFields = false; + + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') MessageReceived clone() => MessageReceived()..mergeFromMessage(this); - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - MessageReceived copyWith(void Function(MessageReceived) updates) => super.copyWith((message) => updates(message as MessageReceived)) as MessageReceived; + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + MessageReceived copyWith(void Function(MessageReceived) updates) => + super.copyWith((message) => updates(message as MessageReceived)) + as MessageReceived; $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static MessageReceived create() => MessageReceived._(); MessageReceived createEmptyInstance() => create(); - static $pb.PbList createRepeated() => $pb.PbList(); + static $pb.PbList createRepeated() => + $pb.PbList(); @$core.pragma('dart2js:noInline') - static MessageReceived getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static MessageReceived getDefault() => _defaultInstance ??= + $pb.GeneratedMessage.$_defaultFor(create); static MessageReceived? _defaultInstance; @$pb.TagNumber(1) MidiMessage get receivedMessage => $_getN(0); @$pb.TagNumber(1) - set receivedMessage(MidiMessage v) { setField(1, v); } + set receivedMessage(MidiMessage v) { + setField(1, v); + } + @$pb.TagNumber(1) $core.bool hasReceivedMessage() => $_has(0); @$pb.TagNumber(1) @@ -866,12 +1064,12 @@ class MessageReceived extends $pb.GeneratedMessage { } enum Message_Message { - getRequest, - createRequest, - createResponse, - update, - remove, - messageReceived, + getRequest, + createRequest, + createResponse, + update, + remove, + messageReceived, notSet } @@ -906,39 +1104,49 @@ class Message extends $pb.GeneratedMessage { return $result; } Message._() : super(); - factory Message.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); - factory Message.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); + factory Message.fromBuffer($core.List<$core.int> i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(i, r); + factory Message.fromJson($core.String i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(i, r); static const $core.Map<$core.int, Message_Message> _Message_MessageByTag = { - 1 : Message_Message.getRequest, - 2 : Message_Message.createRequest, - 3 : Message_Message.createResponse, - 4 : Message_Message.update, - 5 : Message_Message.remove, - 6 : Message_Message.messageReceived, - 0 : Message_Message.notSet + 1: Message_Message.getRequest, + 2: Message_Message.createRequest, + 3: Message_Message.createResponse, + 4: Message_Message.update, + 5: Message_Message.remove, + 6: Message_Message.messageReceived, + 0: Message_Message.notSet }; - static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Message', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.midi_mapping'), createEmptyInstance: create) + static final $pb.BuilderInfo _i = $pb.BuilderInfo( + _omitMessageNames ? '' : 'Message', + package: const $pb.PackageName( + _omitMessageNames ? '' : 'shrapnel.midi_mapping'), + createEmptyInstance: create) ..oo(0, [1, 2, 3, 4, 5, 6]) - ..aOM(1, _omitFieldNames ? '' : 'getRequest', subBuilder: GetRequest.create) - ..aOM(2, _omitFieldNames ? '' : 'createRequest', subBuilder: CreateRequest.create) - ..aOM(3, _omitFieldNames ? '' : 'createResponse', subBuilder: CreateResponse.create) + ..aOM(1, _omitFieldNames ? '' : 'getRequest', + subBuilder: GetRequest.create) + ..aOM(2, _omitFieldNames ? '' : 'createRequest', + subBuilder: CreateRequest.create) + ..aOM(3, _omitFieldNames ? '' : 'createResponse', + subBuilder: CreateResponse.create) ..aOM(4, _omitFieldNames ? '' : 'update', subBuilder: Update.create) ..aOM(5, _omitFieldNames ? '' : 'remove', subBuilder: Remove.create) - ..aOM(6, _omitFieldNames ? '' : 'messageReceived', subBuilder: MessageReceived.create) - ..hasRequiredFields = false - ; - - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + ..aOM(6, _omitFieldNames ? '' : 'messageReceived', + subBuilder: MessageReceived.create) + ..hasRequiredFields = false; + + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') Message clone() => Message()..mergeFromMessage(this); - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - Message copyWith(void Function(Message) updates) => super.copyWith((message) => updates(message as Message)) as Message; + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + Message copyWith(void Function(Message) updates) => + super.copyWith((message) => updates(message as Message)) as Message; $pb.BuilderInfo get info_ => _i; @@ -947,7 +1155,8 @@ class Message extends $pb.GeneratedMessage { Message createEmptyInstance() => create(); static $pb.PbList createRepeated() => $pb.PbList(); @$core.pragma('dart2js:noInline') - static Message getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static Message getDefault() => + _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); static Message? _defaultInstance; Message_Message whichMessage() => _Message_MessageByTag[$_whichOneof(0)]!; @@ -956,7 +1165,10 @@ class Message extends $pb.GeneratedMessage { @$pb.TagNumber(1) GetRequest get getRequest => $_getN(0); @$pb.TagNumber(1) - set getRequest(GetRequest v) { setField(1, v); } + set getRequest(GetRequest v) { + setField(1, v); + } + @$pb.TagNumber(1) $core.bool hasGetRequest() => $_has(0); @$pb.TagNumber(1) @@ -967,7 +1179,10 @@ class Message extends $pb.GeneratedMessage { @$pb.TagNumber(2) CreateRequest get createRequest => $_getN(1); @$pb.TagNumber(2) - set createRequest(CreateRequest v) { setField(2, v); } + set createRequest(CreateRequest v) { + setField(2, v); + } + @$pb.TagNumber(2) $core.bool hasCreateRequest() => $_has(1); @$pb.TagNumber(2) @@ -978,7 +1193,10 @@ class Message extends $pb.GeneratedMessage { @$pb.TagNumber(3) CreateResponse get createResponse => $_getN(2); @$pb.TagNumber(3) - set createResponse(CreateResponse v) { setField(3, v); } + set createResponse(CreateResponse v) { + setField(3, v); + } + @$pb.TagNumber(3) $core.bool hasCreateResponse() => $_has(2); @$pb.TagNumber(3) @@ -989,7 +1207,10 @@ class Message extends $pb.GeneratedMessage { @$pb.TagNumber(4) Update get update => $_getN(3); @$pb.TagNumber(4) - set update(Update v) { setField(4, v); } + set update(Update v) { + setField(4, v); + } + @$pb.TagNumber(4) $core.bool hasUpdate() => $_has(3); @$pb.TagNumber(4) @@ -1000,7 +1221,10 @@ class Message extends $pb.GeneratedMessage { @$pb.TagNumber(5) Remove get remove => $_getN(4); @$pb.TagNumber(5) - set remove(Remove v) { setField(5, v); } + set remove(Remove v) { + setField(5, v); + } + @$pb.TagNumber(5) $core.bool hasRemove() => $_has(4); @$pb.TagNumber(5) @@ -1011,7 +1235,10 @@ class Message extends $pb.GeneratedMessage { @$pb.TagNumber(6) MessageReceived get messageReceived => $_getN(5); @$pb.TagNumber(6) - set messageReceived(MessageReceived v) { setField(6, v); } + set messageReceived(MessageReceived v) { + setField(6, v); + } + @$pb.TagNumber(6) $core.bool hasMessageReceived() => $_has(5); @$pb.TagNumber(6) @@ -1020,6 +1247,6 @@ class Message extends $pb.GeneratedMessage { MessageReceived ensureMessageReceived() => $_ensure(5); } - const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names'); -const _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names'); +const _omitMessageNames = + $core.bool.fromEnvironment('protobuf.omit_message_names'); diff --git a/dart/shrapnel_common/lib/api_data/generated/midi_mapping.pbenum.dart b/dart/shrapnel_common/lib/api_data/generated/midi_mapping.pbenum.dart index a61eae4c..2faa4b9e 100644 --- a/dart/shrapnel_common/lib/api_data/generated/midi_mapping.pbenum.dart +++ b/dart/shrapnel_common/lib/api_data/generated/midi_mapping.pbenum.dart @@ -14,21 +14,24 @@ import 'dart:core' as $core; import 'package:protobuf/protobuf.dart' as $pb; class Mapping_Mode extends $pb.ProtobufEnum { - static const Mapping_Mode parameter = Mapping_Mode._(0, _omitEnumNames ? '' : 'parameter'); - static const Mapping_Mode toggle = Mapping_Mode._(1, _omitEnumNames ? '' : 'toggle'); - static const Mapping_Mode button = Mapping_Mode._(2, _omitEnumNames ? '' : 'button'); - - static const $core.List values = [ + static const Mapping_Mode parameter = + Mapping_Mode._(0, _omitEnumNames ? '' : 'parameter'); + static const Mapping_Mode toggle = + Mapping_Mode._(1, _omitEnumNames ? '' : 'toggle'); + static const Mapping_Mode button = + Mapping_Mode._(2, _omitEnumNames ? '' : 'button'); + + static const $core.List values = [ parameter, toggle, button, ]; - static final $core.Map<$core.int, Mapping_Mode> _byValue = $pb.ProtobufEnum.initByValue(values); + static final $core.Map<$core.int, Mapping_Mode> _byValue = + $pb.ProtobufEnum.initByValue(values); static Mapping_Mode? valueOf($core.int value) => _byValue[value]; const Mapping_Mode._($core.int v, $core.String n) : super(v, n); } - const _omitEnumNames = $core.bool.fromEnvironment('protobuf.omit_enum_names'); diff --git a/dart/shrapnel_common/lib/api_data/generated/midi_mapping.pbjson.dart b/dart/shrapnel_common/lib/api_data/generated/midi_mapping.pbjson.dart index d1de1d3f..24adc6e8 100644 --- a/dart/shrapnel_common/lib/api_data/generated/midi_mapping.pbjson.dart +++ b/dart/shrapnel_common/lib/api_data/generated/midi_mapping.pbjson.dart @@ -19,7 +19,14 @@ const Mapping$json = { '2': [ {'1': 'midi_channel', '3': 1, '4': 1, '5': 13, '10': 'midiChannel'}, {'1': 'cc_number', '3': 2, '4': 1, '5': 13, '10': 'ccNumber'}, - {'1': 'mode', '3': 3, '4': 1, '5': 14, '6': '.shrapnel.midi_mapping.Mapping.Mode', '10': 'mode'}, + { + '1': 'mode', + '3': 3, + '4': 1, + '5': 14, + '6': '.shrapnel.midi_mapping.Mapping.Mode', + '10': 'mode' + }, {'1': 'parameter_name', '3': 4, '4': 1, '5': 9, '10': 'parameterName'}, {'1': 'preset_id', '3': 5, '4': 1, '5': 13, '10': 'presetId'}, ], @@ -49,12 +56,49 @@ const MidiMessage$json = { '1': 'MidiMessage', '2': [ {'1': 'channel', '3': 1, '4': 1, '5': 13, '10': 'channel'}, - {'1': 'note_on', '3': 2, '4': 1, '5': 11, '6': '.shrapnel.midi_mapping.MidiMessage.NoteOn', '9': 0, '10': 'noteOn'}, - {'1': 'note_off', '3': 3, '4': 1, '5': 11, '6': '.shrapnel.midi_mapping.MidiMessage.NoteOff', '9': 0, '10': 'noteOff'}, - {'1': 'control_change', '3': 4, '4': 1, '5': 11, '6': '.shrapnel.midi_mapping.MidiMessage.ControlChange', '9': 0, '10': 'controlChange'}, - {'1': 'program_change', '3': 5, '4': 1, '5': 11, '6': '.shrapnel.midi_mapping.MidiMessage.ProgramChange', '9': 0, '10': 'programChange'}, + { + '1': 'note_on', + '3': 2, + '4': 1, + '5': 11, + '6': '.shrapnel.midi_mapping.MidiMessage.NoteOn', + '9': 0, + '10': 'noteOn' + }, + { + '1': 'note_off', + '3': 3, + '4': 1, + '5': 11, + '6': '.shrapnel.midi_mapping.MidiMessage.NoteOff', + '9': 0, + '10': 'noteOff' + }, + { + '1': 'control_change', + '3': 4, + '4': 1, + '5': 11, + '6': '.shrapnel.midi_mapping.MidiMessage.ControlChange', + '9': 0, + '10': 'controlChange' + }, + { + '1': 'program_change', + '3': 5, + '4': 1, + '5': 11, + '6': '.shrapnel.midi_mapping.MidiMessage.ProgramChange', + '9': 0, + '10': 'programChange' + }, + ], + '3': [ + MidiMessage_NoteOn$json, + MidiMessage_NoteOff$json, + MidiMessage_ControlChange$json, + MidiMessage_ProgramChange$json ], - '3': [MidiMessage_NoteOn$json, MidiMessage_NoteOff$json, MidiMessage_ControlChange$json, MidiMessage_ProgramChange$json], '8': [ {'1': 'parameters'}, ], @@ -114,7 +158,14 @@ const MappingRecord$json = { '1': 'MappingRecord', '2': [ {'1': 'id', '3': 1, '4': 1, '5': 13, '10': 'id'}, - {'1': 'mapping', '3': 2, '4': 1, '5': 11, '6': '.shrapnel.midi_mapping.Mapping', '10': 'mapping'}, + { + '1': 'mapping', + '3': 2, + '4': 1, + '5': 11, + '6': '.shrapnel.midi_mapping.Mapping', + '10': 'mapping' + }, ], }; @@ -129,14 +180,21 @@ const GetRequest$json = { }; /// Descriptor for `GetRequest`. Decode as a `google.protobuf.DescriptorProto`. -final $typed_data.Uint8List getRequestDescriptor = $convert.base64Decode( - 'CgpHZXRSZXF1ZXN0'); +final $typed_data.Uint8List getRequestDescriptor = + $convert.base64Decode('CgpHZXRSZXF1ZXN0'); @$core.Deprecated('Use createRequestDescriptor instead') const CreateRequest$json = { '1': 'CreateRequest', '2': [ - {'1': 'mapping', '3': 1, '4': 1, '5': 11, '6': '.shrapnel.midi_mapping.Mapping', '10': 'mapping'}, + { + '1': 'mapping', + '3': 1, + '4': 1, + '5': 11, + '6': '.shrapnel.midi_mapping.Mapping', + '10': 'mapping' + }, ], }; @@ -149,7 +207,14 @@ final $typed_data.Uint8List createRequestDescriptor = $convert.base64Decode( const CreateResponse$json = { '1': 'CreateResponse', '2': [ - {'1': 'mapping', '3': 1, '4': 1, '5': 11, '6': '.shrapnel.midi_mapping.MappingRecord', '10': 'mapping'}, + { + '1': 'mapping', + '3': 1, + '4': 1, + '5': 11, + '6': '.shrapnel.midi_mapping.MappingRecord', + '10': 'mapping' + }, ], }; @@ -162,7 +227,14 @@ final $typed_data.Uint8List createResponseDescriptor = $convert.base64Decode( const Update$json = { '1': 'Update', '2': [ - {'1': 'mapping', '3': 1, '4': 1, '5': 11, '6': '.shrapnel.midi_mapping.MappingRecord', '10': 'mapping'}, + { + '1': 'mapping', + '3': 1, + '4': 1, + '5': 11, + '6': '.shrapnel.midi_mapping.MappingRecord', + '10': 'mapping' + }, ], }; @@ -180,14 +252,21 @@ const Remove$json = { }; /// Descriptor for `Remove`. Decode as a `google.protobuf.DescriptorProto`. -final $typed_data.Uint8List removeDescriptor = $convert.base64Decode( - 'CgZSZW1vdmUSDgoCaWQYASABKA1SAmlk'); +final $typed_data.Uint8List removeDescriptor = + $convert.base64Decode('CgZSZW1vdmUSDgoCaWQYASABKA1SAmlk'); @$core.Deprecated('Use messageReceivedDescriptor instead') const MessageReceived$json = { '1': 'MessageReceived', '2': [ - {'1': 'received_message', '3': 1, '4': 1, '5': 11, '6': '.shrapnel.midi_mapping.MidiMessage', '10': 'receivedMessage'}, + { + '1': 'received_message', + '3': 1, + '4': 1, + '5': 11, + '6': '.shrapnel.midi_mapping.MidiMessage', + '10': 'receivedMessage' + }, ], }; @@ -200,12 +279,60 @@ final $typed_data.Uint8List messageReceivedDescriptor = $convert.base64Decode( const Message$json = { '1': 'Message', '2': [ - {'1': 'get_request', '3': 1, '4': 1, '5': 11, '6': '.shrapnel.midi_mapping.GetRequest', '9': 0, '10': 'getRequest'}, - {'1': 'create_request', '3': 2, '4': 1, '5': 11, '6': '.shrapnel.midi_mapping.CreateRequest', '9': 0, '10': 'createRequest'}, - {'1': 'create_response', '3': 3, '4': 1, '5': 11, '6': '.shrapnel.midi_mapping.CreateResponse', '9': 0, '10': 'createResponse'}, - {'1': 'update', '3': 4, '4': 1, '5': 11, '6': '.shrapnel.midi_mapping.Update', '9': 0, '10': 'update'}, - {'1': 'remove', '3': 5, '4': 1, '5': 11, '6': '.shrapnel.midi_mapping.Remove', '9': 0, '10': 'remove'}, - {'1': 'message_received', '3': 6, '4': 1, '5': 11, '6': '.shrapnel.midi_mapping.MessageReceived', '9': 0, '10': 'messageReceived'}, + { + '1': 'get_request', + '3': 1, + '4': 1, + '5': 11, + '6': '.shrapnel.midi_mapping.GetRequest', + '9': 0, + '10': 'getRequest' + }, + { + '1': 'create_request', + '3': 2, + '4': 1, + '5': 11, + '6': '.shrapnel.midi_mapping.CreateRequest', + '9': 0, + '10': 'createRequest' + }, + { + '1': 'create_response', + '3': 3, + '4': 1, + '5': 11, + '6': '.shrapnel.midi_mapping.CreateResponse', + '9': 0, + '10': 'createResponse' + }, + { + '1': 'update', + '3': 4, + '4': 1, + '5': 11, + '6': '.shrapnel.midi_mapping.Update', + '9': 0, + '10': 'update' + }, + { + '1': 'remove', + '3': 5, + '4': 1, + '5': 11, + '6': '.shrapnel.midi_mapping.Remove', + '9': 0, + '10': 'remove' + }, + { + '1': 'message_received', + '3': 6, + '4': 1, + '5': 11, + '6': '.shrapnel.midi_mapping.MessageReceived', + '9': 0, + '10': 'messageReceived' + }, ], '8': [ {'1': 'message'}, @@ -223,4 +350,3 @@ final $typed_data.Uint8List messageDescriptor = $convert.base64Decode( 'cGluZy5SZW1vdmVIAFIGcmVtb3ZlElMKEG1lc3NhZ2VfcmVjZWl2ZWQYBiABKAsyJi5zaHJhcG' '5lbC5taWRpX21hcHBpbmcuTWVzc2FnZVJlY2VpdmVkSABSD21lc3NhZ2VSZWNlaXZlZEIJCgdt' 'ZXNzYWdl'); - diff --git a/dart/shrapnel_common/lib/api_data/generated/midi_mapping.pbserver.dart b/dart/shrapnel_common/lib/api_data/generated/midi_mapping.pbserver.dart index 519159b1..ff2db38c 100644 --- a/dart/shrapnel_common/lib/api_data/generated/midi_mapping.pbserver.dart +++ b/dart/shrapnel_common/lib/api_data/generated/midi_mapping.pbserver.dart @@ -11,4 +11,3 @@ // ignore_for_file: unnecessary_import, unnecessary_this, unused_import export 'midi_mapping.pb.dart'; - diff --git a/dart/shrapnel_common/lib/api_data/generated/presets.pb.dart b/dart/shrapnel_common/lib/api_data/generated/presets.pb.dart index 97a1efc4..f478fa82 100644 --- a/dart/shrapnel_common/lib/api_data/generated/presets.pb.dart +++ b/dart/shrapnel_common/lib/api_data/generated/presets.pb.dart @@ -100,10 +100,18 @@ class PresetParameters extends $pb.GeneratedMessage { return $result; } PresetParameters._() : super(); - factory PresetParameters.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); - factory PresetParameters.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'PresetParameters', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.presets'), createEmptyInstance: create) + factory PresetParameters.fromBuffer($core.List<$core.int> i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(i, r); + factory PresetParameters.fromJson($core.String i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo( + _omitMessageNames ? '' : 'PresetParameters', + package: + const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.presets'), + createEmptyInstance: create) ..a<$core.int>(1, _omitFieldNames ? '' : 'ampGain', $pb.PbFieldType.O3) ..a<$core.int>(2, _omitFieldNames ? '' : 'ampChannel', $pb.PbFieldType.O3) ..a<$core.int>(3, _omitFieldNames ? '' : 'bass', $pb.PbFieldType.O3) @@ -111,47 +119,58 @@ class PresetParameters extends $pb.GeneratedMessage { ..a<$core.int>(5, _omitFieldNames ? '' : 'treble', $pb.PbFieldType.O3) ..a<$core.int>(6, _omitFieldNames ? '' : 'contour', $pb.PbFieldType.O3) ..a<$core.int>(7, _omitFieldNames ? '' : 'volume', $pb.PbFieldType.O3) - ..a<$core.int>(8, _omitFieldNames ? '' : 'noiseGateThreshold', $pb.PbFieldType.O3) - ..a<$core.int>(9, _omitFieldNames ? '' : 'noiseGateHysteresis', $pb.PbFieldType.O3) - ..a<$core.int>(10, _omitFieldNames ? '' : 'noiseGateAttack', $pb.PbFieldType.O3) - ..a<$core.int>(11, _omitFieldNames ? '' : 'noiseGateHold', $pb.PbFieldType.O3) - ..a<$core.int>(12, _omitFieldNames ? '' : 'noiseGateRelease', $pb.PbFieldType.O3) - ..a<$core.int>(13, _omitFieldNames ? '' : 'noiseGateBypass', $pb.PbFieldType.O3) + ..a<$core.int>( + 8, _omitFieldNames ? '' : 'noiseGateThreshold', $pb.PbFieldType.O3) + ..a<$core.int>( + 9, _omitFieldNames ? '' : 'noiseGateHysteresis', $pb.PbFieldType.O3) + ..a<$core.int>( + 10, _omitFieldNames ? '' : 'noiseGateAttack', $pb.PbFieldType.O3) + ..a<$core.int>( + 11, _omitFieldNames ? '' : 'noiseGateHold', $pb.PbFieldType.O3) + ..a<$core.int>( + 12, _omitFieldNames ? '' : 'noiseGateRelease', $pb.PbFieldType.O3) + ..a<$core.int>( + 13, _omitFieldNames ? '' : 'noiseGateBypass', $pb.PbFieldType.O3) ..a<$core.int>(14, _omitFieldNames ? '' : 'chorusRate', $pb.PbFieldType.O3) ..a<$core.int>(15, _omitFieldNames ? '' : 'chorusDepth', $pb.PbFieldType.O3) ..a<$core.int>(16, _omitFieldNames ? '' : 'chorusMix', $pb.PbFieldType.O3) - ..a<$core.int>(17, _omitFieldNames ? '' : 'chorusBypass', $pb.PbFieldType.O3) + ..a<$core.int>( + 17, _omitFieldNames ? '' : 'chorusBypass', $pb.PbFieldType.O3) ..a<$core.int>(18, _omitFieldNames ? '' : 'wahPosition', $pb.PbFieldType.O3) ..a<$core.int>(19, _omitFieldNames ? '' : 'wahVocal', $pb.PbFieldType.O3) ..a<$core.int>(20, _omitFieldNames ? '' : 'wahBypass', $pb.PbFieldType.O3) - ..hasRequiredFields = false - ; + ..hasRequiredFields = false; - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') PresetParameters clone() => PresetParameters()..mergeFromMessage(this); - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - PresetParameters copyWith(void Function(PresetParameters) updates) => super.copyWith((message) => updates(message as PresetParameters)) as PresetParameters; + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + PresetParameters copyWith(void Function(PresetParameters) updates) => + super.copyWith((message) => updates(message as PresetParameters)) + as PresetParameters; $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static PresetParameters create() => PresetParameters._(); PresetParameters createEmptyInstance() => create(); - static $pb.PbList createRepeated() => $pb.PbList(); + static $pb.PbList createRepeated() => + $pb.PbList(); @$core.pragma('dart2js:noInline') - static PresetParameters getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static PresetParameters getDefault() => _defaultInstance ??= + $pb.GeneratedMessage.$_defaultFor(create); static PresetParameters? _defaultInstance; @$pb.TagNumber(1) $core.int get ampGain => $_getIZ(0); @$pb.TagNumber(1) - set ampGain($core.int v) { $_setSignedInt32(0, v); } + set ampGain($core.int v) { + $_setSignedInt32(0, v); + } + @$pb.TagNumber(1) $core.bool hasAmpGain() => $_has(0); @$pb.TagNumber(1) @@ -160,7 +179,10 @@ class PresetParameters extends $pb.GeneratedMessage { @$pb.TagNumber(2) $core.int get ampChannel => $_getIZ(1); @$pb.TagNumber(2) - set ampChannel($core.int v) { $_setSignedInt32(1, v); } + set ampChannel($core.int v) { + $_setSignedInt32(1, v); + } + @$pb.TagNumber(2) $core.bool hasAmpChannel() => $_has(1); @$pb.TagNumber(2) @@ -169,7 +191,10 @@ class PresetParameters extends $pb.GeneratedMessage { @$pb.TagNumber(3) $core.int get bass => $_getIZ(2); @$pb.TagNumber(3) - set bass($core.int v) { $_setSignedInt32(2, v); } + set bass($core.int v) { + $_setSignedInt32(2, v); + } + @$pb.TagNumber(3) $core.bool hasBass() => $_has(2); @$pb.TagNumber(3) @@ -178,7 +203,10 @@ class PresetParameters extends $pb.GeneratedMessage { @$pb.TagNumber(4) $core.int get middle => $_getIZ(3); @$pb.TagNumber(4) - set middle($core.int v) { $_setSignedInt32(3, v); } + set middle($core.int v) { + $_setSignedInt32(3, v); + } + @$pb.TagNumber(4) $core.bool hasMiddle() => $_has(3); @$pb.TagNumber(4) @@ -187,7 +215,10 @@ class PresetParameters extends $pb.GeneratedMessage { @$pb.TagNumber(5) $core.int get treble => $_getIZ(4); @$pb.TagNumber(5) - set treble($core.int v) { $_setSignedInt32(4, v); } + set treble($core.int v) { + $_setSignedInt32(4, v); + } + @$pb.TagNumber(5) $core.bool hasTreble() => $_has(4); @$pb.TagNumber(5) @@ -196,7 +227,10 @@ class PresetParameters extends $pb.GeneratedMessage { @$pb.TagNumber(6) $core.int get contour => $_getIZ(5); @$pb.TagNumber(6) - set contour($core.int v) { $_setSignedInt32(5, v); } + set contour($core.int v) { + $_setSignedInt32(5, v); + } + @$pb.TagNumber(6) $core.bool hasContour() => $_has(5); @$pb.TagNumber(6) @@ -205,7 +239,10 @@ class PresetParameters extends $pb.GeneratedMessage { @$pb.TagNumber(7) $core.int get volume => $_getIZ(6); @$pb.TagNumber(7) - set volume($core.int v) { $_setSignedInt32(6, v); } + set volume($core.int v) { + $_setSignedInt32(6, v); + } + @$pb.TagNumber(7) $core.bool hasVolume() => $_has(6); @$pb.TagNumber(7) @@ -214,7 +251,10 @@ class PresetParameters extends $pb.GeneratedMessage { @$pb.TagNumber(8) $core.int get noiseGateThreshold => $_getIZ(7); @$pb.TagNumber(8) - set noiseGateThreshold($core.int v) { $_setSignedInt32(7, v); } + set noiseGateThreshold($core.int v) { + $_setSignedInt32(7, v); + } + @$pb.TagNumber(8) $core.bool hasNoiseGateThreshold() => $_has(7); @$pb.TagNumber(8) @@ -223,7 +263,10 @@ class PresetParameters extends $pb.GeneratedMessage { @$pb.TagNumber(9) $core.int get noiseGateHysteresis => $_getIZ(8); @$pb.TagNumber(9) - set noiseGateHysteresis($core.int v) { $_setSignedInt32(8, v); } + set noiseGateHysteresis($core.int v) { + $_setSignedInt32(8, v); + } + @$pb.TagNumber(9) $core.bool hasNoiseGateHysteresis() => $_has(8); @$pb.TagNumber(9) @@ -232,7 +275,10 @@ class PresetParameters extends $pb.GeneratedMessage { @$pb.TagNumber(10) $core.int get noiseGateAttack => $_getIZ(9); @$pb.TagNumber(10) - set noiseGateAttack($core.int v) { $_setSignedInt32(9, v); } + set noiseGateAttack($core.int v) { + $_setSignedInt32(9, v); + } + @$pb.TagNumber(10) $core.bool hasNoiseGateAttack() => $_has(9); @$pb.TagNumber(10) @@ -241,7 +287,10 @@ class PresetParameters extends $pb.GeneratedMessage { @$pb.TagNumber(11) $core.int get noiseGateHold => $_getIZ(10); @$pb.TagNumber(11) - set noiseGateHold($core.int v) { $_setSignedInt32(10, v); } + set noiseGateHold($core.int v) { + $_setSignedInt32(10, v); + } + @$pb.TagNumber(11) $core.bool hasNoiseGateHold() => $_has(10); @$pb.TagNumber(11) @@ -250,7 +299,10 @@ class PresetParameters extends $pb.GeneratedMessage { @$pb.TagNumber(12) $core.int get noiseGateRelease => $_getIZ(11); @$pb.TagNumber(12) - set noiseGateRelease($core.int v) { $_setSignedInt32(11, v); } + set noiseGateRelease($core.int v) { + $_setSignedInt32(11, v); + } + @$pb.TagNumber(12) $core.bool hasNoiseGateRelease() => $_has(11); @$pb.TagNumber(12) @@ -259,7 +311,10 @@ class PresetParameters extends $pb.GeneratedMessage { @$pb.TagNumber(13) $core.int get noiseGateBypass => $_getIZ(12); @$pb.TagNumber(13) - set noiseGateBypass($core.int v) { $_setSignedInt32(12, v); } + set noiseGateBypass($core.int v) { + $_setSignedInt32(12, v); + } + @$pb.TagNumber(13) $core.bool hasNoiseGateBypass() => $_has(12); @$pb.TagNumber(13) @@ -268,7 +323,10 @@ class PresetParameters extends $pb.GeneratedMessage { @$pb.TagNumber(14) $core.int get chorusRate => $_getIZ(13); @$pb.TagNumber(14) - set chorusRate($core.int v) { $_setSignedInt32(13, v); } + set chorusRate($core.int v) { + $_setSignedInt32(13, v); + } + @$pb.TagNumber(14) $core.bool hasChorusRate() => $_has(13); @$pb.TagNumber(14) @@ -277,7 +335,10 @@ class PresetParameters extends $pb.GeneratedMessage { @$pb.TagNumber(15) $core.int get chorusDepth => $_getIZ(14); @$pb.TagNumber(15) - set chorusDepth($core.int v) { $_setSignedInt32(14, v); } + set chorusDepth($core.int v) { + $_setSignedInt32(14, v); + } + @$pb.TagNumber(15) $core.bool hasChorusDepth() => $_has(14); @$pb.TagNumber(15) @@ -286,7 +347,10 @@ class PresetParameters extends $pb.GeneratedMessage { @$pb.TagNumber(16) $core.int get chorusMix => $_getIZ(15); @$pb.TagNumber(16) - set chorusMix($core.int v) { $_setSignedInt32(15, v); } + set chorusMix($core.int v) { + $_setSignedInt32(15, v); + } + @$pb.TagNumber(16) $core.bool hasChorusMix() => $_has(15); @$pb.TagNumber(16) @@ -295,7 +359,10 @@ class PresetParameters extends $pb.GeneratedMessage { @$pb.TagNumber(17) $core.int get chorusBypass => $_getIZ(16); @$pb.TagNumber(17) - set chorusBypass($core.int v) { $_setSignedInt32(16, v); } + set chorusBypass($core.int v) { + $_setSignedInt32(16, v); + } + @$pb.TagNumber(17) $core.bool hasChorusBypass() => $_has(16); @$pb.TagNumber(17) @@ -304,7 +371,10 @@ class PresetParameters extends $pb.GeneratedMessage { @$pb.TagNumber(18) $core.int get wahPosition => $_getIZ(17); @$pb.TagNumber(18) - set wahPosition($core.int v) { $_setSignedInt32(17, v); } + set wahPosition($core.int v) { + $_setSignedInt32(17, v); + } + @$pb.TagNumber(18) $core.bool hasWahPosition() => $_has(17); @$pb.TagNumber(18) @@ -313,7 +383,10 @@ class PresetParameters extends $pb.GeneratedMessage { @$pb.TagNumber(19) $core.int get wahVocal => $_getIZ(18); @$pb.TagNumber(19) - set wahVocal($core.int v) { $_setSignedInt32(18, v); } + set wahVocal($core.int v) { + $_setSignedInt32(18, v); + } + @$pb.TagNumber(19) $core.bool hasWahVocal() => $_has(18); @$pb.TagNumber(19) @@ -322,7 +395,10 @@ class PresetParameters extends $pb.GeneratedMessage { @$pb.TagNumber(20) $core.int get wahBypass => $_getIZ(19); @$pb.TagNumber(20) - set wahBypass($core.int v) { $_setSignedInt32(19, v); } + set wahBypass($core.int v) { + $_setSignedInt32(19, v); + } + @$pb.TagNumber(20) $core.bool hasWahBypass() => $_has(19); @$pb.TagNumber(20) @@ -344,25 +420,32 @@ class Preset extends $pb.GeneratedMessage { return $result; } Preset._() : super(); - factory Preset.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); - factory Preset.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Preset', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.presets'), createEmptyInstance: create) + factory Preset.fromBuffer($core.List<$core.int> i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(i, r); + factory Preset.fromJson($core.String i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo( + _omitMessageNames ? '' : 'Preset', + package: + const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.presets'), + createEmptyInstance: create) ..aOS(1, _omitFieldNames ? '' : 'name') - ..aOM(2, _omitFieldNames ? '' : 'parameters', subBuilder: PresetParameters.create) - ..hasRequiredFields = false - ; - - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + ..aOM(2, _omitFieldNames ? '' : 'parameters', + subBuilder: PresetParameters.create) + ..hasRequiredFields = false; + + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') Preset clone() => Preset()..mergeFromMessage(this); - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - Preset copyWith(void Function(Preset) updates) => super.copyWith((message) => updates(message as Preset)) as Preset; + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + Preset copyWith(void Function(Preset) updates) => + super.copyWith((message) => updates(message as Preset)) as Preset; $pb.BuilderInfo get info_ => _i; @@ -371,14 +454,18 @@ class Preset extends $pb.GeneratedMessage { Preset createEmptyInstance() => create(); static $pb.PbList createRepeated() => $pb.PbList(); @$core.pragma('dart2js:noInline') - static Preset getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static Preset getDefault() => + _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); static Preset? _defaultInstance; /// The name given by the user to the preset @$pb.TagNumber(1) $core.String get name => $_getSZ(0); @$pb.TagNumber(1) - set name($core.String v) { $_setString(0, v); } + set name($core.String v) { + $_setString(0, v); + } + @$pb.TagNumber(1) $core.bool hasName() => $_has(0); @$pb.TagNumber(1) @@ -388,7 +475,10 @@ class Preset extends $pb.GeneratedMessage { @$pb.TagNumber(2) PresetParameters get parameters => $_getN(1); @$pb.TagNumber(2) - set parameters(PresetParameters v) { setField(2, v); } + set parameters(PresetParameters v) { + setField(2, v); + } + @$pb.TagNumber(2) $core.bool hasParameters() => $_has(1); @$pb.TagNumber(2) @@ -412,41 +502,53 @@ class PresetRecord extends $pb.GeneratedMessage { return $result; } PresetRecord._() : super(); - factory PresetRecord.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); - factory PresetRecord.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'PresetRecord', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.presets'), createEmptyInstance: create) + factory PresetRecord.fromBuffer($core.List<$core.int> i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(i, r); + factory PresetRecord.fromJson($core.String i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo( + _omitMessageNames ? '' : 'PresetRecord', + package: + const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.presets'), + createEmptyInstance: create) ..a<$core.int>(1, _omitFieldNames ? '' : 'id', $pb.PbFieldType.OU3) ..aOM(2, _omitFieldNames ? '' : 'preset', subBuilder: Preset.create) - ..hasRequiredFields = false - ; + ..hasRequiredFields = false; - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') PresetRecord clone() => PresetRecord()..mergeFromMessage(this); - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - PresetRecord copyWith(void Function(PresetRecord) updates) => super.copyWith((message) => updates(message as PresetRecord)) as PresetRecord; + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + PresetRecord copyWith(void Function(PresetRecord) updates) => + super.copyWith((message) => updates(message as PresetRecord)) + as PresetRecord; $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static PresetRecord create() => PresetRecord._(); PresetRecord createEmptyInstance() => create(); - static $pb.PbList createRepeated() => $pb.PbList(); + static $pb.PbList createRepeated() => + $pb.PbList(); @$core.pragma('dart2js:noInline') - static PresetRecord getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static PresetRecord getDefault() => _defaultInstance ??= + $pb.GeneratedMessage.$_defaultFor(create); static PresetRecord? _defaultInstance; /// A number used to identify the preset @$pb.TagNumber(1) $core.int get id => $_getIZ(0); @$pb.TagNumber(1) - set id($core.int v) { $_setUnsignedInt32(0, v); } + set id($core.int v) { + $_setUnsignedInt32(0, v); + } + @$pb.TagNumber(1) $core.bool hasId() => $_has(0); @$pb.TagNumber(1) @@ -455,7 +557,10 @@ class PresetRecord extends $pb.GeneratedMessage { @$pb.TagNumber(2) Preset get preset => $_getN(1); @$pb.TagNumber(2) - set preset(Preset v) { setField(2, v); } + set preset(Preset v) { + setField(2, v); + } + @$pb.TagNumber(2) $core.bool hasPreset() => $_has(1); @$pb.TagNumber(2) @@ -467,23 +572,29 @@ class PresetRecord extends $pb.GeneratedMessage { class Initialise extends $pb.GeneratedMessage { factory Initialise() => create(); Initialise._() : super(); - factory Initialise.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); - factory Initialise.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Initialise', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.presets'), createEmptyInstance: create) - ..hasRequiredFields = false - ; - - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + factory Initialise.fromBuffer($core.List<$core.int> i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(i, r); + factory Initialise.fromJson($core.String i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo( + _omitMessageNames ? '' : 'Initialise', + package: + const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.presets'), + createEmptyInstance: create) + ..hasRequiredFields = false; + + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') Initialise clone() => Initialise()..mergeFromMessage(this); - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - Initialise copyWith(void Function(Initialise) updates) => super.copyWith((message) => updates(message as Initialise)) as Initialise; + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + Initialise copyWith(void Function(Initialise) updates) => + super.copyWith((message) => updates(message as Initialise)) as Initialise; $pb.BuilderInfo get info_ => _i; @@ -492,7 +603,8 @@ class Initialise extends $pb.GeneratedMessage { Initialise createEmptyInstance() => create(); static $pb.PbList createRepeated() => $pb.PbList(); @$core.pragma('dart2js:noInline') - static Initialise getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static Initialise getDefault() => _defaultInstance ??= + $pb.GeneratedMessage.$_defaultFor(create); static Initialise? _defaultInstance; } @@ -507,24 +619,31 @@ class Notify extends $pb.GeneratedMessage { return $result; } Notify._() : super(); - factory Notify.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); - factory Notify.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Notify', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.presets'), createEmptyInstance: create) - ..aOM(1, _omitFieldNames ? '' : 'preset', subBuilder: PresetRecord.create) - ..hasRequiredFields = false - ; - - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + factory Notify.fromBuffer($core.List<$core.int> i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(i, r); + factory Notify.fromJson($core.String i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo( + _omitMessageNames ? '' : 'Notify', + package: + const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.presets'), + createEmptyInstance: create) + ..aOM(1, _omitFieldNames ? '' : 'preset', + subBuilder: PresetRecord.create) + ..hasRequiredFields = false; + + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') Notify clone() => Notify()..mergeFromMessage(this); - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - Notify copyWith(void Function(Notify) updates) => super.copyWith((message) => updates(message as Notify)) as Notify; + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + Notify copyWith(void Function(Notify) updates) => + super.copyWith((message) => updates(message as Notify)) as Notify; $pb.BuilderInfo get info_ => _i; @@ -533,13 +652,17 @@ class Notify extends $pb.GeneratedMessage { Notify createEmptyInstance() => create(); static $pb.PbList createRepeated() => $pb.PbList(); @$core.pragma('dart2js:noInline') - static Notify getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static Notify getDefault() => + _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); static Notify? _defaultInstance; @$pb.TagNumber(1) PresetRecord get preset => $_getN(0); @$pb.TagNumber(1) - set preset(PresetRecord v) { setField(1, v); } + set preset(PresetRecord v) { + setField(1, v); + } + @$pb.TagNumber(1) $core.bool hasPreset() => $_has(0); @$pb.TagNumber(1) @@ -559,24 +682,30 @@ class Create extends $pb.GeneratedMessage { return $result; } Create._() : super(); - factory Create.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); - factory Create.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Create', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.presets'), createEmptyInstance: create) + factory Create.fromBuffer($core.List<$core.int> i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(i, r); + factory Create.fromJson($core.String i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo( + _omitMessageNames ? '' : 'Create', + package: + const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.presets'), + createEmptyInstance: create) ..aOM(1, _omitFieldNames ? '' : 'preset', subBuilder: Preset.create) - ..hasRequiredFields = false - ; + ..hasRequiredFields = false; - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') Create clone() => Create()..mergeFromMessage(this); - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - Create copyWith(void Function(Create) updates) => super.copyWith((message) => updates(message as Create)) as Create; + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + Create copyWith(void Function(Create) updates) => + super.copyWith((message) => updates(message as Create)) as Create; $pb.BuilderInfo get info_ => _i; @@ -585,13 +714,17 @@ class Create extends $pb.GeneratedMessage { Create createEmptyInstance() => create(); static $pb.PbList createRepeated() => $pb.PbList(); @$core.pragma('dart2js:noInline') - static Create getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static Create getDefault() => + _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); static Create? _defaultInstance; @$pb.TagNumber(1) Preset get preset => $_getN(0); @$pb.TagNumber(1) - set preset(Preset v) { setField(1, v); } + set preset(Preset v) { + setField(1, v); + } + @$pb.TagNumber(1) $core.bool hasPreset() => $_has(0); @$pb.TagNumber(1) @@ -611,24 +744,31 @@ class Update extends $pb.GeneratedMessage { return $result; } Update._() : super(); - factory Update.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); - factory Update.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Update', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.presets'), createEmptyInstance: create) - ..aOM(1, _omitFieldNames ? '' : 'preset', subBuilder: PresetRecord.create) - ..hasRequiredFields = false - ; - - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + factory Update.fromBuffer($core.List<$core.int> i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(i, r); + factory Update.fromJson($core.String i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo( + _omitMessageNames ? '' : 'Update', + package: + const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.presets'), + createEmptyInstance: create) + ..aOM(1, _omitFieldNames ? '' : 'preset', + subBuilder: PresetRecord.create) + ..hasRequiredFields = false; + + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') Update clone() => Update()..mergeFromMessage(this); - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - Update copyWith(void Function(Update) updates) => super.copyWith((message) => updates(message as Update)) as Update; + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + Update copyWith(void Function(Update) updates) => + super.copyWith((message) => updates(message as Update)) as Update; $pb.BuilderInfo get info_ => _i; @@ -637,13 +777,17 @@ class Update extends $pb.GeneratedMessage { Update createEmptyInstance() => create(); static $pb.PbList createRepeated() => $pb.PbList(); @$core.pragma('dart2js:noInline') - static Update getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static Update getDefault() => + _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); static Update? _defaultInstance; @$pb.TagNumber(1) PresetRecord get preset => $_getN(0); @$pb.TagNumber(1) - set preset(PresetRecord v) { setField(1, v); } + set preset(PresetRecord v) { + setField(1, v); + } + @$pb.TagNumber(1) $core.bool hasPreset() => $_has(0); @$pb.TagNumber(1) @@ -663,24 +807,30 @@ class Remove extends $pb.GeneratedMessage { return $result; } Remove._() : super(); - factory Remove.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); - factory Remove.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Remove', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.presets'), createEmptyInstance: create) + factory Remove.fromBuffer($core.List<$core.int> i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(i, r); + factory Remove.fromJson($core.String i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo( + _omitMessageNames ? '' : 'Remove', + package: + const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.presets'), + createEmptyInstance: create) ..a<$core.int>(1, _omitFieldNames ? '' : 'id', $pb.PbFieldType.OU3) - ..hasRequiredFields = false - ; + ..hasRequiredFields = false; - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') Remove clone() => Remove()..mergeFromMessage(this); - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - Remove copyWith(void Function(Remove) updates) => super.copyWith((message) => updates(message as Remove)) as Remove; + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + Remove copyWith(void Function(Remove) updates) => + super.copyWith((message) => updates(message as Remove)) as Remove; $pb.BuilderInfo get info_ => _i; @@ -689,27 +839,24 @@ class Remove extends $pb.GeneratedMessage { Remove createEmptyInstance() => create(); static $pb.PbList createRepeated() => $pb.PbList(); @$core.pragma('dart2js:noInline') - static Remove getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static Remove getDefault() => + _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); static Remove? _defaultInstance; @$pb.TagNumber(1) $core.int get id => $_getIZ(0); @$pb.TagNumber(1) - set id($core.int v) { $_setUnsignedInt32(0, v); } + set id($core.int v) { + $_setUnsignedInt32(0, v); + } + @$pb.TagNumber(1) $core.bool hasId() => $_has(0); @$pb.TagNumber(1) void clearId() => clearField(1); } -enum Message_Message { - initialise, - notify, - create_3, - update, - remove, - notSet -} +enum Message_Message { initialise, notify, create_3, update, remove, notSet } class Message extends $pb.GeneratedMessage { factory Message({ @@ -738,37 +885,44 @@ class Message extends $pb.GeneratedMessage { return $result; } Message._() : super(); - factory Message.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); - factory Message.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); + factory Message.fromBuffer($core.List<$core.int> i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(i, r); + factory Message.fromJson($core.String i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(i, r); static const $core.Map<$core.int, Message_Message> _Message_MessageByTag = { - 1 : Message_Message.initialise, - 2 : Message_Message.notify, - 3 : Message_Message.create_3, - 4 : Message_Message.update, - 5 : Message_Message.remove, - 0 : Message_Message.notSet + 1: Message_Message.initialise, + 2: Message_Message.notify, + 3: Message_Message.create_3, + 4: Message_Message.update, + 5: Message_Message.remove, + 0: Message_Message.notSet }; - static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Message', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.presets'), createEmptyInstance: create) + static final $pb.BuilderInfo _i = $pb.BuilderInfo( + _omitMessageNames ? '' : 'Message', + package: + const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.presets'), + createEmptyInstance: create) ..oo(0, [1, 2, 3, 4, 5]) - ..aOM(1, _omitFieldNames ? '' : 'initialise', subBuilder: Initialise.create) + ..aOM(1, _omitFieldNames ? '' : 'initialise', + subBuilder: Initialise.create) ..aOM(2, _omitFieldNames ? '' : 'notify', subBuilder: Notify.create) ..aOM(3, _omitFieldNames ? '' : 'create', subBuilder: Create.create) ..aOM(4, _omitFieldNames ? '' : 'update', subBuilder: Update.create) ..aOM(5, _omitFieldNames ? '' : 'remove', subBuilder: Remove.create) - ..hasRequiredFields = false - ; + ..hasRequiredFields = false; - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') Message clone() => Message()..mergeFromMessage(this); - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - Message copyWith(void Function(Message) updates) => super.copyWith((message) => updates(message as Message)) as Message; + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + Message copyWith(void Function(Message) updates) => + super.copyWith((message) => updates(message as Message)) as Message; $pb.BuilderInfo get info_ => _i; @@ -777,7 +931,8 @@ class Message extends $pb.GeneratedMessage { Message createEmptyInstance() => create(); static $pb.PbList createRepeated() => $pb.PbList(); @$core.pragma('dart2js:noInline') - static Message getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static Message getDefault() => + _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); static Message? _defaultInstance; Message_Message whichMessage() => _Message_MessageByTag[$_whichOneof(0)]!; @@ -786,7 +941,10 @@ class Message extends $pb.GeneratedMessage { @$pb.TagNumber(1) Initialise get initialise => $_getN(0); @$pb.TagNumber(1) - set initialise(Initialise v) { setField(1, v); } + set initialise(Initialise v) { + setField(1, v); + } + @$pb.TagNumber(1) $core.bool hasInitialise() => $_has(0); @$pb.TagNumber(1) @@ -797,7 +955,10 @@ class Message extends $pb.GeneratedMessage { @$pb.TagNumber(2) Notify get notify => $_getN(1); @$pb.TagNumber(2) - set notify(Notify v) { setField(2, v); } + set notify(Notify v) { + setField(2, v); + } + @$pb.TagNumber(2) $core.bool hasNotify() => $_has(1); @$pb.TagNumber(2) @@ -808,7 +969,10 @@ class Message extends $pb.GeneratedMessage { @$pb.TagNumber(3) Create get create_3 => $_getN(2); @$pb.TagNumber(3) - set create_3(Create v) { setField(3, v); } + set create_3(Create v) { + setField(3, v); + } + @$pb.TagNumber(3) $core.bool hasCreate_3() => $_has(2); @$pb.TagNumber(3) @@ -819,7 +983,10 @@ class Message extends $pb.GeneratedMessage { @$pb.TagNumber(4) Update get update => $_getN(3); @$pb.TagNumber(4) - set update(Update v) { setField(4, v); } + set update(Update v) { + setField(4, v); + } + @$pb.TagNumber(4) $core.bool hasUpdate() => $_has(3); @$pb.TagNumber(4) @@ -830,7 +997,10 @@ class Message extends $pb.GeneratedMessage { @$pb.TagNumber(5) Remove get remove => $_getN(4); @$pb.TagNumber(5) - set remove(Remove v) { setField(5, v); } + set remove(Remove v) { + setField(5, v); + } + @$pb.TagNumber(5) $core.bool hasRemove() => $_has(4); @$pb.TagNumber(5) @@ -839,6 +1009,6 @@ class Message extends $pb.GeneratedMessage { Remove ensureRemove() => $_ensure(4); } - const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names'); -const _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names'); +const _omitMessageNames = + $core.bool.fromEnvironment('protobuf.omit_message_names'); diff --git a/dart/shrapnel_common/lib/api_data/generated/presets.pbenum.dart b/dart/shrapnel_common/lib/api_data/generated/presets.pbenum.dart index f7be615d..bc37d711 100644 --- a/dart/shrapnel_common/lib/api_data/generated/presets.pbenum.dart +++ b/dart/shrapnel_common/lib/api_data/generated/presets.pbenum.dart @@ -8,4 +8,3 @@ // ignore_for_file: constant_identifier_names, library_prefixes // ignore_for_file: non_constant_identifier_names, prefer_final_fields // ignore_for_file: unnecessary_import, unnecessary_this, unused_import - diff --git a/dart/shrapnel_common/lib/api_data/generated/presets.pbjson.dart b/dart/shrapnel_common/lib/api_data/generated/presets.pbjson.dart index fe5f58a4..932d87e3 100644 --- a/dart/shrapnel_common/lib/api_data/generated/presets.pbjson.dart +++ b/dart/shrapnel_common/lib/api_data/generated/presets.pbjson.dart @@ -24,12 +24,42 @@ const PresetParameters$json = { {'1': 'treble', '3': 5, '4': 1, '5': 5, '10': 'treble'}, {'1': 'contour', '3': 6, '4': 1, '5': 5, '10': 'contour'}, {'1': 'volume', '3': 7, '4': 1, '5': 5, '10': 'volume'}, - {'1': 'noise_gate_threshold', '3': 8, '4': 1, '5': 5, '10': 'noiseGateThreshold'}, - {'1': 'noise_gate_hysteresis', '3': 9, '4': 1, '5': 5, '10': 'noiseGateHysteresis'}, - {'1': 'noise_gate_attack', '3': 10, '4': 1, '5': 5, '10': 'noiseGateAttack'}, + { + '1': 'noise_gate_threshold', + '3': 8, + '4': 1, + '5': 5, + '10': 'noiseGateThreshold' + }, + { + '1': 'noise_gate_hysteresis', + '3': 9, + '4': 1, + '5': 5, + '10': 'noiseGateHysteresis' + }, + { + '1': 'noise_gate_attack', + '3': 10, + '4': 1, + '5': 5, + '10': 'noiseGateAttack' + }, {'1': 'noise_gate_hold', '3': 11, '4': 1, '5': 5, '10': 'noiseGateHold'}, - {'1': 'noise_gate_release', '3': 12, '4': 1, '5': 5, '10': 'noiseGateRelease'}, - {'1': 'noise_gate_bypass', '3': 13, '4': 1, '5': 5, '10': 'noiseGateBypass'}, + { + '1': 'noise_gate_release', + '3': 12, + '4': 1, + '5': 5, + '10': 'noiseGateRelease' + }, + { + '1': 'noise_gate_bypass', + '3': 13, + '4': 1, + '5': 5, + '10': 'noiseGateBypass' + }, {'1': 'chorus_rate', '3': 14, '4': 1, '5': 5, '10': 'chorusRate'}, {'1': 'chorus_depth', '3': 15, '4': 1, '5': 5, '10': 'chorusDepth'}, {'1': 'chorus_mix', '3': 16, '4': 1, '5': 5, '10': 'chorusMix'}, @@ -61,7 +91,14 @@ const Preset$json = { '1': 'Preset', '2': [ {'1': 'name', '3': 1, '4': 1, '5': 9, '10': 'name'}, - {'1': 'parameters', '3': 2, '4': 1, '5': 11, '6': '.shrapnel.presets.PresetParameters', '10': 'parameters'}, + { + '1': 'parameters', + '3': 2, + '4': 1, + '5': 11, + '6': '.shrapnel.presets.PresetParameters', + '10': 'parameters' + }, ], }; @@ -75,7 +112,14 @@ const PresetRecord$json = { '1': 'PresetRecord', '2': [ {'1': 'id', '3': 1, '4': 1, '5': 13, '10': 'id'}, - {'1': 'preset', '3': 2, '4': 1, '5': 11, '6': '.shrapnel.presets.Preset', '10': 'preset'}, + { + '1': 'preset', + '3': 2, + '4': 1, + '5': 11, + '6': '.shrapnel.presets.Preset', + '10': 'preset' + }, ], }; @@ -90,14 +134,21 @@ const Initialise$json = { }; /// Descriptor for `Initialise`. Decode as a `google.protobuf.DescriptorProto`. -final $typed_data.Uint8List initialiseDescriptor = $convert.base64Decode( - 'CgpJbml0aWFsaXNl'); +final $typed_data.Uint8List initialiseDescriptor = + $convert.base64Decode('CgpJbml0aWFsaXNl'); @$core.Deprecated('Use notifyDescriptor instead') const Notify$json = { '1': 'Notify', '2': [ - {'1': 'preset', '3': 1, '4': 1, '5': 11, '6': '.shrapnel.presets.PresetRecord', '10': 'preset'}, + { + '1': 'preset', + '3': 1, + '4': 1, + '5': 11, + '6': '.shrapnel.presets.PresetRecord', + '10': 'preset' + }, ], }; @@ -110,7 +161,14 @@ final $typed_data.Uint8List notifyDescriptor = $convert.base64Decode( const Create$json = { '1': 'Create', '2': [ - {'1': 'preset', '3': 1, '4': 1, '5': 11, '6': '.shrapnel.presets.Preset', '10': 'preset'}, + { + '1': 'preset', + '3': 1, + '4': 1, + '5': 11, + '6': '.shrapnel.presets.Preset', + '10': 'preset' + }, ], }; @@ -123,7 +181,14 @@ final $typed_data.Uint8List createDescriptor = $convert.base64Decode( const Update$json = { '1': 'Update', '2': [ - {'1': 'preset', '3': 1, '4': 1, '5': 11, '6': '.shrapnel.presets.PresetRecord', '10': 'preset'}, + { + '1': 'preset', + '3': 1, + '4': 1, + '5': 11, + '6': '.shrapnel.presets.PresetRecord', + '10': 'preset' + }, ], }; @@ -141,18 +206,58 @@ const Remove$json = { }; /// Descriptor for `Remove`. Decode as a `google.protobuf.DescriptorProto`. -final $typed_data.Uint8List removeDescriptor = $convert.base64Decode( - 'CgZSZW1vdmUSDgoCaWQYASABKA1SAmlk'); +final $typed_data.Uint8List removeDescriptor = + $convert.base64Decode('CgZSZW1vdmUSDgoCaWQYASABKA1SAmlk'); @$core.Deprecated('Use messageDescriptor instead') const Message$json = { '1': 'Message', '2': [ - {'1': 'initialise', '3': 1, '4': 1, '5': 11, '6': '.shrapnel.presets.Initialise', '9': 0, '10': 'initialise'}, - {'1': 'notify', '3': 2, '4': 1, '5': 11, '6': '.shrapnel.presets.Notify', '9': 0, '10': 'notify'}, - {'1': 'create', '3': 3, '4': 1, '5': 11, '6': '.shrapnel.presets.Create', '9': 0, '10': 'create'}, - {'1': 'update', '3': 4, '4': 1, '5': 11, '6': '.shrapnel.presets.Update', '9': 0, '10': 'update'}, - {'1': 'remove', '3': 5, '4': 1, '5': 11, '6': '.shrapnel.presets.Remove', '9': 0, '10': 'remove'}, + { + '1': 'initialise', + '3': 1, + '4': 1, + '5': 11, + '6': '.shrapnel.presets.Initialise', + '9': 0, + '10': 'initialise' + }, + { + '1': 'notify', + '3': 2, + '4': 1, + '5': 11, + '6': '.shrapnel.presets.Notify', + '9': 0, + '10': 'notify' + }, + { + '1': 'create', + '3': 3, + '4': 1, + '5': 11, + '6': '.shrapnel.presets.Create', + '9': 0, + '10': 'create' + }, + { + '1': 'update', + '3': 4, + '4': 1, + '5': 11, + '6': '.shrapnel.presets.Update', + '9': 0, + '10': 'update' + }, + { + '1': 'remove', + '3': 5, + '4': 1, + '5': 11, + '6': '.shrapnel.presets.Remove', + '9': 0, + '10': 'remove' + }, ], '8': [ {'1': 'message'}, @@ -167,4 +272,3 @@ final $typed_data.Uint8List messageDescriptor = $convert.base64Decode( 'VIAFIGY3JlYXRlEjIKBnVwZGF0ZRgEIAEoCzIYLnNocmFwbmVsLnByZXNldHMuVXBkYXRlSABS' 'BnVwZGF0ZRIyCgZyZW1vdmUYBSABKAsyGC5zaHJhcG5lbC5wcmVzZXRzLlJlbW92ZUgAUgZyZW' '1vdmVCCQoHbWVzc2FnZQ=='); - diff --git a/dart/shrapnel_common/lib/api_data/generated/presets.pbserver.dart b/dart/shrapnel_common/lib/api_data/generated/presets.pbserver.dart index 05e67634..d4c3e511 100644 --- a/dart/shrapnel_common/lib/api_data/generated/presets.pbserver.dart +++ b/dart/shrapnel_common/lib/api_data/generated/presets.pbserver.dart @@ -11,4 +11,3 @@ // ignore_for_file: unnecessary_import, unnecessary_this, unused_import export 'presets.pb.dart'; - diff --git a/dart/shrapnel_common/lib/api_data/generated/selected_preset.pb.dart b/dart/shrapnel_common/lib/api_data/generated/selected_preset.pb.dart index cd657333..5487a4a8 100644 --- a/dart/shrapnel_common/lib/api_data/generated/selected_preset.pb.dart +++ b/dart/shrapnel_common/lib/api_data/generated/selected_preset.pb.dart @@ -16,23 +16,29 @@ import 'package:protobuf/protobuf.dart' as $pb; class Read extends $pb.GeneratedMessage { factory Read() => create(); Read._() : super(); - factory Read.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); - factory Read.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Read', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.selected_preset'), createEmptyInstance: create) - ..hasRequiredFields = false - ; - - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + factory Read.fromBuffer($core.List<$core.int> i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(i, r); + factory Read.fromJson($core.String i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo( + _omitMessageNames ? '' : 'Read', + package: const $pb.PackageName( + _omitMessageNames ? '' : 'shrapnel.selected_preset'), + createEmptyInstance: create) + ..hasRequiredFields = false; + + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') Read clone() => Read()..mergeFromMessage(this); - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - Read copyWith(void Function(Read) updates) => super.copyWith((message) => updates(message as Read)) as Read; + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + Read copyWith(void Function(Read) updates) => + super.copyWith((message) => updates(message as Read)) as Read; $pb.BuilderInfo get info_ => _i; @@ -41,7 +47,8 @@ class Read extends $pb.GeneratedMessage { Read createEmptyInstance() => create(); static $pb.PbList createRepeated() => $pb.PbList(); @$core.pragma('dart2js:noInline') - static Read getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static Read getDefault() => + _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); static Read? _defaultInstance; } @@ -56,24 +63,30 @@ class Notify extends $pb.GeneratedMessage { return $result; } Notify._() : super(); - factory Notify.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); - factory Notify.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Notify', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.selected_preset'), createEmptyInstance: create) + factory Notify.fromBuffer($core.List<$core.int> i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(i, r); + factory Notify.fromJson($core.String i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo( + _omitMessageNames ? '' : 'Notify', + package: const $pb.PackageName( + _omitMessageNames ? '' : 'shrapnel.selected_preset'), + createEmptyInstance: create) ..a<$core.int>(1, _omitFieldNames ? '' : 'id', $pb.PbFieldType.OU3) - ..hasRequiredFields = false - ; + ..hasRequiredFields = false; - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') Notify clone() => Notify()..mergeFromMessage(this); - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - Notify copyWith(void Function(Notify) updates) => super.copyWith((message) => updates(message as Notify)) as Notify; + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + Notify copyWith(void Function(Notify) updates) => + super.copyWith((message) => updates(message as Notify)) as Notify; $pb.BuilderInfo get info_ => _i; @@ -82,13 +95,17 @@ class Notify extends $pb.GeneratedMessage { Notify createEmptyInstance() => create(); static $pb.PbList createRepeated() => $pb.PbList(); @$core.pragma('dart2js:noInline') - static Notify getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static Notify getDefault() => + _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); static Notify? _defaultInstance; @$pb.TagNumber(1) $core.int get id => $_getIZ(0); @$pb.TagNumber(1) - set id($core.int v) { $_setUnsignedInt32(0, v); } + set id($core.int v) { + $_setUnsignedInt32(0, v); + } + @$pb.TagNumber(1) $core.bool hasId() => $_has(0); @$pb.TagNumber(1) @@ -106,24 +123,30 @@ class Write extends $pb.GeneratedMessage { return $result; } Write._() : super(); - factory Write.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); - factory Write.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Write', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.selected_preset'), createEmptyInstance: create) + factory Write.fromBuffer($core.List<$core.int> i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(i, r); + factory Write.fromJson($core.String i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo( + _omitMessageNames ? '' : 'Write', + package: const $pb.PackageName( + _omitMessageNames ? '' : 'shrapnel.selected_preset'), + createEmptyInstance: create) ..a<$core.int>(1, _omitFieldNames ? '' : 'id', $pb.PbFieldType.OU3) - ..hasRequiredFields = false - ; + ..hasRequiredFields = false; - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') Write clone() => Write()..mergeFromMessage(this); - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - Write copyWith(void Function(Write) updates) => super.copyWith((message) => updates(message as Write)) as Write; + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + Write copyWith(void Function(Write) updates) => + super.copyWith((message) => updates(message as Write)) as Write; $pb.BuilderInfo get info_ => _i; @@ -132,25 +155,24 @@ class Write extends $pb.GeneratedMessage { Write createEmptyInstance() => create(); static $pb.PbList createRepeated() => $pb.PbList(); @$core.pragma('dart2js:noInline') - static Write getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static Write getDefault() => + _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); static Write? _defaultInstance; @$pb.TagNumber(1) $core.int get id => $_getIZ(0); @$pb.TagNumber(1) - set id($core.int v) { $_setUnsignedInt32(0, v); } + set id($core.int v) { + $_setUnsignedInt32(0, v); + } + @$pb.TagNumber(1) $core.bool hasId() => $_has(0); @$pb.TagNumber(1) void clearId() => clearField(1); } -enum Message_Message { - read, - notify, - write, - notSet -} +enum Message_Message { read, notify, write, notSet } class Message extends $pb.GeneratedMessage { factory Message({ @@ -171,33 +193,39 @@ class Message extends $pb.GeneratedMessage { return $result; } Message._() : super(); - factory Message.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); - factory Message.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); + factory Message.fromBuffer($core.List<$core.int> i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(i, r); + factory Message.fromJson($core.String i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(i, r); static const $core.Map<$core.int, Message_Message> _Message_MessageByTag = { - 1 : Message_Message.read, - 2 : Message_Message.notify, - 3 : Message_Message.write, - 0 : Message_Message.notSet + 1: Message_Message.read, + 2: Message_Message.notify, + 3: Message_Message.write, + 0: Message_Message.notSet }; - static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Message', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.selected_preset'), createEmptyInstance: create) + static final $pb.BuilderInfo _i = $pb.BuilderInfo( + _omitMessageNames ? '' : 'Message', + package: const $pb.PackageName( + _omitMessageNames ? '' : 'shrapnel.selected_preset'), + createEmptyInstance: create) ..oo(0, [1, 2, 3]) ..aOM(1, _omitFieldNames ? '' : 'read', subBuilder: Read.create) ..aOM(2, _omitFieldNames ? '' : 'notify', subBuilder: Notify.create) ..aOM(3, _omitFieldNames ? '' : 'write', subBuilder: Write.create) - ..hasRequiredFields = false - ; + ..hasRequiredFields = false; - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') Message clone() => Message()..mergeFromMessage(this); - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - Message copyWith(void Function(Message) updates) => super.copyWith((message) => updates(message as Message)) as Message; + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + Message copyWith(void Function(Message) updates) => + super.copyWith((message) => updates(message as Message)) as Message; $pb.BuilderInfo get info_ => _i; @@ -206,7 +234,8 @@ class Message extends $pb.GeneratedMessage { Message createEmptyInstance() => create(); static $pb.PbList createRepeated() => $pb.PbList(); @$core.pragma('dart2js:noInline') - static Message getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static Message getDefault() => + _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); static Message? _defaultInstance; Message_Message whichMessage() => _Message_MessageByTag[$_whichOneof(0)]!; @@ -215,7 +244,10 @@ class Message extends $pb.GeneratedMessage { @$pb.TagNumber(1) Read get read => $_getN(0); @$pb.TagNumber(1) - set read(Read v) { setField(1, v); } + set read(Read v) { + setField(1, v); + } + @$pb.TagNumber(1) $core.bool hasRead() => $_has(0); @$pb.TagNumber(1) @@ -226,7 +258,10 @@ class Message extends $pb.GeneratedMessage { @$pb.TagNumber(2) Notify get notify => $_getN(1); @$pb.TagNumber(2) - set notify(Notify v) { setField(2, v); } + set notify(Notify v) { + setField(2, v); + } + @$pb.TagNumber(2) $core.bool hasNotify() => $_has(1); @$pb.TagNumber(2) @@ -237,7 +272,10 @@ class Message extends $pb.GeneratedMessage { @$pb.TagNumber(3) Write get write => $_getN(2); @$pb.TagNumber(3) - set write(Write v) { setField(3, v); } + set write(Write v) { + setField(3, v); + } + @$pb.TagNumber(3) $core.bool hasWrite() => $_has(2); @$pb.TagNumber(3) @@ -246,6 +284,6 @@ class Message extends $pb.GeneratedMessage { Write ensureWrite() => $_ensure(2); } - const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names'); -const _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names'); +const _omitMessageNames = + $core.bool.fromEnvironment('protobuf.omit_message_names'); diff --git a/dart/shrapnel_common/lib/api_data/generated/selected_preset.pbenum.dart b/dart/shrapnel_common/lib/api_data/generated/selected_preset.pbenum.dart index dd68bd34..0952a0a2 100644 --- a/dart/shrapnel_common/lib/api_data/generated/selected_preset.pbenum.dart +++ b/dart/shrapnel_common/lib/api_data/generated/selected_preset.pbenum.dart @@ -8,4 +8,3 @@ // ignore_for_file: constant_identifier_names, library_prefixes // ignore_for_file: non_constant_identifier_names, prefer_final_fields // ignore_for_file: unnecessary_import, unnecessary_this, unused_import - diff --git a/dart/shrapnel_common/lib/api_data/generated/selected_preset.pbjson.dart b/dart/shrapnel_common/lib/api_data/generated/selected_preset.pbjson.dart index 4750e6d2..bcc1c45e 100644 --- a/dart/shrapnel_common/lib/api_data/generated/selected_preset.pbjson.dart +++ b/dart/shrapnel_common/lib/api_data/generated/selected_preset.pbjson.dart @@ -19,8 +19,7 @@ const Read$json = { }; /// Descriptor for `Read`. Decode as a `google.protobuf.DescriptorProto`. -final $typed_data.Uint8List readDescriptor = $convert.base64Decode( - 'CgRSZWFk'); +final $typed_data.Uint8List readDescriptor = $convert.base64Decode('CgRSZWFk'); @$core.Deprecated('Use notifyDescriptor instead') const Notify$json = { @@ -31,8 +30,8 @@ const Notify$json = { }; /// Descriptor for `Notify`. Decode as a `google.protobuf.DescriptorProto`. -final $typed_data.Uint8List notifyDescriptor = $convert.base64Decode( - 'CgZOb3RpZnkSDgoCaWQYASABKA1SAmlk'); +final $typed_data.Uint8List notifyDescriptor = + $convert.base64Decode('CgZOb3RpZnkSDgoCaWQYASABKA1SAmlk'); @$core.Deprecated('Use writeDescriptor instead') const Write$json = { @@ -43,16 +42,40 @@ const Write$json = { }; /// Descriptor for `Write`. Decode as a `google.protobuf.DescriptorProto`. -final $typed_data.Uint8List writeDescriptor = $convert.base64Decode( - 'CgVXcml0ZRIOCgJpZBgBIAEoDVICaWQ='); +final $typed_data.Uint8List writeDescriptor = + $convert.base64Decode('CgVXcml0ZRIOCgJpZBgBIAEoDVICaWQ='); @$core.Deprecated('Use messageDescriptor instead') const Message$json = { '1': 'Message', '2': [ - {'1': 'read', '3': 1, '4': 1, '5': 11, '6': '.shrapnel.selected_preset.Read', '9': 0, '10': 'read'}, - {'1': 'notify', '3': 2, '4': 1, '5': 11, '6': '.shrapnel.selected_preset.Notify', '9': 0, '10': 'notify'}, - {'1': 'write', '3': 3, '4': 1, '5': 11, '6': '.shrapnel.selected_preset.Write', '9': 0, '10': 'write'}, + { + '1': 'read', + '3': 1, + '4': 1, + '5': 11, + '6': '.shrapnel.selected_preset.Read', + '9': 0, + '10': 'read' + }, + { + '1': 'notify', + '3': 2, + '4': 1, + '5': 11, + '6': '.shrapnel.selected_preset.Notify', + '9': 0, + '10': 'notify' + }, + { + '1': 'write', + '3': 3, + '4': 1, + '5': 11, + '6': '.shrapnel.selected_preset.Write', + '9': 0, + '10': 'write' + }, ], '8': [ {'1': 'message'}, @@ -65,4 +88,3 @@ final $typed_data.Uint8List messageDescriptor = $convert.base64Decode( 'gAUgRyZWFkEjoKBm5vdGlmeRgCIAEoCzIgLnNocmFwbmVsLnNlbGVjdGVkX3ByZXNldC5Ob3Rp' 'ZnlIAFIGbm90aWZ5EjcKBXdyaXRlGAMgASgLMh8uc2hyYXBuZWwuc2VsZWN0ZWRfcHJlc2V0Ll' 'dyaXRlSABSBXdyaXRlQgkKB21lc3NhZ2U='); - diff --git a/dart/shrapnel_common/lib/api_data/generated/selected_preset.pbserver.dart b/dart/shrapnel_common/lib/api_data/generated/selected_preset.pbserver.dart index 438dea8c..23ac5988 100644 --- a/dart/shrapnel_common/lib/api_data/generated/selected_preset.pbserver.dart +++ b/dart/shrapnel_common/lib/api_data/generated/selected_preset.pbserver.dart @@ -11,4 +11,3 @@ // ignore_for_file: unnecessary_import, unnecessary_this, unused_import export 'selected_preset.pb.dart'; - diff --git a/dart/shrapnel_common/lib/api_data/generated/shrapnel.pb.dart b/dart/shrapnel_common/lib/api_data/generated/shrapnel.pb.dart index d1041f55..dc87908d 100644 --- a/dart/shrapnel_common/lib/api_data/generated/shrapnel.pb.dart +++ b/dart/shrapnel_common/lib/api_data/generated/shrapnel.pb.dart @@ -20,11 +20,11 @@ import 'presets.pb.dart' as $3; import 'selected_preset.pb.dart' as $4; enum Message_Message { - audioEvent, - command, - midiMapping, - preset, - selectedPreset, + audioEvent, + command, + midiMapping, + preset, + selectedPreset, notSet } @@ -55,37 +55,48 @@ class Message extends $pb.GeneratedMessage { return $result; } Message._() : super(); - factory Message.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); - factory Message.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); + factory Message.fromBuffer($core.List<$core.int> i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(i, r); + factory Message.fromJson($core.String i, + [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(i, r); static const $core.Map<$core.int, Message_Message> _Message_MessageByTag = { - 1 : Message_Message.audioEvent, - 2 : Message_Message.command, - 3 : Message_Message.midiMapping, - 4 : Message_Message.preset, - 5 : Message_Message.selectedPreset, - 0 : Message_Message.notSet + 1: Message_Message.audioEvent, + 2: Message_Message.command, + 3: Message_Message.midiMapping, + 4: Message_Message.preset, + 5: Message_Message.selectedPreset, + 0: Message_Message.notSet }; - static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Message', package: const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.messages'), createEmptyInstance: create) + static final $pb.BuilderInfo _i = $pb.BuilderInfo( + _omitMessageNames ? '' : 'Message', + package: + const $pb.PackageName(_omitMessageNames ? '' : 'shrapnel.messages'), + createEmptyInstance: create) ..oo(0, [1, 2, 3, 4, 5]) - ..aOM<$0.Message>(1, _omitFieldNames ? '' : 'audioEvent', subBuilder: $0.Message.create) - ..aOM<$1.Message>(2, _omitFieldNames ? '' : 'command', subBuilder: $1.Message.create) - ..aOM<$2.Message>(3, _omitFieldNames ? '' : 'midiMapping', subBuilder: $2.Message.create) - ..aOM<$3.Message>(4, _omitFieldNames ? '' : 'preset', subBuilder: $3.Message.create) - ..aOM<$4.Message>(5, _omitFieldNames ? '' : 'selectedPreset', subBuilder: $4.Message.create) - ..hasRequiredFields = false - ; - - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') + ..aOM<$0.Message>(1, _omitFieldNames ? '' : 'audioEvent', + subBuilder: $0.Message.create) + ..aOM<$1.Message>(2, _omitFieldNames ? '' : 'command', + subBuilder: $1.Message.create) + ..aOM<$2.Message>(3, _omitFieldNames ? '' : 'midiMapping', + subBuilder: $2.Message.create) + ..aOM<$3.Message>(4, _omitFieldNames ? '' : 'preset', + subBuilder: $3.Message.create) + ..aOM<$4.Message>(5, _omitFieldNames ? '' : 'selectedPreset', + subBuilder: $4.Message.create) + ..hasRequiredFields = false; + + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') Message clone() => Message()..mergeFromMessage(this); - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') - Message copyWith(void Function(Message) updates) => super.copyWith((message) => updates(message as Message)) as Message; + @$core.Deprecated('Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + Message copyWith(void Function(Message) updates) => + super.copyWith((message) => updates(message as Message)) as Message; $pb.BuilderInfo get info_ => _i; @@ -94,7 +105,8 @@ class Message extends $pb.GeneratedMessage { Message createEmptyInstance() => create(); static $pb.PbList createRepeated() => $pb.PbList(); @$core.pragma('dart2js:noInline') - static Message getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static Message getDefault() => + _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); static Message? _defaultInstance; Message_Message whichMessage() => _Message_MessageByTag[$_whichOneof(0)]!; @@ -103,7 +115,10 @@ class Message extends $pb.GeneratedMessage { @$pb.TagNumber(1) $0.Message get audioEvent => $_getN(0); @$pb.TagNumber(1) - set audioEvent($0.Message v) { setField(1, v); } + set audioEvent($0.Message v) { + setField(1, v); + } + @$pb.TagNumber(1) $core.bool hasAudioEvent() => $_has(0); @$pb.TagNumber(1) @@ -114,7 +129,10 @@ class Message extends $pb.GeneratedMessage { @$pb.TagNumber(2) $1.Message get command => $_getN(1); @$pb.TagNumber(2) - set command($1.Message v) { setField(2, v); } + set command($1.Message v) { + setField(2, v); + } + @$pb.TagNumber(2) $core.bool hasCommand() => $_has(1); @$pb.TagNumber(2) @@ -125,7 +143,10 @@ class Message extends $pb.GeneratedMessage { @$pb.TagNumber(3) $2.Message get midiMapping => $_getN(2); @$pb.TagNumber(3) - set midiMapping($2.Message v) { setField(3, v); } + set midiMapping($2.Message v) { + setField(3, v); + } + @$pb.TagNumber(3) $core.bool hasMidiMapping() => $_has(2); @$pb.TagNumber(3) @@ -136,7 +157,10 @@ class Message extends $pb.GeneratedMessage { @$pb.TagNumber(4) $3.Message get preset => $_getN(3); @$pb.TagNumber(4) - set preset($3.Message v) { setField(4, v); } + set preset($3.Message v) { + setField(4, v); + } + @$pb.TagNumber(4) $core.bool hasPreset() => $_has(3); @$pb.TagNumber(4) @@ -147,7 +171,10 @@ class Message extends $pb.GeneratedMessage { @$pb.TagNumber(5) $4.Message get selectedPreset => $_getN(4); @$pb.TagNumber(5) - set selectedPreset($4.Message v) { setField(5, v); } + set selectedPreset($4.Message v) { + setField(5, v); + } + @$pb.TagNumber(5) $core.bool hasSelectedPreset() => $_has(4); @$pb.TagNumber(5) @@ -156,6 +183,6 @@ class Message extends $pb.GeneratedMessage { $4.Message ensureSelectedPreset() => $_ensure(4); } - const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names'); -const _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names'); +const _omitMessageNames = + $core.bool.fromEnvironment('protobuf.omit_message_names'); diff --git a/dart/shrapnel_common/lib/api_data/generated/shrapnel.pbenum.dart b/dart/shrapnel_common/lib/api_data/generated/shrapnel.pbenum.dart index e50c4f7f..f2b397ae 100644 --- a/dart/shrapnel_common/lib/api_data/generated/shrapnel.pbenum.dart +++ b/dart/shrapnel_common/lib/api_data/generated/shrapnel.pbenum.dart @@ -8,4 +8,3 @@ // ignore_for_file: constant_identifier_names, library_prefixes // ignore_for_file: non_constant_identifier_names, prefer_final_fields // ignore_for_file: unnecessary_import, unnecessary_this, unused_import - diff --git a/dart/shrapnel_common/lib/api_data/generated/shrapnel.pbjson.dart b/dart/shrapnel_common/lib/api_data/generated/shrapnel.pbjson.dart index 1e36640e..0af5577a 100644 --- a/dart/shrapnel_common/lib/api_data/generated/shrapnel.pbjson.dart +++ b/dart/shrapnel_common/lib/api_data/generated/shrapnel.pbjson.dart @@ -17,11 +17,51 @@ import 'dart:typed_data' as $typed_data; const Message$json = { '1': 'Message', '2': [ - {'1': 'audio_event', '3': 1, '4': 1, '5': 11, '6': '.shrapnel.audio_events.Message', '9': 0, '10': 'audioEvent'}, - {'1': 'command', '3': 2, '4': 1, '5': 11, '6': '.shrapnel.cmd_handling.Message', '9': 0, '10': 'command'}, - {'1': 'midi_mapping', '3': 3, '4': 1, '5': 11, '6': '.shrapnel.midi_mapping.Message', '9': 0, '10': 'midiMapping'}, - {'1': 'preset', '3': 4, '4': 1, '5': 11, '6': '.shrapnel.presets.Message', '9': 0, '10': 'preset'}, - {'1': 'selected_preset', '3': 5, '4': 1, '5': 11, '6': '.shrapnel.selected_preset.Message', '9': 0, '10': 'selectedPreset'}, + { + '1': 'audio_event', + '3': 1, + '4': 1, + '5': 11, + '6': '.shrapnel.audio_events.Message', + '9': 0, + '10': 'audioEvent' + }, + { + '1': 'command', + '3': 2, + '4': 1, + '5': 11, + '6': '.shrapnel.cmd_handling.Message', + '9': 0, + '10': 'command' + }, + { + '1': 'midi_mapping', + '3': 3, + '4': 1, + '5': 11, + '6': '.shrapnel.midi_mapping.Message', + '9': 0, + '10': 'midiMapping' + }, + { + '1': 'preset', + '3': 4, + '4': 1, + '5': 11, + '6': '.shrapnel.presets.Message', + '9': 0, + '10': 'preset' + }, + { + '1': 'selected_preset', + '3': 5, + '4': 1, + '5': 11, + '6': '.shrapnel.selected_preset.Message', + '9': 0, + '10': 'selectedPreset' + }, ], '8': [ {'1': 'message'}, @@ -37,4 +77,3 @@ final $typed_data.Uint8List messageDescriptor = $convert.base64Decode( 'GS5zaHJhcG5lbC5wcmVzZXRzLk1lc3NhZ2VIAFIGcHJlc2V0EkwKD3NlbGVjdGVkX3ByZXNldB' 'gFIAEoCzIhLnNocmFwbmVsLnNlbGVjdGVkX3ByZXNldC5NZXNzYWdlSABSDnNlbGVjdGVkUHJl' 'c2V0QgkKB21lc3NhZ2U='); - diff --git a/dart/shrapnel_common/lib/api_data/generated/shrapnel.pbserver.dart b/dart/shrapnel_common/lib/api_data/generated/shrapnel.pbserver.dart index de6ed7e7..0a0e78f2 100644 --- a/dart/shrapnel_common/lib/api_data/generated/shrapnel.pbserver.dart +++ b/dart/shrapnel_common/lib/api_data/generated/shrapnel.pbserver.dart @@ -11,4 +11,3 @@ // ignore_for_file: unnecessary_import, unnecessary_this, unused_import export 'shrapnel.pb.dart'; - diff --git a/dart/shrapnel_test_lib/.gitignore b/dart/shrapnel_test_lib/.gitignore index 3f8172af..3cceda55 100644 --- a/dart/shrapnel_test_lib/.gitignore +++ b/dart/shrapnel_test_lib/.gitignore @@ -5,6 +5,3 @@ # Avoid committing pubspec.lock for library packages; see # https://dart.dev/guides/libraries/private-files#pubspeclock. pubspec.lock - -.flutter-plugins -.flutter-plugins-dependencies diff --git a/dart/shrapnel_test_lib/pubspec.yaml b/dart/shrapnel_test_lib/pubspec.yaml index ca0b019c..1cb072f5 100644 --- a/dart/shrapnel_test_lib/pubspec.yaml +++ b/dart/shrapnel_test_lib/pubspec.yaml @@ -12,7 +12,7 @@ dependencies: git: url: https://github.com/ShrapnelDSP/esp_softap_provisioning.git ref: shrapnel - flutter_libserialport: ^0.4.0 + libserialport: ^0.3.0 logging: ^1.2.0 path: ^1.8.0 shrapnel_common: diff --git a/dart/shrapnel_test_tool/.gitignore b/dart/shrapnel_test_tool/.gitignore index 5c2eea91..b56e2838 100644 --- a/dart/shrapnel_test_tool/.gitignore +++ b/dart/shrapnel_test_tool/.gitignore @@ -2,9 +2,6 @@ # Created by `dart pub` .dart_tool/ -.flutter-plugins -.flutter-plugins-dependencies - *.g.dart *.mocks.dart *.freezed.dart diff --git a/dart/shrapnel_test_tool/pubspec.lock b/dart/shrapnel_test_tool/pubspec.lock index 02eecc07..c70511cb 100644 --- a/dart/shrapnel_test_tool/pubspec.lock +++ b/dart/shrapnel_test_tool/pubspec.lock @@ -41,14 +41,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.1" - characters: - dependency: transitive - description: - name: characters - sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" - url: "https://pub.dev" - source: hosted - version: "1.3.0" collection: dependency: transitive description: @@ -130,19 +122,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.1.0" - flutter: - dependency: transitive - description: flutter - source: sdk - version: "0.0.0" - flutter_libserialport: - dependency: transitive - description: - name: flutter_libserialport - sha256: "20c320dcde8592a16f9badc0cacad61b1fb283dbec647b6ebfc1020f8274c67b" - url: "https://pub.dev" - source: hosted - version: "0.4.0" freezed_annotation: dependency: transitive description: @@ -255,14 +234,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.12.16+1" - material_color_utilities: - dependency: transitive - description: - name: material_color_utilities - sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" - url: "https://pub.dev" - source: hosted - version: "0.5.0" meta: dependency: transitive description: @@ -381,11 +352,6 @@ packages: relative: true source: path version: "1.0.0" - sky_engine: - dependency: transitive - description: flutter - source: sdk - version: "0.0.99" source_map_stack_trace: dependency: transitive description: @@ -482,14 +448,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.2" - vector_math: - dependency: transitive - description: - name: vector_math - sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" - url: "https://pub.dev" - source: hosted - version: "2.1.4" vm_service: dependency: transitive description: @@ -540,4 +498,3 @@ packages: version: "3.1.2" sdks: dart: ">=3.2.6 <4.0.0" - flutter: ">=3.0.0" From 2544d9098dff0d9823d7862cd414c6ca9c5c309a Mon Sep 17 00:00:00 2001 From: Barabas Raffai Date: Sat, 3 Aug 2024 20:43:36 +0100 Subject: [PATCH 08/14] remove flutter dependency from shared code --- dart/shrapnel_test_lib/lib/src/shrapnel_test_lib_base.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dart/shrapnel_test_lib/lib/src/shrapnel_test_lib_base.dart b/dart/shrapnel_test_lib/lib/src/shrapnel_test_lib_base.dart index 9c505102..2af79d6e 100644 --- a/dart/shrapnel_test_lib/lib/src/shrapnel_test_lib_base.dart +++ b/dart/shrapnel_test_lib/lib/src/shrapnel_test_lib_base.dart @@ -22,7 +22,7 @@ import 'dart:convert'; import 'dart:io'; import 'package:esp_softap_provisioning/esp_softap_provisioning.dart'; -import 'package:flutter_libserialport/flutter_libserialport.dart'; +import 'package:libserialport/libserialport.dart'; import 'package:logging/logging.dart'; import 'package:path/path.dart' as p; import 'package:shrapnel_common/api_data/midi_api_message.dart'; From 54002d758aeafd079ac162522bde5c12402f1c4a Mon Sep 17 00:00:00 2001 From: Barabas Raffai Date: Sun, 4 Aug 2024 11:59:00 +0100 Subject: [PATCH 09/14] Update CI --- .github/workflows/main.yml | 39 +++++----- dart/.gitignore | 2 + dart/frontend/lib/api/api_websocket.dart | 3 +- dart/frontend/pubspec.lock | 8 --- dart/frontend/pubspec.yaml | 1 - dart/melos.yaml | 16 +++++ .../lib/api_data/presets_message.dart | 1 - .../lib/api_data/selected_preset_data.dart | 4 +- .../lib/shrapnel_test_lib.dart | 2 +- .../lib/src/shrapnel_test_lib_base.dart | 72 +++++++++---------- .../test/shrapnel_test_lib_test.dart | 2 +- .../bin/shrapnel_test_tool.dart | 3 +- 12 files changed, 85 insertions(+), 68 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1c91c487..4c3eb805 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,6 +16,9 @@ env: CCACHE_DIR: /ccache FLUTTER_VERSION: '3.16.9' FLUTTER_CHANNEL: 'stable' + MELOS_VERSION: '^6.1.0' + COVERDE_VERSION: '^0.2.0+2' + COVERAGE_VERSION: '^0.2.0+2' jobs: build-firmware: @@ -192,7 +195,7 @@ jobs: defaults: run: working-directory: - frontend + dart steps: - uses: actions/checkout@v2 with: @@ -205,10 +208,11 @@ jobs: channel: ${{ env.FLUTTER_CHANNEL }} cache: true - - run: flutter pub get + - run: dart pub global activate melos ${{ env.MELOS_VERSION }} + - run: dart run melos bootstrap - name: Generate code - run: flutter pub run build_runner build + run: dart run melos run generate_code - name: Analyze run: flutter analyze @@ -218,7 +222,7 @@ jobs: defaults: run: working-directory: - frontend + dart steps: - uses: actions/checkout@v2 with: @@ -231,17 +235,18 @@ jobs: channel: ${{ env.FLUTTER_CHANNEL }} cache: true - - run: flutter pub get + - run: dart pub global activate melos ${{ env.MELOS_VERSION }} + - run: dart run melos bootstrap - name: Format - run: dart format -o none --set-exit-if-changed lib test + run: dart format -o none --set-exit-if-changed . flutter-test: runs-on: ubuntu-latest defaults: run: working-directory: - frontend + dart steps: - uses: actions/checkout@v2 with: @@ -254,25 +259,27 @@ jobs: channel: ${{ env.FLUTTER_CHANNEL }} cache: true - - run: flutter pub get + - run: dart pub global activate melos ${{ env.MELOS_VERSION }} + - run: dart pub global activate coverde ${{ env.COVERDE_VERSION }} + - run: dart pub global activate coverage ${{ env.COVERAGE_VERSION }} + - run: melos bootstrap - name: Generate code - run: flutter pub run build_runner build + run: melos run generate_code - name: Test - run: flutter test --coverage --exclude-tags=api + run: | + dart run melos run test + dart run melos run test-dart - name: Coverage clean-up - run: > - flutter pub run - remove_from_coverage --remove="\.g\.dart$" - --file=coverage/lcov.info + run: dart run melos run coverage - name: Coveralls uses: coverallsapp/github-action@master with: - path-to-lcov: frontend/coverage/lcov.info - base-path: frontend + path-to-lcov: coverage/filtered.lcov.info + base-path: dart github-token: ${{ secrets.GITHUB_TOKEN }} parallel: true flag-name: "flutter" diff --git a/dart/.gitignore b/dart/.gitignore index d8d06263..3f92df8a 100644 --- a/dart/.gitignore +++ b/dart/.gitignore @@ -7,3 +7,5 @@ # https://melos.invertase.dev/getting-started#configure-the-workspace pubspec_overrides.yaml + +coverage diff --git a/dart/frontend/lib/api/api_websocket.dart b/dart/frontend/lib/api/api_websocket.dart index dafd6a62..b020d8ac 100644 --- a/dart/frontend/lib/api/api_websocket.dart +++ b/dart/frontend/lib/api/api_websocket.dart @@ -24,7 +24,8 @@ import 'package:logging/logging.dart'; import 'package:rxdart/rxdart.dart'; import 'package:shrapnel_common/api_data/api_message.dart'; -import 'package:shrapnel_common/api_data/generated/shrapnel.pb.dart' as shrapnel_pb; +import 'package:shrapnel_common/api_data/generated/shrapnel.pb.dart' + as shrapnel_pb; import 'package:shrapnel_common/api_data/proto_extension.dart'; import '../core/message_transport.dart'; import '../core/stream_extensions.dart'; diff --git a/dart/frontend/pubspec.lock b/dart/frontend/pubspec.lock index 8f1c79d1..98e1ed10 100644 --- a/dart/frontend/pubspec.lock +++ b/dart/frontend/pubspec.lock @@ -563,14 +563,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.2.3" - remove_from_coverage: - dependency: "direct main" - description: - name: remove_from_coverage - sha256: "5b5745f6b692c80e3d7903fb83f9e789dc4575e6db5443a1b391ca25c10bad06" - url: "https://pub.dev" - source: hosted - version: "2.0.0" rxdart: dependency: "direct main" description: diff --git a/dart/frontend/pubspec.yaml b/dart/frontend/pubspec.yaml index 7c8dbafb..e6fd8eaf 100644 --- a/dart/frontend/pubspec.yaml +++ b/dart/frontend/pubspec.yaml @@ -24,7 +24,6 @@ dependencies: pausable_timer: ^3.1.0+3 protobuf: ^3.1.0 provider: ^6.0.0 - remove_from_coverage: ^2.0.0 rxdart: ^0.27.7 shrapnel_common: path: ../shrapnel_common diff --git a/dart/melos.yaml b/dart/melos.yaml index 3cc2bedc..f92c904d 100644 --- a/dart/melos.yaml +++ b/dart/melos.yaml @@ -5,3 +5,19 @@ packages: - shrapnel_common - shrapnel_test_lib - shrapnel_test_tool + +scripts: + generate_code: + run: melos exec --depends-on=build_runner -- "dart run build_runner build -d" + + test: + run: melos exec -c 1 --depends-on=flutter_test -- "flutter test --coverage --exclude-tags=api" + + test-dart: + run: melos exec -c 1 --depends-on=test -- "dart run coverage:test_with_coverage" + + coverage: + description: Merge all packages coverage trace files ignoring data related to generated files. + run: > + coverde rm MELOS_ROOT_PATH/coverage/filtered.lcov.info && + melos exec --file-exists=coverage/lcov.info -- "coverde filter --input ./coverage/lcov.info --output MELOS_ROOT_PATH/coverage/filtered.lcov.info --paths-parent MELOS_PACKAGE_PATH --filters '\.g\.dart'" \ No newline at end of file diff --git a/dart/shrapnel_common/lib/api_data/presets_message.dart b/dart/shrapnel_common/lib/api_data/presets_message.dart index 94378b13..1bb9f8da 100644 --- a/dart/shrapnel_common/lib/api_data/presets_message.dart +++ b/dart/shrapnel_common/lib/api_data/presets_message.dart @@ -49,5 +49,4 @@ class PresetData with _$PresetData { required String name, required PresetParametersData parameters, }) = _PresetData; - } diff --git a/dart/shrapnel_common/lib/api_data/selected_preset_data.dart b/dart/shrapnel_common/lib/api_data/selected_preset_data.dart index c9e27a38..0a76ce08 100644 --- a/dart/shrapnel_common/lib/api_data/selected_preset_data.dart +++ b/dart/shrapnel_common/lib/api_data/selected_preset_data.dart @@ -7,8 +7,8 @@ sealed class SelectedPresetMessage with _$SelectedPresetMessage { factory SelectedPresetMessage.read() = ReadSelectedPresetMessage; factory SelectedPresetMessage.notify({required int selectedPreset}) = - NotifySelectedPresetMessage; + NotifySelectedPresetMessage; factory SelectedPresetMessage.write({required int selectedPreset}) = - WriteSelectedPresetMessage; + WriteSelectedPresetMessage; } diff --git a/dart/shrapnel_test_lib/lib/shrapnel_test_lib.dart b/dart/shrapnel_test_lib/lib/shrapnel_test_lib.dart index 0fcd688f..33c5467d 100644 --- a/dart/shrapnel_test_lib/lib/shrapnel_test_lib.dart +++ b/dart/shrapnel_test_lib/lib/shrapnel_test_lib.dart @@ -1,4 +1,4 @@ /// Testing utilities. library; -export 'src/shrapnel_test_lib_base.dart'; \ No newline at end of file +export 'src/shrapnel_test_lib_base.dart'; diff --git a/dart/shrapnel_test_lib/lib/src/shrapnel_test_lib_base.dart b/dart/shrapnel_test_lib/lib/src/shrapnel_test_lib_base.dart index 2af79d6e..eac0b116 100644 --- a/dart/shrapnel_test_lib/lib/src/shrapnel_test_lib_base.dart +++ b/dart/shrapnel_test_lib/lib/src/shrapnel_test_lib_base.dart @@ -67,7 +67,7 @@ Future setUpWiFi({required String ssid, required String password}) async { }); var success = - await provisioning.sendWifiConfig(ssid: ssid, password: password); + await provisioning.sendWifiConfig(ssid: ssid, password: password); if (!success) { throw StateError('send wifi config failed'); } @@ -101,7 +101,7 @@ Future _eraseFlash({required String port}) async { List _getMacAddressFromEsptoolStdout(String espToolStdout) { final macRegex = - RegExp(r'^MAC: (([0-9a-f]{2}:){5}([0-9a-f]{2}))$', multiLine: true); + RegExp(r'^MAC: (([0-9a-f]{2}:){5}([0-9a-f]{2}))$', multiLine: true); final macString = macRegex.allMatches(espToolStdout).single.group(1)!; return macString.split(':').map((e) => int.parse(e, radix: 16)).toList(); } @@ -172,10 +172,10 @@ Future<(bool, MacAddress)> _checkIfAlreadyFlashed({ // https://docs.espressif.com/projects/esptool/en/latest/esp32/#quick-start const command = 'esptool.py'; final args = '-p $port ' - '-b 2000000 ' - '--before default_reset --after hard_reset ' - '--chip esp32 ' - 'verify_flash 0x10000 $expectedHeaderFilePath' + '-b 2000000 ' + '--before default_reset --after hard_reset ' + '--chip esp32 ' + 'verify_flash 0x10000 $expectedHeaderFilePath' .split(' '); final result = await Process.run(command, args); @@ -188,14 +188,14 @@ Future<(bool, MacAddress)> _checkIfAlreadyFlashed({ _log.info(result.stdout); return ( - switch (result.exitCode) { - 0 => true, - 2 => false, - _ => throw StateError( - 'esptool.py exited with unexpected code ${result.exitCode}', - ), - }, - _getMacAddressFromEsptoolStdout(result.stdout as String) + switch (result.exitCode) { + 0 => true, + 2 => false, + _ => throw StateError( + 'esptool.py exited with unexpected code ${result.exitCode}', + ), + }, + _getMacAddressFromEsptoolStdout(result.stdout as String) ); } @@ -206,13 +206,13 @@ Future _flashFirmware(String path, {required String port}) async { // https://docs.espressif.com/projects/esptool/en/latest/esp32/#quick-start const command = 'esptool.py'; final args = '-p $port ' - '-b 2000000 ' - '--before default_reset --after hard_reset ' - '--chip esp32 ' - 'write_flash --flash_mode dio --flash_size 4MB --flash_freq 80m ' - '0x1000 $path/bootloader.bin ' - '0x8000 $path/partition-table.bin ' - '0x10000 $path/esp32-dsp.bin' + '-b 2000000 ' + '--before default_reset --after hard_reset ' + '--chip esp32 ' + 'write_flash --flash_mode dio --flash_size 4MB --flash_freq 80m ' + '0x1000 $path/bootloader.bin ' + '0x8000 $path/partition-table.bin ' + '0x10000 $path/esp32-dsp.bin' .split(' '); final result = await Process.run(command, args); @@ -230,10 +230,10 @@ Future nvsErase({required String port}) async { // https://docs.espressif.com/projects/esptool/en/latest/esp32/#quick-start const command = 'esptool.py'; final args = '-p $port ' - '-b 2000000 ' - '--before default_reset --after hard_reset ' - '--chip esp32 ' - 'erase_region 0x9000 0x6000' + '-b 2000000 ' + '--before default_reset --after hard_reset ' + '--chip esp32 ' + 'erase_region 0x9000 0x6000' .split(' '); final result = await Process.run(command, args); @@ -251,11 +251,11 @@ Future nvsLoad(String binaryPath, {required String port}) async { // https://docs.espressif.com/projects/esptool/en/latest/esp32/#quick-start const command = 'esptool.py'; final args = '-p $port ' - '-b 2000000 ' - '--before default_reset --after hard_reset ' - '--chip esp32 ' - 'write_flash --flash_mode dio --flash_size 4MB --flash_freq 80m ' - '0x9000 $binaryPath' + '-b 2000000 ' + '--before default_reset --after hard_reset ' + '--chip esp32 ' + 'write_flash --flash_mode dio --flash_size 4MB --flash_freq 80m ' + '0x9000 $binaryPath' .split(' '); final result = await Process.run(command, args); @@ -273,11 +273,11 @@ Future nvsSave(String binaryPath, {required String port}) async { // https://docs.espressif.com/projects/esptool/en/latest/esp32/#quick-start const command = 'esptool.py'; final args = '-p $port ' - '-b 2000000 ' - '--before default_reset --after hard_reset ' - '--chip esp32 ' - 'read_flash ' - '0x9000 0x6000 $binaryPath' + '-b 2000000 ' + '--before default_reset --after hard_reset ' + '--chip esp32 ' + 'read_flash ' + '0x9000 0x6000 $binaryPath' .split(' '); final result = await Process.run(command, args); @@ -369,7 +369,7 @@ class ShrapnelUart { String escapeCommandArg(String arg) { return arg.replaceAllMapped( RegExp(r'[\\" ]'), - (match) => '\\${match.group(0)!}', + (match) => '\\${match.group(0)!}', ); } diff --git a/dart/shrapnel_test_lib/test/shrapnel_test_lib_test.dart b/dart/shrapnel_test_lib/test/shrapnel_test_lib_test.dart index eb8028f7..ef8b2458 100644 --- a/dart/shrapnel_test_lib/test/shrapnel_test_lib_test.dart +++ b/dart/shrapnel_test_lib/test/shrapnel_test_lib_test.dart @@ -36,7 +36,7 @@ void main() { }; final result = - testCases.map((key, value) => MapEntry(key, escapeCommandArg(key))); + testCases.map((key, value) => MapEntry(key, escapeCommandArg(key))); expect(result, testCases); }); diff --git a/dart/shrapnel_test_tool/bin/shrapnel_test_tool.dart b/dart/shrapnel_test_tool/bin/shrapnel_test_tool.dart index b1228ac0..3f7202b8 100644 --- a/dart/shrapnel_test_tool/bin/shrapnel_test_tool.dart +++ b/dart/shrapnel_test_tool/bin/shrapnel_test_tool.dart @@ -1,4 +1,5 @@ -import 'package:shrapnel_test_tool/shrapnel_test_tool.dart' as shrapnel_test_tool; +import 'package:shrapnel_test_tool/shrapnel_test_tool.dart' + as shrapnel_test_tool; void main(List arguments) { shrapnel_test_tool.main(arguments); From 8432fcb4b2e1dcdd2c88236971152b16d0d15d39 Mon Sep 17 00:00:00 2001 From: Barabas Raffai Date: Sun, 4 Aug 2024 12:06:35 +0100 Subject: [PATCH 10/14] fix doc action --- .github/workflows/strictdoc.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/strictdoc.yml b/.github/workflows/strictdoc.yml index 58052351..a196698f 100644 --- a/.github/workflows/strictdoc.yml +++ b/.github/workflows/strictdoc.yml @@ -54,7 +54,7 @@ jobs: defaults: run: working-directory: - frontend + dart/frontend steps: - uses: actions/checkout@v3 @@ -79,7 +79,7 @@ jobs: - uses: actions/upload-artifact@v3 with: name: frontend-docs - path: frontend/doc/api + path: dart/frontend/doc/api retention-days: 5 deploy: From 5ed04eb5a096eae02c32ed3db2929553d275b3d4 Mon Sep 17 00:00:00 2001 From: Barabas Raffai Date: Sun, 4 Aug 2024 12:12:05 +0100 Subject: [PATCH 11/14] fix CI --- .github/workflows/main.yml | 2 +- .licenserc.yaml | 4 ++-- .../lib/api_data/api_message.dart | 19 +++++++++++++++ .../lib/api_data/audio_event_message.dart | 19 +++++++++++++++ .../lib/api_data/parameter_message.dart | 19 +++++++++++++++ .../lib/api_data/presets_message.dart | 19 +++++++++++++++ .../lib/api_data/selected_preset_data.dart | 19 +++++++++++++++ dart/shrapnel_common/lib/shrapnel_common.dart | 24 ++++++++++++++----- .../lib/src/shrapnel_common_base.dart | 19 +++++++++++++++ .../test/shrapnel_common_test.dart | 19 +++++++++++++++ .../lib/shrapnel_test_lib.dart | 19 +++++++++++++++ .../bin/shrapnel_test_tool.dart | 19 +++++++++++++++ .../lib/shrapnel_test_tool.dart | 19 +++++++++++++++ .../test/shrapnel_test_tool_test.dart | 19 +++++++++++++++ 14 files changed, 230 insertions(+), 9 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4c3eb805..0828b12d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,7 +18,7 @@ env: FLUTTER_CHANNEL: 'stable' MELOS_VERSION: '^6.1.0' COVERDE_VERSION: '^0.2.0+2' - COVERAGE_VERSION: '^0.2.0+2' + COVERAGE_VERSION: '^1.9.0' jobs: build-firmware: diff --git a/.licenserc.yaml b/.licenserc.yaml index 6e1b6ecc..ca56fe57 100644 --- a/.licenserc.yaml +++ b/.licenserc.yaml @@ -38,8 +38,8 @@ header: - '**/*.pbserver.dart' - '**/*.pb-c.c' - '**/*.pb-c.h' - - 'frontend/.dart_tool/**' - - 'frontend/linux/flutter/**' + - '**/.dart_tool/**' + - '**/linux/flutter/**' # Test support files are usually derivatives of third-party library code, # which is licensed under some other license. - 'test/support/**' diff --git a/dart/shrapnel_common/lib/api_data/api_message.dart b/dart/shrapnel_common/lib/api_data/api_message.dart index 4bdb6bf8..68543885 100644 --- a/dart/shrapnel_common/lib/api_data/api_message.dart +++ b/dart/shrapnel_common/lib/api_data/api_message.dart @@ -1,3 +1,22 @@ +/* + * Copyright 2022 Barabas Raffai + * + * This file is part of ShrapnelDSP. + * + * ShrapnelDSP is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free + * Software Foundation, either version 3 of the License, or (at your option) + * any later version. + * + * ShrapnelDSP is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * ShrapnelDSP. If not, see . + */ + import 'package:freezed_annotation/freezed_annotation.dart'; import 'audio_event_message.dart'; diff --git a/dart/shrapnel_common/lib/api_data/audio_event_message.dart b/dart/shrapnel_common/lib/api_data/audio_event_message.dart index 38b7d59a..6c50a223 100644 --- a/dart/shrapnel_common/lib/api_data/audio_event_message.dart +++ b/dart/shrapnel_common/lib/api_data/audio_event_message.dart @@ -1,3 +1,22 @@ +/* + * Copyright 2022 Barabas Raffai + * + * This file is part of ShrapnelDSP. + * + * ShrapnelDSP is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free + * Software Foundation, either version 3 of the License, or (at your option) + * any later version. + * + * ShrapnelDSP is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * ShrapnelDSP. If not, see . + */ + import 'package:freezed_annotation/freezed_annotation.dart'; part 'audio_event_message.freezed.dart'; diff --git a/dart/shrapnel_common/lib/api_data/parameter_message.dart b/dart/shrapnel_common/lib/api_data/parameter_message.dart index e39880a4..ff1fa209 100644 --- a/dart/shrapnel_common/lib/api_data/parameter_message.dart +++ b/dart/shrapnel_common/lib/api_data/parameter_message.dart @@ -1,3 +1,22 @@ +/* + * Copyright 2022 Barabas Raffai + * + * This file is part of ShrapnelDSP. + * + * ShrapnelDSP is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free + * Software Foundation, either version 3 of the License, or (at your option) + * any later version. + * + * ShrapnelDSP is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * ShrapnelDSP. If not, see . + */ + import 'package:freezed_annotation/freezed_annotation.dart'; part 'parameter_message.freezed.dart'; diff --git a/dart/shrapnel_common/lib/api_data/presets_message.dart b/dart/shrapnel_common/lib/api_data/presets_message.dart index 1bb9f8da..4ab8ecf5 100644 --- a/dart/shrapnel_common/lib/api_data/presets_message.dart +++ b/dart/shrapnel_common/lib/api_data/presets_message.dart @@ -1,3 +1,22 @@ +/* + * Copyright 2022 Barabas Raffai + * + * This file is part of ShrapnelDSP. + * + * ShrapnelDSP is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free + * Software Foundation, either version 3 of the License, or (at your option) + * any later version. + * + * ShrapnelDSP is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * ShrapnelDSP. If not, see . + */ + import 'package:freezed_annotation/freezed_annotation.dart'; part 'presets_message.freezed.dart'; diff --git a/dart/shrapnel_common/lib/api_data/selected_preset_data.dart b/dart/shrapnel_common/lib/api_data/selected_preset_data.dart index 0a76ce08..838c754d 100644 --- a/dart/shrapnel_common/lib/api_data/selected_preset_data.dart +++ b/dart/shrapnel_common/lib/api_data/selected_preset_data.dart @@ -1,3 +1,22 @@ +/* + * Copyright 2022 Barabas Raffai + * + * This file is part of ShrapnelDSP. + * + * ShrapnelDSP is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free + * Software Foundation, either version 3 of the License, or (at your option) + * any later version. + * + * ShrapnelDSP is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * ShrapnelDSP. If not, see . + */ + import 'package:freezed_annotation/freezed_annotation.dart'; part 'selected_preset_data.freezed.dart'; diff --git a/dart/shrapnel_common/lib/shrapnel_common.dart b/dart/shrapnel_common/lib/shrapnel_common.dart index e99e9860..e5dcf0ae 100644 --- a/dart/shrapnel_common/lib/shrapnel_common.dart +++ b/dart/shrapnel_common/lib/shrapnel_common.dart @@ -1,8 +1,20 @@ -/// Support for doing something awesome. -/// -/// More dartdocs go here. -library; +/* + * Copyright 2022 Barabas Raffai + * + * This file is part of ShrapnelDSP. + * + * ShrapnelDSP is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free + * Software Foundation, either version 3 of the License, or (at your option) + * any later version. + * + * ShrapnelDSP is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * ShrapnelDSP. If not, see . + */ export 'src/shrapnel_common_base.dart'; - -// TODO: Export any libraries intended for clients of this package. diff --git a/dart/shrapnel_common/lib/src/shrapnel_common_base.dart b/dart/shrapnel_common/lib/src/shrapnel_common_base.dart index 85650ffb..128ec61d 100644 --- a/dart/shrapnel_common/lib/src/shrapnel_common_base.dart +++ b/dart/shrapnel_common/lib/src/shrapnel_common_base.dart @@ -1,3 +1,22 @@ +/* + * Copyright 2022 Barabas Raffai + * + * This file is part of ShrapnelDSP. + * + * ShrapnelDSP is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free + * Software Foundation, either version 3 of the License, or (at your option) + * any later version. + * + * ShrapnelDSP is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * ShrapnelDSP. If not, see . + */ + import 'dart:async'; import 'package:esp_softap_provisioning/esp_softap_provisioning.dart'; diff --git a/dart/shrapnel_common/test/shrapnel_common_test.dart b/dart/shrapnel_common/test/shrapnel_common_test.dart index 13880f99..ccf1b445 100644 --- a/dart/shrapnel_common/test/shrapnel_common_test.dart +++ b/dart/shrapnel_common/test/shrapnel_common_test.dart @@ -1,3 +1,22 @@ +/* + * Copyright 2022 Barabas Raffai + * + * This file is part of ShrapnelDSP. + * + * ShrapnelDSP is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free + * Software Foundation, either version 3 of the License, or (at your option) + * any later version. + * + * ShrapnelDSP is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * ShrapnelDSP. If not, see . + */ + import 'package:test/test.dart'; void main() { diff --git a/dart/shrapnel_test_lib/lib/shrapnel_test_lib.dart b/dart/shrapnel_test_lib/lib/shrapnel_test_lib.dart index 33c5467d..0bf388f6 100644 --- a/dart/shrapnel_test_lib/lib/shrapnel_test_lib.dart +++ b/dart/shrapnel_test_lib/lib/shrapnel_test_lib.dart @@ -1,3 +1,22 @@ +/* + * Copyright 2022 Barabas Raffai + * + * This file is part of ShrapnelDSP. + * + * ShrapnelDSP is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free + * Software Foundation, either version 3 of the License, or (at your option) + * any later version. + * + * ShrapnelDSP is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * ShrapnelDSP. If not, see . + */ + /// Testing utilities. library; diff --git a/dart/shrapnel_test_tool/bin/shrapnel_test_tool.dart b/dart/shrapnel_test_tool/bin/shrapnel_test_tool.dart index 3f7202b8..e88c5dba 100644 --- a/dart/shrapnel_test_tool/bin/shrapnel_test_tool.dart +++ b/dart/shrapnel_test_tool/bin/shrapnel_test_tool.dart @@ -1,3 +1,22 @@ +/* + * Copyright 2022 Barabas Raffai + * + * This file is part of ShrapnelDSP. + * + * ShrapnelDSP is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free + * Software Foundation, either version 3 of the License, or (at your option) + * any later version. + * + * ShrapnelDSP is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * ShrapnelDSP. If not, see . + */ + import 'package:shrapnel_test_tool/shrapnel_test_tool.dart' as shrapnel_test_tool; diff --git a/dart/shrapnel_test_tool/lib/shrapnel_test_tool.dart b/dart/shrapnel_test_tool/lib/shrapnel_test_tool.dart index 9b44f469..3c257194 100644 --- a/dart/shrapnel_test_tool/lib/shrapnel_test_tool.dart +++ b/dart/shrapnel_test_tool/lib/shrapnel_test_tool.dart @@ -1,3 +1,22 @@ +/* + * Copyright 2022 Barabas Raffai + * + * This file is part of ShrapnelDSP. + * + * ShrapnelDSP is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free + * Software Foundation, either version 3 of the License, or (at your option) + * any later version. + * + * ShrapnelDSP is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * ShrapnelDSP. If not, see . + */ + import 'package:logging/logging.dart'; import 'package:shrapnel_test_lib/shrapnel_test_lib.dart'; diff --git a/dart/shrapnel_test_tool/test/shrapnel_test_tool_test.dart b/dart/shrapnel_test_tool/test/shrapnel_test_tool_test.dart index 13880f99..ccf1b445 100644 --- a/dart/shrapnel_test_tool/test/shrapnel_test_tool_test.dart +++ b/dart/shrapnel_test_tool/test/shrapnel_test_tool_test.dart @@ -1,3 +1,22 @@ +/* + * Copyright 2022 Barabas Raffai + * + * This file is part of ShrapnelDSP. + * + * ShrapnelDSP is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free + * Software Foundation, either version 3 of the License, or (at your option) + * any later version. + * + * ShrapnelDSP is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * ShrapnelDSP. If not, see . + */ + import 'package:test/test.dart'; void main() { From fe534e96d7328899290a0a806fa6d48bbdc74753 Mon Sep 17 00:00:00 2001 From: Barabas Raffai Date: Sun, 4 Aug 2024 12:14:26 +0100 Subject: [PATCH 12/14] fix CI again --- .github/workflows/strictdoc.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/strictdoc.yml b/.github/workflows/strictdoc.yml index a196698f..25ac0ebb 100644 --- a/.github/workflows/strictdoc.yml +++ b/.github/workflows/strictdoc.yml @@ -6,7 +6,7 @@ on: branches: [ master ] env: - FLUTTER_VERSION: '3.16.0' + FLUTTER_VERSION: '3.16.9' FLUTTER_CHANNEL: 'stable' jobs: From e3cca3dd5ec3edd51fdea1c230c062d66b15a638 Mon Sep 17 00:00:00 2001 From: Barabas Raffai Date: Sun, 4 Aug 2024 12:16:23 +0100 Subject: [PATCH 13/14] fix CI --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0828b12d..84c89055 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,7 +18,7 @@ env: FLUTTER_CHANNEL: 'stable' MELOS_VERSION: '^6.1.0' COVERDE_VERSION: '^0.2.0+2' - COVERAGE_VERSION: '^1.9.0' + COVERAGE_VERSION: '^1.8.0' jobs: build-firmware: From 016c5b5e1a98b4dcccbdfa9c59eb1e3e0dcaa56a Mon Sep 17 00:00:00 2001 From: Barabas Raffai Date: Sun, 4 Aug 2024 12:31:19 +0100 Subject: [PATCH 14/14] fix ci --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 84c89055..76ef9f42 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -278,7 +278,7 @@ jobs: - name: Coveralls uses: coverallsapp/github-action@master with: - path-to-lcov: coverage/filtered.lcov.info + path-to-lcov: dart/coverage/filtered.lcov.info base-path: dart github-token: ${{ secrets.GITHUB_TOKEN }} parallel: true