diff --git a/AgroBase/AgroBase/Models/Operacoes/OperacaoModel.cs b/AgroBase/AgroBase/Models/Operacoes/OperacaoModel.cs index a3ca71c85..8378c3f1c 100644 --- a/AgroBase/AgroBase/Models/Operacoes/OperacaoModel.cs +++ b/AgroBase/AgroBase/Models/Operacoes/OperacaoModel.cs @@ -1583,7 +1583,7 @@ namespace AgroBase.Models { var (la_frontal, la_lateral) = ((JObject)controleBase._comp_value).ToObject<(double?, double?)>(); if (la_lateral != null || la_frontal != null) - GPSService.LeverArm = new GeoLeverArm(la_frontal ?? 0, la_lateral ?? 0); + GPSService.LeverArm = new GeoLeverArm(offsetFisicoFrontalCm: VariaveisEquipamento.LeverArmFrontalCm, offsetFisicoLateralCm: VariaveisEquipamento.LeverArmLateralCm, offsetCampoFrontalCm: la_frontal ?? 0, offsetCampoLateralCm: la_lateral ?? 0); return; } diff --git a/AgroBase/AgroBase/Services/GPSService.cs b/AgroBase/AgroBase/Services/GPSService.cs index 6b82f49a6..f01734ecd 100644 --- a/AgroBase/AgroBase/Services/GPSService.cs +++ b/AgroBase/AgroBase/Services/GPSService.cs @@ -49,7 +49,7 @@ namespace AgroBase.Services private static bool LoopRTK_Ntrip = false; public static bool CorrecaoRTK_Ntrip = false; public static DateTime UltimoEnvioCorrecaoRTK = DateTime.MinValue; - public static GeoLeverArm LeverArm = new GeoLeverArm(); + public static GeoLeverArm LeverArm = new GeoLeverArm(offsetFisicoFrontalCm: VariaveisEquipamento.LeverArmFrontalCm, offsetFisicoLateralCm: VariaveisEquipamento.LeverArmLateralCm); public static void AtualizarPortaCOM(SerialPort Porta) { @@ -1347,14 +1347,16 @@ namespace AgroBase.Services public double LatDeg { get; } public double LonDeg { get; } public double AltElipsoidalM { get; } + public double HeadingDeg { get; } public TiposCorrecaoGPS FixQuality { get; } - public GgaFix(DateTime tsUtc, double latDeg, double lonDeg, double altElipsoidalM, TiposCorrecaoGPS fixQuality) + public GgaFix(DateTime tsUtc, double latDeg, double lonDeg, double altElipsoidalM, double headingDeg, TiposCorrecaoGPS fixQuality) { TsUtc = tsUtc; LatDeg = latDeg; LonDeg = lonDeg; AltElipsoidalM = altElipsoidalM; + HeadingDeg = headingDeg; FixQuality = fixQuality; } } @@ -1374,11 +1376,11 @@ namespace AgroBase.Services private readonly bool invertHeading; private readonly bool mirrorLateral; - public GeoLeverArm(double offsetCampoFrontalCm = 0, double offsetCampoLateralCm = 0, bool invH = false, bool mirrL = false) + public GeoLeverArm(double offsetFisicoFrontalCm = 0, double offsetFisicoLateralCm = 0, double offsetCampoFrontalCm = 0, double offsetCampoLateralCm = 0, bool invH = false, bool mirrL = false) { // fixos do equipamento - xFisico = VariaveisEquipamento.LeverArmFrontalCm / 100.0; - yFisico = VariaveisEquipamento.LeverArmLateralCm / 100.0; + xFisico = offsetFisicoFrontalCm / 100.0; + yFisico = offsetFisicoLateralCm / 100.0; // ajustes de campo xCampo = offsetCampoFrontalCm / 100.0; diff --git a/AgroBase/AgroBase/bin/x64/Debug/Python/requirements.txt b/AgroBase/AgroBase/bin/x64/Debug/Python/requirements.txt index 5e159fc95..71099c89a 100644 Binary files a/AgroBase/AgroBase/bin/x64/Debug/Python/requirements.txt and b/AgroBase/AgroBase/bin/x64/Debug/Python/requirements.txt differ