moves manifest polling section

Author: MarkoVcode

benchmesh-serial-service/src/benchmesh_service/drivers/owon_dge/manifest.json

@@ -16,14 +16,14 @@
         "reol": "\r",
         "def_conn_ver_command": "*IDN?"
       },
+      "polling": [
+        {
+          "method": "poll_status",
+          "interval": 0.6
+        }
+      ],
       "instrument_class": {
         "AWG": {
-          "pooling": [
-            {
-              "method": "poll_status",
-              "interval": 0.6
-            }
-          ],
           "ui_component": "GenericAWG",
           "features": {
             "lock": true,
@@ -33,4 +33,4 @@
       }
     }
   }
-}
+}

benchmesh-serial-service/src/benchmesh_service/drivers/owon_oel/manifest.json

@@ -16,14 +16,14 @@
         "reol": "\r",
         "def_conn_ver_command": "*IDN?"
       },
+      "polling": [
+        {
+          "method": "poll_status",
+          "interval": 1.1
+        }
+      ],
       "instrument_class": {
         "ELL": {
-          "pooling": [
-            {
-              "method": "poll_status",
-              "interval": 1.1
-            }
-          ],
           "ui_component": "OwonOELELL",
           "features": {
             "channels": 1,
@@ -103,4 +103,4 @@
       }
     }
   }
-}
+}

benchmesh-serial-service/src/benchmesh_service/drivers/owon_spm/manifest.json

@@ -17,7 +17,7 @@
         "reol": "\r",
         "def_conn_ver_command": "*IDN?"
       },
-      "pooling": [
+      "polling": [
         {
           "method": "poll_status",
           "interval": 2,
@@ -303,4 +303,4 @@
       }
     }
   }
-}
+}

benchmesh-serial-service/src/benchmesh_service/drivers/owon_xdm/manifest.json

@@ -16,14 +16,14 @@
         "reol": "\r",
         "def_conn_ver_command": "*IDN?"
       },
+      "polling": [
+        {
+          "method": "poll_status",
+          "interval": 0.1
+        }
+      ],
       "instrument_class": {
         "DMM": {
-          "pooling": [
-            {
-              "method": "poll_status",
-              "interval": 0.1
-            }
-          ],
           "ui_component": "GenericDMM",
           "features": {
             "channels": 1,
@@ -479,4 +479,4 @@
       }
     }
   }
-}
+}

benchmesh-serial-service/src/benchmesh_service/drivers/tenma_72/manifest.json

@@ -16,14 +16,14 @@
         "reol": "",
         "def_conn_ver_command": "*IDN?"
       },
+      "polling": [
+        {
+          "method": "poll_status",
+          "interval": 3
+        }
+      ],
       "instrument_class": {
         "PSU": {
-          "pooling": [
-            {
-              "method": "poll_status",
-              "interval": 6
-            }
-          ],
           "ui_component": "GenericPSU",
           "features": {
             "lock": true,
@@ -82,4 +82,4 @@
       }
     }
   }
-}
+}

benchmesh-serial-service/src/benchmesh_service/manifest_resolver.py

@@ -77,16 +77,21 @@ def get_poll_intervals(self, dev: dict) -> Dict[str, float]:
             return out
         manifest = self._load_manifest(driver_key)
         model_cfg = self._get_model_cfg(manifest, dev)
+
+        # Check model-level polling first (new unified approach)
+        model_interval = self._first_poll_interval(model_cfg)
+
         inst = model_cfg.get('instrument_class') or {}
         for klass, cfg in (inst or {}).items():
-            iv = self._first_poll_interval(cfg)
+            # Use model-level interval if available, otherwise class-level
+            iv = model_interval if model_interval is not None else self._first_poll_interval(cfg)
             if iv is not None:
                 out[str(klass)] = iv
             # nested
             for subk, subcfg in (cfg or {}).items():
                 if not isinstance(subcfg, dict) or subk in ('features','modes','pooling','polling'):
                     continue
-                siv = self._first_poll_interval(subcfg)
+                siv = model_interval if model_interval is not None else self._first_poll_interval(subcfg)
                 if siv is not None:
                     out[str(subk)] = siv
         return out
@@ -108,6 +113,13 @@ def get_poll_method(self, dev: dict, klass: str) -> Optional[str]:
             return None
         manifest = self._load_manifest(driver_key)
         model_cfg = self._get_model_cfg(manifest, dev)
+
+        # Check model-level polling first (new unified approach)
+        model_method = self._first_poll_method(model_cfg)
+        if model_method:
+            return model_method
+
+        # Fall back to class-level polling (backward compatibility)
         iclasses = (model_cfg or {}).get('instrument_class', {}) or {}
         # top-level
         meth = self._first_poll_method(iclasses.get(klass, {}) or {})