Add APE2Ax, APCNxx, APN2xx, APMPAD, as seen in tocalls.txt

aprsorg / aprs-deviceid

APRS device identification data: tocalls.txt + mic-e-types.txt current master allocations (YAML, JSON, XML)

60 stars 23 forks source link

Add APE2Ax, APCNxx, APN2xx, APMPAD, as seen in tocalls.txt #50

Closed NoseyNick closed 3 years ago

NoseyNick commented 3 years ago

Slightly selfishly adding my APE2A?, but whilst I'm there, a few other recent ones as seen in http://aprs.org/aprs11/tocalls.txt too.

LMK if there's anything I've missed. APCN??, APN2??, APMPAD are not mine, so a little guesswork involved.

LMK if I should update the generated/* - the diffs looked CONSIDERABLY more than just these 4, perhaps random / different sort order?

~Speaking of which, is tocalls.yaml supposed to be sorted? It's kinda not quite, or at least not by tocall: ?~ (never mind, I see #16)

NoseyNick commented 3 years ago

@hessu any comment, and/or good to merge?

hessu commented 3 years ago

Hi,

Unfortunately there are conflicts.
Please also observe the git commit log for examples of previous additions, and follow the style.
One commit per one logical addition: one commit for your new allocations, etc.
I'll do the generation step and make a separate commit out of that after every maintenance round. If the generated files would be included, all PRs would conflict every time.

NoseyNick commented 3 years ago

Oddly enough, the conflicts were what I was trying to avoid by daisy-chaining a few of my subsequent, but no worries, I'll re-merge / rebase / repush shortly.

The git commit logs on my PR are unrelated to the git commit logs on master, aren't they? On my own repos, when I merge I get to choose the actual merge commit log message. What have I misunderstood here? Did I somehow accidentally bypass a GitHub PR Template?

See what I can do anyway :thinking:

NoseyNick commented 3 years ago

Replaced by #53 #54 #55 #56 - closing in favour of those, which hopefully meet the submission requirements. LMK if you have any questions,