Update thresholds.json with exact VFKD forum values

- SNR: exact values from forum (256QAM >33, 64QAM >27, 1024QAM >39)
- US Power: split by DOCSIS version (3.0 vs 3.1)
- Fritz!Box DOCSIS 3.1 US offset: -6 dB applied to thresholds
- US assessment now uses DOCSIS version instead of modulation
- Source: vodafonekabelforum.de/viewtopic.php?t=39941 (all 3 sections)

Author: Dennis Braun

app/analyzer.py

@@ -41,12 +41,17 @@ def _get_ds_power_thresholds(modulation=None):
     }
 
 
-def _get_us_power_thresholds(modulation=None):
-    """Get US power thresholds for a given modulation."""
+def _get_us_power_thresholds(docsis_version=None):
+    """Get US power thresholds for a given DOCSIS version."""
     us = _thresholds.get("upstream_power", {})
-    default_mod = us.get("_default", "64QAM")
-    mod = modulation if modulation in us else default_mod
-    t = us.get(mod, {})
+    default_ver = us.get("_default", "EuroDOCSIS 3.0")
+    # Map version strings
+    ver = default_ver
+    if docsis_version in ("3.1", "DOCSIS 3.1"):
+        ver = "DOCSIS 3.1"
+    elif docsis_version in ("3.0", "EuroDOCSIS 3.0"):
+        ver = "EuroDOCSIS 3.0"
+    t = us.get(ver, us.get(default_ver, {}))
     return {
         "good_min": t.get("good_min", 41.0),
         "good_max": t.get("good_max", 47.0),
@@ -126,13 +131,12 @@ def _assess_ds_channel(ch, docsis_ver):
     return _channel_health(issues), _health_detail(issues)
 
 
-def _assess_us_channel(ch):
+def _assess_us_channel(ch, docsis_ver="3.0"):
     """Assess a single upstream channel. Returns (health, health_detail)."""
     issues = []
     power = _parse_float(ch.get("powerLevel"))
-    modulation = (ch.get("modulation") or ch.get("type") or "").upper().replace("-", "")
 
-    pt = _get_us_power_thresholds(modulation)
+    pt = _get_us_power_thresholds(docsis_ver)
     if power < pt["crit_min"] or power > pt["crit_max"]:
         issues.append("power critical")
     elif power < pt["good_min"] or power > pt["good_max"]:
@@ -197,7 +201,7 @@ def analyze(data: dict) -> dict:
     # --- Parse upstream channels ---
     us_channels = []
     for ch in us30:
-        health, health_detail = _assess_us_channel(ch)
+        health, health_detail = _assess_us_channel(ch, "3.0")
         us_channels.append({
             "channel_id": ch.get("channelID", 0),
             "frequency": ch.get("frequency", ""),
@@ -209,7 +213,7 @@ def analyze(data: dict) -> dict:
             "health_detail": health_detail,
         })
     for ch in us31:
-        health, health_detail = _assess_us_channel(ch)
+        health, health_detail = _assess_us_channel(ch, "3.1")
         us_channels.append({
             "channel_id": ch.get("channelID", 0),
             "frequency": ch.get("frequency", ""),

app/thresholds.json

@@ -1,8 +1,9 @@
 {
   "_source": "Vodafone Kabel Deutschland (VFKD) guidelines, vodafonekabelforum.de/viewtopic.php?t=39941",
-  "_note": "All power values in dBmV (as shown by Fritz!Box). SNR/MER in dB.",
+  "_note": "All power values in dBmV (as shown by Fritz!Box). SNR/MER in dB (absolute values).",
 
   "downstream_power": {
+    "_comment": "Asymmetric ranges per modulation",
     "256QAM": {
       "good_min": -3.9, "good_max": 13.0,
       "tolerated_min": -5.9, "tolerated_max": 18.0,
@@ -25,45 +26,42 @@
   },
 
   "upstream_power": {
-    "64QAM": {
+    "_comment_fritz": "Fritz!Box shows DOCSIS 3.1 upstream 6 dB lower than actual. Values here are as displayed by Fritz!Box.",
+    "EuroDOCSIS 3.0": {
       "good_min": 41.1, "good_max": 47.0,
-      "tolerated_min": 38.1, "tolerated_max": 50.0,
+      "tolerated_min": 37.1, "tolerated_max": 51.0,
       "monthly_min": 35.1, "monthly_max": 53.0,
       "immediate_min": 35.0, "immediate_max": 53.0
     },
-    "128QAM": {
-      "good_min": 44.1, "good_max": 47.0,
-      "tolerated_min": 41.1, "tolerated_max": 50.0,
-      "monthly_min": 38.1, "monthly_max": 53.0,
-      "immediate_min": 38.0, "immediate_max": 53.0
+    "DOCSIS 3.1": {
+      "_comment": "Values adjusted for Fritz!Box display (-6 dB from actual). Actual regelkonform: 44.1-47.0",
+      "good_min": 38.1, "good_max": 41.0,
+      "tolerated_min": 34.1, "tolerated_max": 44.0,
+      "monthly_min": 32.1, "monthly_max": 50.0,
+      "immediate_min": 32.0, "immediate_max": 50.0
     },
-    "_default": "64QAM"
+    "_default": "EuroDOCSIS 3.0"
   },
 
   "snr": {
+    "_comment": "Values as absolute dB (Fritz!Box shows MSE as negative, DOCSight uses abs())",
     "256QAM": {
-      "good_min": 33.1,
-      "tolerated_min": 31.1,
-      "monthly_min": 29.1,
-      "immediate_min": 29.0
+      "good_min": 33.0,
+      "tolerated_min": 32.0,
+      "monthly_min": 30.0,
+      "immediate_min": 30.0
     },
     "64QAM": {
-      "good_min": 27.1,
-      "tolerated_min": 25.1,
-      "monthly_min": 23.1,
-      "immediate_min": 23.0
+      "good_min": 27.0,
+      "tolerated_min": 26.0,
+      "monthly_min": 24.0,
+      "immediate_min": 24.0
     },
     "1024QAM": {
-      "good_min": 37.1,
-      "tolerated_min": 35.1,
-      "monthly_min": 33.1,
-      "immediate_min": 33.0
-    },
-    "4096QAM": {
-      "good_min": 45.1,
-      "tolerated_min": 43.1,
-      "monthly_min": 41.1,
-      "immediate_min": 41.0
+      "good_min": 39.0,
+      "tolerated_min": 38.0,
+      "monthly_min": 36.0,
+      "immediate_min": 36.0
     },
     "_default": "256QAM"
   },