merge

Author: Wu-Fan-529

StateMachine.mmd

@@ -65,43 +65,43 @@ stateDiagram-v2
   %% INTAKING
   INTAKE_ALGAE_GROUP --> [*]
   INTAKE_CORAL_GROUP --> [*]
-  INTAKE_CORAL_GROUP --> HAS_CORAL
-  INTAKE_ALGAE_GROUP --> HAS_ALGAE
-  INTAKE_CORAL_WITH_ALGAE_GROUP --> HAS_CORAL_AND_ALGAE
-  INTAKE_ALGAE_WITH_CORAL_GROUP --> HAS_CORAL_AND_ALGAE
+  INTAKE_CORAL_GROUP --> HAS_CORAL: Trigger = Has Coral
+  INTAKE_ALGAE_GROUP --> HAS_ALGAE: Trigger = Has Algae
+  INTAKE_CORAL_WITH_ALGAE_GROUP --> HAS_CORAL_AND_ALGAE: Trigger = Has Coral & Has Algae
+  INTAKE_ALGAE_WITH_CORAL_GROUP --> HAS_CORAL_AND_ALGAE: Trigger = Has Coral & Has Algae
   %% HAS SCORING ELEMENT
-  HAS_CORAL --> PREP_CORAL_GROUP
-  HAS_CORAL --> INTAKE_ALGAE_WITH_CORAL_GROUP
-  HAS_CORAL --> PREP_CLIMB
+  HAS_CORAL --> PREP_CORAL_GROUP: BTN = A/B/X/Y/Right Stick
+  HAS_CORAL --> INTAKE_ALGAE_WITH_CORAL_GROUP: BTN = Left Trigger/Right Bumper
+  HAS_CORAL --> PREP_CLIMB: BTN = Driver BTN = Start
   HAS_CORAL --> EJECTING
-  HAS_ALGAE --> INTAKE_CORAL_WITH_ALGAE_GROUP
-  HAS_ALGAE --> PREP_ALGAE_GROUP
+  HAS_ALGAE --> INTAKE_CORAL_WITH_ALGAE_GROUP: BTN = Left Bumper/West/East
+  HAS_ALGAE --> PREP_ALGAE_GROUP: BTN = North/South/Left Stick
   HAS_ALGAE --> PREP_CLIMB
   HAS_ALGAE --> EJECTING
-  HAS_CORAL_AND_ALGAE --> PREP_CORAL_WITH_ALGAE_GROUP
-  HAS_CORAL_AND_ALGAE --> PREP_ALGAE_WITH_CORAL_GROUP
-  HAS_CORAL_AND_ALGAE --> PREP_CLIMB
+  HAS_CORAL_AND_ALGAE --> PREP_CORAL_WITH_ALGAE_GROUP: BTN = A/B/X/Y/Right Stick
+  HAS_CORAL_AND_ALGAE --> PREP_ALGAE_WITH_CORAL_GROUP: BTN = North/South/Left Stick
+  HAS_CORAL_AND_ALGAE --> PREP_CLIMB: BTN = Driver BTN = Start
   HAS_CORAL_AND_ALGAE --> EJECTING
 
   %% PREPPING
-  PREP_CORAL_GROUP --> SCORING_CORAL
-  PREP_CORAL_WITH_ALGAE_GROUP --> SCORING_CORAL_WITH_ALGAE
-  PREP_ALGAE_GROUP --> SCORING_ALGAE
-  PREP_ALGAE_WITH_CORAL_GROUP --> SCORING_ALGAE_WITH_CORAL
+  PREP_CORAL_GROUP --> SCORING_CORAL: BTN = Right Trigger
+  PREP_CORAL_WITH_ALGAE_GROUP --> SCORING_CORAL_WITH_ALGAE: BTN = Right Trigger
+  PREP_ALGAE_GROUP --> SCORING_ALGAE: BTN = Right Trigger
+  PREP_ALGAE_WITH_CORAL_GROUP --> SCORING_ALGAE_WITH_CORAL: BTN = Right Trigger
   PREP_ALGAE_WITH_CORAL_GROUP --> PREP_CORAL_WITH_ALGAE_GROUP
   PREP_CORAL_WITH_ALGAE_GROUP --> PREP_ALGAE_WITH_CORAL_GROUP
   PREP_ALGAE_GROUP --> EJECTING
   PREP_CORAL_GROUP --> EJECTING
   PREP_CORAL_WITH_ALGAE_GROUP --> EJECTING
   PREP_ALGAE_WITH_CORAL_GROUP --> EJECTING
   %% CLIMBING
-  PREP_CLIMB --> CLIMBING
+  PREP_CLIMB --> CLIMBING: BTN = Driver BTN = Y
   PREP_CLIMB --> [*]
   %% SCORING
   SCORING_CORAL --> [*]
   SCORING_ALGAE --> [*]
-  SCORING_CORAL_WITH_ALGAE --> HAS_ALGAE
-  SCORING_ALGAE_WITH_CORAL --> HAS_CORAL
+  SCORING_CORAL_WITH_ALGAE --> HAS_ALGAE: Trigger = Has Algae
+  SCORING_ALGAE_WITH_CORAL --> HAS_CORAL: Trigger = Has Coral
   EJECTING --> [*]