thooge
/
esp32-nmea2000-obp60
mirror of https://github.com/thooge/esp32-nmea2000-obp60.git
1
0
Fork 0
Code Releases Activity

Backup

This commit is contained in:
norbert-walter 2022-03-12 18:13:51 +01:00
parent 918e286f34
commit dc283813b1
1 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/obp60task/obp60task.cpp
View File

@ -485,6 +485,7 @@ void OBP60Task(GwApi *api){
String gpsFix = api->getConfig()->getConfigItem(api->getConfig()->flashLED,true)->asString(); String gpsFix = api->getConfig()->getConfigItem(api->getConfig()->flashLED,true)->asString();
String gps = api->getConfig()->getConfigItem(api->getConfig()->useGPS,true)->asString(); String gps = api->getConfig()->getConfigItem(api->getConfig()->useGPS,true)->asString();
String backlight = api->getConfig()->getConfigItem(api->getConfig()->backlight,true)->asString(); String backlight = api->getConfig()->getConfigItem(api->getConfig()->backlight,true)->asString();
String envsensor = api->getConfig()->getConfigItem(api->getConfig()->useEnvSensor,true)->asString();
// refreshmode defined in init section // refreshmode defined in init section
// displaycolor defined in init section // displaycolor defined in init section
// textcolor defined in init section // textcolor defined in init section
@ -634,7 +635,7 @@ void OBP60Task(GwApi *api){
unsigned char PressureSource = 0; // Atmospheric pressure unsigned char PressureSource = 0; // Atmospheric pressure
unsigned char HumiditySource=0; // Inside humidity unsigned char HumiditySource=0; // Inside humidity
LOG_DEBUG(GwLog::LOG,"Ready status BME280 %d", BME280_ready); LOG_DEBUG(GwLog::LOG,"Ready status BME280 %d", BME280_ready);
if(BME280_ready == true){ if(envsensor == "BME280" && BME280_ready == true){
airtemperature = bme280.readTemperature(); airtemperature = bme280.readTemperature();
commonData.data.airTemperature = airtemperature; // Data take over to page commonData.data.airTemperature = airtemperature; // Data take over to page
airpressure = bme280.readPressure()/100; airpressure = bme280.readPressure()/100;
@ -642,36 +643,50 @@ void OBP60Task(GwApi *api){
airhumidity = bme280.readHumidity(); airhumidity = bme280.readHumidity();
commonData.data.airHumidity = airhumidity; // Data take over to page commonData.data.airHumidity = airhumidity; // Data take over to page
// Send to NMEA200 bus // Send to NMEA200 bus
if(!isnan(airtemperature)){
SetN2kPGN130312(N2kMsg, 0, 0,(tN2kTempSource) TempSource, CToKelvin(airtemperature), N2kDoubleNA); SetN2kPGN130312(N2kMsg, 0, 0,(tN2kTempSource) TempSource, CToKelvin(airtemperature), N2kDoubleNA);
api->sendN2kMessage(N2kMsg); api->sendN2kMessage(N2kMsg);
}
if(!isnan(airhumidity)){
SetN2kPGN130313(N2kMsg, 0, 0,(tN2kHumiditySource) HumiditySource, airhumidity, N2kDoubleNA); SetN2kPGN130313(N2kMsg, 0, 0,(tN2kHumiditySource) HumiditySource, airhumidity, N2kDoubleNA);
api->sendN2kMessage(N2kMsg); api->sendN2kMessage(N2kMsg);
}
if(!isnan(airpressure)){
SetN2kPGN130314(N2kMsg, 0, 0, (tN2kPressureSource) mBarToPascal(PressureSource), airpressure); SetN2kPGN130314(N2kMsg, 0, 0, (tN2kPressureSource) mBarToPascal(PressureSource), airpressure);
api->sendN2kMessage(N2kMsg); api->sendN2kMessage(N2kMsg);
} }
else if(BMP280_ready == true){ }
else if(envsensor == "BMP280" && BMP280_ready == true){
airtemperature = bmp280.readTemperature(); airtemperature = bmp280.readTemperature();
commonData.data.airTemperature = airtemperature; // Data take over to page commonData.data.airTemperature = airtemperature; // Data take over to page
airpressure =bmp280.readPressure()/100; airpressure =bmp280.readPressure()/100;
commonData.data.airPressure = airpressure; // Data take over to page commonData.data.airPressure = airpressure; // Data take over to page
// Send to NMEA200 bus // Send to NMEA200 bus
if(!isnan(airtemperature)){
SetN2kPGN130312(N2kMsg, 0, 0,(tN2kTempSource) TempSource, CToKelvin(airtemperature), N2kDoubleNA); SetN2kPGN130312(N2kMsg, 0, 0,(tN2kTempSource) TempSource, CToKelvin(airtemperature), N2kDoubleNA);
api->sendN2kMessage(N2kMsg); api->sendN2kMessage(N2kMsg);
}
if(!isnan(airpressure)){
SetN2kPGN130314(N2kMsg, 0, 0, (tN2kPressureSource) mBarToPascal(PressureSource), airpressure); SetN2kPGN130314(N2kMsg, 0, 0, (tN2kPressureSource) mBarToPascal(PressureSource), airpressure);
api->sendN2kMessage(N2kMsg); api->sendN2kMessage(N2kMsg);
} }
else if(BME280_ready == true){ }
else if(envsensor == "SHT21" && BME280_ready == true){
airhumidity = sht21.readCompensatedHumidity(); airhumidity = sht21.readCompensatedHumidity();
commonData.data.airHumidity = airhumidity; // Data take over to page commonData.data.airHumidity = airhumidity; // Data take over to page
airtemperature = sht21.readTemperature(); airtemperature = sht21.readTemperature();
commonData.data.airTemperature = airtemperature; // Data take over to page commonData.data.airTemperature = airtemperature; // Data take over to page
// Send to NMEA200 bus // Send to NMEA200 bus
if(!isnan(airtemperature)){
SetN2kPGN130312(N2kMsg, 0, 0,(tN2kTempSource) TempSource, CToKelvin(airtemperature), N2kDoubleNA); SetN2kPGN130312(N2kMsg, 0, 0,(tN2kTempSource) TempSource, CToKelvin(airtemperature), N2kDoubleNA);
api->sendN2kMessage(N2kMsg); api->sendN2kMessage(N2kMsg);
}
if(!isnan(airhumidity)){
SetN2kPGN130313(N2kMsg, 0, 0,(tN2kHumiditySource) HumiditySource, airhumidity, N2kDoubleNA); SetN2kPGN130313(N2kMsg, 0, 0,(tN2kHumiditySource) HumiditySource, airhumidity, N2kDoubleNA);
api->sendN2kMessage(N2kMsg); api->sendN2kMessage(N2kMsg);
} }
} }
}
// Refresh display data all 1s // Refresh display data all 1s
if(millis() > starttime3 + 1000){ if(millis() > starttime3 + 1000){