diff --git a/.gitignore b/.gitignore index d6944e3..453ced4 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/result* +workspace/*/ diff --git a/workspace/Makefile b/workspace/Makefile index fd3fe32..34170a2 100644 --- a/workspace/Makefile +++ b/workspace/Makefile @@ -1,5 +1,3 @@ all: ./wifi_loopback_noGUI.py -t $(t) -n $(n) -c $(c) -s $(s) -o $(o) -e $(e) -i $(i) -r $(result) - tshark -r $(result)/ofdm_t$(t)_n$(n)_s$(s)_e$(e)_i$(i).pcap > $(result)/t$(t)_n$(n)_s$(s)_e$(e)_i$(i).log - - + tshark -r $(result)/ofdm_t$(t)_n$(n)_s$(s)_e$(e)_i$(i).pcap > $(result)/t$(t)_n$(n)_s$(s)_e$(e)_i$(i).log \ No newline at end of file diff --git a/workspace/parse.py b/workspace/parse.py index 71f3723..bf951bd 100755 --- a/workspace/parse.py +++ b/workspace/parse.py @@ -68,6 +68,6 @@ plt.ylabel("PDR") plt.xlabel("SNR") plt.title("Delivery rate vs. SNR for different encoding schemes") plt.legend() -plt.show() plt.savefig(os.path.join(path,"plot.png")) +plt.show() diff --git a/workspace/run b/workspace/run index dbc71b6..a0ece86 100755 --- a/workspace/run +++ b/workspace/run @@ -28,4 +28,5 @@ do done done done + ./parse.py $result_dir $ntrials diff --git a/workspace/wifi_loopback_noGUI.grc b/workspace/wifi_loopback_noGUI.grc index 0918ff4..40b0198 100644 --- a/workspace/wifi_loopback_noGUI.grc +++ b/workspace/wifi_loopback_noGUI.grc @@ -104,6 +104,49 @@ 96000 + + blocks_complex_to_arg + + alias + + + + comment + + + + affinity + + + + _enabled + True + + + _coordinate + (792, 152) + + + _rotation + 0 + + + id + blocks_complex_to_arg_0 + + + maxoutbuf + 0 + + + minoutbuf + 0 + + + vlen + 1 + + blocks_file_sink @@ -966,18 +1009,99 @@ Max: 30 encoding + + wxgui_scopesink2 + + ac_couple + False + + + alias + + + + comment + + + + affinity + + + + _enabled + True + + + _coordinate + (784, 195) + + + _rotation + 0 + + + grid_pos + + + + id + wxgui_scopesink2_0 + + + notebook + + + + num_inputs + 1 + + + samp_rate + samp_rate + + + t_scale + 0 + + + title + Scope Plot + + + trig_mode + wxgui.TRIG_MODE_AUTO + + + type + complex + + + v_offset + 0 + + + v_scale + 0 + + + win_size + + + + xy_mode + False + + + y_axis_label + Counts + + blocks_multiply_const_vxx_0 channels_channel_model_0 0 0 - - channels_channel_model_0 - wifi_phy_hier_0 - 0 - 0 - foo_packet_pad2_0 blocks_multiply_const_vxx_0