Un-tweak paths & add servo state nums

cwru-baja · Jan 12, 2024 · 633643e · 633643e
1 parent d985b36
commit 633643e
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 3 deletions.
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -59,7 +59,7 @@ jobs:
             --enable-serialization-asserts \
             --experimental-languages \
             cwrubaja \
-            --outdir nunavut_out/cwrubaja-dsdl \
+            --outdir nunavut_out \
             --lookup-dir public_regulated_data_types/uavcan \
             --lookup-dir public_regulated_data_types/reg
 
@@ -82,7 +82,7 @@ jobs:
         uses: actions/upload-pages-artifact@v3
         with:
           # Upload our docs
-          path: 'nunavut_out/cwrubaja-dsdl/'
+          path: 'nunavut_out/cwrubaja/'
       - name: Deploy to GitHub Pages
         id: deployment
         uses: actions/deploy-pages@v4
diff --git a/cwrubaja-dsdl.code-workspace b/cwrubaja-dsdl.code-workspace
@@ -0,0 +1,11 @@
+{
+	"folders": [
+		{
+			"path": "."
+		},
+		{
+			"path": "../public_regulated_data_types"
+		}
+	],
+  "settings": {}
+}
diff --git a/cwrubaja/servocontroller/State.0.1.dsdl b/cwrubaja/servocontroller/State.0.1.dsdl
@@ -5,4 +5,19 @@ uavcan.time.SynchronizedTimestamp.1.0 timestamp
 uavcan.si.unit.electric_current.Scalar.1.0 servoCurrent
 bool engaged
 
-@sealed
+
+uint8 state
+
+uint8 ServoStartup            = 1
+uint8 ServoDisengaged         = 2
+uint8 ServoEngaged            = 3
+uint8 ServoFault              = 4
+uint8 ServoTrimEngagedMenu    = 5
+uint8 ServoTrimDisengagedMenu = 6
+uint8 ServoLocateInit         = 7
+uint8 ServoLocateOne          = 8
+uint8 ServoLocateTwo          = 9
+uint8 ServoLocateDecide       = 10
+uint8 ServoAutoTrim           = 11
+
+@extent 19