[hamradio-commits] [gnss-sdr] 50/126: Fixing wrong merge

[Carles Fernandez]

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

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

commit 19c9875c4aacd4963627376f4daa3d9d6a246725
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Tue Nov 24 00:55:42 2015 +0100

    Fixing wrong merge
---
 src/core/system_parameters/rtcm.cc | 38 +-------------------------------------
 src/tests/formats/rtcm_test.cc     |  6 ------
 2 files changed, 1 insertion(+), 43 deletions(-)

diff --git a/src/core/system_parameters/rtcm.cc b/src/core/system_parameters/rtcm.cc
index 137dc2d..933211f 100644
--- a/src/core/system_parameters/rtcm.cc
+++ b/src/core/system_parameters/rtcm.cc
@@ -349,7 +349,7 @@ std::string Rtcm::print_MT1001(const Gps_Ephemeris & gps_eph, double obs_time, c
             pseudoranges_iter != pseudoranges.end();
             pseudoranges_iter++)
         {
-            std::bitset<58> content = Rtcm::get_M1001_sat_content(pseudoranges_iter->second);
+            std::bitset<58> content = Rtcm::get_MT1001_sat_content(pseudoranges_iter->second);
             data += content.to_string();
         }
 
@@ -417,42 +417,6 @@ std::bitset<152> Rtcm::get_MT1005_test ()
     return test_msg;
 }
 
-std::string Rtcm::print_M1005( unsigned int ref_id, double ecef_x, double ecef_y, double ecef_z, bool gps, bool glonass, bool galileo, bool non_physical, bool single_oscillator, unsigned int quarter_cycle_indicator)
-{
-    unsigned int msg_number = 1005;
-    std::bitset<1> DF001_;
-
-    Rtcm::set_DF002(msg_number);
-    Rtcm::set_DF003(ref_id);
-    Rtcm::set_DF021();
-    Rtcm::set_DF022(gps);
-    Rtcm::set_DF023(glonass);
-    Rtcm::set_DF024(galileo);
-    DF141 = std::bitset<1>(non_physical);
-    DF001_ = std::bitset<1>("0");
-    Rtcm::set_DF025(ecef_x);
-    DF142 = std::bitset<1>(single_oscillator);
-    Rtcm::set_DF026(ecef_y);
-    DF364 = std::bitset<2>(quarter_cycle_indicator);
-    Rtcm::set_DF027(ecef_z);
-
-    std::string data = DF002.to_string() +
-            DF003.to_string() +
-            DF021.to_string() +
-            DF022.to_string() +
-            DF023.to_string() +
-            DF024.to_string() +
-            DF141.to_string() +
-            DF025.to_string() +
-            DF142.to_string() +
-            DF001_.to_string() +
-            DF026.to_string() +
-            DF364.to_string() +
-            DF027.to_string() ;
-
-    std::string message = build_message(data);
-    return message;
-}
 
 std::string Rtcm::print_MT1005( unsigned int ref_id, double ecef_x, double ecef_y, double ecef_z, bool gps, bool glonass, bool galileo, bool non_physical, bool single_oscillator, unsigned int quarter_cycle_indicator)
 {
diff --git a/src/tests/formats/rtcm_test.cc b/src/tests/formats/rtcm_test.cc
index f2257ca..8e7e674 100644
--- a/src/tests/formats/rtcm_test.cc
+++ b/src/tests/formats/rtcm_test.cc
@@ -168,13 +168,7 @@ TEST(Rtcm_Test, Test_MT1005)
 {
     auto rtcm = std::make_shared<Rtcm>();
     std::string reference_msg = rtcm->print_MT1005_test();
-
     std::string reference_msg2 = rtcm->print_MT1005(2003, 1114104.5999, -4850729.7108, 3975521.4643, true, false, false, false, false, 0);
-
-    EXPECT_EQ(0, reference_msg.compare(reference_msg2));
-
-    std::string reference_msg2 = rtcm->print_M1005(2003, 1114104.5999, -4850729.7108, 3975521.4643, true, false, false, false, false, 0);
-
     EXPECT_EQ(0, reference_msg.compare(reference_msg2));
 
     unsigned int ref_id;

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