combine 3.7 and 3.8

grc/CMakeLists.txt

@@ -50,5 +50,7 @@ install(FILES
     lilacsat_vitfilt27_bb.block.yml
     lilacsat_vitfilt27_fb.block.yml
     lilacsat_ccsds_ssdv_encode.block.yml
-    lilacsat_ccsds_ssdv_decode.block.yml DESTINATION share/gnuradio/grc/blocks
+    lilacsat_ccsds_ssdv_decode.block.yml
+    lilacsat_ccsds_afsk_decode.xml
+    lilacsat_ccsds_afsk_encode.xml DESTINATION share/gnuradio/grc/blocks
 )

grc/lilacsat_ccsds_ssdv_decode.block.yml → grc/lilacsat_ccsds_afsk_decode.block.yml

@@ -1,11 +1,17 @@
-id: lilacsat_ccsds_ssdv_decode
-label: CCSDS SSDV Decode
+id: lilacsat_ccsds_afsk_decode
+label: CCSDS AFSK Decode
 category: '[Lilacsat]'
 templates:
   imports: import lilacsat
-  make: lilacsat.ccsds_ssdv_decode(${frame_len}, ${using_m}, ${using_convolutional_code},
+  make: lilacsat.ccsds_afsk_decode(${bitrate}, ${frame_len}, ${using_m}, ${using_convolutional_code},
     ${pass_all})
 parameters:
+- id: bitrate
+  label: Bitrate
+  dtype: enum
+  default: '1200'
+  options: ['1200', '2400', '24001']
+  option_labels: ['1200', '2400 (fc = 1800)', '2400 (fc = 1650)']
 - id: frame_len
   label: Frame Length
   dtype: int

grc/lilacsat_ccsds_ssdv_encode.block.yml → grc/lilacsat_ccsds_afsk_encode.block.yml

@@ -1,11 +1,17 @@
-id: lilacsat_ccsds_ssdv_encode
-label: CCSDS SSDV Encode
+id: lilacsat_ccsds_afsk_encode
+label: CCSDS AFSK Encode
 category: '[Lilacsat]'
 templates:
   imports: import lilacsat
-  make: lilacsat.ccsds_ssdv_encode(${frame_len}, ${preamble_len}, ${trailer_len},
+  make: lilacsat.ccsds_afsk_encode(${bitrate}, ${frame_len}, ${preamble_len}, ${trailer_len},
     ${continous}, ${padding_zero}, ${using_m}, ${using_convolutional_code})
 parameters:
+- id: bitrate
+  label: Bitrate
+  dtype: enum
+  default: '1200'
+  options: ['1200', '2400', '24001']
+  option_labels: ['1200', '2400 (fc = 1800)', '2400 (fc = 1650)']
 - id: frame_len
   label: Frame Length
   dtype: int

include/lilacsat/ccsds_ssdv_decode.h → include/lilacsat/ccsds_afsk_decode.h

@@ -1,25 +1,26 @@
 /* -*- c++ -*- */
-/*
- * Copyright 2021 gr-lilacsat author.
- *
+/* 
+ * Copyright 2022 <+YOU OR YOUR COMPANY+>.
+ * 
  * This 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, or (at your option)
  * any later version.
- *
+ * 
  * This software 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 this software; see the file COPYING.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street,
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef INCLUDED_LILACSAT_CCSDS_SSDV_DECODE_H
-#define INCLUDED_LILACSAT_CCSDS_SSDV_DECODE_H
+
+#ifndef INCLUDED_LILACSAT_CCSDS_AFSK_DECODE_H
+#define INCLUDED_LILACSAT_CCSDS_AFSK_DECODE_H
 
 #include <lilacsat/api.h>
 #include <gnuradio/sync_block.h>
@@ -32,24 +33,24 @@ namespace gr {
      * \ingroup lilacsat
      *
      */
-    class LILACSAT_API ccsds_ssdv_decode : virtual public gr::sync_block
+    class LILACSAT_API ccsds_afsk_decode : virtual public gr::sync_block
     {
      public:
-      typedef boost::shared_ptr<ccsds_ssdv_decode> sptr;
+      typedef boost::shared_ptr<ccsds_afsk_decode> sptr;
 
       /*!
-       * \brief Return a shared_ptr to a new instance of lilacsat::ccsds_ssdv_decode.
+       * \brief Return a shared_ptr to a new instance of lilacsat::ccsds_afsk_decode.
        *
-       * To avoid accidental use of raw pointers, lilacsat::ccsds_ssdv_decode's
+       * To avoid accidental use of raw pointers, lilacsat::ccsds_afsk_decode's
        * constructor is in a private implementation
-       * class. lilacsat::ccsds_ssdv_decode::make is the public interface for
+       * class. lilacsat::ccsds_afsk_decode::make is the public interface for
        * creating new instances.
        */
-      static sptr make(int frame_len, bool using_m, bool using_convolutional_code, bool pass_all);
+      static sptr make(int bitrate, int frame_len, bool using_m, bool using_convolutional_code, bool pass_all);
     };
 
   } // namespace lilacsat
 } // namespace gr
 
