Merge branch 'master' of https://github.com/ComputerNetworks-UFRGS/OpERA

Conflicts:
	__init__.py
	algorithm/__init__.py
	algorithm/abstractAlgorithm.py
	algorithm/chimas.py
	algorithm/feedbackAlgorithm.py
	algorithm/qa_test.py
	algorithm/qnoise.py
	algorithm/sensing/__init__.py
	algorithm/sensing/bayesianAlgorithm.py
	algorithm/sensing/energyAlgorithm.py
	algorithm/sensing/qa_test.py
	algorithm/sensing/waveformAlgorithm.py
	app/chimas.py
	app/cpqd.py
	app/ieee_networks/do_tests.bash
	app/ieee_networks/plots.py
	app/ieee_networks/ss_rank_tx.py
	app/tx_uhd_tb_utils.py
	device/__init__.py
	device/qa_test.py
	device/qa_test_wrapper.py
	device/uhd/qa_test.py
	device/uhd/uhdDevice.py
	device/uhd/uhdSSArch.py
	device/uhd/uhdTxPktArch.py
	device/uhdDevice.py
	device/uhdSSArch.py
	device/uhdTxPktArch.py
	device/uhdWrapper.py
	reception/architecture/__init__.py
	reception/architecture/feedback/__init__.py
	reception/architecture/feedback/feedback.py
	reception/architecture/feedback/qa_feedback.py
	reception/architecture/ranking/__init__.py
	reception/architecture/ranking/qa_ranking.py
	reception/architecture/ranking/ranking_arch.py
	reception/architecture/ss_rank_tx/do_tests.bash
	reception/architecture/ss_rank_tx/ss_rank_tx.py
	reception/sensing/__init__.py
	reception/sensing/energy/energyDetector.py
	reception/sensing/energy/qa_energyDetector.py
	reception/sensing/waveform/qa_waveform.py
	reception/sensing/waveform/waveformDetector.py
	src/algorithm/__init__.py
	src/algorithm/abstractAlgorithm.py
	src/algorithm/chimas.py
	src/algorithm/feedbackAlgorithm.py
	src/algorithm/qa_test.py
	src/algorithm/qnoise.py
	src/algorithm/sensing/__init__.py
	src/algorithm/sensing/bayesianAlgorithm.py
	src/algorithm/sensing/energyAlgorithm.py
	src/algorithm/sensing/qa_test.py
	src/algorithm/sensing/waveformAlgorithm.py
	src/app/chimas.py
	src/app/cpqd.py
	src/app/ieee_networks/do_tests.bash
	src/app/ieee_networks/plots.py
	src/app/ieee_networks/ss_rank_tx.py
	src/app/tx_uhd_tb_utils.py
	src/device/qa_test.py
	src/device/qa_test_wrapper.py
	src/device/uhdDevice.py
	src/device/uhdSSArch.py
	src/device/uhdTxPktArch.py
	src/device/uhdWrapper.py
	src/reception/architecture/__init__.py
	src/reception/architecture/feedback/__init__.py
	src/reception/architecture/feedback/feedback.py
	src/reception/architecture/feedback/qa_feedback.py
	src/reception/architecture/ranking/__init__.py
	src/reception/architecture/ranking/qa_ranking.py
	src/reception/architecture/ranking/ranking_arch.py
	src/reception/architecture/ss_rank_tx/do_tests.bash
	src/reception/architecture/ss_rank_tx/ss_rank_tx.py
	src/reception/sensing/__init__.py
	src/reception/sensing/energy/energyDetector.py
	src/reception/sensing/energy/qa_energyDetector.py
	src/reception/sensing/waveform/qa_waveform.py
	src/reception/sensing/waveform/waveformDetector.py
	src/utils/block/__init__.py
	src/utils/block/array_grouper.py
	src/utils/block/qa_utils.py
	src/utils/block/tx.py
	src/utils/sensing/__init__.py
	src/utils/sensing/channel.py
	src/utils/sensing/deviceChannelModel.py
	src/utils/sensing/logger.py
	src/utils/sensing/proxy.py
	src/utils/sensing/qa_ssutils.py
	src/utils/sensing/ss_types.py
	src/utils/sensing/top_block.py
	ss_utils/__init__.py
	ss_utils/channel.py
	ss_utils/deviceChannelModel.py
	ss_utils/logger.py
	ss_utils/proxy.py
	ss_utils/qa_ssutils.py
	ss_utils/ss_types.py
	ss_utils/top_block.py
	ssf/algorithm/__init__.py
	ssf/algorithm/abstractAlgorithm.py
	ssf/algorithm/chimas.py
	ssf/algorithm/feedbackAlgorithm.py
	ssf/algorithm/qa_test.py
	ssf/algorithm/qnoise.py
	ssf/algorithm/sensing/__init__.py
	ssf/algorithm/sensing/bayesianAlgorithm.py
	ssf/algorithm/sensing/energyAlgorithm.py
	ssf/algorithm/sensing/qa_test.py
	ssf/algorithm/sensing/waveformAlgorithm.py
	ssf/uhd/architecture/__init__.py
	ssf/uhd/architecture/feedback/__init__.py
	ssf/uhd/architecture/feedback/feedback.py
	ssf/uhd/architecture/feedback/qa_feedback.py
	ssf/uhd/architecture/ranking/__init__.py
	ssf/uhd/architecture/ranking/qa_ranking.py
	ssf/uhd/architecture/ranking/ranking_arch.py
	ssf/uhd/architecture/ss_rank_tx/do_tests.bash
	ssf/uhd/architecture/ss_rank_tx/ss_rank_tx.py
	ssf/uhd/block_util/__init__.py
	ssf/uhd/block_util/array_grouper.py
	ssf/uhd/block_util/qa_utils.py
	ssf/uhd/block_util/tx.py
	ssf/uhd/detectors/__init__.py
	ssf/uhd/detectors/energy/energyDetector.py
	ssf/uhd/detectors/energy/qa_energyDetector.py
	ssf/uhd/detectors/waveform/qa_waveform.py
	ssf/uhd/detectors/waveform/waveformDetector.py
	ssf/uhd/uhd_wrapper/qa_test.py
	ssf/uhd/uhd_wrapper/uhdWrapper.py
	tests/chimas.py
	tests/cpqd.py
	tests/ieee_networks/do_tests.bash
	tests/ieee_networks/plots.py
	tests/ieee_networks/ss_rank_tx.py
	uhd_tb_utils/tx.py
	utils/block/__init__.py
	utils/block/array_grouper.py
	utils/block/qa_utils.py
	utils/block/tx.py
	utils/sensing/__init__.py
	utils/sensing/channel.py
	utils/sensing/deviceChannelModel.py
	utils/sensing/logger.py
	utils/sensing/proxy.py
	utils/sensing/qa_ssutils.py
	utils/sensing/ss_types.py
	utils/sensing/top_block.py
