Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mycodeplug/dzcb Loading
base: 0.3.6
Choose a base ref
...
head repository: mycodeplug/dzcb Loading
compare: 0.3.7
Choose a head ref
  • 8 commits
  • 8 files changed
  • 1 contributor

Commits on Mar 26, 2022

  1. dzcb.farnsworth: export "ColorCode", not "Color Code" 

    Fixes #84; long standing bug affecting digital repeaters with color code other than 1
    @masenf
    masenf committed Mar 26, 2022
    Configuration menu
    Copy the full SHA
    d37003b View commit details
    Browse the repository at this point in the history

  2. Update integration test 

    #84 changed the output format, so fix the
expected output files.
    @masenf
    masenf committed Mar 26, 2022
    Configuration menu
    Copy the full SHA
    ad695bb View commit details
    Browse the repository at this point in the history

  3. Merge pull request #85 from masenf/farnsworth-colorcode 

    Farnsworth ColorCode fix
    @masenf
    masenf committed Mar 26, 2022
    Configuration menu
    Copy the full SHA
    e30fe30 View commit details
    Browse the repository at this point in the history

  4. test_k7abd: same talkgroup, different name/slot test 

    Ensure that talkgroups with the same ID are
treated as equivalent when generating farnsworth
output.
    @masenf
    masenf committed Mar 26, 2022
    Configuration menu
    Copy the full SHA
    e614dc0 View commit details
    Browse the repository at this point in the history

  5. dzcb.farnsworth: lookup ContactName when generating 

    Farnsworth format only allows one contact per ID,
so contacts are collapsed by ID and Slot when
generating the JSON. This process is lossy, resulting
in some channels with talkgroups that have names
which don't appear in the final farnsworth output.

To avoid this issue, we pass a mapping of DMR ID
to Talkgroup when generating channels. Instead
of taking the channel's Talkgroup.name as-is,
look up the ID in the set of known contacts and
use the deduplicated name.
    @masenf
    masenf committed Mar 26, 2022
    Configuration menu
    Copy the full SHA
    3f84da3 View commit details
    Browse the repository at this point in the history

  6. test_k7abd: assert farnsworth grouplist contact names 

    Similarly for channels, ensure that GroupList
entries are actually present in the deduped
contact list.
    @masenf
    masenf committed Mar 26, 2022
    Configuration menu
    Copy the full SHA
    09230bf View commit details
    Browse the repository at this point in the history

  7. dzcb.farnsworth: lookup ContactName for GroupLists 

    When generating GroupLists, lookup the member
talkgroups by ID to ensure the correct name is
used (after deduping).
    @masenf
    masenf committed Mar 26, 2022
    Configuration menu
    Copy the full SHA
    612e3ac View commit details
    Browse the repository at this point in the history

  8. Merge pull request #86 from masenf/farnsworth-contact-dedupe 

    Farnsworth contact dedupe
    @masenf
    masenf committed Mar 26, 2022
    Configuration menu
    Copy the full SHA
    6effff7 View commit details
    Browse the repository at this point in the history
Loading