From 398def65f22fe3ce7b4a9d8d6282556ece313e66 Mon Sep 17 00:00:00 2001 From: Derisis13 Date: Sun, 2 Aug 2026 11:55:21 +0200 Subject: [PATCH] feat(all): things? idk, just pushing --- hier_blocks/ONBEAT_demod.grc | 102 ++++++++++------------------------- hier_blocks/ONBEAT_mod.grc | 69 +++--------------------- onbeat_tx.grc | 2 +- 3 files changed, 34 insertions(+), 139 deletions(-) diff --git a/hier_blocks/ONBEAT_demod.grc b/hier_blocks/ONBEAT_demod.grc index de8d7d7..e6cc3d2 100644 --- a/hier_blocks/ONBEAT_demod.grc +++ b/hier_blocks/ONBEAT_demod.grc @@ -28,7 +28,7 @@ options: bus_sink: false bus_source: false bus_structure: null - coordinate: [8, 8] + coordinate: [8, 12.0] rotation: 0 state: enabled @@ -53,6 +53,18 @@ blocks: coordinate: [192, 12.0] rotation: 0 state: enabled +- name: symbol_map + id: variable + parameters: + comment: '' + value: '[0, 1, 3, 2]' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [368, 92.0] + rotation: 0 + state: true - name: FULL_PACKET_LEN id: parameter parameters: @@ -61,13 +73,13 @@ blocks: hide: none label: '' short_id: '' - type: eng_float + type: intx value: '4096' states: bus_sink: false bus_source: false bus_structure: null - coordinate: [664, 8.0] + coordinate: [688, 12.0] rotation: 0 state: enabled - name: OVERSAMPLING @@ -84,7 +96,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [448, 8.0] + coordinate: [464, 12.0] rotation: 0 state: enabled - name: RRC_ALPHA @@ -101,7 +113,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [568, 8.0] + coordinate: [584, 12.0] rotation: 0 state: enabled - name: analog_agc_xx_0 @@ -121,7 +133,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [152, 232.0] + coordinate: [152, 228.0] rotation: 0 state: enabled - name: blocks_multiply_const_xx_0 @@ -258,25 +270,6 @@ blocks: coordinate: [616, 496.0] rotation: 0 state: enabled -- name: blocks_tag_debug_0 - id: blocks_tag_debug - parameters: - affinity: '' - alias: '' - comment: '' - display: 'True' - filter: '""' - name: '' - num_inputs: '4' - type: byte - vlen: '1' - states: - bus_sink: false - bus_source: false - bus_structure: null - coordinate: [1064.0, 896] - rotation: 270 - state: disabled - name: digital_constellation_decoder_cb_0 id: digital_constellation_decoder_cb parameters: @@ -432,7 +425,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [1008, 184.0] + coordinate: [1008, 176.0] rotation: 0 state: enabled - name: digital_map_bb_0 @@ -523,7 +516,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [616, 196.0] + coordinate: [632, 196.0] rotation: 0 state: enabled - name: filter_fft_rrc_filter_0 @@ -546,7 +539,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [352, 204.0] + coordinate: [336, 204.0] rotation: 0 state: enabled - name: pad_sink_0 @@ -600,27 +593,9 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [560.0, 376] + coordinate: [572.0, 360] rotation: 270 state: enabled -- name: pad_sink_3 - id: pad_sink - parameters: - affinity: '' - alias: '' - comment: '' - label: agc_out - num_streams: '1' - optional: 'True' - type: complex - vlen: '1' - states: - bus_sink: false - bus_source: false - bus_structure: null - coordinate: [296.0, 376] - rotation: 270 - state: disabled - name: pad_sink_4 id: pad_sink parameters: @@ -656,7 +631,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [8, 256.0] + coordinate: [8, 252.0] rotation: 0 state: enabled - name: roc_tolerance @@ -673,7 +648,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [1000, 8.0] + coordinate: [1016, 12.0] rotation: 0 state: enabled - name: samp_rate @@ -690,7 +665,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [352, 8.0] + coordinate: [368, 12.0] rotation: 0 state: enabled - name: satellites_fixedlen_to_pdu_0 @@ -769,23 +744,6 @@ blocks: coordinate: [1208, 752.0] rotation: 0 state: enabled -- name: symbol_map - id: parameter - parameters: - alias: '' - comment: '' - hide: none - label: '' - short_id: '' - type: '' - value: '[0, 1, 3, 2]' - states: - bus_sink: false - bus_source: false - bus_structure: null - coordinate: [352, 96.0] - rotation: 0 - state: enabled - name: syncword id: parameter parameters: @@ -800,7 +758,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [824, 8.0] + coordinate: [832, 12.0] rotation: 0 state: enabled - name: virtual_sink_0 @@ -813,7 +771,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [1304, 176.0] + coordinate: [1288, 172.0] rotation: 0 state: enabled - name: virtual_source_0 @@ -832,7 +790,6 @@ blocks: connections: - [analog_agc_xx_0, '0', filter_fft_rrc_filter_0, '0'] -- [analog_agc_xx_0, '0', pad_sink_3, '0'] - [blocks_multiply_const_xx_0, '0', digital_constellation_decoder_cb_0_0, '0'] - [blocks_multiply_const_xx_0_0, '0', digital_constellation_decoder_cb_0_1, '0'] - [blocks_multiply_const_xx_0_1, '0', digital_constellation_decoder_cb_0_2, '0'] @@ -844,15 +801,11 @@ connections: - [digital_constellation_decoder_cb_0_0, '0', digital_map_bb_0_0, '0'] - [digital_constellation_decoder_cb_0_1, '0', digital_map_bb_0_1, '0'] - [digital_constellation_decoder_cb_0_2, '0', digital_map_bb_0_2, '0'] -- [digital_correlate_access_code_tag_xx_0, '0', blocks_tag_debug_0, '3'] - [digital_correlate_access_code_tag_xx_0, '0', satellites_fixedlen_to_pdu_0, '0'] -- [digital_correlate_access_code_tag_xx_0_0, '0', blocks_tag_debug_0, '2'] - [digital_correlate_access_code_tag_xx_0_0, '0', satellites_fixedlen_to_pdu_0_0, '0'] -- [digital_correlate_access_code_tag_xx_0_1, '0', blocks_tag_debug_0, '1'] - [digital_correlate_access_code_tag_xx_0_1, '0', satellites_fixedlen_to_pdu_0_1, '0'] -- [digital_correlate_access_code_tag_xx_0_2, '0', blocks_tag_debug_0, '0'] - [digital_correlate_access_code_tag_xx_0_2, '0', satellites_fixedlen_to_pdu_0_2, '0'] - [digital_costas_loop_cc_0, '0', pad_sink_0, '0'] @@ -877,4 +830,3 @@ connections: metadata: file_format: 1 - grc_version: 3.10.11.0 diff --git a/hier_blocks/ONBEAT_mod.grc b/hier_blocks/ONBEAT_mod.grc index dd3677a..95fc42c 100644 --- a/hier_blocks/ONBEAT_mod.grc +++ b/hier_blocks/ONBEAT_mod.grc @@ -80,24 +80,9 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [64, 304.0] + coordinate: [64, 308.0] rotation: 0 state: enabled -- name: trailer_len - id: variable_tag_object - parameters: - comment: '' - key: pmt.intern("packet_len") - offset: '0' - src: pmt.intern("src") - value: pmt.from_long(8) - states: - bus_sink: false - bus_source: false - bus_structure: null - coordinate: [168, 504.0] - rotation: 0 - state: disabled - name: OVERSAMPLING id: parameter parameters: @@ -149,29 +134,9 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [352, 312.0] + coordinate: [384, 316.0] rotation: 0 state: enabled -- name: blocks_repack_bits_bb_1_0_0 - id: blocks_repack_bits_bb - parameters: - affinity: '' - alias: '' - align_output: 'False' - comment: '' - endianness: gr.GR_MSB_FIRST - k: '1' - l: '8' - len_tag_key: '""' - maxoutbuf: '0' - minoutbuf: '0' - states: - bus_sink: false - bus_source: false - bus_structure: null - coordinate: [456, 512.0] - rotation: 0 - state: disabled - name: blocks_tagged_stream_mux_0 id: blocks_tagged_stream_mux parameters: @@ -189,7 +154,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [848, 296.0] + coordinate: [712, 296.0] rotation: 0 state: enabled - name: blocks_vector_source_x_0_0 @@ -229,29 +194,9 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [168, 304.0] + coordinate: [168, 308.0] rotation: 0 state: enabled -- name: blocks_vector_source_x_0_0_0_0 - id: blocks_vector_source_x - parameters: - affinity: '' - alias: '' - comment: '' - maxoutbuf: '0' - minoutbuf: '0' - repeat: 'True' - tags: '[trailer_len]' - type: byte - vector: preamble - vlen: '1' - states: - bus_sink: false - bus_source: false - bus_structure: null - coordinate: [272, 504.0] - rotation: 0 - state: disabled - name: digital_constellation_modulator_0 id: digital_constellation_modulator parameters: @@ -271,7 +216,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [1096, 312.0] + coordinate: [992, 300.0] rotation: 0 state: enabled - name: pad_sink_0 @@ -289,7 +234,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [1352, 336.0] + coordinate: [1248, 324.0] rotation: 0 state: enabled - name: pad_source_0 @@ -352,10 +297,8 @@ connections: - [blocks_tagged_stream_mux_0, '0', digital_constellation_modulator_0, '0'] - [blocks_vector_source_x_0_0, '0', blocks_tagged_stream_mux_0, '0'] - [blocks_vector_source_x_0_0_0, '0', blocks_repack_bits_bb_1_0, '0'] -- [blocks_vector_source_x_0_0_0_0, '0', blocks_repack_bits_bb_1_0_0, '0'] - [digital_constellation_modulator_0, '0', pad_sink_0, '0'] - [pad_source_0, '0', blocks_tagged_stream_mux_0, '2'] metadata: file_format: 1 - grc_version: 3.10.11.0 diff --git a/onbeat_tx.grc b/onbeat_tx.grc index 9df169b..6b38026 100644 --- a/onbeat_tx.grc +++ b/onbeat_tx.grc @@ -127,7 +127,7 @@ blocks: parameters: affinity: '' alias: '' - attenuation1: '5.0' + attenuation1: '89.0' bandwidth: '20000000' buffer_size: '32768' comment: ''