diff --git a/LEEME.txt b/LEEME.txt index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..261753ee8a8b53c192ae37ee372a460dc5d11bba 100644 --- a/LEEME.txt +++ b/LEEME.txt @@ -0,0 +1,26 @@ +### COMINA - COMUNICACIONES INALAMBRICAS +### iie-fing-udelar +### LABORATORIO INTEGRADOR + +Dependencias Python: + - Pillow (Python Imaging Library) + - Numpy + +En linux, Pillow se puede instalar mediante pip: + +pip install Pillow + + +#### image2bit +Convierte la imagen que se encuentra en images/image.png, a una secuencia de bytes (uint8). +El archivo image_bin.dat generado se encuentra en la carpeta dat/. + +En terminal hacer: +python image2bit.py + + +#### bit2image +Convierte un .dat en una o varias imágenes y calculas el PSNR. + +En terminal hacer: +python bit2image.py diff --git a/Madonna_24.wav b/Madonna_24.wav deleted file mode 100644 index 25fe900152a673aa1e0884b88a217fc94d288947..0000000000000000000000000000000000000000 Binary files a/Madonna_24.wav and /dev/null differ diff --git a/gnuradio/transmisor_hackrf.grc b/gnuradio/transmisor_audio_hackrf.grc similarity index 96% rename from gnuradio/transmisor_hackrf.grc rename to gnuradio/transmisor_audio_hackrf.grc index beec8812e38607d505b38c047b73915be89fac55..f37eb0723ceb4ebb493765f3501df717cea76f7f 100644 --- a/gnuradio/transmisor_hackrf.grc +++ b/gnuradio/transmisor_audio_hackrf.grc @@ -306,33 +306,6 @@ <value>firdes.root_raised_cosine(1, sym_rate*samp_per_sym, sym_rate, alfa, samp_per_sym*len_sym_srrc)</value> </param> </block> - <block> - <key>variable</key> - <param> - <key>comment</key> - <value></value> - </param> - <param> - <key>_enabled</key> - <value>0</value> - </param> - <param> - <key>_coordinate</key> - <value>(400, 717)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - <param> - <key>id</key> - <value>pulso</value> - </param> - <param> - <key>value</key> - <value>firdes.root_raised_cosine(samp_per_sym,samp_per_sym,1.0,alfa,samp_per_sym*len_sym_srrc)</value> - </param> - </block> <block> <key>variable</key> <param> @@ -441,61 +414,6 @@ <value>48e03*4</value> </param> </block> - <block> - <key>blocks_file_source</key> - <param> - <key>alias</key> - <value></value> - </param> - <param> - <key>comment</key> - <value>Imagen</value> - </param> - <param> - <key>affinity</key> - <value></value> - </param> - <param> - <key>_enabled</key> - <value>1</value> - </param> - <param> - <key>file</key> - <value>/home/gonzalo/ownCloud/IIE/Comina/2019/laboratorioIntegrador/transmision imagen/dat/imagen_bin.dat</value> - </param> - <param> - <key>_coordinate</key> - <value>(80, 461)</value> - </param> - <param> - <key>_rotation</key> - <value>180</value> - </param> - <param> - <key>id</key> - <value>blocks_file_source_0</value> - </param> - <param> - <key>maxoutbuf</key> - <value>0</value> - </param> - <param> - <key>minoutbuf</key> - <value>0</value> - </param> - <param> - <key>type</key> - <value>byte</value> - </param> - <param> - <key>repeat</key> - <value>True</value> - </param> - <param> - <key>vlen</key> - <value>1</value> - </param> - </block> <block> <key>blocks_float_to_char</key> <param> @@ -512,7 +430,7 @@ </param> <param> <key>_enabled</key> - <value>0</value> + <value>1</value> </param> <param> <key>_coordinate</key> @@ -563,7 +481,7 @@ </param> <param> <key>_enabled</key> - <value>0</value> + <value>1</value> </param> <param> <key>_coordinate</key> @@ -716,7 +634,7 @@ </param> <param> <key>_enabled</key> - <value>0</value> + <value>1</value> </param> <param> <key>file</key> @@ -2706,12 +2624,6 @@ <value>ccc</value> </param> </block> - <connection> - <source_block_id>blocks_file_source_0</source_block_id> - <sink_block_id>blocks_packed_to_unpacked_xx_0</sink_block_id> - <source_key>0</source_key> - <sink_key>0</sink_key> - </connection> <connection> <source_block_id>blocks_float_to_char_0</source_block_id> <sink_block_id>blocks_packed_to_unpacked_xx_0</sink_block_id> diff --git a/gnuradio/transmisor_imagen_hackrf.grc b/gnuradio/transmisor_imagen_hackrf.grc index 30eb4b16ebaacf0989194ff8a1fe8c8cca47f758..02323b6b191aee818e153b327c6f2c2dd29b8576 100644 --- a/gnuradio/transmisor_imagen_hackrf.grc +++ b/gnuradio/transmisor_imagen_hackrf.grc @@ -93,7 +93,7 @@ </param> <param> <key>_coordinate</key> - <value>(88, 428)</value> + <value>(88, 556)</value> </param> <param> <key>_rotation</key> @@ -124,7 +124,7 @@ </param> <param> <key>_coordinate</key> - <value>(952, 424)</value> + <value>(952, 552)</value> </param> <param> <key>gui_hint</key> @@ -183,7 +183,7 @@ </param> <param> <key>_coordinate</key> - <value>(608, 428)</value> + <value>(608, 556)</value> </param> <param> <key>_rotation</key> @@ -210,7 +210,7 @@ </param> <param> <key>_coordinate</key> - <value>(768, 428)</value> + <value>(768, 556)</value> </param> <param> <key>_rotation</key> @@ -237,7 +237,7 @@ </param> <param> <key>_coordinate</key> - <value>(848, 428)</value> + <value>(848, 556)</value> </param> <param> <key>_rotation</key> @@ -264,7 +264,7 @@ </param> <param> <key>_coordinate</key> - <value>(168, 428)</value> + <value>(168, 556)</value> </param> <param> <key>_rotation</key> @@ -291,7 +291,7 @@ </param> <param> <key>_coordinate</key> - <value>(144, 484)</value> + <value>(144, 612)</value> </param> <param> <key>_rotation</key> @@ -306,33 +306,6 @@ <value>firdes.root_raised_cosine(1, sym_rate*samp_per_sym, sym_rate, alfa, samp_per_sym*len_sym_srrc)</value> </param> </block> - <block> - <key>variable</key> - <param> - <key>comment</key> - <value></value> - </param> - <param> - <key>_enabled</key> - <value>0</value> - </param> - <param> - <key>_coordinate</key> - <value>(400, 717)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - <param> - <key>id</key> - <value>pulso</value> - </param> - <param> - <key>value</key> - <value>firdes.root_raised_cosine(samp_per_sym,samp_per_sym,1.0,alfa,samp_per_sym*len_sym_srrc)</value> - </param> - </block> <block> <key>variable</key> <param> @@ -345,7 +318,7 @@ </param> <param> <key>_coordinate</key> - <value>(264, 428)</value> + <value>(264, 556)</value> </param> <param> <key>_rotation</key> @@ -372,7 +345,7 @@ </param> <param> <key>_coordinate</key> - <value>(520, 428)</value> + <value>(520, 556)</value> </param> <param> <key>_rotation</key> @@ -399,7 +372,7 @@ </param> <param> <key>_coordinate</key> - <value>(440, 484)</value> + <value>(440, 612)</value> </param> <param> <key>_rotation</key> @@ -426,7 +399,7 @@ </param> <param> <key>_coordinate</key> - <value>(440, 428)</value> + <value>(440, 556)</value> </param> <param> <key>_rotation</key> @@ -1884,7 +1857,7 @@ </param> <param> <key>_coordinate</key> - <value>(992, 28)</value> + <value>(688, 452)</value> </param> <param> <key>gui_hint</key> @@ -2171,7 +2144,7 @@ </param> <param> <key>_coordinate</key> - <value>(992, 108)</value> + <value>(688, 380)</value> </param> <param> <key>gui_hint</key>