small tweaks to work with Jim's freedv API changes. Requires more work to do so...

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

diff --git a/fdmdv2-dev/README.txt b/fdmdv2-dev/README.txt
index 73b276aa30775b4a8d592f43e115d85f269c18e5..da26ffe41334b11e897e96d24edc59c6bd076e40 100644 (file)
--- a/fdmdv2-dev/README.txt
+++ b/fdmdv2-dev/README.txt
@@ -188,10 +188,11 @@ TODO
         + clue: only when analog not pressed
         + this was 7.5 to 8kHz interpolator bug
     [X] spectrum and waterfall scale changes when analog pressed
-    [ ] ocassional test frames error counter goes crazy
+    [X] ocassional test frames error counter goes crazy
     [ ] 700 syncs up to 1000Hz sine waves
         + shouldn't trigger sync logic, will be a problem with carriers
     [ ] "clip" led, encourage people to adjust gain to hit that occ when speaking
+    [ ] Win32 record from radio time
 
 [ ] FreeDV 700 improvements
     [ ] bpf filter after clipping to remove clicks
@@ -232,7 +233,7 @@ TODO
             + still not real obvious on plot
             + might be useful to make this switchable
     [X] scatter diagram different colours/carrier
-    [ ] remember what mode you were in
+    [X] remember what mode you were in
     [ ] cmd line file decode
     [ ] Waterfall direction
     [ ] documentation or use, walk through, you tube, blog posts

diff --git a/fdmdv2-dev/src/fdmdv2_defines.h b/fdmdv2-dev/src/fdmdv2_defines.h
index 8c2c5d1d41ac51206f620fc546b6b4b86b5e9c7d..64aa606d0129a2ceaff282db7f067d1178ff0d98 100644 (file)
--- a/fdmdv2-dev/src/fdmdv2_defines.h
+++ b/fdmdv2-dev/src/fdmdv2_defines.h
@@ -23,6 +23,7 @@
 
 #include "wx/wx.h"
 #include "freedv_api.h"
+#include "freedv_api_internal.h"
 
 // Spectrogram and Waterfall
 

diff --git a/fdmdv2-dev/src/fdmdv2_plot_waterfall.cpp b/fdmdv2-dev/src/fdmdv2_plot_waterfall.cpp
index d3a29abdb0f0622e5366a5e01695435be86b969d..4a8b44738fdc1f70012d4005cc966571e033b9c9 100644 (file)
--- a/fdmdv2-dev/src/fdmdv2_plot_waterfall.cpp
+++ b/fdmdv2-dev/src/fdmdv2_plot_waterfall.cpp
@@ -356,8 +356,8 @@ void PlotWaterfall::plotPixelData()
     m_max_mag = BETA*m_max_mag + (1 - BETA)*max_mag;
     m_min_mag = max_mag - 20.0;
     //printf("max_mag: %f m_max_mag: %f\n", max_mag, m_max_mag);
-    //intensity_per_dB  = (float)256 /(MAX_MAG_DB - MIN_MAG_DB);
-    intensity_per_dB  = (float)256 /(m_max_mag - m_min_mag);
+    intensity_per_dB  = (float)256 /(MAX_MAG_DB - MIN_MAG_DB);
+    //intensity_per_dB  = (float)256 /(m_max_mag - m_min_mag);
     spec_index_per_px = ((float)(MAX_F_HZ)/(float)m_modem_stats_max_f_hz)*(float)MODEM_STATS_NSPEC / (float) m_rGrid.GetWidth();
 
     /*