From ea058a33da1154494018030516ae2cea444c77ff Mon Sep 17 00:00:00 2001 From: Torrie Fischer Date: Sun, 19 Feb 2023 18:46:28 +0100 Subject: [PATCH] main: drop pulse input in favor of existing BPM, add to default config --- data/profiles/default.json | 17 +++++++++++++---- src/main.cpp | 19 ------------------- 2 files changed, 13 insertions(+), 23 deletions(-) diff --git a/data/profiles/default.json b/data/profiles/default.json index 75ad724..d8c9e77 100644 --- a/data/profiles/default.json +++ b/data/profiles/default.json @@ -1,15 +1,24 @@ { "version": 1, "tasks": [ + "Power", "Renderer", - "MQTT", + "U8Display", "WiFi", + "MQTT", "ArduinoOTA", - "UpdateStatusAnimation" + "BPM" ], "scenes": { - "Idle": ["Solid", "MPU5060", "Pulse", "IdleColors", "CircadianRhythm"], + "Idle": ["Solid", "MPU5060", "IdleColors", "CircadianRhythm"], "Flashlight": ["Flashlight"] }, - "surfaceMap": "default" + "surfaceMap": "default", + "logLevel": 6, + "defaults": { + "mqtt.ip": "10.0.0.2", + "power.milliamps": 500, + "power.volts": 5, + "bpm.idle": 75 + } } diff --git a/src/main.cpp b/src/main.cpp index d774f9c..73fa4ee 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -34,24 +34,6 @@ Display dpy(leds, HardwareConfig::MAX_LED_NUM, Static::instance() } });*/ -InputFunc randomPulse([]() { - static unsigned int pulse = 0; - EVERY_N_MILLISECONDS(25) { - if (pulse == 0) { - pulse = random(25) + 25; - } - } - if (pulse > 0) { - if (random(255) >= 25) { - pulse--; - return InputEvent{InputEvent::Acceleration, beatsin16(60 * 8, 0, 4972)}; - } - } - return InputEvent{}; -}, "Pulse"); - -REGISTER_TASK(randomPulse); - InputMapper keyMap([](const InputEvent& evt) { if (evt.intent == InputEvent::UserInput) { Buttons::Chord chord = (Buttons::Chord)evt.asInt(); @@ -74,7 +56,6 @@ InputMapper keyMap([](const InputEvent& evt) { REGISTER_TASK(keyMap); - // Cycle some random colors ColorSequenceInput<9> idleCycle{{ CRGB(0, 123, 167), // Cerulean