From 1e47495c528a6f0d4f4a391e8e93595d76601e6c Mon Sep 17 00:00:00 2001
From: ha7ilm <retzlerandras@gmail.com>
Date: Wed, 28 Jun 2017 22:32:19 +0200
Subject: [PATCH] Few fixes

---
 config_webrx.py     | 4 +++-
 csdr.py             | 3 +--
 htdocs/openwebrx.js | 4 +++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/config_webrx.py b/config_webrx.py
index dcc65e3..5d0cd2a 100644
--- a/config_webrx.py
+++ b/config_webrx.py
@@ -106,7 +106,9 @@ Note: if you experience audio underruns while CPU usage is 100%, you can:
 start_rtl_command="rtl_sdr -s {samp_rate} -f {center_freq} -p {ppm} -g {rf_gain} -".format(rf_gain=rf_gain, center_freq=center_freq, samp_rate=samp_rate, ppm=ppm)
 format_conversion="csdr convert_u8_f"
 
-#start_rtl_command="hackrf_transfer -s {samp_rate} -f {center_freq} -g {rf_gain} -l16 -a0 -q -r-".format(rf_gain=rf_gain, center_freq=center_freq, samp_rate=samp_rate, ppm=ppm)
+#lna_gain=8
+#rf_amp=1
+#start_rtl_command="hackrf_transfer -s {samp_rate} -f {center_freq} -g {rf_gain} -l{lna_gain} -a{rf_amp} -r-".format(rf_gain=rf_gain, center_freq=center_freq, samp_rate=samp_rate, ppm=ppm, rf_amp=rf_amp, lna_gain=lna_gain)
 #format_conversion="csdr convert_s8_f"
 """
 To use a HackRF, compile the HackRF host tools from its "stdout" branch:
diff --git a/csdr.py b/csdr.py
index f63f77b..a2fb490 100755
--- a/csdr.py
+++ b/csdr.py
@@ -79,7 +79,7 @@ class dsp:
         chain_begin=any_chain_base+"csdr shift_addition_cc --fifo {shift_pipe} | csdr fir_decimate_cc {decimation} {ddc_transition_bw} HAMMING | csdr bandpass_fir_fft_cc --fifo {bpf_pipe} {bpf_transition_bw} HAMMING | csdr squelch_and_smeter_cc --fifo {squelch_pipe} --outfifo {smeter_pipe} 5 1 | "
         if self.secondary_demodulator:
             chain_begin+="csdr tee {iqtee_pipe} | "
-            chain_begin+="csdr tee {iqtee2_pipe} | " #TODO digimodes, and yes, tee sometimes hangs everything
+            chain_begin+="csdr tee {iqtee2_pipe} | " 
         chain_end = ""
         if self.audio_compression=="adpcm":
             chain_end = " | csdr encode_ima_adpcm_i16_u8"
@@ -95,7 +95,6 @@ class dsp:
             return secondary_chain_base + "csdr shift_addition_cc --fifo {secondary_shift_pipe} | " + \
                     "csdr bandpass_fir_fft_cc $(csdr '=-(31.25)/{if_samp_rate}') $(csdr '=(31.25)/{if_samp_rate}') $(csdr '=31.25/{if_samp_rate}') | " + \
                     "csdr simple_agc_cc 0.001 0.5 | " + \
-                    "CSDR_FIXED_BUFSIZE=256 csdr tee /s/tr_input | " + \
                     "csdr timing_recovery_cc GARDNER {secondary_samples_per_bits} 0.5 2 --add_q | " + \
                     "CSDR_FIXED_BUFSIZE=1 csdr dbpsk_decoder_c_u8 | " + \
                     "CSDR_FIXED_BUFSIZE=1 csdr psk31_varicode_decoder_u8_u8"
diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index 10629dd..f26afad 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -2568,8 +2568,10 @@ function secondary_demod_push_data(x)
 {
     x=Array.from(x).map((y)=>{
         var c=y.charCodeAt(0);
+        if(y=="\r") return "&nbsp;";
+        if(y=="\n") return "&nbsp;";
+        //if(y=="\n") return "<br />";
         if(c<32||c>126) return "";
-        if(y=="\n") return "<br />";
         if(y=="&") return "&amp;";
         if(y=="<") return "&lt;";
         if(y==">") return "&gt;";