Commit 8fbca870 authored by Manolis Surligas's avatar Manolis Surligas

Remove left over flowgraphs and files

parent 39bf8524
......@@ -142,12 +142,6 @@ option(INCLUDE_DEBUG_BLOCKS
########################################################################
# Find gr-satnogs external build dependencies
########################################################################
if(${INCLUDE_DEBUG_BLOCKS})
find_package(Nova)
if(NOT NOVA_FOUND)
message(FATAL_ERROR "libnova required to compile satnogs")
endif()
endif()
########################################################################
# Search for the libfec if it is already installed in the system
......
This diff is collapsed.
......@@ -21,9 +21,8 @@ include(GrPython)
GR_PYTHON_INSTALL(
PROGRAMS
upsat_transceiver_cli.py
satnogs_amsat_fox_duv_decoder.py
satnogs_noaa_apt_decoder.py
satnogs_meteor_decoder.py
DESTINATION bin
)
\ No newline at end of file
)
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
INCLUDE(FindPkgConfig)
PKG_CHECK_MODULES(PC_NOVA Nova)
FIND_PATH(
NOVA_INCLUDE_DIRS
NAMES libnova/libnova.h
HINTS $ENV{NOVA_DIR}/include
${PC_NOVA_INCLUDEDIR}
PATHS /usr/local/include
/usr/include
)
FIND_LIBRARY(
NOVA_LIBRARIES
NAMES nova
HINTS $ENV{NOVA_DIR}/lib
${PC_NOVA_LIBDIR}
PATHS /usr/local/lib
/usr/local/lib64
/usr/lib
/usr/lib64
)
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(NOVA DEFAULT_MSG NOVA_LIBRARIES NOVA_INCLUDE_DIRS)
MARK_AS_ADVANCED(NOVA_LIBRARIES NOVA_INCLUDE_DIRS)
\ No newline at end of file
......@@ -24,7 +24,6 @@ list(APPEND DEBUG_HEADER_FILES
morse_debug_source.h
debug_msg_source_raw.h
debug_msg_source.h
leo_channel.h
cw_encoder.h
)
......
This diff is collapsed.
......@@ -38,7 +38,6 @@ list(APPEND satnogs_debug_sources
morse_debug_source_impl.cc
debug_msg_source_impl.cc
debug_msg_source_raw_impl.cc
leo_channel_impl.cc
cw_encoder_impl.cc
)
list(APPEND satnogs_sources
......@@ -94,7 +93,6 @@ target_link_libraries(gnuradio-satnogs
gnuradio-blocks
gnuradio-digital
${CMAKE_THREAD_LIBS_INIT}
${NOVA_LIBRARIES}
${VOLK_LIBRARIES}
${OGGVORBIS_LIBRARIES}
${PNG_LIBRARIES}
......
/* -*- c++ -*- */
/*
* gr-satnogs: SatNOGS GNU Radio Out-Of-Tree Module
*
* Copyright (C) 2016, Libre Space Foundation <http://librespacefoundation.org/>
*
* 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
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program 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 program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <gnuradio/io_signature.h>
#include "leo_channel_impl.h"
namespace gr
{
namespace satnogs
{
leo_channel::sptr
leo_channel::make (const double freq, const double samp_rate,
const double sat_altitude, const double sat_inclination,
const size_t pass_duration_sec,
const size_t freq_shifts_per_sec)
{
return gnuradio::get_initial_sptr (
new leo_channel_impl (freq, freq_shifts_per_sec));
}
/*
* The private constructor
*/
leo_channel_impl::leo_channel_impl (const double freq,
const size_t freq_shifts_per_sec) :
gr::sync_block ("leo_channel",
gr::io_signature::make (1, 1, sizeof(gr_complex)),
gr::io_signature::make (1, 1, sizeof(gr_complex))),
d_freq (freq),
d_shifts_per_sec (freq_shifts_per_sec)
{
}
/*
* Our virtual destructor.
*/
leo_channel_impl::~leo_channel_impl ()
{
}
int
leo_channel_impl::work (int noutput_items,
gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items)
{
const gr_complex *in = (const gr_complex *) input_items[0];
gr_complex *out = (gr_complex *) output_items[0];
// Do <+signal processing+>
// Tell runtime system how many output items we produced.
return noutput_items;
}
} /* namespace satnogs */
} /* namespace gr */
/* -*- c++ -*- */
/*
* gr-satnogs: SatNOGS GNU Radio Out-Of-Tree Module
*
* Copyright (C) 2016, Libre Space Foundation <http://librespacefoundation.org/>
*
* 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
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program 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 program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef INCLUDED_SATNOGS_LEO_CHANNEL_IMPL_H
#define INCLUDED_SATNOGS_LEO_CHANNEL_IMPL_H
#include <satnogs/leo_channel.h>
#include <libnova/libnova.h>
namespace gr
{
namespace satnogs
{
class leo_channel_impl : public leo_channel
{
private:
const double d_freq;
const size_t d_shifts_per_sec;
public:
leo_channel_impl (const double freq, const size_t freq_shifts_per_sec);
~leo_channel_impl ();
// Where all the action really happens
int
work (int noutput_items, gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items);
};
} // namespace satnogs
} // namespace gr
#endif /* INCLUDED_SATNOGS_LEO_CHANNEL_IMPL_H */
......@@ -35,9 +35,7 @@ configure_file(satnogs_info.py.in ${CMAKE_BINARY_DIR}/satnogs_info.py
GR_PYTHON_INSTALL(
FILES
__init__.py
dsp_settings.py
hw_settings.py
satnogs_upsat_transmitter.py
utils.py
${CMAKE_BINARY_DIR}/satnogs_info.py
DESTINATION ${GR_PYTHON_DIR}/satnogs
......
......@@ -28,9 +28,7 @@ import sys
try:
# this might fail if the module is python-only
from satnogs_swig import *
from dsp_settings import *
from hw_settings import *
from satnogs_upsat_transmitter import *
from utils import *
except ImportError as err:
sys.stderr.write("Failed to import SatNOGS ({})\n".format(err))
......
#! /usr/bin/python
#
# gr-satnogs: SatNOGS GNU Radio Out-Of-Tree Module
#
# Copyright (C) 2016, Libre Space Foundation <http://librespacefoundation.org/>
#
# 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
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program 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 program. If not, see <http://www.gnu.org/licenses/>
#
#===============================================================================
# This file provides a variaty of settings for the flowgraphs
# based on the hardware SDR device that they are using
#===============================================================================
fm_demod_settings = {'usrpb200' : {'decimation_rx' : 5, 'audio_gain' : 0.9},
'usrp2' : {'decimation_rx' : 5, 'audio_gain' : 0.9},
'airspy' : {'decimation_rx' : 10, 'audio_gain' : 0.9},
'airspymini' : {'decimation_rx' : 5, 'audio_gain' : 0.9},
'hackrf' : {'decimation_rx' : 5, 'audio_gain' : 0.9},
'rtlsdr' : {'decimation_rx' : 5, 'audio_gain' : 0.9}
}
\ No newline at end of file
#! /usr/bin/python
import satnogs
import satnogs_swig
import math
from gnuradio import blocks
from gnuradio import filter
from gnuradio import analog
from gnuradio import gr
from gnuradio.filter import firdes
from gnuradio.gr.runtime_swig import sizeof_gr_complex
class satnogs_upsat_transmitter(gr.hier_block2):
def __init__(self,
frame_preamble,
sync_word,
append_crc,
whitening,
manchester,
msb_first,
ax25_format,
dest_addr,
dest_ssid,
src_addr,
src_ssid,
settling_samples,
samps_per_symbol,
interpolation_taps,
samp_rate,
lo_offset,
deviation,
baud_rate):
gr.hier_block2.__init__(self, "satnogs_upsat_transmitter",
gr.io_signature(0 , 0 , 0),
# Output 0: The complex TX signal for the SDR device
# Output 1: The constellation output for the vector analyzer
gr.io_signature(1, 1, sizeof_gr_complex))
self.frame_preamble = frame_preamble
self.sync_word = sync_word
self.append_crc = append_crc
self.whitening = whitening
self.manchester = manchester
self.msb_first = msb_first
self.ax25_format = ax25_format
self.dest_addr = dest_addr
self.dest_ssid = dest_ssid
self.src_addr = src_addr
self.src_ssid = src_ssid
self.settling_samples = settling_samples
self.samps_per_symbol = samps_per_symbol
self.interpolation_taps = interpolation_taps
self.samp_rate = samp_rate
self.lo_offset = lo_offset
self.deviation=deviation
self.baud_rate=baud_rate
self.message_port_register_hier_out("in")
self.modulation_index = self.deviation/(self.baud_rate / 2.0)
self.sensitivity = (math.pi*self.modulation_index) / self.samps_per_symbol
self.resampling_rate = self.samp_rate / (self.baud_rate*self.samps_per_symbol )
self.par_taps = filter.firdes.low_pass_2(32, 32, 0.8, 0.1, 60)
self.num_filters = 32
#=================================================================
# TX Related blocks
#=================================================================
self.fsk_frame_encoder = satnogs_swig.upsat_fsk_frame_encoder(self.frame_preamble,
self.sync_word,
self.append_crc,
self.whitening,
self.manchester,
self.msb_first,
self.ax25_format,
self.dest_addr,
self.dest_ssid,
self.src_addr,
self.src_ssid,
self.settling_samples
)
self.interp_fir_filter = filter.interp_fir_filter_fff(self.samps_per_symbol,
self.interpolation_taps
)
self.frequency_modulator = analog.frequency_modulator_fc(self.sensitivity)
self.signal_source = analog.sig_source_c(self.samp_rate,
102,
self.lo_offset,
1,
0)
self.polyphase_arbitrary_resampler = filter.pfb_arb_resampler_ccf(self.resampling_rate,
self.par_taps,
self.num_filters)
self.multiply = blocks.multiply_cc(1)
#=================================================================
# Connections
#=================================================================
self.msg_connect((self, "in"), (self.fsk_frame_encoder, "pdu"))
self.connect((self.fsk_frame_encoder, 0), (self.interp_fir_filter, 0))
self.connect((self.interp_fir_filter, 0), (self.frequency_modulator, 0))
self.connect((self.frequency_modulator, 0), (self.polyphase_arbitrary_resampler, 0))
self.connect((self.signal_source, 0) , (self.multiply, 0))
self.connect((self.polyphase_arbitrary_resampler, 0) , (self.multiply, 1))
self.connect((self.multiply, 0), self)
......@@ -12,7 +12,6 @@
#include "satnogs/morse_debug_source.h"
#include "satnogs/debug_msg_source.h"
#include "satnogs/debug_msg_source_raw.h"
#include "satnogs/leo_channel.h"
#include "satnogs/cw_encoder.h"
%}
......@@ -25,8 +24,5 @@ GR_SWIG_BLOCK_MAGIC2(satnogs, debug_msg_source);
%include "satnogs/debug_msg_source_raw.h"
GR_SWIG_BLOCK_MAGIC2(satnogs, debug_msg_source_raw);
%include "satnogs/leo_channel.h"
GR_SWIG_BLOCK_MAGIC2(satnogs, leo_channel);
%include "satnogs/cw_encoder.h"
GR_SWIG_BLOCK_MAGIC2(satnogs, cw_encoder);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment