From 3886524b0e27fdc128e1df3baaa919aca6b87295 Mon Sep 17 00:00:00 2001 From: magf Date: Tue, 20 Jan 2026 14:49:36 +0100 Subject: [PATCH] - Resolved conflict (hopefully) --- Classes/04_DSP/Timing_Recovery.m | 14 -------------- Functions/EQ_structures/ml_mlse.m | 4 ---- 2 files changed, 18 deletions(-) diff --git a/Classes/04_DSP/Timing_Recovery.m b/Classes/04_DSP/Timing_Recovery.m index 5e33b6b..3999ad7 100644 --- a/Classes/04_DSP/Timing_Recovery.m +++ b/Classes/04_DSP/Timing_Recovery.m @@ -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 diff --git a/Functions/EQ_structures/ml_mlse.m b/Functions/EQ_structures/ml_mlse.m index 17e25ca..84ff5cb 100644 --- a/Functions/EQ_structures/ml_mlse.m +++ b/Functions/EQ_structures/ml_mlse.m @@ -45,7 +45,6 @@ end ml_mlse_results.config = Equalizerstruct(); -<<<<<<< HEAD eq_small = strip_eq(eq_, 10); fn = fieldnames(eq_small); for k = 1:numel(fn) @@ -54,9 +53,6 @@ for k = 1:numel(fn) end end json_str = jsonencode(eq_small); -======= -eq_ = strip_eq(eq_, 10); ->>>>>>> 719e5508e776c18e3dcf72a954c71bdedda179e0 fn = fieldnames(eq_); for k = 1:numel(fn)