muting rx side on half duplex, nneds a bit more testing

git-svn-id: https://svn.code.sf.net/p/freetel/code@2216 01035d8c-6547-0410-b346-abe4f91aad63

diff --git a/fdmdv2-dev/README.txt b/fdmdv2-dev/README.txt
index 49eab1e144a02c5228407af3d0f73159a59aa097..22f7675e60cfe0eb13de872af47f9cd804d8bf0e 100644 (file)
--- a/fdmdv2-dev/README.txt
+++ b/fdmdv2-dev/README.txt
@@ -156,7 +156,7 @@ TODO
         [X] generic, mode indep, sync, snr, scatter?
         [X] text working on 700 and 1600
         [X] char by char text appearing
-    [ ] add 700 to freedv API
+    [X] add 700 to freedv API
         [X] modem signal spectrum and stats consistent with fdmdv
         [X] rx from file works
         [X] cohpsk snr est
@@ -167,27 +167,28 @@ TODO
             + complicated by sample rate change
         [X] from radio plot broken
         [X] support for both varicodes
-        [ ] squelch
-        [ ] normalise output pwr across modes?
+        [X] squelch
+        [X] normalise output pwr across modes?
             + or maybe peak output?
             + option?
-    [ ] test frames 
-        [X] freedv API support
-        [X] BER displayed on GUI for 700 and 1600
-        [ ] plot error patterns for 700 and 1600
-        [ ] plot error histograms for 700 and 1600
     [X] file sample replay at 7500Hz work OK?
     [X] interp 7500 to 8k for spectrum plotting
     [X] rotation of scatter diagram on FreeDV 700
     [X] freq track plot
 
+[ ] test frames 
+    [X] freedv API support
+    [X] BER displayed on GUI for 700 and 1600
+    [ ] plot error patterns for 700 and 1600
+    [ ] plot error histograms for 700 and 1600
+
 [ ] Mel Bugs
     [X] resync issue
     [X] equalise power on 700 and 1600
     [X] research real and complex PAPR
     [X] waterfall and spectrum in analog mode
     [X] The waterfall in analog mode appears to quit working sometimes?
-    [ ] Squelch control on 1600 mode will not open up squelch to 0 (appears to be around 2 dB)
+    [X] Squelch control on 1600 mode will not open up squelch to 0 (appears to be around 2 dB)
     [ ] On TX, intermittently PTT will cause signal to be heard in speakers.  Toggle PTT or 
         Stop/Start toggle and then starts working.
     [ ] There is a .dll missing otherwise FreeDV will not excite.  We tested it on xp, win7, 8, 8.1 and 10.   
@@ -200,10 +201,9 @@ TODO
     [ ] error masking
     [ ] plotting other demod stats like ch ampl and phase ests
 
-[ ] win32
+[X] win32
     [X] X-compile works
     [X] basic installer
-    [ ] 
 
 [ ] Small fixes
     [X] Playfile bug
@@ -216,6 +216,7 @@ TODO
     [ ] Waterfall direction
     [ ] documenttation or use, walk through,you tube, blog posts
     [ ] scatter diagram agc with hysteresis
+    [ ] scatter diagram useful on fading channels in real time (longer persistance?)
 
 [ ] Web support for Presence/spotting hooks
 

diff --git a/fdmdv2-dev/src/fdmdv2_main.cpp b/fdmdv2-dev/src/fdmdv2_main.cpp
index 9c8fdb3f0b9e52c0f3b77294aefe39183dea8be6..011ca5247c2666965cb5fc5e438e318b425c0bec 100644 (file)
--- a/fdmdv2-dev/src/fdmdv2_main.cpp
+++ b/fdmdv2-dev/src/fdmdv2_main.cpp
@@ -2872,7 +2872,7 @@ void txRxProcessing()
     int nsam = g_soundCard1SampleRate * (float)N8/FS;
     assert(nsam <= N48);
     g_mutexProtectingCallbackData.Lock();
-    while (fifo_read(cbData->infifo1, in48k_short, nsam) == 0)
+    while ((fifo_read(cbData->infifo1, in48k_short, nsam) == 0) && ((g_half_duplex && !g_tx) || !g_half_duplex)) 
     {
         g_mutexProtectingCallbackData.Unlock();
         unsigned int n8k;