SM5BSZ Linrad-05.03 rev 1038

fventuri · May 28, 2024 · f288043 · f288043
1 parent 0b1572c
commit f288043
Show file tree

Hide file tree

Showing 5 changed files with 76 additions and 62 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,62 +14,67 @@ jobs:
         run: sudo apt update -qq && sudo apt install -y gcc-mingw-w64 nasm
       - name: Checkout code
         uses: actions/checkout@v4
-      - name: Setup API 3.09
-        run: |
-          cp Makefile.msys2.nodebug Makefile
-          sed -i 's/^\(#define SDRPLAY3PAR_VERNR 3[0-9][0-9]\)/\/\/\1/; s/^\/\/\(#define SDRPLAY3PAR_VERNR 309\)/\1/' vernr.h
-      - name: Build 32 bit - API 3.09
-        run: make linrad.exe && mv linrad.exe linrad-API3.09.exe && rm *.oz
-      - name: Build 64 bit - API 3.09
-        run: make linrad64.exe && mv linrad64.exe linrad64-API3.09.exe && rm *.ox
-      - name: Setup API 3.10
-        run: |
-          cp Makefile.msys2.nodebug Makefile
-          sed -i 's/^\(#define SDRPLAY3PAR_VERNR 3[0-9][0-9]\)/\/\/\1/; s/^\/\/\(#define SDRPLAY3PAR_VERNR 310\)/\1/' vernr.h
-      - name: Build 32 bit - API 3.10
-        run: make linrad.exe && mv linrad.exe linrad-API3.10.exe && rm *.oz
-      - name: Build 64 bit - API 3.10
-        run: make linrad64.exe && mv linrad64.exe linrad64-API3.10.exe && rm *.ox
-      - name: Setup API 3.11
-        run: |
-          cp Makefile.msys2.nodebug Makefile
-          sed -i 's/^\(#define SDRPLAY3PAR_VERNR 3[0-9][0-9]\)/\/\/\1/; s/^\/\/\(#define SDRPLAY3PAR_VERNR 311\)/\1/' vernr.h
-      - name: Build 32 bit - API 3.11
-        run: make linrad.exe && mv linrad.exe linrad-API3.11.exe && rm *.oz
-      - name: Build 64 bit - API 3.11
-        run: make linrad64.exe && mv linrad64.exe linrad64-API3.11.exe && rm *.ox
-      - name: Setup API 3.14
-        run: |
-          cp Makefile.msys2.nodebug Makefile
-          sed -i 's/^\(#define SDRPLAY3PAR_VERNR 3[0-9][0-9]\)/\/\/\1/; s/^\/\/\(#define SDRPLAY3PAR_VERNR 314\)/\1/' vernr.h
-      - name: Build 32 bit - API 3.14
-        run: make linrad.exe && mv linrad.exe linrad-API3.14.exe && rm *.oz
-      - name: Build 64 bit - API 3.14
-        run: make linrad64.exe && mv linrad64.exe linrad64-API3.14.exe && rm *.ox
+      #- name: Setup API 3.09
+      #  run: |
+      #    cp Makefile.msys2.nodebug Makefile
+      #    sed -i 's/^\(#define SDRPLAY3PAR_VERNR 3[0-9][0-9]\)/\/\/\1/; s/^\/\/\(#define SDRPLAY3PAR_VERNR 309\)/\1/' vernr.h
+      #- name: Build 32 bit - API 3.09
+      #  run: make linrad.exe && mv linrad.exe linrad-API3.09.exe && rm *.oz
+      #- name: Build 64 bit - API 3.09
+      #  run: make linrad64.exe && mv linrad64.exe linrad64-API3.09.exe && rm *.ox
+      #- name: Setup API 3.10
+      #  run: |
+      #    cp Makefile.msys2.nodebug Makefile
+      #    sed -i 's/^\(#define SDRPLAY3PAR_VERNR 3[0-9][0-9]\)/\/\/\1/; s/^\/\/\(#define SDRPLAY3PAR_VERNR 310\)/\1/' vernr.h
+      #- name: Build 32 bit - API 3.10
+      #  run: make linrad.exe && mv linrad.exe linrad-API3.10.exe && rm *.oz
+      #- name: Build 64 bit - API 3.10
+      #  run: make linrad64.exe && mv linrad64.exe linrad64-API3.10.exe && rm *.ox
+      #- name: Setup API 3.11
+      #  run: |
+      #    cp Makefile.msys2.nodebug Makefile
+      #    sed -i 's/^\(#define SDRPLAY3PAR_VERNR 3[0-9][0-9]\)/\/\/\1/; s/^\/\/\(#define SDRPLAY3PAR_VERNR 311\)/\1/' vernr.h
+      #- name: Build 32 bit - API 3.11
+      #  run: make linrad.exe && mv linrad.exe linrad-API3.11.exe && rm *.oz
+      #- name: Build 64 bit - API 3.11
+      #  run: make linrad64.exe && mv linrad64.exe linrad64-API3.11.exe && rm *.ox
+      #- name: Setup API 3.14
+      #  run: |
+      #    cp Makefile.msys2.nodebug Makefile
+      #    sed -i 's/^\(#define SDRPLAY3PAR_VERNR 3[0-9][0-9]\)/\/\/\1/; s/^\/\/\(#define SDRPLAY3PAR_VERNR 314\)/\1/' vernr.h
+      #- name: Build 32 bit - API 3.14
+      #  run: make linrad.exe && mv linrad.exe linrad-API3.14.exe && rm *.oz
+      #- name: Build 64 bit - API 3.14
+      #  run: make linrad64.exe && mv linrad64.exe linrad64-API3.14.exe && rm *.ox
       - name: Setup API 3.15
         run: |
           cp Makefile.msys2.nodebug Makefile
           sed -i 's/^\(#define SDRPLAY3PAR_VERNR 3[0-9][0-9]\)/\/\/\1/; s/^\/\/\(#define SDRPLAY3PAR_VERNR 315\)/\1/' vernr.h
