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

Fix for Problems with reboots by using GPS modul

This commit is contained in:
norbert-walter 2022-03-17 13:55:55 +01:00
parent 009794920b
commit 4f60101b60
2 changed files with 54 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
lib/obp60task/config.json
View File

@ -246,7 +246,7 @@
"label": "Env. Sensor", "label": "Env. Sensor",
"type": "list", "type": "list",
"default": "off", "default": "off",
"description": "Use internal or external environment sensor [off|BME280|BMP280|SHT21]", "description": "Use internal or external environment sensor via I2C bus[off|BME280|BMP280|SHT21]",
"list": [ "list": [
"off", "off",
"BME280", "BME280",
@ -261,6 +261,51 @@
"obp60":"true" "obp60":"true"
} }
}, },
{
"name": "useRotSensor",
"label": "Rot. Sensor",
"type": "list",
"default": "off",
"description": "Use external rotation sensor via I2C bus[off|AS5600]",
"list": [
"off",
"AS5600"
],
"category": "OBP60 Hardware",
"capabilities": {
"obp60":"true"
}
},
{
"name": "rotFunction",
"label": "Rot. Function",
"type": "list",
"default": "off",
"description": "Function for rotation sensor [off|Rudder|Mast]",
"list": [
"off",
"Rudder",
"Mast"
],
"category": "OBP60 Hardware",
"capabilities": {
"obp60":"true"
}
},
{
"name": "rotOffset",
"label": "Rot. Offset",
"type": "number",
"default": "0",
"check": "checkMinMax",
"min": -180,
"max": 180,
"description": "Offset for rotation sensor [-180°...+180°]",
"category": "OBP60 Hardware",
"capabilities": {
"obp60":"true"
}
},
{ {
"name": "useTempSensor", "name": "useTempSensor",
"label": "Temp. Sensor", "label": "Temp. Sensor",

18
lib/obp60task/obp60task.cpp
View File

@ -29,12 +29,11 @@
#include "Logo_OBP_400x300_sw.h" // OBP Logo #include "Logo_OBP_400x300_sw.h" // OBP Logo
#include "OBP60QRWiFi.h" // Functions lib for WiFi QR code #include "OBP60QRWiFi.h" // Functions lib for WiFi QR code
#include "ObpNmea0183.h" #include "ObpNmea0183.h" // Bugfix lib for NMEA0183
#include "GwNmea0183Msg.h" #include "GwNmea0183Msg.h" // Bugfix lib for NMEA0183
tNMEA0183Msg NMEA0183Msg; ObpNmea0183 NMEA0183; // Use new Lib for NMEA0183
ObpNmea0183 NMEA0183; // Fixed Lib for NMEA0183 // tNMEA0183 NMEA0183; // Use old lib with problems for NMEA0183
// tNMEA0183 NMEA0183; // Old lib with problems for NMEA0183
Adafruit_BME280 bme280; // Evironment sensor BME280 Adafruit_BME280 bme280; // Evironment sensor BME280
Adafruit_BMP280 bmp280; // Evironment sensor BMP280 Adafruit_BMP280 bmp280; // Evironment sensor BMP280
@ -55,8 +54,8 @@ double airpressure = 0; // Ais pressure value from environment sensor
// Timer Interrupts for hardware functions // Timer Interrupts for hardware functions
void underVoltageDetection(); void underVoltageDetection();
Ticker Timer1(underVoltageDetection, 1); // Start Timer1 with maximum speed with 1ms Ticker Timer1(underVoltageDetection, 1); // Start Timer1 with maximum speed with 1ms
Ticker Timer2(blinkingFlashLED, 500); Ticker Timer2(blinkingFlashLED, 500); // Satrt Timer2 for flash LED all 500ms
// Undervoltage function for shutdown display // Undervoltage function for shutdown display
void underVoltageDetection(){ void underVoltageDetection(){
@ -94,7 +93,6 @@ void underVoltageDetection(){
// Hardware initialization before start all services // Hardware initialization before start all services
//################################################## //##################################################
void OBP60Init(GwApi *api){ void OBP60Init(GwApi *api){
GwLog *logger = api->getLogger();
api->getLogger()->logDebug(GwLog::LOG,"obp60init running"); api->getLogger()->logDebug(GwLog::LOG,"obp60init running");
// Start timer interrupts // Start timer interrupts
@ -547,8 +545,8 @@ void OBP60Task(GwApi *api){
// Send NMEA0183 GPS data on several bus systems all 1000ms // Send NMEA0183 GPS data on several bus systems all 1000ms
if(String(gps) == "NEO-6M" || String(gps) == "NEO-M8N"){ // If config enabled if(String(gps) == "NEO-6M" || String(gps) == "NEO-M8N"){ // If config enabled
if(gps_ready == true){ if(gps_ready == true){
tNMEA0183Msg NMEA0183Msg; SNMEA0183Msg NMEA0183Msg;
while(NMEA0183.GetMessage(NMEA0183Msg)){ while(NMEA0183.GetMessageCor(NMEA0183Msg)){
api->sendNMEA0183Message(NMEA0183Msg); api->sendNMEA0183Message(NMEA0183Msg);
} }
} }