From c052d9295daffdf679e473d44eb1dc053cf600a3 Mon Sep 17 00:00:00 2001 From: Diego Freitas Date: Thu, 11 Dec 2025 15:41:13 -0300 Subject: [PATCH] Ajustes cooler control --- .../Models/Operacoes/OperacaoModel.cs | 2 +- .../AgroBase/Services/CoolerControlService.cs | 6 ++++ .../Windows/MainWindow.xaml.cs | 32 +++++++------------ 3 files changed, 19 insertions(+), 21 deletions(-) diff --git a/AgroBase/AgroBase/Models/Operacoes/OperacaoModel.cs b/AgroBase/AgroBase/Models/Operacoes/OperacaoModel.cs index e8f142bee..426721f2f 100644 --- a/AgroBase/AgroBase/Models/Operacoes/OperacaoModel.cs +++ b/AgroBase/AgroBase/Models/Operacoes/OperacaoModel.cs @@ -2346,7 +2346,7 @@ namespace AgroBase.Models _Cooler?.Atualizar(tmp_max, DateTime.Now); _Bateria?.AtualizarConsumo(_DispMvd?.Dados?.DistanciaPercorridaTotal ?? 0); _Reservatorio?.AtualizarConsumo(_DispMvd?.Dados?.DistanciaPercorridaTotal ?? 0, Variaveis.OperacaoEmAndamento.TempoDecorridoSegs); - _Trajetoria.AtualizarDadosAutonomiaCorredor(); + _Trajetoria?.AtualizarDadosAutonomiaCorredor(); var sIMU = LivoxManagerProcess.DadosLeitura.imu; var dadosIMU = sIMU != null ? new OperacaoSensoriamentoLogImuModel() diff --git a/AgroBase/AgroBase/Services/CoolerControlService.cs b/AgroBase/AgroBase/Services/CoolerControlService.cs index bc20c9d4d..172b7e8cd 100644 --- a/AgroBase/AgroBase/Services/CoolerControlService.cs +++ b/AgroBase/AgroBase/Services/CoolerControlService.cs @@ -169,6 +169,8 @@ namespace AgroBase.Services { Modo = ModoAtual, UltimaMudanca = UltimaMudancaModo, + TemperaturaLigar = TempOn, + TemperaturaTurbo = TempTurbo, EstadoEntrada = CoolerEntradaEstado, EstadoSaida = CoolerSaidaEstado, LeituraEntrada = CoolerEntradaLeitura, @@ -191,6 +193,8 @@ namespace AgroBase.Services { public CoolerMode Modo { get; set; } public DateTime UltimaMudanca { get; set; } + public double TemperaturaLigar { get; set; } + public double TemperaturaTurbo { get; set; } public Estado EstadoEntrada { get; set; } public Estado EstadoSaida { get; set; } public Estado LeituraEntrada { get; set; } @@ -204,6 +208,8 @@ namespace AgroBase.Services { Modo = Modo, UltimaMudanca = UltimaMudanca, + TemperaturaLigar = TemperaturaLigar, + TemperaturaTurbo = TemperaturaTurbo, EstadoEntrada = EstadoEntrada, EstadoSaida = EstadoSaida, LeituraEntrada = LeituraEntrada, diff --git a/AgroBase/OperationControl/Windows/MainWindow.xaml.cs b/AgroBase/OperationControl/Windows/MainWindow.xaml.cs index a9c89ef99..6364f183e 100644 --- a/AgroBase/OperationControl/Windows/MainWindow.xaml.cs +++ b/AgroBase/OperationControl/Windows/MainWindow.xaml.cs @@ -49,8 +49,8 @@ namespace OperationControl.Windows cmbDir_Movimento.SelectedIndex = 0; cmbNpc_CoolerModo.Items.Clear(); - foreach (var m in Enum.GetNames(typeof(AgroBase.Services.CoolerControlService.CoolerMode))) - cmbNpc_CoolerModo.Items.Add(m); + cmbNpc_CoolerModo.Items.Add("Automático"); + cmbNpc_CoolerModo.Items.Add("Manual"); cmbNpc_CoolerModo.SelectedIndex = 0; AtualizarListaDispositivos(new List() { VariaveisControleOperacao.SelectedRoverId }); @@ -1197,19 +1197,23 @@ namespace OperationControl.Windows var modo = dados?.Modo ?? AgroBase.Services.CoolerControlService.CoolerMode.Off; double tmp = dados?.Temperatura ?? 0; - var entrada = dados?.LeituraEntrada ?? AgroBase.Models.Enums.Estado.Desligado; - var saida = dados?.LeituraSaida ?? AgroBase.Models.Enums.Estado.Desligado; + var c_entrada = dados?.EstadoEntrada ?? AgroBase.Models.Enums.Estado.Desligado; + var c_saida = dados?.EstadoSaida ?? AgroBase.Models.Enums.Estado.Desligado; + var l_entrada = dados?.LeituraEntrada ?? AgroBase.Models.Enums.Estado.Desligado; + var l_saida = dados?.LeituraSaida ?? AgroBase.Models.Enums.Estado.Desligado; txtNpc_CoolerModo.Text = $"{modo}"; txtNpc_CoolerTemperatura.Text = $"{tmp:0.00} °C"; - txtNpc_CoolerEntrada.Text = $"{entrada}"; - txtNpc_CoolerSaida.Text = $"{saida}"; + txtNpc_CoolerEntrada.Text = $"{c_entrada} ({l_entrada})"; + txtNpc_CoolerSaida.Text = $"{c_saida} ({l_saida})"; if (inicial) { cmbNpc_CoolerModo.SelectedIndex = (int)modo; - chbNpc_CoolerEntrada.IsChecked = entrada == AgroBase.Models.Enums.Estado.Ligado; - chbNpc_CoolerSaida.IsChecked = saida == AgroBase.Models.Enums.Estado.Ligado; + chbNpc_CoolerEntrada.IsChecked = c_entrada == AgroBase.Models.Enums.Estado.Ligado; + chbNpc_CoolerSaida.IsChecked = c_saida == AgroBase.Models.Enums.Estado.Ligado; + txtNpc_CoolerTempOn.Text = (dados?.TemperaturaLigar ?? 0).ToString(); + txtNpc_CoolerTempTurbo.Text = (dados?.TemperaturaTurbo ?? 0).ToString(); } break; } @@ -1449,18 +1453,6 @@ namespace OperationControl.Windows chbNpc_CoolerEntrada.IsChecked = false; chbNpc_CoolerSaida.IsChecked = false; break; - case AgroBase.Services.CoolerControlService.CoolerMode.ExhaustOnly: - chbNpc_CoolerEntrada.IsEnabled = false; - chbNpc_CoolerSaida.IsEnabled = false; - chbNpc_CoolerEntrada.IsChecked = false; - chbNpc_CoolerSaida.IsChecked = true; - break; - case AgroBase.Services.CoolerControlService.CoolerMode.IntakeAndExhaust: - chbNpc_CoolerEntrada.IsEnabled = false; - chbNpc_CoolerSaida.IsEnabled = false; - chbNpc_CoolerEntrada.IsChecked = true; - chbNpc_CoolerSaida.IsChecked = true; - break; } }