Move sys/wifi/watchdog to sys/watchdog

Author: chrismerck

common/info.yaml

@@ -220,7 +220,7 @@ description: |
             - commands
             - state
         - sys
-          - wifi
+          - network
 
   Clearly, if the entire tree were expanded on a request of the root,
   then the resulting request may be very large! This large response body

common/paths.yaml

@@ -136,19 +136,19 @@
     $ref: ../users/paths.yaml#/Patch
 /v2/sys/wifi/sta:
   get:
-    $ref: ../wifi/paths.yaml#/StaGet
+    $ref: ../network/paths.yaml#/StaGet
   put:
-    $ref: ../wifi/paths.yaml#/StaPut
+    $ref: ../network/paths.yaml#/StaPut
   delete:
-    $ref: ../wifi/paths.yaml#/StaDelete
+    $ref: ../network/paths.yaml#/StaDelete
 /v2/sys/wifi/scan:
   get:
-    $ref: ../wifi/paths.yaml#/ScanGet
-/v2/sys/wifi/watchdog:
+    $ref: ../network/paths.yaml#/ScanGet
+/v2/sys/watchdog:
   get:
-    $ref: ../wifi/paths.yaml#/WatchdogGet
+    $ref: ../network/paths.yaml#/WatchdogGet
   patch:
-    $ref: ../wifi/paths.yaml#/WatchdogPatch
+    $ref: ../network/paths.yaml#/WatchdogPatch
 /v2/sys/time:
   get:
     $ref: ../sys/paths.yaml#/TimeGet

local.yaml

@@ -41,11 +41,13 @@ x-tagGroups:
       - Token
       - MQTT
       - BPUP
-  - name: System
+  - name: Network
     tags:
       - Wi-Fi Scan
       - Wi-Fi Station
-      - Wi-Fi Watchdog
+      - Network Watchdog
+  - name: System
+    tags:
       - Upgrade
       - Version
       - Reset

local/paths.yaml

@@ -52,19 +52,19 @@
 /v2/api/bpup:
     $ref: ../api/bpup.yaml#/Path
 /v2/sys/wifi/scan:
-  $ref: ../wifi/paths.yaml#/WifiScanPath
+  $ref: ../network/paths.yaml#/WifiScanPath
 /v2/sys/wifi/sta:
-  $ref: ../wifi/paths.yaml#/WifiStaPath
-/v2/sys/wifi/watchdog:
-  $ref: ../wifi/paths.yaml#/WifiWatchDogPath
+  $ref: ../network/paths.yaml#/WifiStaPath
+/v2/sys/watchdog:
+  $ref: ../network/paths.yaml#/WifiWatchDogPath
 /v2/sys/upgrade:
-  $ref: ../wifi/paths.yaml#/WifiUpgradePath
+  $ref: ../network/paths.yaml#/WifiUpgradePath
 /v2/sys/version:
-  $ref: ../wifi/paths.yaml#/WifiVersionPath
+  $ref: ../network/paths.yaml#/WifiVersionPath
 /v2/sys/reset:
-  $ref: ../wifi/paths.yaml#/WifiResetPath
+  $ref: ../network/paths.yaml#/WifiResetPath
 /v2/sys/reboot:
-  $ref: ../wifi/paths.yaml#/WifiRebootPath
+  $ref: ../network/paths.yaml#/WifiRebootPath
 /v2/sys/time:
   $ref: ../sys/paths.yaml#/TimePath
 /v2/sys/power:

wifi/paths.yaml network/paths.yamlwifi/paths.yaml renamed to network/paths.yaml

@@ -1,18 +1,18 @@
 WifiScanPath:
   get:
-    $ref: ../wifi/paths.yaml#/ScanGet
+    $ref: ../network/paths.yaml#/ScanGet
 WifiStaPath:
   get:
-    $ref: ../wifi/paths.yaml#/StaGet
+    $ref: ../network/paths.yaml#/StaGet
   put:
-    $ref: ../wifi/paths.yaml#/StaPut
+    $ref: ../network/paths.yaml#/StaPut
   delete:
-    $ref: ../wifi/paths.yaml#/StaDelete
+    $ref: ../network/paths.yaml#/StaDelete
 WifiWatchDogPath:
   get:
-    $ref: ../wifi/paths.yaml#/WatchdogGet
+    $ref: ../network/paths.yaml#/WatchdogGet
   patch:
-    $ref: ../wifi/paths.yaml#/WatchdogPatch
+    $ref: ../network/paths.yaml#/WatchdogPatch
 WifiUpgradePath:
   get:
     $ref: ../firmware/paths.yaml#/Get
@@ -188,16 +188,16 @@ WatchdogGet:
         application/json:
           schema:
             $ref: schemas.yaml#/Watchdog
-      description: Wi-Fi Watchdog settings
+      description: Network Watchdog settings
     '401':
       $ref: ../common/responses.yaml#/Unauthorized
     '500':
       $ref: ../common/responses.yaml#/InternalServerError
   security:
   - BasicAuth: []
-  summary: Check Wi-Fi Watchdog configuration
+  summary: Check Network Watchdog configuration
   tags:
-  - Wi-Fi Watchdog
+  - Network Watchdog
 WatchdogPatch:
   requestBody:
     content:
@@ -206,19 +206,19 @@ WatchdogPatch:
           $ref: schemas.yaml#/Watchdog
   responses:
     '200':
-      description: Wi-Fi Watchdog config updated
+      description: Network Watchdog config updated
     '401':
       $ref: ../common/responses.yaml#/Unauthorized
     '500':
       $ref: ../common/responses.yaml#/InternalServerError
   security:
   - BasicAuth: []
-  summary: Configure Wi-Fi Watchdog
+  summary: Configure Network Watchdog
   description: |
     Configure the Wi-Fi watchdog, which runs whenever the Wi-Fi station (`sta`)
     is configured.
 
     This watchdog feature is useful on some Wi-Fi networks where the Bond
     may lose its connection after some period of time.
   tags:
-  - Wi-Fi Watchdog
+  - Network Watchdog

wifi/schemas.yaml network/schemas.yamlwifi/schemas.yaml renamed to network/schemas.yaml

@@ -10,6 +10,8 @@ Watchdog:
         If enabled, Bond will reboot if not connected to Bond Cloud
         within first 10 minutes of boot, or if disconnected for 3 minutes.
 
+        Watchdog does not run if Bond is in Wi-Fi Setup mode.
+
         NOTE: Any communication with the Bond over the HTTP transport
         will reset the timer as if the Bond were connected to the cloud.
     rwdg_timer_ms: