- Fixed 'ML_MLSE'

- Added weighted DFE (work in progress)
- Added 'Evaluation Scripts' and 'Data' to 'projects\FSO_transmission', which contain different evaluations and measured data regarding the DSP applications for the FSO transmission data.

Classes/04_DSP/Timing_Recovery.m

@@ -27,11 +27,19 @@ 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,...
@@ -40,8 +48,14 @@ 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