Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 139be6f779 | |||
| dfec8c07b5 | |||
| bd7a58a5fe |
@@ -34,6 +34,22 @@ public partial class ConfigWindow : Window
|
||||
spPorts.Children.Clear();
|
||||
_portRows.Clear();
|
||||
|
||||
// Show unsupported message if no ports available
|
||||
if (_availablePorts == null || _availablePorts.Count == 0)
|
||||
{
|
||||
spPorts.Children.Add(new TextBlock
|
||||
{
|
||||
Text = "Unsupported",
|
||||
Foreground = Brushes.Gray,
|
||||
FontSize = 16,
|
||||
FontStyle = FontStyles.Italic,
|
||||
HorizontalAlignment = HorizontalAlignment.Center,
|
||||
VerticalAlignment = VerticalAlignment.Center,
|
||||
Margin = new Thickness(0, 40, 0, 40)
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
foreach (var port in _availablePorts)
|
||||
{
|
||||
var existingPortConfig = config.Ports.FirstOrDefault(p => p.VcpValue == port.Value);
|
||||
|
||||
@@ -13,9 +13,9 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<Version>1.0.14</Version>
|
||||
<AssemblyVersion>1.0.14.0</AssemblyVersion>
|
||||
<FileVersion>1.0.14.0</FileVersion>
|
||||
<Version>1.0.17</Version>
|
||||
<AssemblyVersion>1.0.17.0</AssemblyVersion>
|
||||
<FileVersion>1.0.17.0</FileVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
||||
@@ -371,6 +371,10 @@ public partial class MainWindow : Window
|
||||
|
||||
private StackPanel CreateInputRow(int? currentInput, List<InputSourceOption> options, string serialNumber)
|
||||
{
|
||||
DebugLogger.Log($" CreateInputRow: currentInput={currentInput}, optionCount={options.Count}");
|
||||
foreach (var opt in options)
|
||||
DebugLogger.Log($" Option: Value={opt.Value}, Name={opt.Name}");
|
||||
|
||||
var row = new StackPanel { Orientation = Orientation.Horizontal, Margin = new Thickness(0, 3, 0, 3) };
|
||||
row.Children.Add(new TextBlock { Text = "Input", Foreground = Brushes.LightGray, Width = 70, FontSize = 12, VerticalAlignment = VerticalAlignment.Center });
|
||||
|
||||
@@ -390,9 +394,14 @@ public partial class MainWindow : Window
|
||||
if (currentInput.HasValue)
|
||||
{
|
||||
var index = options.FindIndex(o => o.Value == currentInput.Value);
|
||||
DebugLogger.Log($" Selection: Looking for Value={currentInput.Value}, found at index={index}");
|
||||
if (index >= 0)
|
||||
combo.SelectedIndex = index;
|
||||
}
|
||||
else
|
||||
{
|
||||
DebugLogger.Log($" Selection: currentInput is null, no selection");
|
||||
}
|
||||
|
||||
// Add event handler AFTER setting the initial selection
|
||||
combo.SelectionChanged += async (s, e) =>
|
||||
@@ -410,26 +419,33 @@ public partial class MainWindow : Window
|
||||
var row = new StackPanel { Orientation = Orientation.Horizontal, Margin = new Thickness(0, 3, 0, 3) };
|
||||
row.Children.Add(new TextBlock { Text = "Power", Foreground = Brushes.LightGray, Width = 70, FontSize = 12, VerticalAlignment = VerticalAlignment.Center });
|
||||
|
||||
var isUnsupported = string.IsNullOrEmpty(status) || status == "Unknown";
|
||||
|
||||
var btn = new Button
|
||||
{
|
||||
Content = status,
|
||||
Content = isUnsupported ? "Power Unsupported" : status,
|
||||
Width = 170,
|
||||
Tag = serialNumber,
|
||||
Style = (Style)FindResource("DarkButton")
|
||||
Style = (Style)FindResource("DarkButton"),
|
||||
IsEnabled = !isUnsupported
|
||||
};
|
||||
btn.Click += async (s, e) =>
|
||||
|
||||
if (!isUnsupported)
|
||||
{
|
||||
if (s is Button b && b.Tag is string sn)
|
||||
btn.Click += async (s, e) =>
|
||||
{
|
||||
var current = await CMMCommand.GetMonPowerStatus(sn);
|
||||
if (current == "Sleep" || current == "PowerOff")
|
||||
await CMMCommand.PowerOn(sn);
|
||||
else
|
||||
await CMMCommand.Sleep(sn);
|
||||
await Task.Delay(1000);
|
||||
b.Content = await CMMCommand.GetMonPowerStatus(sn);
|
||||
}
|
||||
};
|
||||
if (s is Button b && b.Tag is string sn)
|
||||
{
|
||||
var current = await CMMCommand.GetMonPowerStatus(sn);
|
||||
if (current == "Sleep" || current == "PowerOff")
|
||||
await CMMCommand.PowerOn(sn);
|
||||
else
|
||||
await CMMCommand.Sleep(sn);
|
||||
await Task.Delay(1000);
|
||||
b.Content = await CMMCommand.GetMonPowerStatus(sn);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
row.Children.Add(btn);
|
||||
return row;
|
||||
|
||||
@@ -30,26 +30,32 @@ public static class CMMCommand
|
||||
return ConsoleHelper.CmdCommandAsync($"{CMMexe} /SetValue {monitorSN} D6 4");
|
||||
}
|
||||
|
||||
private static async Task<string> GetMonitorValue(string monitorSN, string vcpCode = "D6", int? reTry = 0)
|
||||
private static async Task<string> GetMonitorValue(string monitorSN, string vcpCode = "D6", int maxRetries = 2)
|
||||
{
|
||||
var value = string.Empty;
|
||||
while (reTry <= 5)
|
||||
for (int attempt = 0; attempt <= maxRetries; attempt++)
|
||||
{
|
||||
var cmdFileName = Path.Combine(CMMTmpFolder, $"{Guid.NewGuid()}.bat");
|
||||
var cmd = $"{CMMexe} /GetValue {monitorSN} {vcpCode}\r\n" +
|
||||
$"echo %errorlevel%";
|
||||
File.WriteAllText(cmdFileName, cmd);
|
||||
var values = await ConsoleHelper.ExecuteCommand(cmdFileName);
|
||||
File.Delete(cmdFileName);
|
||||
try { File.Delete(cmdFileName); } catch { }
|
||||
|
||||
value = values.Split("\r\n", StringSplitOptions.RemoveEmptyEntries).LastOrDefault();
|
||||
// Empty result means timeout - don't retry, monitor is unresponsive
|
||||
if (string.IsNullOrEmpty(values))
|
||||
return string.Empty;
|
||||
|
||||
if (!string.IsNullOrEmpty(value) && value != "0") return value;
|
||||
await Task.Delay(500);
|
||||
await GetMonitorValue(monitorSN, vcpCode, reTry++);
|
||||
};
|
||||
var value = values.Split("\r\n", StringSplitOptions.RemoveEmptyEntries).LastOrDefault();
|
||||
|
||||
return value;
|
||||
if (!string.IsNullOrEmpty(value) && value != "0")
|
||||
return value;
|
||||
|
||||
// Only retry on non-timeout failures
|
||||
if (attempt < maxRetries)
|
||||
await Task.Delay(300);
|
||||
}
|
||||
|
||||
return string.Empty;
|
||||
}
|
||||
|
||||
#region Brightness (VCP Code 10)
|
||||
|
||||
Reference in New Issue
Block a user