Split out apriltag detection

2 files changed, 18 insertions, 11 deletions

diff --git a/virtual-programs/apriltags.folk b/virtual-programs/apriltags.folk
new file mode 100644
index 00000000..265610bb
--- /dev/null
+++ b/virtual-programs/apriltags.folk
@@ -0,0 +1,18 @@
+
+source pi/AprilTags.tcl
+
+AprilTags::init
+
+When the camera frame is /grayFrame/ {
+    set aprilTime [time {
+        set tags [AprilTags::detect $grayFrame]
+    }]
+    Commit {
+        Claim the AprilTag time is $aprilTime
+
+        foreach tag $tags {
+            Claim tag [dict get $tag id] has center [dict get $tag center] size [dict get $tag size]
+            Claim tag [dict get $tag id] has corners [dict get $tag corners]
+        }
+    }
+}
diff --git a/virtual-programs/camera.folk b/virtual-programs/camera.folk
index b865392e..919519fe 100644
--- a/virtual-programs/camera.folk
+++ b/virtual-programs/camera.folk
@@ -7,9 +7,7 @@ namespace eval ::Camera {
 
 On process {
     source pi/Camera.tcl
-    source pi/AprilTags.tcl
     Camera::init 1280 720
-    AprilTags::init
 
     puts "Camera tid: [getTid]"
     
@@ -17,20 +15,11 @@ On process {
         set cameraTime [time {
             set grayFrame [Camera::grayFrame]
         }]
-        set aprilTime [time {
-            set tags [AprilTags::detect $grayFrame]
-        }]
         
         Commit {
             Claim the camera frame is $grayFrame
 
             Claim the camera time is $cameraTime
-            Claim the AprilTag time is $aprilTime
-
-            foreach tag $tags {
-                Claim tag [dict get $tag id] has center [dict get $tag center] size [dict get $tag size]
-                Claim tag [dict get $tag id] has corners [dict get $tag corners]
-            }
         }
         Step
     }