-      - name: Build 32 bit - API 3.15
-        run: make linrad.exe && mv linrad.exe linrad-API3.15.exe && rm *.oz
+      #- name: Build 32 bit - API 3.15
+      #  run: make linrad.exe && mv linrad.exe linrad-API3.15.exe && rm *.oz
       - name: Build 64 bit - API 3.15
         run: make linrad64.exe && mv linrad64.exe linrad64-API3.15.exe && rm *.ox
       - name: Checksums
-        run: sha256sum linrad-API3.09.exe linrad64-API3.09.exe linrad-API3.10.exe linrad64-API3.10.exe linrad-API3.11.exe linrad64-API3.11.exe linrad-API3.14.exe linrad64-API3.14.exe linrad-API3.15.exe linrad64-API3.15.exe > checksums-sha256.txt
+        #run: sha256sum linrad-API3.09.exe linrad64-API3.09.exe linrad-API3.10.exe linrad64-API3.10.exe linrad-API3.11.exe linrad64-API3.11.exe linrad-API3.14.exe linrad64-API3.14.exe linrad-API3.15.exe linrad64-API3.15.exe > checksums-sha256.txt
+        run: sha256sum linrad64-API3.15.exe > checksums-sha256.txt
       - name: Release
         uses: softprops/action-gh-release@v1
         if: startsWith(github.ref, 'refs/tags/')
+        #with:
+        #  files: |
+        #    linrad-API3.09.exe
+        #    linrad64-API3.09.exe
+        #    linrad-API3.10.exe
+        #    linrad64-API3.10.exe
+        #    linrad-API3.11.exe
+        #    linrad64-API3.11.exe
+        #    linrad-API3.14.exe
+        #    linrad64-API3.14.exe
+        #    linrad-API3.15.exe
+        #    linrad64-API3.15.exe
+        #    checksums-sha256.txt
         with:
           files: |
