FreeDV
/
codec2
mirror of https://github.com/drowe67/codec2.git
1
0
Fork 0
Code Issues Releases Wiki Activity

removed unused EsNo_est_all_symbols

dr-qam16-cport
drowe67 2024-04-04 06:37:41 +10:30 committed by David Rowe
parent e02ef2c0a5
commit 6a5687c5f5
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
octave/ofdm_lib.m
View File

@ -52,7 +52,6 @@ function states = ofdm_init(config)
bad_uw_errors = config.bad_uw_errors; bad_uw_errors = config.bad_uw_errors;
amp_scale = config.amp_scale; amp_scale = config.amp_scale;
amp_est_mode = config.amp_est_mode; amp_est_mode = config.amp_est_mode;
EsNo_est_all_symbols = config.EsNo_est_all_symbols;
EsNodB = config.EsNodB; EsNodB = config.EsNodB;
state_machine = config.state_machine; state_machine = config.state_machine;
edge_pilots = config.edge_pilots; edge_pilots = config.edge_pilots;
@ -275,7 +274,6 @@ function states = ofdm_init(config)
% Es/No (SNR) est states % Es/No (SNR) est states
states.EsNo_est_all_symbols = EsNo_est_all_symbols;
states.clock_offset_est = 0; states.clock_offset_est = 0;
% pre-amble for data modes % pre-amble for data modes

5
octave/ofdm_mode.m
View File

@ -25,7 +25,6 @@ function config = ofdm_init_mode(mode="700D")
config.bad_uw_errors = 3; config.bad_uw_errors = 3;
config.amp_scale = 245E3; config.amp_scale = 245E3;
config.amp_est_mode = 0; config.amp_est_mode = 0;
config.EsNo_est_all_symbols = 1;
config.EsNodB = 3; config.EsNodB = 3;
config.state_machine = "voice1"; config.state_machine = "voice1";
config.edge_pilots = 1; 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.bps=4; config.Ntxtbits = 0; config.Nuwbits = 15*4; config.bad_uw_errors = 5;
config.state_machine = "data"; config.state_machine = "data";
config.ftwindow_width = 32; config.amp_scale = 132E3; 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") elseif strcmp(mode,"qam16c2")
Ns=5; config.Np=31; Tcp = 0.004; Ts = 0.016; Nc = 33; config.data_mode = "streaming"; 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.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.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 = 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(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]; 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];