From 0ef20b0d40ccdb81dfcfe1cf81940bc29a4bc7c8 Mon Sep 17 00:00:00 2001 From: Vit Nemecky Date: Sat, 2 Nov 2024 22:47:34 +0100 Subject: [PATCH] Show MaxServo settings for ServoMotor output only --- ...dChannelOutputTypeToMaxServoAngleVisibleConverter.cs} | 6 ++++-- .../BrickController2/UI/Pages/ControllerActionPage.xaml | 9 +++++---- 2 files changed, 9 insertions(+), 6 deletions(-) rename BrickController2/BrickController2/UI/Converters/{DeviceAndChannelToMaxServoAngleVisibleConverter.cs => DeviceAndChannelOutputTypeToMaxServoAngleVisibleConverter.cs} (63%) diff --git a/BrickController2/BrickController2/UI/Converters/DeviceAndChannelToMaxServoAngleVisibleConverter.cs b/BrickController2/BrickController2/UI/Converters/DeviceAndChannelOutputTypeToMaxServoAngleVisibleConverter.cs similarity index 63% rename from BrickController2/BrickController2/UI/Converters/DeviceAndChannelToMaxServoAngleVisibleConverter.cs rename to BrickController2/BrickController2/UI/Converters/DeviceAndChannelOutputTypeToMaxServoAngleVisibleConverter.cs index 1fbc275d..a8a7afa1 100644 --- a/BrickController2/BrickController2/UI/Converters/DeviceAndChannelToMaxServoAngleVisibleConverter.cs +++ b/BrickController2/BrickController2/UI/Converters/DeviceAndChannelOutputTypeToMaxServoAngleVisibleConverter.cs @@ -1,17 +1,19 @@ using System; using System.Globalization; +using BrickController2.CreationManagement; using Microsoft.Maui.Controls; using Device = BrickController2.DeviceManagement.Device; namespace BrickController2.UI.Converters { - internal class DeviceAndChannelToMaxServoAngleVisibleConverter : IMultiValueConverter + internal class DeviceAndChannelOutputTypeToMaxServoAngleVisibleConverter : IMultiValueConverter { public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture) { if (values[0] is Device device) { - return values[1] is int channel && device.CanChangeMaxServoAngle(channel); + return values[1] is ChannelOutputType outputType && outputType == ChannelOutputType.ServoMotor && + values[2] is int channel && device.CanChangeMaxServoAngle(channel); } return false; diff --git a/BrickController2/BrickController2/UI/Pages/ControllerActionPage.xaml b/BrickController2/BrickController2/UI/Pages/ControllerActionPage.xaml index c5fc3462..ec8c84b5 100644 --- a/BrickController2/BrickController2/UI/Pages/ControllerActionPage.xaml +++ b/BrickController2/BrickController2/UI/Pages/ControllerActionPage.xaml @@ -17,11 +17,11 @@ - + - +