From 032be6eef782a4b3737a3179e75cab6feb066384 Mon Sep 17 00:00:00 2001 From: Matti Airas Date: Tue, 15 Feb 2022 09:14:09 +0200 Subject: [PATCH] Update controller to SensESP 2 --- controller/platformio.ini | 2 +- controller/src/main.cpp | 19 ++++++++++++++----- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/controller/platformio.ini b/controller/platformio.ini index 00f8532..a4b8a55 100644 --- a/controller/platformio.ini +++ b/controller/platformio.ini @@ -17,7 +17,7 @@ framework = arduino lib_ldf_mode = deep monitor_speed = 115200 lib_deps = - /Users/mairas/src/SK/SensESP + SignalK/SensESP @ ^2.1.1 ttlappalainen/NMEA2000-library ttlappalainen/NMEA2000_esp32 Adafruit SSD1306 diff --git a/controller/src/main.cpp b/controller/src/main.cpp index 4ffa4ce..1a8bcf4 100644 --- a/controller/src/main.cpp +++ b/controller/src/main.cpp @@ -15,8 +15,11 @@ #include "ReactESP.h" #include "SensESP.h" -#include "sensors/digital_input.h" -#include "system/lambda_consumer.h" +#include "sensesp/sensors/digital_input.h" +#include "sensesp/system/lambda_consumer.h" +#include "sensesp/system/startable.h" + +using namespace sensesp; #define SDA_TEST_PIN 14 #define SCL_TEST_PIN 12 @@ -71,7 +74,9 @@ bool assert_int_almost_equal(int actual, int expected, int tol, String name) { } } -ReactESP app([]() { +ReactESP app; + +void setup() { // setup serial output Serial.begin(115200); delay(100); @@ -214,5 +219,9 @@ ReactESP app([]() { }); // enable all object that need enabling - Enable::enable_all(); -}); + Startable::start_all(); +} + +void loop() { + app.tick(); +}