From ef07f3c035c766e05804b85f0344dee758237251 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Sun, 18 Oct 2020 23:00:16 +0100 Subject: [PATCH] Update the puncturing tables. --- M17Convolution.cpp | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/M17Convolution.cpp b/M17Convolution.cpp index 166348d..a3d06ba 100644 --- a/M17Convolution.cpp +++ b/M17Convolution.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2016,2018 by Jonathan Naylor G4KLX + * Copyright (C) 2009-2016,2018,2020 by Jonathan Naylor G4KLX * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -23,19 +23,18 @@ #include #include -const unsigned int PUNCTURE_LIST_LINK_SETUP[] = { 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, - 213U, 221U, 227U, 235U, 241U, 249U, 255U, 263U, 269U, 277U, - 283U, 291U, 297U, 305U, 311U, 319U, 325U, 333U, 339U, 347U, - 353U, 361U, 367U, 375U, 381U, 389U, 395U, 403U }; +const unsigned int PUNCTURE_LIST_LINK_SETUP[] = { + 3U, 6U, 9U, 12U, 19U, 22U, 25U, 28U, 35U, 38U, 41U, 44U, 51U, 54U, 57U, 64U, 67U, 70U, 73U, 80U, 83U, 86U, 89U, 96U, 99U, 102U, + 105U, 112U, 115U, 118U, 125U, 128U, 131U, 134U, 141U, 144U, 147U, 150U, 157U, 160U, 163U, 166U, 173U, 176U, 179U, 186U, 189U, + 192U, 195U, 202U, 205U, 208U, 211U, 218U, 221U, 224U, 227U, 234U, 237U, 240U, 247U, 250U, 253U, 256U, 263U, 266U, 269U, 272U, + 279U, 282U, 285U, 288U, 295U, 298U, 301U, 308U, 311U, 314U, 317U, 324U, 327U, 330U, 333U, 340U, 343U, 346U, 349U, 356U, 359U, + 362U, 369U, 372U, 375U, 378U, 385U, 388U, 391U, 394U, 401U, 404U, 407U, 410U, 417U, 420U, 423U, 430U, 433U, 436U, 439U, 446U, + 449U, 452U, 455U, 462U, 465U, 468U, 471U, 478U, 481U, 484U}; -const unsigned int PUNCTURE_LIST_DATA[] = { 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, - 213U, 221U, 227U, 235U, 241U, 249U, 255U, 263U, 269U, 277U, - 283U, 291U, 297U, 305U, 311U, 319U, 325U, 333U, 339U, 347U, - 353U, 361U, 367U, 375U, 381U, 389U, 395U, 403U }; +const unsigned int PUNCTURE_LIST_DATA[] = { + 5U, 11U, 17U, 20U, 23U, 29U, 35U, 46U, 52U, 58U, 61U, 64U, 70U, 76U, 87U, 93U, 99U, 102U, 105U, 111U, 117U, 128U, 134U, 140U, + 143U, 146U, 152U, 158U, 169U, 175U, 181U, 184U, 187U, 193U, 199U, 210U, 216U, 222U, 225U, 228U, 234U, 240U, 251U, 257U, 263U, + 266U, 269U, 275U, 281U, 292U, 298U, 304U, 307U, 310U, 316U, 322U}; const unsigned char BIT_MASK_TABLE[] = {0x80U, 0x40U, 0x20U, 0x10U, 0x08U, 0x04U, 0x02U, 0x01U};