diff options
Diffstat (limited to 'src/fig')
| -rw-r--r-- | src/fig/FIG0.h | 3 | ||||
| -rw-r--r-- | src/fig/FIG0_7.cpp | 74 | ||||
| -rw-r--r-- | src/fig/FIG0_7.h | 51 | ||||
| -rw-r--r-- | src/fig/FIGCarousel.cpp | 4 | ||||
| -rw-r--r-- | src/fig/FIGCarousel.h | 2 |
5 files changed, 131 insertions, 3 deletions
diff --git a/src/fig/FIG0.h b/src/fig/FIG0.h index 856b5ee..0076cf4 100644 --- a/src/fig/FIG0.h +++ b/src/fig/FIG0.h @@ -3,7 +3,7 @@ 2011, 2012 Her Majesty the Queen in Right of Canada (Communications Research Center Canada) - Copyright (C) 2017 + Copyright (C) 2020 Matthias P. Braendli, matthias.braendli@mpb.li */ /* @@ -32,6 +32,7 @@ #include "fig/FIG0_3.h" #include "fig/FIG0_5.h" #include "fig/FIG0_6.h" +#include "fig/FIG0_7.h" #include "fig/FIG0_8.h" #include "fig/FIG0_9.h" #include "fig/FIG0_10.h" diff --git a/src/fig/FIG0_7.cpp b/src/fig/FIG0_7.cpp new file mode 100644 index 0000000..e6df66b --- /dev/null +++ b/src/fig/FIG0_7.cpp @@ -0,0 +1,74 @@ +/* + Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, + 2011, 2012 Her Majesty the Queen in Right of Canada (Communications + Research Center Canada) + + Copyright (C) 2020 + Matthias P. Braendli, matthias.braendli@mpb.li + Mathias Kuntze, mathias@kuntze.email + */ +/* + This file is part of ODR-DabMux. + + ODR-DabMux is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + ODR-DabMux is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. +*/ + +#include "fig/FIG0structs.h" +#include "fig/FIG0_7.h" +#include "utils.h" + +namespace FIC { + +struct FIGtype0_7 { + uint8_t Length:5; + uint8_t FIGtypeNumber:3; + uint8_t Extension:5; + uint8_t PD:1; + uint8_t OE:1; + uint8_t CN:1; + + uint8_t ReconfigCounter_high:2; + uint8_t ServiceCount:6; + uint8_t ReconfigCounter_low:8; +} PACKED; + +//=========== FIG 0/0 =========== + +FillStatus FIG0_7::fill(uint8_t *buf, size_t max_size) +{ + FillStatus fs; + + FIGtype0_7 *fig0_7; + fig0_7 = (FIGtype0_7 *)buf; + + fig0_7->FIGtypeNumber = 0; + fig0_7->Length = 3; + fig0_7->CN = 0; + fig0_7->OE = 0; + fig0_7->PD = 0; + fig0_7->Extension = 7; + + auto ensemble = m_rti->ensemble; + + fig0_7->ServiceCount = ensemble->services.size(); + fig0_7->ReconfigCounter_high = (ensemble->reconfig_counter % 1024) / 256; + fig0_7->ReconfigCounter_low = (ensemble->reconfig_counter % 1024) % 256; + + fs.complete_fig_transmitted = true; + fs.num_bytes_written = 4; + return fs; +} + +} + diff --git a/src/fig/FIG0_7.h b/src/fig/FIG0_7.h new file mode 100644 index 0000000..30de3dc --- /dev/null +++ b/src/fig/FIG0_7.h @@ -0,0 +1,51 @@ +/* + Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, + 2011, 2012 Her Majesty the Queen in Right of Canada (Communications + Research Center Canada) + + Copyright (C) 2020 + Matthias P. Braendli, matthias.braendli@mpb.li + Mathisd Kuntze, mathias@kuntze.email + */ +/* + This file is part of ODR-DabMux. + + ODR-DabMux is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + ODR-DabMux is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with ODR-DabMux. If not, see <http://www.gnu.org/licenses/>. +*/ + +#pragma once + +#include <cstdint> +#include <map> + +namespace FIC { + +// FIG type 0/7, Configuration Info (MCI), +// Service Number information +class FIG0_7 : public IFIG +{ + public: + FIG0_7(FIGRuntimeInformation* rti) : + m_rti(rti) {} + virtual FillStatus fill(uint8_t *buf, size_t max_size); + virtual FIG_rate repetition_rate() const { return FIG_rate::FIG0_0; } + + virtual int figtype() const { return 0; } + virtual int figextension() const { return 7; } + + private: + FIGRuntimeInformation *m_rti; +}; + +} diff --git a/src/fig/FIGCarousel.cpp b/src/fig/FIGCarousel.cpp index 8ea183c..bb5e79b 100644 --- a/src/fig/FIGCarousel.cpp +++ b/src/fig/FIGCarousel.cpp @@ -3,7 +3,7 @@ 2011, 2012 Her Majesty the Queen in Right of Canada (Communications Research Center Canada) - Copyright (C) 2017 + Copyright (C) 2020 Matthias P. Braendli, matthias.braendli@mpb.li Implementation of the FIG carousel to schedule the FIGs into the @@ -82,6 +82,7 @@ FIGCarousel::FIGCarousel(std::shared_ptr<dabEnsemble> ensemble) : m_fig0_3(&m_rti), m_fig0_5(&m_rti), m_fig0_6(&m_rti), + m_fig0_7(&m_rti), m_fig0_17(&m_rti), m_fig0_8(&m_rti), m_fig1_0(&m_rti), @@ -114,6 +115,7 @@ FIGCarousel::FIGCarousel(std::shared_ptr<dabEnsemble> ensemble) : * FIG 0/7 have a defined location in the FIC. */ load_and_allocate(m_fig0_0, FIBAllocation::FIB0); + load_and_allocate(m_fig0_7, FIBAllocation::FIB0); load_and_allocate(m_fig0_1, FIBAllocation::FIB_ANY); load_and_allocate(m_fig0_2, FIBAllocation::FIB_ANY); load_and_allocate(m_fig0_3, FIBAllocation::FIB_ANY); diff --git a/src/fig/FIGCarousel.h b/src/fig/FIGCarousel.h index a07a855..bdb9481 100644 --- a/src/fig/FIGCarousel.h +++ b/src/fig/FIGCarousel.h @@ -3,7 +3,7 @@ 2011, 2012 Her Majesty the Queen in Right of Canada (Communications Research Center Canada) - Copyright (C) 2017 + Copyright (C) 2020 Matthias P. Braendli, matthias.braendli@mpb.li Implementation of the FIG carousel to schedule the FIGs into the |