Merge pull request #370 from PTG-Kitware/dev/super_last_minute

super last minute changes

Author: hdefazio

angel_system/global_step_prediction/global_step_predictor.py

@@ -683,9 +683,6 @@ def conditionally_reset_irrational_trackers(self, tracker, skip=False):
                     == resetter_granular_step[recipe][0]
                 ):
                     print("reset condition hit!!")
-                    # import ipdb; ipdb.set_trace()
-                    if tracker["recipe"] == "coffee":
-                        print(f"tea step = {self.trackers[1]['current_granular_step']}")
                     for tracker_ind in self.find_trackers_by_recipe(
                         resetter_granular_step[recipe][1]
                     ):
@@ -696,10 +693,6 @@ def conditionally_reset_irrational_trackers(self, tracker, skip=False):
                             ][0]
                         ):
                             self.reset_one_tracker(tracker_ind)
-                    if tracker["recipe"] == "coffee":
-                        print(
-                            f"tea step after = {self.trackers[1]['current_granular_step']}"
-                        )
         else:
             for recipe in resetter_granular_step:
                 granular_steps = [

config/activity_labels/all_recipe_labels.yaml

@@ -109,7 +109,7 @@ labels:
     full_str: "Pour the measured coffee beans into the coffee grinder"
   - id: 32
     label: "grind-beans"
-    full_str: "Grind the coffee beans by pressing and holding down on the black part of the lid"
+    full_str: "Grind the coffee beans by pressing and holding down on the black part of the lid. Grind until the coffee grounds are the consistency of coarse sand, about 20 seconds."
   - id: 33
     label: "pour-beans-filter"
     full_str: "Transfer the grounds to the filter cone"
@@ -180,7 +180,7 @@ labels:
   - id: 52
     label: "trim-tortilla"
     # TEMPORARY: Should be singular
-    full_str: "Trim the ends of the tortilla roll leaving ½” margin from the toothpick"
+    full_str: "Trim the ends of the tortilla roll with the butter knife, leaving ½” margin from the toothpick"
     repeat: 2
   - id: 53
     label: "discard-tortilla-ends"

config/tasks/recipe_coffee.yaml

@@ -30,7 +30,7 @@ to create a quarter-circle. Place the paper filter in the dripper and spread ope
     label: "coffee-beans-to-grounds"
     full_str: "Weigh the coffee beans and grind until the coffee grounds are the consistency of coarse sand,
 about 20 seconds. Transfer the grounds to the filter cone."
-    activity_ids: [28, 29, 28, 30, 31, 32, 33]
+    activity_ids: [29, 28, 30, 31, 32, 33]
   - id: 5
     label: "check-temp"
     full_str: "Check the temperature of the water."