updating the avpr file's outdated float/null types and regenerating f…

…or relative position action support.
yaq-project · Nov 14, 2023 · 827d4a1 · 827d4a1
1 parent f7c6446
commit 827d4a1
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 13 deletions.
diff --git a/yaqd_watchdog/watchdog.avpr b/yaqd_watchdog/watchdog.avpr
@@ -85,6 +85,11 @@
             "default": {},
             "type": "map",
             "values": "set_position"
+        },
+        "set_relative_actions": {
+            "default": {},
+            "type": "map",
+            "values": "set_relative"
         }
     },
     "doc": "",
@@ -244,18 +249,14 @@
                     "type": "int"
                 },
                 {
+                    "default": "inf",
                     "name": "under",
-                    "type": [
-                        "float",
-                        "null"
-                    ]
+                    "type": "float"
                 },
                 {
+                    "default": "-inf",
                     "name": "over",
-                    "type": [
-                        "float",
-                        "null"
-                    ]
+                    "type": "float"
                 },
                 {
                     "default": 10,
@@ -279,10 +280,12 @@
                     "type": "int"
                 },
                 {
+                    "default": "inf",
                     "name": "percent_under",
                     "type": "float"
                 },
                 {
+                    "default": "-inf",
                     "name": "percent_over",
                     "type": "float"
                 },
@@ -315,6 +318,25 @@
             "name": "set_position",
             "type": "record"
         },
+        {
+            "fields": [
+                {
+                    "default": "localhost",
+                    "name": "host",
+                    "type": "string"
+                },
+                {
+                    "name": "port",
+                    "type": "int"
+                },
+                {
+                    "name": "distance",
+                    "type": "float"
+                }
+            ],
+            "name": "set_relative",
+            "type": "record"
+        },
         {
             "fields": [
                 {
@@ -361,4 +383,4 @@
             "type": "record"
         }
     ]
-}
+}
diff --git a/yaqd_watchdog/watchdog.toml b/yaqd_watchdog/watchdog.toml
@@ -22,17 +22,17 @@ type = "record"
 name = "check_position_absolute"
 fields = [{"name"="host", "type"="string", "default"="localhost"},
           {"name"="port", "type"="int"},
-          {"name"="under", "type"=["float", "null"], default="__null__"},
-          {"name"="over", "type"=["float", "null"], default="__null__"},
+          {"name"="under", "type"="float", default="inf"},
+          {"name"="over", "type"="float", default="-inf"},
           {"name"="timeout", "type"="int", "default"=10, "doc"="seconds"}]
 
 [[types]]
 type = "record"
 name = "check_position_percentage"
 fields = [{"name"="host", "type"="string", "default"="localhost"},
           {"name"="port", "type"="int"},
-          {"name"="percent_under", "type"=["float", "null"], default="__null__"},
-          {"name"="percent_over", "type"=["float", "null"], default="__null__"},
+          {"name"="percent_under", "type"="float", default="inf"},
+          {"name"="percent_over", "type"="float", default="-inf"},
           {"name"="timeout", "type"="int", "default"=10, "doc"="seconds"}]
 
 [[types]]