diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 0000000..0f0d740 --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,7 @@ +{ + // See http://go.microsoft.com/fwlink/?LinkId=827846 + // for the documentation about the extensions.json format + "recommendations": [ + "platformio.platformio-ide" + ] +} diff --git a/platformio.ini b/platformio.ini index 075d754..9a1204e 100644 --- a/platformio.ini +++ b/platformio.ini @@ -17,12 +17,11 @@ framework = arduino lib_ldf_mode = deep monitor_speed = 115200 lib_deps = - SignalK/SensESP@^1.0.8 - Adafruit SSD1306 - - ttlappalainen/NMEA2000-library - ttlappalainen/NMEA2000_esp32 - + SignalK/SensESP@^2.0.0 + SensESP/OneWire@^2.0.0 + adafruit/Adafruit SSD1306@^2.5.1 + ttlappalainen/NMEA2000-library@^4.17.2 + ttlappalainen/NMEA2000_esp32@^1.0.3 [espressif32_base] platform = espressif32 diff --git a/src/main.cpp b/src/main.cpp index 71f92e6..02bcce4 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,14 +1,11 @@ #include #include -#include #include #include -#include -#include "sensesp_app.h" +#include "sensesp/signalk/signalk_output.h" #include "sensesp_app_builder.h" -#include "sensors/onewire_temperature.h" -#include "signalk/signalk_output.h" +#include "sensesp_onewire/onewire_temperature.h" // 1-Wire data pin on SH-ESP32 #define ONEWIRE_PIN 4 @@ -29,6 +26,8 @@ #define TEMP_DISPLAY_FUNC KelvinToCelsius //#define TEMP_DISPLAY_FUNC KelvinToFahrenheit +using namespace sensesp; + TwoWire* i2c; Adafruit_SSD1306* display; @@ -77,17 +76,16 @@ void SendEngineTemperatures() { nmea2000->SendMsg(N2kMsg); } -ReactESP app([]() { -// Some initialization boilerplate when in debug mode... +ReactESP app; + +void setup() { #ifndef SERIAL_DEBUG_DISABLED SetupSerialDebug(115200); #endif SensESPAppBuilder builder; - sensesp_app = builder.set_hostname("temperatures") - ->set_standard_sensors(NONE) - ->get_app(); + sensesp_app = builder.set_hostname("temperatures")->get_app(); DallasTemperatureSensors* dts = new DallasTemperatureSensors(ONEWIRE_PIN); @@ -137,15 +135,15 @@ ReactESP app([]() { main_engine_oil_temperature->connect_to(new SKOutput( "propulsion.main.oilTemperature", "/mainEngineOilTemp/skPath", main_engine_oil_temperature_metadata)); - main_engine_coolant_temperature->connectTo(new SKOutput( + main_engine_coolant_temperature->connect_to(new SKOutput( "propulsion.main.coolantTemperature", "/mainEngineCoolantTemp/skPath", main_engine_coolant_temperature_metadata)); // transmit coolant temperature as overall engine temperature as well - main_engine_coolant_temperature->connectTo(new SKOutput( + main_engine_coolant_temperature->connect_to(new SKOutput( "propulsion.main.temperature", "/mainEngineTemp/skPath", main_engine_temperature_metadata)); // propulsion.*.wetExhaustTemperature is a non-standard path - main_engine_exhaust_temperature->connectTo( + main_engine_exhaust_temperature->connect_to( new SKOutput("propulsion.main.wetExhaustTemperature", "/mainEngineWetExhaustTemp/skPath", main_engine_exhaust_temperature_metadata)); @@ -240,5 +238,8 @@ ReactESP app([]() { nmea2000->SendMsg(N2kMsg); })); - sensesp_app->enable(); -}); + sensesp_app->start(); +} + +// main program loop +void loop() { app.tick(); } \ No newline at end of file