SM5BSZ Linrad-06.00pre rev 1069

buf.c

@@ -616,13 +616,12 @@ else
   timf1_blockbytes*=fft_cntrl[FFT1_CURMODE].parall_fft;
   timf1_blockbytes*=(fft_cntrl[FFT1_CURMODE].real2complex+1);
   }
-timf1_usebytes=timf1_blockbytes;
+timf1_usebytes=timf1_blockbytes/2;
 if(timf1_usebytes < (int)snd[RXAD].block_bytes)timf1_usebytes=snd[RXAD].block_bytes;
 i=genparm[FIRST_FFT_NO_OF_THREADS];
 // In case the oscilloscope for timf3 is enabled we want to
 // update the screen at about TIMF3_OSCILLOSCOPE_RATE Hz.
-timf3_osc_interval=twice_rxchan*(int)(timf3_sampling_speed/
-                                                      TIMF3_OSCILLOSCOPE_RATE);
+timf3_osc_interval=1.0/TIMF3_OSCILLOSCOPE_RATE;
 m=1+twice_rxchan;
 t1=screen_height/(2*m);
 for(i=0; i<8; i++)timf3_y0[i]=screen_height-(i+1)*t1;
@@ -662,9 +661,6 @@ timf3_py=0;
 timf3_ps=0;
 timf3_pn=0;
 timf3_pc=0;
-
-timf3_oscilloscope_limit=timf3_osc_interval+
-                                    twice_rxchan*(mix1.new_points+screen_width/2);
 // ***********************************************************
 // In case second fft is not enabled we need a buffer that can hold 
 // transforms during the time we average over in the AFC process
@@ -1236,7 +1232,7 @@ if(fft1_correlation_flag == 1)
   mem(8104,&fft1_slowcorr_tot,2*fft1_size*sizeof(double),0);
   mem(8105,&fft1_corr_spectrum_tot,screen_width*sizeof(short int),0);
   }
