silas/imdd_silas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Resolved conflict (hopefully)

Browse Source
This commit is contained in:
magf
2026-01-20 14:49:36 +01:00
parent 72c1cc39f8
commit 3886524b0e
2 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Classes/04_DSP/Timing_Recovery.m
View File

@@ -27,19 +27,11 @@ classdef Timing_Recovery < handle
obj.(fn{n}) = options.(fn{n});
end
<<<<<<< HEAD
%obj-Initialization here%
end
function [data_out, timing_error] = process(obj, data_in)
=======
end
function [data_out,timing_error] = process(obj, data_in)
>>>>>>> 719e5508e776c18e3dcf72a954c71bdedda179e0
timing_synchronization = comm.SymbolSynchronizer( ...
"Modulation", obj.modulation,...
@@ -48,14 +40,8 @@ classdef Timing_Recovery < handle
"DampingFactor", obj.damping_factor, ...
"NormalizedLoopBandwidth", obj.normalized_loop_bandwidth, ...
"DetectorGain", obj.detector_gain);
<<<<<<< HEAD
data_out = data_in;
[data_out.signal, timing_error] = timing_synchronization(data_in.signal);
=======
data_out = data_in;
[data_out.signal,timing_error] = timing_synchronization(data_in.signal);
>>>>>>> 719e5508e776c18e3dcf72a954c71bdedda179e0
end
end