platform: auto-register figments, now that we have json config
This commit is contained in:
23
src/main.cpp
23
src/main.cpp
@@ -154,22 +154,6 @@ private:
|
||||
STATIC_ALLOC(BPM);
|
||||
STATIC_TASK(BPM);
|
||||
|
||||
// Render all layers to the displays
|
||||
Renderer renderer{
|
||||
{&dpy},
|
||||
{
|
||||
Static<ChimesAnimation>::instance(),
|
||||
Static<DrainAnimation>::instance(),
|
||||
Static<SolidAnimation>::instance(),
|
||||
Static<Flashlight>::instance(),
|
||||
Static<UpdateStatus>::instance(),
|
||||
&inputBlip,
|
||||
&power,
|
||||
}
|
||||
};
|
||||
|
||||
REGISTER_TASK(renderer);
|
||||
|
||||
Renderer configRenderer{
|
||||
{&dpy},
|
||||
{Static<DrainAnimation>::instance(), /*&configDisplay,*/ Static<InputBlip>::instance(), &power}
|
||||
@@ -460,7 +444,6 @@ void setup() {
|
||||
|
||||
Log.notice(u8"💡 Starting FastLED...");
|
||||
Platform::addLEDs(leds, HardwareConfig::MAX_LED_NUM);
|
||||
runner = new MainLoop{std::vector<Task*>{Platform::beginTasks(), Platform::endTasks()}};
|
||||
|
||||
// Tune in,
|
||||
if (Platform::bootopts.isSafeMode) {
|
||||
@@ -473,6 +456,12 @@ void setup() {
|
||||
//runner = &configApp;
|
||||
} else {
|
||||
Log.notice(u8"🌌 Starting Figment...");
|
||||
// Render all layers to the displays
|
||||
Renderer* renderer = new Renderer({&dpy}, std::vector<Figment*>{Platform::beginFigments(), Platform::endFigments()});
|
||||
|
||||
std::vector<Task*> defaultTasks{Platform::beginTasks(), Platform::endTasks()};
|
||||
defaultTasks.push_back(renderer);
|
||||
runner = new MainLoop{std::vector<Task*>{defaultTasks.begin(), defaultTasks.end()}};
|
||||
}
|
||||
Serial.flush();
|
||||
runner->start();
|
||||
|
Reference in New Issue
Block a user