Python3 parsing correction for priority and lockout and new command switches #37
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rebase to python3 changes from ta6o
On branch py3-updates Changes to be committed: modified: apps/cursesgui.py modified: apps/ham2mon.py new file: apps/lockout-example.txt modified: apps/parser.py new file: apps/priority-example.txt modified: apps/scanner.py Modified detection of builtins functions for python2 and python3 (only tested on 3 so far). Modified priority and lockout file list parsing for python2 and python3 builtin filter function call. Added params for min_db and max_db as -N and -M respectively set from command line. Revised step size on spectrum min/max to 5, preference take it or leave it, may revise to a command line flag. Created example format file with simple entry set for priority and lockout files.
On branch py3-updates Changes to be committed: modified: README.md Revised description to include new min/max spectrum level switches and contributors.
Changes to be committed: modified: README.md Attribution for ta6o python3 fixes adopted in pull request
…ight in color (green if tuned, yellow if lockout). modified spectrum display characters used to visually separate under threshold (-), above threshold (*) and above maximum (+) as well as use colors blue, green, and red respectively. Committer: Andrew Farris <[email protected]> On branch gui-devel Changes to be committed: modified: cursesgui.py modified: ham2mon.py modified: receiver.py modified: scanner.py
…rase instead of clear and call cursor set no cursor. Committer: Andrew Farris <[email protected]> Changes to be committed: modified: cursesgui.py
… users, bold and dim white window titles, work to be done enumerating the colors better such as 'border_color' and 'text_color' where the color pairs are define so that would change in one location versus every call. Changes to be committed: modified: cursesgui.py
Added min/max frequency calculation to estimate the bandwidth covered by current sample rate and center frequency. Added display for min/max to receiver window. Adjusted alignment in receiver window. Separated lockout and priority file display to two lines in receiver window. Added framework for log file display but currently commented out. Log framework will initially text file note of channel active at time with a min time interval of logging. BUG remaining on Fedora 32 Python 3.8.6 there are randomly printed zeros showing up around the screen, has not been fixed by attempting to move cursor to fixed location after window draw and cannot isolate source of the zeros printed. Seems to print in spectrum and channel windows most but can appear in border, maybe lockout, not sure ever seen in receiver window. On branch gui-devel Changes to be committed: modified: cursesgui.py modified: ham2mon.py modified: receiver.py modified: scanner.py
… (long running demod fix) and kibihrchak (logger)
Changes to be committed: modified: apps/cursesgui.py modified: apps/ham2mon.py modified: apps/parser.py modified: apps/scanner.py
…ve channel logging timeout to not flood log file, apparnetly still too frequency so needs fixed, does log active channels as well as demodulators turned on and off Changes to be committed: modified: ../README.md modified: cursesgui.py modified: ham2mon.py modified: parser.py modified: scanner.py
…ctive channel outputs reduced to correct excessive active log entries, but still has excess entries for off channels (seems not only when demodulator is cleared but repeats Changes to be committed: new file: errors.py modified: ham2mon.py modified: scanner.py
…dd dB, timeout or channel indicator and the demodulator number that is turned on or off. Attempted fix of catch exception correctly for LogError. Changes to be committed: modified: ham2mon.py modified: scanner.py
…ter based on capabilities changes from john-, minimal testing, from john/gain_changes_and_long_xmit_kill branch with updates for python3, made killed demod resume set frequency so new file is created but assigned channel remains assigned and a demod on it
modified: receiver.py
modified: receiver.py
…d min file size with default 0, so setting min file size to 10000 will delete any demodulator output wav files that are less than 10k bytes in size when the demodulator is stopped. This may not take effect when ctrl-c is used to stop the program but should when "Q" is pressed since all demodulators are stopped in that case before shutdown. Changes to be committed: modified: ham2mon.py modified: parser.py modified: receiver.py modified: scanner.py
Changes to be committed: modified: ham2mon.py
…ction to display help Changes to be committed: modified: README.md modified: apps/parser.py
…old code, corrected missing parameter descriptions and test script outputs. On branch Gain-changes-and-long-xmit-kill Changes to be committed: modified: README.md modified: apps/cursesgui.py modified: apps/ham2mon.py modified: apps/parser.py modified: apps/receiver.py modified: apps/scanner.py
new file: ham2mon_processor_usage_2.png
Added priority example files for FRS and GMRS, amatuer 2m and 70cm radio services new file: priority-frs1 new file: priority-frs2 new file: priority-gmrs new file: priority-gmrsri new file: priority-uhf new file: priority-vhf new file: ../ham2mon_processor_usage_2.png
Multiple fixes for version updates gr-osmosdr 0.2.0.0 (0.2.0) gnuradio 3.9.5.0 Added priority example files for FRS and GMRS, amatuer 2m and 70cm radio services Revised handling of /dev/null wave file sink by creating a null sink Revised error handling by adding OS and base catch blocks, commented out for testing in this comm
Added freq_low and freq_high tuner limits (in addition to max_freq and min_freq) limited by the sampling Added freq_low and freq_high to gui, command line switches, and demod setup Modified some logic on set frequency and wav filename, separated out function for set_file_name from set_center_freq General cleanup of some comments and code organization, removed last_center member from BaseTuner as never used modified: cursesgui.py modified: ham2mon.py modified: parser.py modified: receiver.py modified: scanner.py
modified: ../README.md
…y to calculate desired low and high freq tuning bounds with given low_freq and high_freq Fixed error in Scanner test code from old gain code upgrades Edited ham2mon to add new param Fixed logic of removing channels that are below low_bound and above high_bound modified: ham2mon.py modified: scanner.py
…ls only, calling channels only in vhf for 2m and uhf for 70cm examples
Added priority example files for FRS and GMRS, amatuer 2m and 70cm radio services new file: priority-frs1 new file: priority-frs2 new file: priority-gmrs new file: priority-gmrsri new file: priority-uhf new file: priority-vhf new file: ../ham2mon_processor_usage_2.png
Multiple fixes for version updates gr-osmosdr 0.2.0.0 (0.2.0) gnuradio 3.9.5.0 Added priority example files for FRS and GMRS, amatuer 2m and 70cm radio services Revised handling of /dev/null wave file sink by creating a null sink Revised error handling by adding OS and base catch blocks, commented out for testing in this comm
Added freq_low and freq_high tuner limits (in addition to max_freq and min_freq) limited by the sampling Added freq_low and freq_high to gui, command line switches, and demod setup Modified some logic on set frequency and wav filename, separated out function for set_file_name from set_center_freq General cleanup of some comments and code organization, removed last_center member from BaseTuner as never used modified: cursesgui.py modified: ham2mon.py modified: parser.py modified: receiver.py modified: scanner.py
modified: ../README.md
…y to calculate desired low and high freq tuning bounds with given low_freq and high_freq Fixed error in Scanner test code from old gain code upgrades Edited ham2mon to add new param Fixed logic of removing channels that are below low_bound and above high_bound modified: ham2mon.py modified: scanner.py
…ls only, calling channels only in vhf for 2m and uhf for 70cm examples
Fixed error in Scanner test code from old gain code upgrades Added center_freq to constructor params for Scanner to provide ability to calculate desired low and high freq tuning bounds with given low_freq and high_freq Fixed logic of removing channels that are below low_bound and above high_bound Added freq_low and freq_high tuner limits (in addition to max_freq and min_freq) limited by the sampling Added freq_low and freq_high to gui, command line switches, and demod setup Modified some logic on set frequency and wav filename, separated out function for set_file_name from set_center_freq General cleanup of some comments and code organization, removed last_center member from BaseTuner as never used Multiple fixes for version updates gr-osmosdr 0.2.0.0 (0.2.0) gnuradio 3.9.5.0 Added priority example files for FRS and GMRS, amatuer 2m and 70cm radio services Revised handling of /dev/null wave file sink by creating a null sink Revised error handling by adding OS and base catch blocks, commented out for testing in this comm Added priority example files for FRS and GMRS, amatuer 2m and 70cm radio services Updated change log history including miweber67 contribution manually captured
remove unused code
priority scanning algorithm change, scanner.py significantly changed, few remaining bugs (currently crashes with a list access error, but saving work done) modified: receiver.py modified: scanner.py debugging new scan priority, added modules for traceback and sys calls corrections to priority channel handling :w Changes to be committed: modified: ham2mon.py modified: receiver.py modified: scanner.py
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Revised python3 compatible import for builtins with backward compatibility, added switches for command line min/max spectrum display, other small fixes. This current branch includes pull request from ta6o as the development branch point.