Merge branch 'master' of https://github.com/ComputerNetworks-UFRGS/OpERA

Conflicts:
	__init__.py
	algorithm/decision/bayesianDecision.py
	algorithm/decision/energyDecision.py
	algorithm/decision/qa_test.py
	algorithm/decision/waveformDecision.py
	algorithm/sensing/__init__.py
	algorithm/sensing/bayesianAlgorithm.py
	algorithm/sensing/energyAlgorithm.py
	algorithm/sensing/qa_test.py
	algorithm/sensing/waveformAlgorithm.py
	device/__init__.py
	device/abstractDevice.py
	device/abstractSSArch.py
	device/abstractTxPktArch.py
	reception/architecture/__init__.py
	reception/architecture/feedback.py
	reception/architecture/feedback/__init__.py
	reception/architecture/feedback/feedback.py
	reception/architecture/feedback/qa_feedback.py
	reception/architecture/qa_feedback.py
	reception/architecture/qa_ranking.py
	reception/architecture/ranking/qa_ranking.py
	reception/architecture/ranking/ranking_arch.py
	reception/architecture/ranking_arch.py
	reception/architecture/ss_rank_tx/do_tests.bash
	reception/architecture/ss_rank_tx/ss_rank_tx.py
	reception/packet/packetGMSKRx.py
	reception/sensing/__init__.py
	reception/sensing/energy/energyDetector.py
	reception/sensing/energy/qa_energyDetector.py
	reception/sensing/energyDetector.py
	reception/sensing/qa_energyDetector.py
	reception/sensing/qa_waveform.py
	reception/sensing/waveform/qa_waveform.py
	reception/sensing/waveform/waveformDetector.py
	reception/sensing/waveformDetector.py
	ssf/algorithm/sensing/bayesianAlgorithm.py
	ssf/algorithm/sensing/energyAlgorithm.py
	ssf/algorithm/sensing/qa_test.py
	ssf/algorithm/sensing/waveformAlgorithm.py
	ssf/uhd/architecture/feedback/feedback.py
	ssf/uhd/architecture/feedback/qa_feedback.py
	ssf/uhd/architecture/ranking/qa_ranking.py
	ssf/uhd/architecture/ranking/ranking_arch.py
	ssf/uhd/detectors/energy/energyDetector.py
	ssf/uhd/detectors/energy/qa_energyDetector.py
	ssf/uhd/detectors/waveform/qa_waveform.py
	ssf/uhd/detectors/waveform/waveformDetector.py
	utils/block/__init__.py
	utils/block/tx.py