diff options
author | Scott Murray <scott.murray@konsulko.com> | 2023-12-17 15:48:21 -0500 |
---|---|---|
committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2023-12-18 13:28:28 +0000 |
commit | 4ae68f5be11d110f2df10d54377d970921e30a21 (patch) | |
tree | b37b5cb3c6964fbaeaa95edc1edeb44d615912e9 /lib/core | |
parent | dda6c8502a3fa1e50654c4cca934b4b846bbca98 (diff) |
Implement audio settings
Changes:
- Rework KUKSA.val "VAL" gRPC API implementation to separate it
from the vehicle model + notifier, and more easily allow using
it from other notifiers.
- Move volume handling from the vehicle model + notifier to the
audio set for clarity.
- Wire up the new VSS audio signals in the audio notifier. The
"rearFront" variable naming has been changed to "fade" in
several places to match expected terminology.
- Add a balance slider to the audio settings page.
- Change the min/max labels on the fade slider to be Text instead
of Icon's since we do not have the equivalent to use with the
balance slider, and text seems like it'd be what you would want
for any potential future internationalization.
- Rework configuration file to be usable from anywhere via a
RiverPod Provider instead of tied to the vehicle notifier code,
and shifted the background and hybrid animation flags to be handled
with it. This change removes the built-in asset with defaults in
favor of maintaining the defaults for the ICS environment in the
AppConfig and KuksaConfig classes, with a goal of avoiding the need
for using async methods in the config provider.
- Change some notifiers from using StateNotifier to the RiverPod
2.0 Notifier class for improved flexibility. The other notifiers
will be updated in future work.
- Added select's to several ref.watches in the new hybrid animation
code to avoid unnecessary repaints.
- Fix several spelling issues in method and parameter names
across the codebase.
Bug-AGL: SPEC-5001
Change-Id: Iefae417fa870405d659303497d96e519e6b6d1de
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Diffstat (limited to 'lib/core')
-rw-r--r-- | lib/core/constants/constants.dart | 4 | ||||
-rw-r--r-- | lib/core/constants/val_client_helper.dart | 58 | ||||
-rw-r--r-- | lib/core/constants/vss_path.dart | 12 |
3 files changed, 14 insertions, 60 deletions
diff --git a/lib/core/constants/constants.dart b/lib/core/constants/constants.dart index 03c1f8a..65aa680 100644 --- a/lib/core/constants/constants.dart +++ b/lib/core/constants/constants.dart @@ -9,8 +9,8 @@ const maxSpeed = 240.0; const maxRpm = 8000; final GlobalKey<ScaffoldState> homeScaffoldKey = GlobalKey(); const debugDisplay = bool.fromEnvironment('DEBUG_DISPLAY'); -const disableBkgAnimation = bool.fromEnvironment('DISABLE_BKG_ANIMATION'); -const randomHybridAnimation = bool.fromEnvironment('RANDOM_HYBRID_ANIMATION'); +const disableBkgAnimationDefault = bool.fromEnvironment('DISABLE_BKG_ANIMATION'); +const randomHybridAnimationDefault = bool.fromEnvironment('RANDOM_HYBRID_ANIMATION'); diff --git a/lib/core/constants/val_client_helper.dart b/lib/core/constants/val_client_helper.dart deleted file mode 100644 index 60b3842..0000000 --- a/lib/core/constants/val_client_helper.dart +++ /dev/null @@ -1,58 +0,0 @@ -import 'package:protos/protos.dart'; - -class ValClientHelper { - final VALClient stub; - final String authorization; - - ValClientHelper({required this.stub, required this.authorization}); - - void setUint32(String path, int value, [bool actuator = true]) async { - var dp = Datapoint()..uint32 = value; - set(path, dp, actuator); - } - - void setInt32(String path, int value, [bool actuator = true]) async { - var dp = Datapoint()..int32 = value; - set(path, dp, actuator); - } - - void setBool(String path, bool value, [bool actuator = true]) async { - var dp = Datapoint()..bool_12 = value; - set(path, dp, actuator); - } - - void setString(String path, String value, [bool actuator = true]) async { - var dp = Datapoint()..string = value; - set(path, dp, actuator); - } - - void setFloat(String path, double value, [bool actuator = true]) async { - var dp = Datapoint()..float = value; - set(path, dp, actuator); - } - - void setDouble(String path, double value, [bool actuator = true]) async { - var dp = Datapoint()..double_18 = value; - set(path, dp, actuator); - } - - void set(String path, Datapoint dp, bool actuator) async { - var entry = DataEntry()..path = path; - var update = EntryUpdate(); - if (actuator) { - entry.actuatorTarget = dp; - update.fields.add(Field.FIELD_ACTUATOR_TARGET); - } else { - entry.value = dp; - update.fields.add(Field.FIELD_VALUE); - } - update.entry = entry; - var request = SetRequest(); - request.updates.add(update); - Map<String, String> metadata = {}; - if (authorization.isNotEmpty) { - metadata = {'authorization': "Bearer $authorization"}; - } - await stub.set(request, options: CallOptions(metadata: metadata)); - } -} diff --git a/lib/core/constants/vss_path.dart b/lib/core/constants/vss_path.dart index 99f3d60..afba8de 100644 --- a/lib/core/constants/vss_path.dart +++ b/lib/core/constants/vss_path.dart @@ -11,6 +11,14 @@ class VSSPath { 'Vehicle.Powertrain.FuelSystem.RelativeLevel'; static const String vehicleMediaVolume = 'Vehicle.Cabin.Infotainment.Media.Volume'; + static const String vehicleMediaBalance = + 'Vehicle.Cabin.Infotainment.Media.Audio.Balance'; + static const String vehicleMediaFade = + 'Vehicle.Cabin.Infotainment.Media.Audio.Fade'; + static const String vehicleMediaBass = + 'Vehicle.Cabin.Infotainment.Media.Audio.Bass'; + static const String vehicleMediaTreble = + 'Vehicle.Cabin.Infotainment.Media.Audio.Treble'; static const String vehicleIsChildLockActiveLeft = 'Vehicle.Cabin.Door.Row2.DriverSide.IsChildLockActive'; static const String vehicleIsChildLockActiveRight = @@ -47,6 +55,10 @@ class VSSPath { vehicleRange, vehicleFuelLevel, vehicleMediaVolume, + vehicleMediaBalance, + vehicleMediaFade, + vehicleMediaBass, + vehicleMediaTreble, vehicleIsChildLockActiveLeft, vehicleIsChildLockActiveRight, vehicleFrontLeftTire, |