refactor interleave and puncture tables; fix blatent offset error;

nxdn/channel/CAC.cpp

@@ -46,7 +46,7 @@ using namespace nxdn::channel;
 //  Constants
 // ---------------------------------------------------------------------------
 
-const uint32_t INTERLEAVE_TABLE_OUT[] = {
+const uint8_t INTERLEAVE_TABLE_OUT[] = {
     0U,  25U, 50U, 75U, 100U, 125U, 150U, 175U, 200U, 225U, 250U, 275U,
     1U,  26U, 51U, 76U, 101U, 126U, 151U, 176U, 201U, 226U, 251U, 276U,
     2U,  27U, 52U, 77U, 102U, 127U, 152U, 177U, 202U, 227U, 252U, 277U,
@@ -73,7 +73,7 @@ const uint32_t INTERLEAVE_TABLE_OUT[] = {
     23U, 48U, 73U, 98U, 123U, 148U, 173U, 198U, 223U, 248U, 273U, 298U,
     24U, 49U, 74U, 99U, 124U, 149U, 174U, 199U, 224U, 249U, 274U, 299U };
 
-const uint32_t INTERLEAVE_TABLE_IN[] = {
+const uint8_t INTERLEAVE_TABLE_IN[] = {
     0U,  21U, 42U, 63U, 84U,  105U, 126U, 147U, 168U, 189U, 210U, 231U,
     1U,  22U, 43U, 64U, 85U,  106U, 127U, 148U, 169U, 190U, 211U, 232U,
     2U,  23U, 44U, 65U, 86U,  107U, 128U, 149U, 170U, 191U, 212U, 233U,
@@ -96,7 +96,15 @@ const uint32_t INTERLEAVE_TABLE_IN[] = {
     19U, 40U, 61U, 82U, 103U, 124U, 145U, 166U, 187U, 208U, 229U, 250U,
     20U, 41U, 62U, 83U, 104U, 125U, 146U, 167U, 188U, 209U, 230U, 251U };
 
-const uint32_t PUNCTURE_LIST_OUT[] = { 
+const uint8_t PUNCTURE_LIST_LONG_IN[] = {
+    1U, 7U, 9U, 11U, 19U, 27U, 33U, 35U, 37U, 45U,
+    53U, 59U, 61U, 63U, 71U, 79U, 85U, 87U, 89U, 97U,
+    105U, 111U, 113U, 115U, 123U, 131U, 137U, 139U, 141U, 149U,
+    157U, 163U, 165U, 167U, 175U, 183U, 189U, 191U, 193U, 201U,
+    209U, 215U, 217U, 219U, 227U, 235U, 241U, 243U, 245U, 253U,
+    261U, 267U, 269U, 271U, 279U, 287U, 293U, 295U, 297U, 305U };
+
+const uint8_t PUNCTURE_LIST_OUT[] = {
     3U, 11U, 17U, 25U, 31U, 39U, 45U, 53U, 59U, 67U,
     73U, 81U, 87U, 95U, 101U, 109U, 115U, 123U, 129U, 137U,
     143U, 151U, 157U, 165U, 171U, 179U, 185U, 193U, 199U, 207U,
@@ -296,14 +304,14 @@ void CAC::encode(uint8_t* data) const
     uint32_t offset = NXDN_FSW_LENGTH_BITS + NXDN_LICH_LENGTH_BITS + NXDN_CAC_OUT_FEC_LENGTH_BITS;
     for (uint32_t i = 0U; i < NXDN_E_POST_FIELD_BITS; i++, offset++) {
         bool b = READ_BIT(control, i);
-        WRITE_BIT(data, offset + i, b);
+        WRITE_BIT(data, offset, b);
     }
 
     // post field
     offset = NXDN_FSW_LENGTH_BITS + NXDN_LICH_LENGTH_BITS + NXDN_CAC_OUT_FEC_LENGTH_BITS + NXDN_E_POST_FIELD_BITS;
     for (uint32_t i = 0U; i < NXDN_E_POST_FIELD_BITS; i++, offset++) {
         bool b = READ_BIT(POST_FIELD, i);
-        WRITE_BIT(data, offset + i, b);
+        WRITE_BIT(data, offset, b);
     }
 }