Commit 4c6246d6 authored by John, Fabian's avatar John, Fabian
Browse files

fixed issues and modiefied program for varying delays.

parent f0eb6151
%% alter path to your python (3.8 is tested) distribution here
py_path = 'C:\Users\Arthur-Vincent\AppData\Local\Programs\Python\Python38\python.exe';
broker_ip = '127.0.0.1';
py_path = 'C:\Users\49151\AppData\Local\Programs\Python\Python37\python.exe';
broker_ip = '192.168.0.1';
%% Init components
......@@ -8,70 +8,66 @@ broker_ip = '127.0.0.1';
%mqtt stuff
addpath('../../lib');
addpath('../../lib/redpitaya');
myMqtt = mqtt_py_matlab(py_path);
myMqtt.connect_mqtt(broker_ip);
for delay = -1e-3:5e-5:1e-3
op = OscilloscopeProperties(); % get an object of the OscilloscopeProperties class
op = OscilloscopeProperties(); % get an object of the OscilloscopeProperties class
% Two options to set sample rate
op = op.set_sample_rate_by_div(1.01e-4); % Set time per Oszilloscope-Div
%op.SampleRate = 15.6e6; % Set samplerate in MHz
op.TriggerDelay =+8192; %Delay in samples (0 delay -> Start writing in the center of the buffer)
% Two options to set sample rate
op = op.set_sample_rate_by_div(1.01e-4); % Set time per Oszilloscope-Div
%op.SampleRate = 15.6e6; % Set samplerate in MHz
op.TriggerLevel = .001; % Trigger level in Volt
op.TriggerDelay = delay; %Delay in samples (0 delay -> Start writing in the center of the buffer)
test_message = op.get_mqtt_message();
%test_message = '[OSC]\ntrigger_delay=100\ndecimation=1\ntrigger_level=0.2\ntrigger_ch=CH_1\ntrigger_src=CH_1_PE';
op.TriggerLevel = .2; % Trigger level in Volt
myMqtt = mqtt_py_matlab(py_path);
myMqtt.connect_mqtt(broker_ip);
test_message = op.get_mqtt_message();
%test_message = '[OSC]\ntrigger_delay=100\ndecimation=1\ntrigger_level=0.2\ntrigger_ch=CH_1\ntrigger_src=CH_1_PE';
% Subscription to RP1 with wildcard (#)
myMqtt.sub_mqtt_topics(broker_ip, "RP1/#");
% Subscription without wildcard
myMqtt.sub_mqtt_topics(broker_ip, "RP1/CONFIGURE/RECONFIG");
myMqtt.sub_mqtt_topics(broker_ip, "RP1/raw/CH1");
pause(2);
% Subscription to RP1 with wildcard (#)
%myMqtt.sub_mqtt_topics(broker_ip, "RP1/#");
% Publish Redpitaya API message
myMqtt.pub_mqtt(broker_ip, "RP1/CONFIGURE/RECONFIG", test_message);
% Subscription without wildcard
%myMqtt.sub_mqtt_topics(broker_ip, "RP1/CONFIGURE/RECONFIG");
% Read the last published message
fprintf('%s', myMqtt.get_payload_str("RP1/CONFIGURE/RECONFIG"));
%pause(2);
% get max length of x axis
x_axis = op.get_ordinate();
% Publish Redpitaya API message
myMqtt.pub_mqtt(broker_ip, "RP1/CONFIGURE/RECONFIG", test_message);
pause(2);
% Read the last published message
%fprintf('%s', myMqtt.get_payload_str("RP1/CONFIGURE/RECONFIG"));
fprintf('%s', test_message);
% Start oszilloscope
myMqtt.pub_mqtt(broker_ip, "RP1/CONFIGURE/START", test_message);
%% Filter
% get max length of x axis
x_axis = op.get_ordinate();
Hd = fir_highpass2k;
myMqtt.sub_mqtt_topics(broker_ip, "RP1/raw/CH1");
% Start oszilloscope
myMqtt.pub_mqtt(broker_ip, "RP1/CONFIGURE/START", test_message);
%% Signal aquisition
%% Signal aquisition
%while(1)
%while(1)
% Read input 1
arr = myMqtt.get_payload_float("RP1/raw/CH1");
y_mat = cell2mat(cell(arr));
%filter input 1
y_filt = filter(Hd,y_mat);
% Plot input 1
subplot (2,1,1)
%subplot (2,1,1)
plot(x_axis, y_mat);
grid on;
drawnow;
% Plot filtered input 1
subplot (2,1,2)
plot(x_axis, y_filt);
grid on;
%subplot (2,1,2)
%plot(x_axis, y_filt);
%grid on;
%end
% Stop the aquisition
myMqtt.pub_mqtt(broker_ip, "RP1/CONFIGURE/RECONFIG", "STOP");
%end
end
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment