Changeset 8182 in ntrip for trunk/BNC/src/RTCM3/ephEncoder.cpp


Ignore:
Timestamp:
Nov 17, 2017, 10:46:47 AM (5 years ago)
Author:
stuerze
Message:

RTCM MT 1020 ephemeris parameter are now completed

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/RTCM3/ephEncoder.cpp

    r7849 r8182  
    123123  GLONASSADDBITS(6, eph._prn.number())
    124124  GLONASSADDBITS(5, 7+eph._frequency_number)
    125   GLONASSADDBITS(1, 0)
    126   GLONASSADDBITS(1, 0)
    127   GLONASSADDBITS(2, 0)
     125  GLONASSADDBITS(1, eph._almanac_health)
     126  GLONASSADDBITS(1, eph._almanac_health_availablility_indicator)
     127  GLONASSADDBITS(2, eph._P1)
    128128  int tki = static_cast<int>(eph._tki)+3*60*60;
    129129  if (tki > 86400) {tki -= 86400;}
     
    132132  GLONASSADDBITS(1, (static_cast<int>(tki)/30)%30)
    133133  GLONASSADDBITS(1, eph._health)
    134   GLONASSADDBITS(1, 0)
     134  GLONASSADDBITS(1, eph._P2)
    135135  unsigned long long timeofday = (static_cast<int>(eph._tt.gpssec()+3*60*60-eph._gps_utc)%86400);
    136136  GLONASSADDBITS(7, timeofday/60/15)
     
    144144  GLONASSADDBITSFLOATM(27,eph._z_pos*1000, 1000.0/static_cast<double>(1<<11))
    145145  GLONASSADDBITSFLOATM(5, eph._z_acceleration*1000, 1000.0/static_cast<double>(1<<30))
    146   GLONASSADDBITS(1, 0)
    147   GLONASSADDBITSFLOATM(11, eph._gamma, 1.0/static_cast<double>(1<<30)
    148   /static_cast<double>(1<<10))
    149   GLONASSADDBITS(2, 0) /* GLONASS-M P */
    150   GLONASSADDBITS(1, 0) /* GLONASS-M ln(3) */
     146  GLONASSADDBITS(1, eph._P3)
     147  GLONASSADDBITSFLOATM(11, eph._gamma, 1.0/static_cast<double>(1<<30)/static_cast<double>(1<<10))
     148  GLONASSADDBITS(2, eph._M_P) /* GLONASS-M P */
     149  GLONASSADDBITS(1, eph._M_l3) /* GLONASS-M ln(3) */
    151150  GLONASSADDBITSFLOATM(22, eph._tau, 1.0/static_cast<double>(1<<30))
    152   GLONASSADDBITS(5, 0) /* GLONASS-M delta tau */
     151  GLONASSADDBITSFLOATM(5, eph._M_delta_tau, 1.0/static_cast<double>(1<<30)) /* GLONASS-M delta tau */
    153152  GLONASSADDBITS(5, eph._E)
    154   GLONASSADDBITS(1, 0) /* GLONASS-M P4 */
    155   GLONASSADDBITS(4, 0) /* GLONASS-M FT */
    156   GLONASSADDBITS(11, 0) /* GLONASS-M NT */
    157   GLONASSADDBITS(2, 0) /* GLONASS-M active? */
    158   GLONASSADDBITS(1, 0) /* GLONASS additional data */
    159   GLONASSADDBITS(11, 0) /* GLONASS NA */
    160   GLONASSADDBITS(32, 0) /* GLONASS tau C */
    161   GLONASSADDBITS(5, 0) /* GLONASS-M N4 */
    162   GLONASSADDBITS(22, 0) /* GLONASS-M tau GPS */
    163   GLONASSADDBITS(1, 0) /* GLONASS-M ln(5) */
     153  GLONASSADDBITS(1, eph._M_P4) /* GLONASS-M P4 */
     154  GLONASSADDBITS(4, eph._M_FT) /* GLONASS-M FT */
     155  GLONASSADDBITS(11, eph._M_NT) /* GLONASS-M NT */
     156  GLONASSADDBITS(2, eph._M_M) /* GLONASS-M active? */
     157  GLONASSADDBITS(1, eph._additional_data_availability) /* GLONASS additional data */
     158  GLONASSADDBITS(11, eph._NA) /* GLONASS NA */
     159  GLONASSADDBITSFLOATM(32, eph._tauC, 1.0/static_cast<double>(1<<30)/static_cast<double>(1<<1)) /* GLONASS tau C */
     160  GLONASSADDBITS(5, eph._M_N4) /* GLONASS-M N4 */
     161  GLONASSADDBITSFLOATM(22, eph._M_tau_GPS, 1.0/static_cast<double>(1<<30)) /* GLONASS-M tau GPS */
     162  GLONASSADDBITS(1, eph._M_l5) /* GLONASS-M ln(5) */
    164163  GLONASSADDBITS(7, 0) /* Reserved */
    165164
Note: See TracChangeset for help on using the changeset viewer.