devices(nvr): three recorders still drew from a 0 W budget, and a fourth cited a reseller #2297
No reviewers
Labels
No milestone
No project
No assignees
1 participant
Notifications
Due date
No due date set.
Dependencies
No dependencies set.
Reference
jaylouisw/packetforge!2297
Loading…
Add table
Add a link
Reference in a new issue
No description provided.
Delete branch "catalogue/1120-1822"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
Three Dahua/Hikvision recorders named their camera ports
PoE n, quoted a wattage indescription/notes, and carried nopoeblock at all - soengine/device.jsfell through toparsePoeBudget(model), found no number inDS-7616NXI-K2/16P, and gave each box 0 W to supply. A fourth had the number but sourced it from a reseller's reprint.scripts/audit-poe-budget.js: main83e2e7c449 silent / 411 PSEs, this branch 46.Reconciled with #2295. This PR opened with seven rows. #2295 merged 18:38 and landed three of them (
nvr5216-16p-ei2,ds-7608ni-k2-8p,ds-7616ni-k2-16p); those three files take main's landed wording and are not contested here. What remains is the part main still lacks.devices/dahua/nvr2108hs-8p-4ks3.jsondevices/dahua/nvr4208-8p-4ks3.jsondevices/dahua/nvr5216-16p-4ks2e.jsondevices/hikvision/ds-7616nxi-k2-16p.jsonAll four vendor documents were re-read this pass (Dahua HTML spec tables; both PDFs through their text layers), not inherited from the branch point.
Two of them were worse than a missing number.
nvr4208-8p-4ks3andds-7616nxi-k2-16phad nopoeOutat the spec level on any of their 8 / 16 camera ports; the engine's name rule inferred them, which is why the audit still counted 8 and 16 PSE - but an inferred port is not a declaration. Both now declare it, and all four gainpoe-pse/802.3af/802.3at, which they were missing while their prose promised 802.3af/at.The NVR5216-16P-4KS2E row also stops citing a reseller's re-hosted copy of the Dahua datasheet (
rxtx.com.au/...) in bothsourceUrlandpoe.sourceUrl; it now points at the Dahua asset the sibling NVR5232 row already used, and the 130 W was re-read there rather than inherited.Full evidence, including the port-ceiling-vs-budget arithmetic and how the Hikvision asset's JS cookie challenge was passed to reach the PDF, is in
research/nvr-integrated-poe-census.md.Gates:
syntax-check.js495 files OK;audit-port-types.js0 contradictions;audit-poe-budget.js46 silent / 0 inferred-from-name / 0 budget-without-PSE;regen-registry-doc.js --checkno drift (2,355 models);scripts/run-tests.js415 suites, 13,817 assertions, 0 failed.Closes nothing: this is catalogue hygiene under the device stream. #803 (E6616X) remains blocked upstream and is not touched here.
needs Jay's decision — this PR now collides with main on three files, and the collision is data, not formatting.
What landed first: #2295 (
2ff67857, "devices(poe): six budgets that were only in prose…"). It was opened at 18:12, this PR at 18:22, and it carriestest/poe-budget-prose-six.test.js, which assertspoe.budgetWfor all six models. Both PRs were green 7/7 and individually mergeable into main; they are not mergeable with each other.Verified locally (
git merge --no-commit origin/catalogue/1120-1822onto2ff67857):CONFLICT (content)on the same object key:devices/dahua/nvr5216-16p-ei2.jsondevices/hikvision/ds-7608ni-k2-8p.jsondevices/hikvision/ds-7616ni-k2-16p.jsoncapabilitiesadditions (poe-pse,802.3af,802.3at), thenotesrewrites,research/nvr-integrated-poe-census.md, and the other five device files.Why I did not resolve it: the wattages agree exactly (130 / 80 / 200 W), but both sides supply a hand-written
poe.notefor the same key, and the two notes make different factual claims:Picking one note over the other is a sourcing judgement, not a merge — and
sourceUrlalso differs for the 7616 (vendor product page in main vs. the 2022-10-26 datasheet PDF here).Decision needed: which per-port ceiling the catalogue quotes for these integrated-PoE NVRs — 2295's 25.5 W vendor figure or this PR's 30 W 802.3at ceiling — and which
sourceUrl/notesurvives for the three overlapping models. Once that is settled the rebase is trivial: keep onepoeblock per file, keep this PR'scapabilitiesandnoteschanges. Say the word and I will do exactly that mechanically.Still needs Jay's decision — re-checked against main
83e2e7c4(10 commits newer than the original escalation,2ff67857). Nothing has changed mechanically; the blocker is still which figure is authoritative.Verified again just now (
git merge --no-commit origin/catalogue/1120-1822in a scratch worktree at83e2e7c4):CONFLICT (content), unchanged:devices/dahua/nvr5216-16p-ei2.json,devices/hikvision/ds-7608ni-k2-8p.json,devices/hikvision/ds-7616ni-k2-16p.json.ds-7616ni-k2-16p.jsonnow also disagrees onpoe.sourceUrl— main points at the Hikvision product page, this PR at the 2022-10-26 datasheet PDF. Same for the per-port ceiling: main states 802.3at's 30 W "not a vendor figure", this PR states the vendor's 25.5 W.nvr2108hs-8p-4ks3,nvr4208-8p-4ks3,ds-7616nxi-k2-16phave nopoeobject on main at all, and thecapabilitiesadditions (poe-pse,802.3af,802.3at) apply cleanly everywhere.So this is not superseded and not mechanical. Picking a side means choosing a sourcing standard, which is Jay's call. Two viable shapes:
note/sourceUrltext on those three.test/poe-budget-prose-six.test.jsfrom #2295.The branch is 10 commits behind and will keep rotting until one is chosen.
devices(nvr): six recorders sourced 8-16 PoE ports from a 0 W budgetto devices(nvr): three recorders still drew from a 0 W budget, and a fourth cited a resellerResolved — merged as
59b1e7ebwithout needing the sourcing call.The branch was reconciled to shape 1 before this merge: it now carries 5 files, and the three contested rows (
nvr5216-16p-ei2,ds-7608ni-k2-8p,ds-7616ni-k2-16p) are no longer in the diff at all. Main's wording on those three is untouched on59b1e7eb— verified on the merged tree:ds-7616ni-k2-16pstill reads 200 W, 25.5 W in prose, product-pagesourceUrl.What landed is only the uncontested net-new:
nvr2108hs-8p-4ks3,nvr4208-8p-4ks3,nvr5216-16p-4ks2e(incl. the reseller-URL repair),ds-7616nxi-k2-16p,research/nvr-integrated-poe-census.md, and thepoe-pse/802.3af/802.3atcapabilities.Verified before merging: merge-tree clean against
ab233500, and full suite 498/498 pass, 0 fail on the merged tree.So the question I escalated — 802.3at's 30 W vs the vendor's 25.5 W — is not a blocker for this PR, but it is still open as an editorial standard: main claims 30 W "not a vendor figure" on Hikvision rows while Dahua rows in the same family quote 25.5 W. Worth one decision eventually; nothing is inconsistent within any single row today.