-            linrad-API3.09.exe
-            linrad64-API3.09.exe
-            linrad-API3.10.exe
-            linrad64-API3.10.exe
-            linrad-API3.11.exe
-            linrad64-API3.11.exe
-            linrad-API3.14.exe
-            linrad64-API3.14.exe
-            linrad-API3.15.exe
             linrad64-API3.15.exe
             checksums-sha256.txt
         env:

diff --git a/baseb_graph.c b/baseb_graph.c
@@ -2782,7 +2782,10 @@ switch (bfo_flag)
     if(kill_all_flag)return;  
     resume_thread(THREAD_SCREEN);
     mg_clear_flag=TRUE;
-    baseb_reset_counter++;
+    if(fft1_correlation_flag > 1)
+      {
+      baseb_reset_counter++;
+      }
     }
   break;
 
@@ -2797,7 +2800,10 @@ switch (bfo_flag)
     if(kill_all_flag)return;  
     resume_thread(THREAD_SCREEN);
     mg_clear_flag=TRUE;
-    baseb_reset_counter++;
+    if(fft1_correlation_flag > 1)
+      {
+      baseb_reset_counter++;
+      }
     }
   break;
 

diff --git a/fft3.c b/fft3.c
@@ -343,7 +343,10 @@ for(ss=0; ss<genparm[MIX1_NO_OF_CHANNELS]; ss++)
                 t1*=(float)timf3_sampling_speed/fft3_size;
                 mix1_selfreq[0]+=t1;
                 add_mix1_cursor(0);
-                baseb_reset_counter++;
+                if(fft1_correlation_flag > 1)
+                  {
+                  baseb_reset_counter++;
+                  }
                 timf3_pd=timf3_pc;
                 corr_afc_count=0;
                 sc[SC_SHOW_CENTER_FQ]++;  

diff --git a/vernr.h b/vernr.h
@@ -32,16 +32,4 @@
 #define CLOUDIQ_PAR_VERNR 60409
 #define AIRSPYHF_PAR_VERNR 40414
 #define SDRPLAY2PAR_VERNR 213
-#if OSNUM == OSNUM_WINDOWS
-//#define SDRPLAY3PAR_VERNR 309
-//#define SDRPLAY3PAR_VERNR 310
-//#define SDRPLAY3PAR_VERNR 311
-//#define SDRPLAY3PAR_VERNR 312
-//#define SDRPLAY3PAR_VERNR 314
 #define SDRPLAY3PAR_VERNR 315
-#else
-//#define SDRPLAY3PAR_VERNR 307
-//#define SDRPLAY3PAR_VERNR 311
-//#define SDRPLAY3PAR_VERNR 314
-#define SDRPLAY3PAR_VERNR 315
-#endif
diff --git a/wide_graph.c b/wide_graph.c
@@ -194,7 +194,10 @@ if(genparm[AFC_ENABLE]==0 || genparm[AFC_LOCK_RANGE] == 0)
     mix1_selfreq[0]=t1;
     add_mix1_cursor(0);
     sc[SC_SHOW_CENTER_FQ]++;
-    baseb_reset_counter++;
+    if(fft1_correlation_flag > 1)
+      {
+      baseb_reset_counter++;
+      }
     break;
 
     case 1:
@@ -218,9 +221,18 @@ if(genparm[AFC_ENABLE]==0 || genparm[AFC_LOCK_RANGE] == 0)
 void step_rx_frequency(int direction)
 {
 int m;
+float t1;
 m=1<<bg.wheel_stepn;
-move_rx_frequency((float)direction*
-                     ((float)m/fftx_points_per_hz)/256,bg.horiz_arrow_mode);
+if(fft1_correlation_flag > 1)
+  {
+  t1=1.0/1024.;
+  }
+else
+  {
+  t1=1.0/256.;
+  }  
+t1*=(float)m;
+move_rx_frequency((float)direction*t1/fftx_points_per_hz,bg.horiz_arrow_mode);
 }