-#endif /* INCLUDED_LILACSAT_CCSDS_SSDV_DECODE_H */
+#endif /* INCLUDED_LILACSAT_CCSDS_AFSK_DECODE_H */
 

include/lilacsat/ccsds_ssdv_encode.h → include/lilacsat/ccsds_afsk_encode.h

@@ -1,25 +1,26 @@
 /* -*- c++ -*- */
-/*
- * Copyright 2021 gr-lilacsat author.
- *
+/* 
+ * Copyright 2022 <+YOU OR YOUR COMPANY+>.
+ * 
  * This 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, or (at your option)
  * any later version.
- *
+ * 
  * This software 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 this software; see the file COPYING.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street,
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef INCLUDED_LILACSAT_CCSDS_SSDV_ENCODE_H
-#define INCLUDED_LILACSAT_CCSDS_SSDV_ENCODE_H
+
+#ifndef INCLUDED_LILACSAT_CCSDS_AFSK_ENCODE_H
+#define INCLUDED_LILACSAT_CCSDS_AFSK_ENCODE_H
 
 #include <lilacsat/api.h>
 #include <gnuradio/sync_block.h>
@@ -32,24 +33,24 @@ namespace gr {
      * \ingroup lilacsat
      *
      */
-    class LILACSAT_API ccsds_ssdv_encode : virtual public gr::sync_block
+    class LILACSAT_API ccsds_afsk_encode : virtual public gr::sync_block
     {
      public:
-      typedef boost::shared_ptr<ccsds_ssdv_encode> sptr;
+      typedef boost::shared_ptr<ccsds_afsk_encode> sptr;
 
       /*!
-       * \brief Return a shared_ptr to a new instance of lilacsat::ccsds_ssdv_encode.
+       * \brief Return a shared_ptr to a new instance of lilacsat::ccsds_afsk_encode.
        *
-       * To avoid accidental use of raw pointers, lilacsat::ccsds_ssdv_encode's
+       * To avoid accidental use of raw pointers, lilacsat::ccsds_afsk_encode's
        * constructor is in a private implementation
-       * class. lilacsat::ccsds_ssdv_encode::make is the public interface for
+       * class. lilacsat::ccsds_afsk_encode::make is the public interface for
        * creating new instances.
        */
-      static sptr make(int frame_len, int preamble_len, int trailer_len, bool continous, bool padding_zero, bool using_m, bool using_convolutional_code);
+      static sptr make(int bitrate, int frame_len, int preamble_len, int trailer_len, bool continous, bool padding_zero, bool using_m, bool using_convolutional_code);
     };
 
   } // namespace lilacsat
 } // namespace gr
 
-#endif /* INCLUDED_LILACSAT_CCSDS_SSDV_ENCODE_H */
+#endif /* INCLUDED_LILACSAT_CCSDS_AFSK_ENCODE_H */
 

include/lilacsat/sync_det_b.h

@@ -46,7 +46,7 @@ namespace gr {
        * class. lilacsat::sync_det_b::make is the public interface for
        * creating new instances.
        */
-      static sptr make(uint32_t sync_word, uint8_t len, uint8_t nrz, uint8_t descrambling);
+      static sptr make(uint32_t sync_word, uint32_t len, uint8_t nrz, uint8_t descrambling);
     };
 
   } // namespace lilacsat

swig/lilacsat_swig.i

@@ -39,8 +39,8 @@
 #include "lilacsat/two_bit_dpd_precoder.h"
 #include "lilacsat/vitfilt27_bb.h"
 #include "lilacsat/vitfilt27_fb.h"
-#include "lilacsat/ccsds_ssdv_encode.h"
-#include "lilacsat/ccsds_ssdv_decode.h"
+#include "lilacsat/ccsds_afsk_decode.h"
+#include "lilacsat/ccsds_afsk_encode.h"
 %}
 
 %include "lilacsat/afsk1200_rx_f.h"
@@ -108,7 +108,8 @@ GR_SWIG_BLOCK_MAGIC2(lilacsat, vitfilt27_bb);
 %include "lilacsat/vitfilt27_fb.h"
 GR_SWIG_BLOCK_MAGIC2(lilacsat, vitfilt27_fb);
 
-%include "lilacsat/ccsds_ssdv_encode.h"
-GR_SWIG_BLOCK_MAGIC2(lilacsat, ccsds_ssdv_encode);
-%include "lilacsat/ccsds_ssdv_decode.h"
-GR_SWIG_BLOCK_MAGIC2(lilacsat, ccsds_ssdv_decode);
+
+%include "lilacsat/ccsds_afsk_decode.h"
+GR_SWIG_BLOCK_MAGIC2(lilacsat, ccsds_afsk_decode);
+%include "lilacsat/ccsds_afsk_encode.h"
+GR_SWIG_BLOCK_MAGIC2(lilacsat, ccsds_afsk_encode);