Correct splitting between OBP60 and OBP40 hardware

2025-12-14 06:23:07 +01:00 · 2025-01-20 21:21:58 +01:00
parent 4c8ffae0b6
commit 569273519c
62 changed files with 74 additions and 200 deletions
--- a/lib/queue/obp60task/AS5600.cpp
+++ b/lib/queue/obp60task/AS5600.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 /****************************************************
  AMS 5600 class for Arduino platform
--- a/lib/queue/obp60task/OBP60Extensions.cpp
+++ b/lib/queue/obp60task/OBP60Extensions.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include <Arduino.h>
 #define FASTLED_ALL_PINS_HARDWARE_SPI
--- a/lib/queue/obp60task/OBP60Formater.cpp
+++ b/lib/queue/obp60task/OBP60Formater.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include <Arduino.h>
 #include "GwApi.h"
--- a/lib/queue/obp60task/OBPSensorTask.cpp
+++ b/lib/queue/obp60task/OBPSensorTask.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 #include <Adafruit_Sensor.h>            // Adafruit Lib for sensors
 #include <Adafruit_BME280.h>            // Adafruit Lib for BME280
 #include <Adafruit_BMP280.h>            // Adafruit Lib for BMP280
--- a/lib/queue/obp60task/PageApparentWind.cpp
+++ b/lib/queue/obp60task/PageApparentWind.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/queue/obp60task/PageBME280.cpp
+++ b/lib/queue/obp60task/PageBME280.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/queue/obp60task/PageBattery.cpp
+++ b/lib/queue/obp60task/PageBattery.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/queue/obp60task/PageBattery2.cpp
+++ b/lib/queue/obp60task/PageBattery2.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/queue/obp60task/PageClock.cpp
+++ b/lib/queue/obp60task/PageClock.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/queue/obp60task/PageDST810.cpp
+++ b/lib/queue/obp60task/PageDST810.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/queue/obp60task/PageFourValues.cpp
+++ b/lib/queue/obp60task/PageFourValues.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/queue/obp60task/PageFourValues2.cpp
+++ b/lib/queue/obp60task/PageFourValues2.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/queue/obp60task/PageGenerator.cpp
+++ b/lib/queue/obp60task/PageGenerator.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3s

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/queue/obp60task/PageKeelPosition.cpp
+++ b/lib/queue/obp60task/PageKeelPosition.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/queue/obp60task/PageOneValue.cpp
+++ b/lib/queue/obp60task/PageOneValue.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/queue/obp60task/PageRollPitch.cpp
+++ b/lib/queue/obp60task/PageRollPitch.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/queue/obp60task/PageRudderPosition.cpp
+++ b/lib/queue/obp60task/PageRudderPosition.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/queue/obp60task/PageSolar.cpp
+++ b/lib/queue/obp60task/PageSolar.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/queue/obp60task/PageThreeValues.cpp
+++ b/lib/queue/obp60task/PageThreeValues.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/queue/obp60task/PageTwoValues.cpp
+++ b/lib/queue/obp60task/PageTwoValues.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/queue/obp60task/PageVoltage.cpp
+++ b/lib/queue/obp60task/PageVoltage.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/queue/obp60task/PageWhite.cpp
+++ b/lib/queue/obp60task/PageWhite.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/queue/obp60task/PageWindRose.cpp
+++ b/lib/queue/obp60task/PageWindRose.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/queue/obp60task/obp60task.cpp
+++ b/lib/queue/obp60task/obp60task.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 #include "obp60task.h"
 #include "Pagedata.h"                   // Data exchange for pages
 #include "OBP60Hardware.h"              // PIN definitions
--- a/lib/queue/obp60task/obp60task.h
+++ b/lib/queue/obp60task/obp60task.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "GwApi.h"
 //we only compile for some boards
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
    #define USBSerial Serial
    // CAN NMEA2000
    #define ESP32_CAN_TX_PIN 46