Convert actions to event loops
The logic gets significantly simpler due to Watchers. But we also get
to port all the users over as well.
Change-Id: Ib4e75951e65f7431acc6c1548b7f1d20da3da295
diff --git a/y2016/actors/superstructure_actor.h b/y2016/actors/superstructure_actor.h
index d48fc71..be02a33 100644
--- a/y2016/actors/superstructure_actor.h
+++ b/y2016/actors/superstructure_actor.h
@@ -13,7 +13,15 @@
class SuperstructureActor
: public ::aos::common::actions::ActorBase<SuperstructureActionQueueGroup> {
public:
- explicit SuperstructureActor(SuperstructureActionQueueGroup *s);
+ typedef ::aos::common::actions::TypedActionFactory<
+ SuperstructureActionQueueGroup>
+ Factory;
+
+ explicit SuperstructureActor(::aos::EventLoop *event_loop);
+
+ static Factory MakeFactory(::aos::EventLoop *event_loop) {
+ return Factory(event_loop, ".y2016.actors.superstructure_action");
+ }
// Internal struct holding superstructure goals sent by autonomous to the
// loop.
@@ -30,13 +38,6 @@
bool SuperstructureDone();
};
-using SuperstructureAction =
- ::aos::common::actions::TypedAction<SuperstructureActionQueueGroup>;
-
-// Makes a new SuperstructureActor action.
-::std::unique_ptr<SuperstructureAction> MakeSuperstructureAction(
- const ::y2016::actors::SuperstructureActionParams ¶ms);
-
} // namespace actors
} // namespace y2016