aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrowe67 <[email protected]>2024-04-04 06:37:41 +1030
committerDavid Rowe <[email protected]>2024-04-04 06:37:41 +1030
commit6a5687c5f5ddf8c9d183ac41491bb179ffb8cbca (patch)
tree0299b095a843184d7ede3381ee038f36e9ef1bef
parente02ef2c0a534bec50267e2dc6bec42b4de062c36 (diff)
removed unused EsNo_est_all_symbols
-rw-r--r--octave/ofdm_lib.m2
-rw-r--r--octave/ofdm_mode.m5
2 files changed, 2 insertions, 5 deletions
diff --git a/octave/ofdm_lib.m b/octave/ofdm_lib.m
index e4ae35a..b3c4dc1 100644
--- a/octave/ofdm_lib.m
+++ b/octave/ofdm_lib.m
@@ -52,7 +52,6 @@ function states = ofdm_init(config)
bad_uw_errors = config.bad_uw_errors;
amp_scale = config.amp_scale;
amp_est_mode = config.amp_est_mode;
- EsNo_est_all_symbols = config.EsNo_est_all_symbols;
EsNodB = config.EsNodB;
state_machine = config.state_machine;
edge_pilots = config.edge_pilots;
@@ -275,7 +274,6 @@ function states = ofdm_init(config)
% Es/No (SNR) est states
- states.EsNo_est_all_symbols = EsNo_est_all_symbols;
states.clock_offset_est = 0;
% pre-amble for data modes
diff --git a/octave/ofdm_mode.m b/octave/ofdm_mode.m
index a56edac..a49c94a 100644
--- a/octave/ofdm_mode.m
+++ b/octave/ofdm_mode.m
@@ -25,7 +25,6 @@ function config = ofdm_init_mode(mode="700D")
config.bad_uw_errors = 3;
config.amp_scale = 245E3;
config.amp_est_mode = 0;
- config.EsNo_est_all_symbols = 1;
config.EsNodB = 3;
config.state_machine = "voice1";
config.edge_pilots = 1;
@@ -59,12 +58,12 @@ function config = ofdm_init_mode(mode="700D")
config.bps=4; config.Ntxtbits = 0; config.Nuwbits = 15*4; config.bad_uw_errors = 5;
config.state_machine = "data";
config.ftwindow_width = 32; config.amp_scale = 132E3;
- config.EsNo_est_all_symbols = 0; config.amp_est_mode = 1; config.EsNodB = 10;
+ config.amp_est_mode = 1; config.EsNodB = 10;
elseif strcmp(mode,"qam16c2")
Ns=5; config.Np=31; Tcp = 0.004; Ts = 0.016; Nc = 33; config.data_mode = "streaming";
config.bps=4; config.Ntxtbits = 0; config.Nuwbits = 42*4; config.bad_uw_errors = 15;
config.ftwindow_width = 80; config.amp_scale = 135E3; config.state_machine = "data";
- config.EsNo_est_all_symbols = 0; config.amp_est_mode = 1; config.EsNodB = 10;
+ config.amp_est_mode = 1; config.EsNodB = 10;
config.tx_uw = zeros(1,config.Nuwbits = 42*4);
config.tx_uw(1:24) = [1 1 0 0 1 0 1 0 1 1 1 1 0 0 0 0 1 1 1 1 0 0 0 0];
config.tx_uw(end-24+1:end) = [1 1 0 0 1 0 1 0 1 1 1 1 0 0 0 0 1 1 1 1 0 0 0 0];