Update to SensESP v2.0.0

This commit is contained in:
Matti Airas 2022-01-21 11:42:36 +02:00
parent ee913dbc08
commit 63811a182c
3 changed files with 28 additions and 21 deletions

7
.vscode/extensions.json vendored Normal file
View File

@ -0,0 +1,7 @@
{
// See http://go.microsoft.com/fwlink/?LinkId=827846
// for the documentation about the extensions.json format
"recommendations": [
"platformio.platformio-ide"
]
}

View File

@ -17,12 +17,11 @@ framework = arduino
lib_ldf_mode = deep lib_ldf_mode = deep
monitor_speed = 115200 monitor_speed = 115200
lib_deps = lib_deps =
SignalK/SensESP@^1.0.8 SignalK/SensESP@^2.0.0
Adafruit SSD1306 SensESP/OneWire@^2.0.0
adafruit/Adafruit SSD1306@^2.5.1
ttlappalainen/NMEA2000-library ttlappalainen/NMEA2000-library@^4.17.2
ttlappalainen/NMEA2000_esp32 ttlappalainen/NMEA2000_esp32@^1.0.3
[espressif32_base] [espressif32_base]
platform = espressif32 platform = espressif32

View File

@ -1,14 +1,11 @@
#include <Adafruit_GFX.h> #include <Adafruit_GFX.h>
#include <Adafruit_SSD1306.h> #include <Adafruit_SSD1306.h>
#include <Arduino.h>
#include <N2kMessages.h> #include <N2kMessages.h>
#include <NMEA2000_esp32.h> #include <NMEA2000_esp32.h>
#include <Wire.h>
#include "sensesp_app.h" #include "sensesp/signalk/signalk_output.h"
#include "sensesp_app_builder.h" #include "sensesp_app_builder.h"
#include "sensors/onewire_temperature.h" #include "sensesp_onewire/onewire_temperature.h"
#include "signalk/signalk_output.h"
// 1-Wire data pin on SH-ESP32 // 1-Wire data pin on SH-ESP32
#define ONEWIRE_PIN 4 #define ONEWIRE_PIN 4
@ -29,6 +26,8 @@
#define TEMP_DISPLAY_FUNC KelvinToCelsius #define TEMP_DISPLAY_FUNC KelvinToCelsius
//#define TEMP_DISPLAY_FUNC KelvinToFahrenheit //#define TEMP_DISPLAY_FUNC KelvinToFahrenheit
using namespace sensesp;
TwoWire* i2c; TwoWire* i2c;
Adafruit_SSD1306* display; Adafruit_SSD1306* display;
@ -77,17 +76,16 @@ void SendEngineTemperatures() {
nmea2000->SendMsg(N2kMsg); nmea2000->SendMsg(N2kMsg);
} }
ReactESP app([]() { ReactESP app;
// Some initialization boilerplate when in debug mode...
void setup() {
#ifndef SERIAL_DEBUG_DISABLED #ifndef SERIAL_DEBUG_DISABLED
SetupSerialDebug(115200); SetupSerialDebug(115200);
#endif #endif
SensESPAppBuilder builder; SensESPAppBuilder builder;
sensesp_app = builder.set_hostname("temperatures") sensesp_app = builder.set_hostname("temperatures")->get_app();
->set_standard_sensors(NONE)
->get_app();
DallasTemperatureSensors* dts = new DallasTemperatureSensors(ONEWIRE_PIN); DallasTemperatureSensors* dts = new DallasTemperatureSensors(ONEWIRE_PIN);
@ -137,15 +135,15 @@ ReactESP app([]() {
main_engine_oil_temperature->connect_to(new SKOutput<float>( main_engine_oil_temperature->connect_to(new SKOutput<float>(
"propulsion.main.oilTemperature", "/mainEngineOilTemp/skPath", "propulsion.main.oilTemperature", "/mainEngineOilTemp/skPath",
main_engine_oil_temperature_metadata)); main_engine_oil_temperature_metadata));
main_engine_coolant_temperature->connectTo(new SKOutput<float>( main_engine_coolant_temperature->connect_to(new SKOutput<float>(
"propulsion.main.coolantTemperature", "/mainEngineCoolantTemp/skPath", "propulsion.main.coolantTemperature", "/mainEngineCoolantTemp/skPath",
main_engine_coolant_temperature_metadata)); main_engine_coolant_temperature_metadata));
// transmit coolant temperature as overall engine temperature as well // transmit coolant temperature as overall engine temperature as well
main_engine_coolant_temperature->connectTo(new SKOutput<float>( main_engine_coolant_temperature->connect_to(new SKOutput<float>(
"propulsion.main.temperature", "/mainEngineTemp/skPath", "propulsion.main.temperature", "/mainEngineTemp/skPath",
main_engine_temperature_metadata)); main_engine_temperature_metadata));
// propulsion.*.wetExhaustTemperature is a non-standard path // propulsion.*.wetExhaustTemperature is a non-standard path
main_engine_exhaust_temperature->connectTo( main_engine_exhaust_temperature->connect_to(
new SKOutput<float>("propulsion.main.wetExhaustTemperature", new SKOutput<float>("propulsion.main.wetExhaustTemperature",
"/mainEngineWetExhaustTemp/skPath", "/mainEngineWetExhaustTemp/skPath",
main_engine_exhaust_temperature_metadata)); main_engine_exhaust_temperature_metadata));
@ -240,5 +238,8 @@ ReactESP app([]() {
nmea2000->SendMsg(N2kMsg); nmea2000->SendMsg(N2kMsg);
})); }));
sensesp_app->enable(); sensesp_app->start();
}); }
// main program loop
void loop() { app.tick(); }