sebastian
/
gr-satnogs
mirror of https://gitlab.com/LongHairedHacker/gr-satnogs.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Change the waterfall palette 

* Change the waterfall palette
* OGG output file at the FM demod flowgraph
This commit is contained in:
Manolis Surligas 2017-02-03 16:46:12 +02:00
parent ec0549f98d
commit 6c80475700
3 changed files with 62 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
apps/flowgraphs/fm_demod.grc
View File

@ -451,53 +451,6 @@ TX sampling rate</value>
<value>ccc</value>
</param>
</block>
<block>
<key>blocks_wavfile_sink</key>
<param>
<key>bits_per_sample</key>
<value>16</value>
</param>
<param>
<key>alias</key>
<value></value>
</param>
<param>
<key>comment</key>
<value></value>
</param>
<param>
<key>affinity</key>
<value></value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
<key>file</key>
<value>file_path</value>
</param>
<param>
<key>_coordinate</key>
<value>(1088, 664)</value>
</param>
<param>
<key>_rotation</key>
<value>0</value>
</param>
<param>
<key>id</key>
<value>blocks_wavfile_sink_0</value>
</param>
<param>
<key>nchan</key>
<value>1</value>
</param>
<param>
<key>samp_rate</key>
<value>audio_samp_rate</value>
</param>
</block>
<block>
<key>parameter</key>
<param>
@ -2270,6 +2223,49 @@ we shift the LO a little further</value>
<value>rx_freq</value>
</param>
</block>
<block>
<key>satnogs_ogg_encoder</key>
<param>
<key>alias</key>
<value></value>
</param>
<param>
<key>comment</key>
<value></value>
</param>
<param>
<key>affinity</key>
<value></value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
<key>filename</key>
<value>file_path</value>
</param>
<param>
<key>_coordinate</key>
<value>(920, 548)</value>
</param>
<param>
<key>_rotation</key>
<value>180</value>
</param>
<param>
<key>id</key>
<value>satnogs_ogg_encoder_0</value>
</param>
<param>
<key>quality</key>
<value>1.0</value>
</param>
<param>
<key>samp_rate</key>
<value>audio_samp_rate</value>
</param>
</block>
<block>
<key>satnogs_tcp_rigctl_msg_source</key>
<param>
@ -2429,7 +2425,7 @@ we shift the LO a little further</value>
</block>
<connection>
<source_block_id>analog_quadrature_demod_cf_0</source_block_id>
<sink_block_id>blocks_wavfile_sink_0</sink_block_id>
<sink_block_id>satnogs_ogg_encoder_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>

8
apps/flowgraphs/satnogs_fm_demod.py
View File

@ -5,11 +5,10 @@
# Title: FM Generic Demodulation
# Author: Manolis Surligas (surligas@gmail.com)
# Description: A generic FM demodulation block
# Generated: Mon Jan 23 20:10:12 2017
# Generated: Fri Feb 3 16:44:07 2017
##################################################
from gnuradio import analog
from gnuradio import blocks
from gnuradio import eng_notation
from gnuradio import filter
from gnuradio import gr
@ -56,6 +55,7 @@ class satnogs_fm_demod(gr.top_block):
##################################################
self.satnogs_waterfall_sink_0 = satnogs.waterfall_sink(audio_samp_rate, 0.0, 10, 1024, waterfall_file_path, 1)
self.satnogs_tcp_rigctl_msg_source_0 = satnogs.tcp_rigctl_msg_source("127.0.0.1", rigctl_port, False, 1000, 1500)
self.satnogs_ogg_encoder_0 = satnogs.ogg_encoder(file_path, audio_samp_rate, 1.0)
self.satnogs_coarse_doppler_correction_cc_0 = satnogs.coarse_doppler_correction_cc(rx_freq, samp_rate_rx)
self.osmosdr_source_0 = osmosdr.source( args="numchan=" + str(1) + " " + satnogs.hw_rx_settings[rx_sdr_device]['dev_arg'] )
self.osmosdr_source_0.set_sample_rate(samp_rate_rx)
@ -71,7 +71,6 @@ class satnogs_fm_demod(gr.top_block):
self.osmosdr_source_0.set_bandwidth(samp_rate_rx, 0)
self.freq_xlating_fir_filter_xxx_0 = filter.freq_xlating_fir_filter_ccc(int(samp_rate_rx/filter_rate), (xlate_filter_taps), lo_offset, samp_rate_rx)
self.blocks_wavfile_sink_0 = blocks.wavfile_sink(file_path, 1, audio_samp_rate, 16)
self.blks2_rational_resampler_xxx_1 = filter.rational_resampler_ccc(
interpolation=24,
decimation=125,
@ -84,7 +83,7 @@ class satnogs_fm_demod(gr.top_block):
# Connections
##################################################
self.msg_connect((self.satnogs_tcp_rigctl_msg_source_0, 'freq'), (self.satnogs_coarse_doppler_correction_cc_0, 'freq'))
self.connect((self.analog_quadrature_demod_cf_0, 0), (self.blocks_wavfile_sink_0, 0))
self.connect((self.analog_quadrature_demod_cf_0, 0), (self.satnogs_ogg_encoder_0, 0))
self.connect((self.blks2_rational_resampler_xxx_1, 0), (self.analog_quadrature_demod_cf_0, 0))
self.connect((self.blks2_rational_resampler_xxx_1, 0), (self.satnogs_waterfall_sink_0, 0))
self.connect((self.freq_xlating_fir_filter_xxx_0, 0), (self.blks2_rational_resampler_xxx_1, 0))
@ -102,7 +101,6 @@ class satnogs_fm_demod(gr.top_block):
def set_file_path(self, file_path):
self.file_path = file_path
self.blocks_wavfile_sink_0.open(self.file_path)
def get_lo_offset(self):
return self.lo_offset

25
apps/scripts/satnogs_waterfall.gp
View File

@ -23,7 +23,7 @@ if (!exists("height")) height=800
if (!exists("width")) width=800
if (!exists("outfile")) outfile='/tmp/waterfall.png'
set terminal pngcairo size height,width enhanced font 'Verdana,14'
set terminal pngcairo size width,height enhanced font 'Verdana,14'
set output outfile
unset key
@ -36,18 +36,23 @@ set tics nomirror out scale 0.75
set xlabel 'Frequency (kHz)'
set ylabel 'Time'
set cbtics scale 0
set cbtics (-110, -105, -100, -95, -90, -85, -80, -75, -70, -65, -60, -55, -50, -55, -40)
# palette
set palette defined (0 '#3288BD',\
1 '#66C2A5',\
2 '#ABDDA4',\
3 '#E6F598',\
4 '#FEE08B',\
5 '#FDAE61',\
6 '#F46D43',\
7 '#D53E4F')
set palette defined (0 '#aa00ff',\
1 '#6200ea',\
2 '#2962ff',\
3 '#00b8d4',\
4 '#00bfa5',\
5 '#00c853',\
6 '#64dd17 ',\
7 '#aeea00',\
9 '#ffd600 ',\
10 '#ffab00 ',\
11 '#ff6d00',\
12 '#d50000')
set ylabel 'Time (seconds)'
set cbrange [-110:-20]
set cbrange [-100:-50]
set cblabel 'Power (dB)'
# Get automatically the axis ranges from the file