[hamradio-commits] [gnss-sdr] 111/303: Fix erros in Galileo message decoding

[Carles Fernandez]

This is an automated email from the git hooks/post-receive script.

carles_fernandez-guest pushed a commit to branch master
in repository gnss-sdr.

commit 3d315af2866b2c765f318e40d1b07a894891a7d6
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Sat Oct 22 13:19:17 2016 +0200

    Fix erros in Galileo message decoding
    
    Thanks to Patricia Lopez Torres from Fundacion Ayesa for spotting the
    errors.
---
 src/core/system_parameters/Galileo_E1.h                  | 6 +++---
 src/core/system_parameters/galileo_navigation_message.cc | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/core/system_parameters/Galileo_E1.h b/src/core/system_parameters/Galileo_E1.h
index 6c415d7..258a9e9 100644
--- a/src/core/system_parameters/Galileo_E1.h
+++ b/src/core/system_parameters/Galileo_E1.h
@@ -145,7 +145,7 @@ const std::vector<std::pair<int,int>> af1_4_bit({{100,21}});            //
 const double af1_4_LSB = TWO_N46;
 const std::vector<std::pair<int,int>> af2_4_bit({{121,6}});
 const double af2_4_LSB = TWO_N59;
-const std::vector<std::pair<int,int>> spare_4_bit({{121,6}});
+const std::vector<std::pair<int,int>> spare_4_bit({{127,2}});
 //last two bits are reserved
 
 
@@ -187,9 +187,9 @@ const std::vector<std::pair<int,int>> Delta_tLS_6_bit({{63,8}});
 const std::vector<std::pair<int,int>> t0t_6_bit({{71,8}});
 const double t0t_6_LSB = 3600;
 const std::vector<std::pair<int,int>> WNot_6_bit({{79,8}});
-const std::vector<std::pair<int,int>> WN_LSF_6_bit({{86,8}});
+const std::vector<std::pair<int,int>> WN_LSF_6_bit({{87,8}});
 const std::vector<std::pair<int,int>> DN_6_bit({{95,3}});
-const std::vector<std::pair<int,int>> Delta_tLSF_6_bit({{97,8}});
+const std::vector<std::pair<int,int>> Delta_tLSF_6_bit({{98,8}});
 const std::vector<std::pair<int,int>> TOW_6_bit({{106,20}});
 
 
diff --git a/src/core/system_parameters/galileo_navigation_message.cc b/src/core/system_parameters/galileo_navigation_message.cc
index 1b1fb82..f2a8b72 100644
--- a/src/core/system_parameters/galileo_navigation_message.cc
+++ b/src/core/system_parameters/galileo_navigation_message.cc
@@ -906,7 +906,7 @@ int Galileo_Navigation_Message::page_jk_decoder(const char *data_jk)
         break;
 
     case 8: /*Word type 8: Almanac for SVID1 (2/2) and SVID2 (1/2)*/
-        IOD_a_8 = static_cast<double>(read_navigation_signed(data_jk_bits, IOD_a_8_bit));
+        IOD_a_8 = static_cast<double>(read_navigation_unsigned(data_jk_bits, IOD_a_8_bit));
         DLOG(INFO) << "IOD_a_8= " << IOD_a_8;
         af0_8 = static_cast<double>(read_navigation_signed(data_jk_bits, af0_8_bit));
         af0_8 = af0_8 * af0_8_LSB;
@@ -959,11 +959,11 @@ int Galileo_Navigation_Message::page_jk_decoder(const char *data_jk)
         af1_9 = static_cast<double>(read_navigation_signed(data_jk_bits, af1_9_bit));
         af1_9 = af1_9 * af1_9_LSB;
         DLOG(INFO) << "af1_9= " << af1_9;
+        E5b_HS_9 = static_cast<double>(read_navigation_unsigned(data_jk_bits, E5b_HS_9_bit));
+        DLOG(INFO) << "E5b_HS_9= " << E5b_HS_9;
         E1B_HS_9 = static_cast<double>(read_navigation_unsigned(data_jk_bits, E1B_HS_9_bit));
         DLOG(INFO) << "E1B_HS_9= " << E1B_HS_9;
-        E1B_HS_9 = static_cast<double>(read_navigation_unsigned(data_jk_bits, E1B_HS_9_bit));
-        DLOG(INFO) << "E1B_HS_9= " << E1B_HS_9;
-        SVID3_9 = static_cast<double>(read_navigation_unsigned(data_jk_bits,SVID3_9_bit));
+        SVID3_9 = static_cast<double>(read_navigation_unsigned(data_jk_bits, SVID3_9_bit));
         DLOG(INFO) << "SVID3_9= " << SVID3_9;
         DELTA_A_9 = static_cast<double>(read_navigation_signed(data_jk_bits, DELTA_A_9_bit));
         DELTA_A_9 = DELTA_A_9 * DELTA_A_9_LSB;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/gnss-sdr.git