From 1573f0a95ad06108cdcf7e8fe4c5ef839d599e37 Mon Sep 17 00:00:00 2001 From: KenanZhu111 <3471685733@qq.com> Date: Fri, 20 Sep 2024 22:08:55 +0800 Subject: [PATCH] Fixed some mistake --- cal_mod.h | 8 ++++---- main.exe | Bin 94720 -> 94720 bytes 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cal_mod.h b/cal_mod.h index 16d3db6..ee74a43 100644 --- a/cal_mod.h +++ b/cal_mod.h @@ -167,9 +167,9 @@ pxyz2blh tem2 = NULL; tem2 = (pxyz2blh)malloc(sizeof(pxyz2blh)); - XYZtoBLH( tem2, obs_h->apX, obs_h->apY, obs_h->apZ, a, e2); - station->B = tem2->B; - station->L = tem2->L; + tem2 = XYZtoBLH( tem2, obs_h->apX, obs_h->apY, obs_h->apZ, a, e2); + station->B = tem2->B / 57.295779513; + station->L = tem2->L / 57.295779513; station->H = tem2->H; @@ -191,7 +191,7 @@ rah->A -= 2 * PI; rah->R = sqrt(enu->E * enu->E + enu->N * enu->N + enu->U * enu->U); //*******************************************************************************// - + if (blh->H < 0 || nav_b[best_epoch].sHEA != 0) { break; diff --git a/main.exe b/main.exe index a8f2fb2b34c8e291b3cb850c69604369d12af05b..2c8e641d6fd93d827327cfc8360dece3ec923c1f 100644 GIT binary patch delta 8112 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 G=Klcq0NM!v delta 7976 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