@@ -527,9 +527,9 @@ unsigned int CAMBEFEC::regenerateDMR(unsigned char* bytes) const
527
527
c3 |= MASK;
528
528
}
529
529
530
- unsigned int errors = regenerateDMR (a1, b1);
531
- errors += regenerateDMR (a2, b2);
532
- errors += regenerateDMR (a3, b3);
530
+ unsigned int errors = regenerateDMR (a1, b1, c1 );
531
+ errors += regenerateDMR (a2, b2, c2 );
532
+ errors += regenerateDMR (a3, b3, c3 );
533
533
534
534
MASK = 0x800000U ;
535
535
for (unsigned int i = 0U ; i < 24U ; i++, MASK >>= 1 ) {
@@ -633,7 +633,7 @@ unsigned int CAMBEFEC::regenerateYSFDN(unsigned char* bytes) const
633
633
c |= MASK;
634
634
}
635
635
636
- unsigned int errors = regenerateDMR (a, b);
636
+ unsigned int errors = regenerateDMR (a, b, c );
637
637
638
638
MASK = 0x800000U ;
639
639
for (unsigned int i = 0U ; i < 24U ; i++, MASK >>= 1 ) {
@@ -827,7 +827,7 @@ unsigned int CAMBEFEC::regenerateDStar(unsigned int& a, unsigned int& b) const
827
827
return errsA + errsB;
828
828
}
829
829
830
- unsigned int CAMBEFEC::regenerateDMR (unsigned int & a, unsigned int & b) const
830
+ unsigned int CAMBEFEC::regenerateDMR (unsigned int & a, unsigned int & b, unsigned int & c ) const
831
831
{
832
832
unsigned int orig_a = a;
833
833
unsigned int orig_b = b;
@@ -861,5 +861,11 @@ unsigned int CAMBEFEC::regenerateDMR(unsigned int& a, unsigned int& b) const
861
861
errsB++;
862
862
}
863
863
864
+ if (errsA >= 4U || ((errsA + errsB) >= 6U && errsA >= 2U )) {
865
+ a = 0xF00292U ;
866
+ b = 0x0E0B20U ;
867
+ c = 0x000000U ;
868
+ }
869
+
864
870
return errsA + errsB;
865
871
}
0 commit comments