Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix argument handling in sigrok file generation #3161

Merged
merged 1 commit into from
Jan 25, 2025

Conversation

meastman
Copy link
Contributor

Since 96226b5 (October 2023), when building the arguments for zip for creating a sigrok file, the arg count is incremented multiple times for each analog file, leaving extra NULLs, causing only the first analog file to be included. Any other analog files are not included in the zip file and are not cleaned up afterwards.

This PR removes the extra increment, allowing all files to be included in the sigrok file and cleaned up afterwards.

Before:

$ rtl_433 -r g2678_433.92M_250k.cs16 -w test.sr
rtl_433 version 24.10-41-ge215c2dc branch master at 202501251130 inputs file rtl_tcp SoapySDR with TLS
[Input] Test mode active. Reading samples from file: g2678_433.92M_250k.cs16
  adding: version (stored 0%)
  adding: metadata (deflated 24%)
  adding: logic-1-1 (deflated 100%)
  adding: analog-1-4-1 (deflated 82%)

After:

$ rtl_433 -r g2678_433.92M_250k.cs16 -w test.sr
rtl_433 version 24.10-42-g4af625d5 branch sigrok-fixes at 202501251246 inputs file rtl_tcp SoapySDR with TLS
[Input] Test mode active. Reading samples from file: g2678_433.92M_250k.cs16
  adding: version (stored 0%)
  adding: metadata (deflated 24%)
  adding: logic-1-1 (deflated 100%)
  adding: analog-1-4-1 (deflated 82%)
  adding: analog-1-5-1 (deflated 82%)
  adding: analog-1-6-1 (deflated 87%)
  adding: analog-1-7-1 (deflated 78%)

@zuckschwerdt
Copy link
Collaborator

Good catch, thanks!

@zuckschwerdt zuckschwerdt merged commit 07e94ee into merbanan:master Jan 25, 2025
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants