Closed fengzhe29888 closed 10 years ago
BTW, the new trellis was just now merged to gnuradio.master, so you can download and make it. I will soon delete the remote branch "trellisupdates"
Achilleas
On Thu, Oct 16, 2014 at 12:23 PM, fengzhe29888 notifications@github.com wrote:
Dear Professor,
I followed your suggestion and the segmentation fault is gone. Here is the new pull request. To run the cdma_txrx1.py, you need callback functions of repacked_bits and gr-trellis, and new constellations of gr-digital.
Thanks! Best,
Zhe
You can merge this Pull Request by running
git pull https://github.com/fengzhe29888/gr-cdma master
Or view, comment on, or merge it at:
https://github.com/anastas/gr-cdma/pull/2 Commit Summary
- full updates on gr-cdma
- deleted the ~editing files
- deleted the ~editing files
- added needed fsm_files
- deleted the 16qam class in cdma_parameters which is no longer needed
- minor typo found
- removed ~
- removed unnecessary class packet_header and block packet_header_generator_bb1
- removed unnecessary class packet_header and block packet_header_generator_bb1
- removed unnecessary class packet_header and block packet_header_generator_bb1
- resolved segmentation fault by removing previous version gr-modtool craps
- cleaned up some unused pads and blocks
File Changes
- M CMakeLists.txt https://github.com/anastas/gr-cdma/pull/2/files#diff-0 (2)
- A apps/cdma_rx_hier1.grc https://github.com/anastas/gr-cdma/pull/2/files#diff-1 (2088)
- A apps/cdma_tx_hier1.grc https://github.com/anastas/gr-cdma/pull/2/files#diff-2 (1422)
- A apps/cdma_txrx1.grc https://github.com/anastas/gr-cdma/pull/2/files#diff-3 (2625)
- A apps/cdma_txrx1.py https://github.com/anastas/gr-cdma/pull/2/files#diff-4 (678)
- M grc/CMakeLists.txt https://github.com/anastas/gr-cdma/pull/2/files#diff-5 (3)
- A grc/cdma_message_probe.xml https://github.com/anastas/gr-cdma/pull/2/files#diff-6 (61)
- A grc/cdma_packet_headerparser_b2.xml https://github.com/anastas/gr-cdma/pull/2/files#diff-7 (20)
- A grc/cdma_packet_headerparser_b2_default.xml https://github.com/anastas/gr-cdma/pull/2/files#diff-8 (27)
- M include/cdma/CMakeLists.txt https://github.com/anastas/gr-cdma/pull/2/files#diff-9 (2)
- A include/cdma/packet_header2.h https://github.com/anastas/gr-cdma/pull/2/files#diff-10 (126)
- A include/cdma/packet_headerparser_b2.h https://github.com/anastas/gr-cdma/pull/2/files#diff-11 (71)
- M lib/CMakeLists.txt https://github.com/anastas/gr-cdma/pull/2/files#diff-12 (4)
- A lib/packet_header2.cc https://github.com/anastas/gr-cdma/pull/2/files#diff-13 (174)
- A lib/packet_headerparser_b2_impl.cc https://github.com/anastas/gr-cdma/pull/2/files#diff-14 (98)
- A lib/packet_headerparser_b2_impl.h https://github.com/anastas/gr-cdma/pull/2/files#diff-15 (48)
- M python/init.py https://github.com/anastas/gr-cdma/pull/2/files#diff-16 (23)
- M python/cdma_parameters.py https://github.com/anastas/gr-cdma/pull/2/files#diff-17 (117)
- A python/fsm_files/awgn2o2_1.fsm https://github.com/anastas/gr-cdma/pull/2/files#diff-18 (6)
- A python/fsm_files/awgn2o3_8ungerboecka.fsm https://github.com/anastas/gr-cdma/pull/2/files#diff-19 (32)
- A python/fsm_files/awgn2o4_8_ungerboeckc.fsm https://github.com/anastas/gr-cdma/pull/2/files#diff-20 (25)
- M swig/cdma_swig.i https://github.com/anastas/gr-cdma/pull/2/files#diff-21 (13)
- A swig/packet_header.i https://github.com/anastas/gr-cdma/pull/2/files#diff-22 (27)
Patch Links:
— Reply to this email directly or view it on GitHub https://github.com/anastas/gr-cdma/pull/2.
Dear Professor,
I followed your suggestion and the segmentation fault is gone. Here is the new pull request. To run the cdma_txrx1.py, you need callback functions of repacked_bits and gr-trellis, and new constellations of gr-digital.
Thanks! Best, Zhe