Index: trunk/rtcm3torinex/lib/rtcm3torinex.c
===================================================================
--- trunk/rtcm3torinex/lib/rtcm3torinex.c	(revision 2848)
+++ trunk/rtcm3torinex/lib/rtcm3torinex.c	(revision 2849)
@@ -1330,5 +1330,6 @@
                   if(dop[count] > -1.6384)
                   {
-                    gnss->measdata[num][cd.typeD] = dop[count]+rdop[numsat];
+                    gnss->measdata[num][cd.typeD] = (dop[count]
+                    +rdop[numsat])/wl;
                     gnss->dataflags[num] |= (1<<cd.typeD);
                   }
@@ -1342,5 +1343,5 @@
                   }
 
-                  if(wl && cp[count] > -2055.0)
+                  if(wl && cp[count] > -2048.0)
                   {
                     gnss->measdata[num][cd.typeP] = cp[count]
@@ -1365,5 +1366,5 @@
                   }
 
-                  if(wl && cp[count] > -2055.0)
+                  if(wl && cp[count] > -2048.0)
                   {
                     gnss->measdata[num][cd.typeP] = cp[count]
@@ -1382,5 +1383,6 @@
                   if(dop[count] > -1.6384)
                   {
-                    gnss->measdata[num][cd.typeD] = dop[count]+rdop[numsat];
+                    gnss->measdata[num][cd.typeD] = (dop[count]
+                    +rdop[numsat])/wl;
                     gnss->dataflags[num] |= (1<<cd.typeD);
                   }
Index: trunk/rtcm3torinex/lib/rtcm3torinex.h
===================================================================
--- trunk/rtcm3torinex/lib/rtcm3torinex.h	(revision 2848)
+++ trunk/rtcm3torinex/lib/rtcm3torinex.h	(revision 2849)
@@ -43,6 +43,6 @@
 #define PRN_GLONASS_NUM           (PRN_GLONASS_END-PRN_GLONASS_START+1)
 
-#define RTCM3_MSM_NUMSIG      24
-#define RTCM3_MSM_NUMSAT      40
+#define RTCM3_MSM_NUMSIG      32
+#define RTCM3_MSM_NUMSAT      64
 #define RTCM3_MSM_NUMCELLS    64