-if(fft1_correlation_flag != 0)
+if(fft1_correlation_flag > 1)
   {
   mem(8109,&d_mix1_fqwin,(mix1.size/2+16)*sizeof(double),0);
   mem(8111,&d_mix1_table,mix1.size*sizeof(D_COSIN_TABLE)/2,0);
@@ -1474,7 +1470,7 @@ memset(liminfo_wait,0,fft1_size*sizeof(unsigned char));
 memset(fft1_slowsum,0,fft1_size*sizeof(float));
 fft1corr_reset_flag=0;
 if(fft1_correlation_flag == 1)clear_fft1_correlation();
-if(fft1_correlation_flag != 0)
+if(fft1_correlation_flag > 1)
   {
   make_d_window(5,mix1.size, 4, d_mix1_fqwin);
   make_d_sincos(0, mix1.size, d_mix1_table);
@@ -2124,6 +2120,7 @@ if(diskwrite_flag == 1)
   lir_sync();
   diskwrite_flag = 0;
   }
+
 fft1_handle=chk_free(fft1_handle);
 wg_waterf=chk_free(wg_waterf);
 fft3_handle=chk_free(fft3_handle);

cohsub.c

@@ -637,7 +637,6 @@ baseb_ps=baseb_pa;
 baseb_pm=baseb_pa;
 baseb_px=baseb_pa;
 nn=0.5+daout_pa/(rx_daout_channels*rx_daout_bytes*da_resample_ratio);
-baseb_wts=2;
 baseb_fx=(baseb_pa-2-nn+baseband_size)&baseband_mask;
 // *********** Clear basblock. Used for S-meter averaging ************ 
 basblock_pa=2*baseb_pa/mix2.size;

configure

@@ -7338,18 +7338,13 @@ if test "$SHOW32" = "1"; then
         echo "The purpose of installing Portaudio is to be able to use Jack."
       fi
       if test "$BITS" = "32"; then
-        echo "-------------------------Debian----------------------"
-        echo "apt-get install libportaudio2"
-        echo "ln -s -f /usr/lib/i386-linux-gnu/libportaudio.so.2.0.0 /usr/lib/i386-linux-gnu/libportaudio.so"
-        echo "-----------------------------------------------------"
+        echo "Debian: apt-get install portaudio19-dev"
         echo "Fedora: dnf install portaudio-devel"
         echo "openSUSE: zypper install portaudio-devel"
         echo "Mageia: urpmi libportaudio-devel"
       else
         debian_i386
-        echo "apt-get install libportaudio2:i386"
-        echo "ln -s -f /usr/lib/i386-linux-gnu/libportaudio.so.2.0.0 /usr/lib/i386-linux-gnu/libportaudio.so"
-        echo "-----------------------------------------------------"
+        echo "Debian: apt-get install portaudio19-dev:i386"
         echo "Fedora: dnf install portaudio-devel.i686"
         echo " "
         echo "---------------------openSUSE--------------------------------"
@@ -7460,10 +7455,19 @@ if test "$SHOW32" = "1"; then
               echo "  cd librtlsdr"
               echo "  mkdir -p build"
               echo "  cd build"
-              echo "  cmake .."
+              echo "  cmake ../ -DINSTALL_UDEV_RULES=ON"
               echo "  make"
               echo "  make install"
+              echo "  ldconfig"
               echo "Go back to the linrad directory and run ./configure again."
+              echo "At runtime you may have to remove dvb_usb_rtl28xxu with"
+              echo "this command before starting Linrad:"
+              echo "  rmmod dvb_usb_rtl28xxu"
+              echo "Or blacklist the module with these commands:"
+              echo "  echo blacklist dvb_usb_rtl28xxu /etc/modprobe.d/rtl2832.conf"
+              echo "  depmod -ae"
+              echo "  update-initramfs  -u"
+              echo " "
             fi
           fi
         fi
@@ -8059,11 +8063,7 @@ if test "$BITS" = "64"; then
           if test ${OS} != "Darwin"; then
             echo "The purpose of installing Portaudio is to be able to use Jack."
           fi
-        echo "-------------------------Debian----------------------"
-        echo "apt-get install libportaudio2"
-        echo "ln -s -f /usr/lib/x86_64-linux-gnu/libportaudio.so.2.0.0 /usr/lib/x86_64-linux-gnu/libportaudio.so"
-        echo "-----------------------------------------------------"
-        echo " "
+        echo "Debian: apt-get install portaudio19-dev"
         echo "Fedora: dnf install portaudio-devel"
         echo "openSUSE: zypper install portaudio-devel"
         echo "Gentoo: emerge portaudio"

errors.lir

@@ -218,9 +218,9 @@ call to ioctl failed. (SNDCTL_DSP_GETFMTS)
 call to ioctl failed. (SNDCTL_DSP_SPEED)
 [1073]routine:set_analog_io      file:lsetad.c                      
 call to ioctl failed. (SNDCTL_DSP_SPEED)
-[1074]routine:xz                 file:ui.c                      
-Trying to write to debug file (dmp) but file is not open.
-(See define of DUMPFILE in vernr.h)
+[1074]
+ö not used any more
+
 [1075]routine:read_eme_database      file:eme.c                      
 Failed to get scratch memory.
 [1076]The timing for the rise time or for the pilot tone
@@ -775,7 +775,7 @@ no configurations available.
 [1310]open_rx_sndout:resampling setup failed.
 [1311]open_rx_sndout:Could not set sampling speed.
 [1312]open_rx_sndout:Unable to set period size for playback.
-[1313]open_rx_sndout/snd_pcm_get_params.
+[1313[open_rx_sndout/snd_pcm_get_params.
 Can't recover from underrun - prepare failed.
 [1314]routine:make_radar_graph    file:radar.c
 Failed to allocate memory for radar.
@@ -804,7 +804,7 @@ input in the "N = Network setup" menu.
 [1329]lir_tx_dawrite/ writei/ catch all error
 [1330]Sampling rate in par_sdrip not compatible with SDR-IP setup.
 Rerun "U=A/D and D/A setup for RX" from the main menu.
-[1331]Error in the initioalization of soundcard output.
+[1331]Error in the initialization of soundcard output.
 [1332]lir_rx_dawrite/ writei/ catch all error
 [1333]Could not find the serial number file for Excalibur.
 par_excalibur_sernum
@@ -1146,6 +1146,7 @@ FM low pass filter filter.
 FM low pass filter filter.
 [1477]Too low samplingrate in the baseband to initialize
 FM low pass filter filter.
+[1478]Failed to open soundcard for RX input.
 [2600]The file par_sdrplay3 is corrupted or not consistent
 with other parameters. Use the U menu to set up your RSP device
 and do not forget to press W to save data in the main menu

fft0.c

@@ -1159,7 +1159,7 @@ else
   n=(unsigned int)nz;
   size=(unsigned int)sz;
   }
-if(!fft1_use_gpu)
+if(!fft1_use_gpu && fft1_correlation_flag <= 1)
   {
   if(size > 65536)
     {