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

Correct splitting between OBP60 and OBP40 hardware

This commit is contained in:
norbert-walter 2025-01-20 21:21:58 +01:00
parent 4c8ffae0b6
commit 569273519c
62 changed files with 74 additions and 200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
boards/obp60_s3_light_n8r8.json → boards/obp40_s3_n8r8.json
View File

@ -10,7 +10,7 @@
"-DBOARD_HAS_PSRAM", "-DBOARD_HAS_PSRAM",
"-DARDUINO_ESP32S3_DEV", "-DARDUINO_ESP32S3_DEV",
"-DARDUINO_USB_MODE=1", "-DARDUINO_USB_MODE=1",
"-DARDUINO_USB_CDC_ON_BOOT=1", "-DARDUINO_USB_CDC_ON_BOOT=0",
"-DARDUINO_RUNNING_CORE=1", "-DARDUINO_RUNNING_CORE=1",
"-DARDUINO_EVENT_RUNNING_CORE=1" "-DARDUINO_EVENT_RUNNING_CORE=1"
], ],
@ -24,7 +24,7 @@
] ]
], ],
"mcu": "esp32s3", "mcu": "esp32s3",
"variant": "obp60s3_light" "variant": "obp40s3"
}, },
"connectivity": [ "connectivity": [
"bluetooth", "bluetooth",
@ -41,7 +41,7 @@
"arduino", "arduino",
"espidf" "espidf"
], ],
"name": "OBP60 Light ESP32-S3-N8R8 (8 MB QD, 8 MB PSRAM)", "name": "OBP40 ESP32-S3-N8R8 (8 MB QD, 8 MB PSRAM)",
"upload": { "upload": {
"flash_size": "8MB", "flash_size": "8MB",
"maximum_ram_size": 327680, "maximum_ram_size": 327680,

2
lib/obp60task/AS5600.cpp
View File

@ -1,4 +1,4 @@
#ifdef BOARD_OBP60S3 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
/**************************************************** /****************************************************
AMS 5600 class for Arduino platform AMS 5600 class for Arduino platform

4
lib/obp60task/OBP60Extensions.cpp
View File

@ -1,4 +1,4 @@
#ifdef BOARD_OBP60S3 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
#include <Arduino.h> #include <Arduino.h>
#include <PCF8574.h> // Driver for PCF8574 output modul from Horter #include <PCF8574.h> // Driver for PCF8574 output modul from Horter
@ -426,7 +426,7 @@ void displayFooter(CommonData &commonData) {
getdisplay().print("Press 1 and 6 fast to unlock keys"); getdisplay().print("Press 1 and 6 fast to unlock keys");
} }
#endif #endif
#ifdef HARDWARE_LIGHT #ifdef BOARD_OBP40S3
// grapical page indicator // grapical page indicator
static const uint16_t r = 5; static const uint16_t r = 5;
static const uint16_t space = 4; static const uint16_t space = 4;

2
lib/obp60task/OBP60Formater.cpp
View File

@ -1,4 +1,4 @@
#ifdef BOARD_OBP60S3 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
#include <Arduino.h> #include <Arduino.h>
#include "GwApi.h" #include "GwApi.h"

4
lib/obp60task/OBP60Hardware.h
View File

@ -76,9 +76,9 @@
#define OBP_POWER_50 5 // 5.0V power rail #define OBP_POWER_50 5 // 5.0V power rail
#endif #endif
// Hardware configuration for OBP60 LIGHT // Hardware configuration for OBP40
#ifdef HARDWARE_LIGHT #ifdef BOARD_OBP40S3
// Direction pin for RS485 NMEA0183 // Direction pin for RS485 NMEA0183
#define OBP_DIRECTION_PIN 8 #define OBP_DIRECTION_PIN 8
// I2C // I2C

2
lib/obp60task/OBP60Keypad.h
View File

@ -236,7 +236,7 @@ void initKeys(CommonData &commonData) {
} }
#endif #endif
#ifdef HARDWARE_LIGHT #ifdef BOARD_OBP40S3
int readSensorpads(){ int readSensorpads(){
// Read key code // Read key code
if(digitalRead(UP) == LOW){ if(digitalRead(UP) == LOW){

2
lib/obp60task/OBPSensorTask.cpp
View File

@ -1,4 +1,4 @@
#ifdef BOARD_OBP60S3 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
#include <Adafruit_Sensor.h> // Adafruit Lib for sensors #include <Adafruit_Sensor.h> // Adafruit Lib for sensors
#include <Adafruit_BME280.h> // Adafruit Lib for BME280 #include <Adafruit_BME280.h> // Adafruit Lib for BME280
#include <Adafruit_BMP280.h> // Adafruit Lib for BMP280 #include <Adafruit_BMP280.h> // Adafruit Lib for BMP280

2
lib/obp60task/PageBME280.cpp
View File

@ -1,4 +1,4 @@
#ifdef BOARD_OBP60S3 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
#include "Pagedata.h" #include "Pagedata.h"
#include "OBP60Extensions.h" #include "OBP60Extensions.h"

2
lib/obp60task/PageBattery.cpp
View File

@ -1,4 +1,4 @@
#ifdef BOARD_OBP60S3 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
#include "Pagedata.h" #include "Pagedata.h"
#include "OBP60Extensions.h" #include "OBP60Extensions.h"

2
lib/obp60task/PageBattery2.cpp
View File

@ -1,4 +1,4 @@
#ifdef BOARD_OBP60S3 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
#include "Pagedata.h" #include "Pagedata.h"
#include "OBP60Extensions.h" #include "OBP60Extensions.h"

2
lib/obp60task/PageClock.cpp
View File

@ -1,4 +1,4 @@
#ifdef BOARD_OBP60S3 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
#include "Pagedata.h" #include "Pagedata.h"
#include "OBP60Extensions.h" #include "OBP60Extensions.h"

2
lib/obp60task/PageDST810.cpp
View File

@ -1,4 +1,4 @@
#ifdef BOARD_OBP60S3 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
#include "Pagedata.h" #include "Pagedata.h"
#include "OBP60Extensions.h" #include "OBP60Extensions.h"

2
lib/obp60task/PageFluid.cpp
View File

@ -1,4 +1,4 @@
#ifdef BOARD_OBP60S3 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
#include "Pagedata.h" #include "Pagedata.h"
#include "OBP60Extensions.h" #include "OBP60Extensions.h"

2
lib/obp60task/PageFourValues.cpp
View File

@ -1,4 +1,4 @@
#ifdef BOARD_OBP60S3 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
#include "Pagedata.h" #include "Pagedata.h"
#include "OBP60Extensions.h" #include "OBP60Extensions.h"

2
lib/obp60task/PageFourValues2.cpp
View File

@ -1,4 +1,4 @@
#ifdef BOARD_OBP60S3 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
#include "Pagedata.h" #include "Pagedata.h"
#include "OBP60Extensions.h" #include "OBP60Extensions.h"

2
lib/obp60task/PageGenerator.cpp
View File

@ -1,4 +1,4 @@
#ifdef BOARD_OBP60S3 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
#include "Pagedata.h" #include "Pagedata.h"
#include "OBP60Extensions.h" #include "OBP60Extensions.h"

2
lib/obp60task/PageKeelPosition.cpp
View File

@ -1,4 +1,4 @@
#ifdef BOARD_OBP60S3 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
#include "Pagedata.h" #include "Pagedata.h"
#include "OBP60Extensions.h" #include "OBP60Extensions.h"

2
lib/obp60task/PageOneValue.cpp
View File

@ -1,4 +1,4 @@
#ifdef BOARD_OBP60S3 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
#include "Pagedata.h" #include "Pagedata.h"
#include "OBP60Extensions.h" #include "OBP60Extensions.h"

2
lib/obp60task/PageRollPitch.cpp
View File

@ -1,4 +1,4 @@
#ifdef BOARD_OBP60S3 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
#include "Pagedata.h" #include "Pagedata.h"
#include "OBP60Extensions.h" #include "OBP60Extensions.h"

2
lib/obp60task/PageRudderPosition.cpp
View File

@ -1,4 +1,4 @@
#ifdef BOARD_OBP60S3 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
#include "Pagedata.h" #include "Pagedata.h"
#include "OBP60Extensions.h" #include "OBP60Extensions.h"

2
lib/obp60task/PageSolar.cpp
View File

@ -1,4 +1,4 @@
#ifdef BOARD_OBP60S3 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
#include "Pagedata.h" #include "Pagedata.h"
#include "OBP60Extensions.h" #include "OBP60Extensions.h"

2
lib/obp60task/PageSystem.cpp
View File

@ -1,4 +1,4 @@
#ifdef BOARD_OBP60S3 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
#include "Pagedata.h" #include "Pagedata.h"
#include "OBP60Extensions.h" #include "OBP60Extensions.h"

2
lib/obp60task/PageThreeValues.cpp
View File

@ -1,4 +1,4 @@
#ifdef BOARD_OBP60S3 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
#include "Pagedata.h" #include "Pagedata.h"
#include "OBP60Extensions.h" #include "OBP60Extensions.h"

2
lib/obp60task/PageTwoValues.cpp
View File

@ -1,4 +1,4 @@
#ifdef BOARD_OBP60S3 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
#include "Pagedata.h" #include "Pagedata.h"
#include "OBP60Extensions.h" #include "OBP60Extensions.h"

2
lib/obp60task/PageVoltage.cpp
View File

@ -1,4 +1,4 @@
#ifdef BOARD_OBP60S3 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
#include "Pagedata.h" #include "Pagedata.h"
#include "OBP60Extensions.h" #include "OBP60Extensions.h"

2
lib/obp60task/PageWhite.cpp
View File

@ -1,4 +1,4 @@
#ifdef BOARD_OBP60S3 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
#include "Pagedata.h" #include "Pagedata.h"
#include "OBP60Extensions.h" #include "OBP60Extensions.h"

2
lib/obp60task/PageWind.cpp
View File

@ -1,4 +1,4 @@
#ifdef BOARD_OBP60S3 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
#include "Pagedata.h" #include "Pagedata.h"
#include "OBP60Extensions.h" #include "OBP60Extensions.h"

2
lib/obp60task/PageWindRose.cpp
View File

@ -1,4 +1,4 @@
#ifdef BOARD_OBP60S3 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
#include "Pagedata.h" #include "Pagedata.h"
#include "OBP60Extensions.h" #include "OBP60Extensions.h"

2
lib/obp60task/PageWindRoseFlex.cpp
View File

@ -1,4 +1,4 @@
#ifdef BOARD_OBP60S3 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
#include "Pagedata.h" #include "Pagedata.h"
#include "OBP60Extensions.h" #include "OBP60Extensions.h"

2
lib/obp60task/PageXTETrack.cpp
View File

@ -1,4 +1,4 @@
#ifdef BOARD_OBP60S3 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
#include "Pagedata.h" #include "Pagedata.h"
#include "OBP60Extensions.h" #include "OBP60Extensions.h"

2
lib/obp60task/Pagedata.h
View File

@ -115,7 +115,7 @@ class Page{
commonData->keydata[5].label = ""; commonData->keydata[5].label = "";
} }
#endif #endif
#ifdef HARDWARE_LIGHT #ifdef BOARD_OBP40S3
commonData->keydata[0].label = ""; commonData->keydata[0].label = "";
commonData->keydata[1].label = ""; commonData->keydata[1].label = "";

13
lib/obp60task/obp60task.cpp
View File

@ -1,4 +1,4 @@
#ifdef BOARD_OBP60S3 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
#include "obp60task.h" #include "obp60task.h"
#include "Pagedata.h" // Data exchange for pages #include "Pagedata.h" // Data exchange for pages
#include "OBP60Hardware.h" // PIN definitions #include "OBP60Hardware.h" // PIN definitions
@ -13,7 +13,7 @@
#include "OBP60Extensions.h" // Functions lib for extension board #include "OBP60Extensions.h" // Functions lib for extension board
#include "OBP60Keypad.h" // Functions for keypad #include "OBP60Keypad.h" // Functions for keypad
#ifdef HARDWARE_LIGHT #ifdef BOARD_OBP40S3
#include <FS.h> // SD-Card access #include <FS.h> // SD-Card access
#include <SD.h> #include <SD.h>
#include <SPI.h> #include <SPI.h>
@ -54,8 +54,9 @@ void OBP60Init(GwApi *api){
// Init hardware // Init hardware
hardwareInit(api); hardwareInit(api);
#ifdef HARDWARE_LIGHT #ifdef BOARD_OBP40S3
String sdcard = config->getConfigItem(config->useSDCard, true)->asString(); //String sdcard = config->getConfigItem(config->useSDCard, true)->asString();
String sdcard = "on";
if (sdcard == "on") { if (sdcard == "on") {
setPortPin(OBP_POWER_SD, true); // Power on SD setPortPin(OBP_POWER_SD, true); // Power on SD
delay(10); delay(10);
@ -88,7 +89,7 @@ void OBP60Init(GwApi *api){
#ifdef HARDWARE_V21 #ifdef HARDWARE_V21
setPortPin(OBP_POWER_50, true); // Power on 5.0V rail setPortPin(OBP_POWER_50, true); // Power on 5.0V rail
#endif #endif
#ifdef HARDWARE_LIGHT #ifdef BOARD_OBP40S3
setPortPin(OBP_POWER_EPD, true);// Power on ePaper display setPortPin(OBP_POWER_EPD, true);// Power on ePaper display
#endif #endif
} }
@ -96,7 +97,7 @@ void OBP60Init(GwApi *api){
#ifdef HARDWARE_V21 #ifdef HARDWARE_V21
setPortPin(OBP_POWER_50, false); // Power off 5.0V rail setPortPin(OBP_POWER_50, false); // Power off 5.0V rail
#endif #endif
#ifdef HARDWARE_LIGHT #ifdef BOARD_OBP40S3
setPortPin(OBP_POWER_EPD, false);// Power off ePaper display setPortPin(OBP_POWER_EPD, false);// Power off ePaper display
#endif #endif
} }

6
lib/obp60task/obp60task.h
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include "GwApi.h" #include "GwApi.h"
//we only compile for some boards //we only compile for some boards
#ifdef BOARD_OBP60S3 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
#define USBSerial Serial #define USBSerial Serial
#ifdef HARDWARE_V21 #ifdef HARDWARE_V21
// CAN NMEA2000 // CAN NMEA2000
@ -14,7 +14,7 @@
#define GWSERIAL_RX 8 #define GWSERIAL_RX 8
#define GWSERIAL_MODE "UNI" #define GWSERIAL_MODE "UNI"
#endif #endif
#ifdef HARDWARE_LIGHT #ifdef BOARD_OBP40S3
// CAN NMEA2000 // CAN NMEA2000
#define ESP32_CAN_TX_PIN 15 #define ESP32_CAN_TX_PIN 15
#define ESP32_CAN_RX_PIN 16 #define ESP32_CAN_RX_PIN 16
@ -38,7 +38,7 @@
#ifdef HARDWARE_V21 #ifdef HARDWARE_V21
DECLARE_CAPABILITY(obp60,true); DECLARE_CAPABILITY(obp60,true);
#endif #endif
#ifdef HARDWARE_LIGHT #ifdef BOARD_OBP40S3
DECLARE_CAPABILITY(obp40,true) DECLARE_CAPABILITY(obp40,true)
#endif #endif
DECLARE_STRING_CAPABILITY(HELP_URL, "https://obp60-v2-docu.readthedocs.io/de/latest/"); // Link to help pages DECLARE_STRING_CAPABILITY(HELP_URL, "https://obp60-v2-docu.readthedocs.io/de/latest/"); // Link to help pages

11
lib/obp60task/platformio.ini
View File

@ -10,7 +10,6 @@ board_build.variants_dir = variants
#board = obp60_s3_n16 #ESP32-S3 N16,16MB flash, no PSRAM, zero series #board = obp60_s3_n16 #ESP32-S3 N16,16MB flash, no PSRAM, zero series
#board = obp60_s3_n8r8 #ESP32-S3 N8R8, 8MB flash, 8MB PSRAM #board = obp60_s3_n8r8 #ESP32-S3 N8R8, 8MB flash, 8MB PSRAM
board = obp60_s3_n16r8 #ESP32-S3 N16R8, 16MB flash, 8MB PSRAM, production series board = obp60_s3_n16r8 #ESP32-S3 N16R8, 16MB flash, 8MB PSRAM, production series
#board = obp60_s3_light_n8r8 #ESP32-S3 N8R8, 8MB flash, 8MB PSRAM, OBP60 clone
#board_build.partitions = default_8MB.csv #ESP32-S3 N8, 8MB flash #board_build.partitions = default_8MB.csv #ESP32-S3 N8, 8MB flash
board_build.partitions = default_16MB.csv #ESP32-S3 N16, 16MB flash board_build.partitions = default_16MB.csv #ESP32-S3 N16, 16MB flash
framework = arduino framework = arduino
@ -39,15 +38,12 @@ lib_deps =
adafruit/Adafruit FRAM I2C@^2.0.3 adafruit/Adafruit FRAM I2C@^2.0.3
build_flags= build_flags=
#https://thingpulse.com/usb-settings-for-logging-with-the-esp32-s3-in-platformio/?srsltid=AfmBOopGskbkr4GoeVkNlFaZXe_zXkLceKF6Rn-tmoXABCeAR2vWsdHL #https://thingpulse.com/usb-settings-for-logging-with-the-esp32-s3-in-platformio/?srsltid=AfmBOopGskbkr4GoeVkNlFaZXe_zXkLceKF6Rn-tmoXABCeAR2vWsdHL
# -D ARDUINO_USB_MODE=1 #0=OTG (to implement other external devices), 1=CDC (is a serial device)
# -D ARDUINO_USB_CDC_ON_BOOT=1 #0=JTAG, 1=CDC (serial device)
# -D CORE_DEBUG_LEVEL=1 #Debug level for CPU core via CDC (seral device) # -D CORE_DEBUG_LEVEL=1 #Debug level for CPU core via CDC (seral device)
# -D TIME=$UNIX_TIME #Set PC time for RTC (only settable via VSC) # -D TIME=$UNIX_TIME #Set PC time for RTC (only settable via VSC)
-D DISABLE_DIAGNOSTIC_OUTPUT #Disable diagnostic output for GxEPD2 lib -D DISABLE_DIAGNOSTIC_OUTPUT #Disable diagnostic output for GxEPD2 lib
-D BOARD_OBP60S3 #Board OBP60 V2.1 with ESP32S3 -D BOARD_OBP60S3 #Board OBP60 V2.1 with ESP32S3
# -D HARDWARE_V20 #OBP60 hardware revision V2.0 # -D HARDWARE_V20 #OBP60 hardware revision V2.0
-D HARDWARE_V21 #OBP60 hardware revision V2.1 -D HARDWARE_V21 #OBP60 hardware revision V2.1
# -D HARDWARE_LIGHT #OBP60 hardware clone
# -D DISPLAY_GDEW042T2 #old E-Ink display from Waveshare, R10 0.47 ohm # -D DISPLAY_GDEW042T2 #old E-Ink display from Waveshare, R10 0.47 ohm
-D DISPLAY_GDEY042T81 #new E-Ink display from Waveshare, R10 2.2 ohm -D DISPLAY_GDEY042T81 #new E-Ink display from Waveshare, R10 2.2 ohm
# -D DISPLAY_GYE042A87 #alternativ E-Ink display from Genyo Optical, R10 2.2 ohm # -D DISPLAY_GYE042A87 #alternativ E-Ink display from Genyo Optical, R10 2.2 ohm
@ -60,10 +56,10 @@ upload_protocol = esptool #firmware upload via USB OTG seriell, by fir
upload_speed = 230400 upload_speed = 230400
monitor_speed = 115200 monitor_speed = 115200
[env:obp40] [env:obp40_s3]
platform = espressif32@6.8.1 platform = espressif32@6.8.1
board_build.variants_dir = variants board_build.variants_dir = variants
board = obp60_s3_light_n8r8 #ESP32-S3 N8R8, 8MB flash, 8MB PSRAM, OBP60 clone board = obp40_s3_n8r8 #ESP32-S3 N8R8, 8MB flash, 8MB PSRAM, OBP60 clone (CrowPanel 4.2)
board_build.partitions = default_8MB.csv #ESP32-S3 N8, 8MB flash board_build.partitions = default_8MB.csv #ESP32-S3 N8, 8MB flash
custom_config = config_obp40.json custom_config = config_obp40.json
framework = arduino framework = arduino
@ -93,8 +89,7 @@ lib_deps =
adafruit/Adafruit FRAM I2C@^2.0.3 adafruit/Adafruit FRAM I2C@^2.0.3
build_flags= build_flags=
-D DISABLE_DIAGNOSTIC_OUTPUT #Disable diagnostic output for GxEPD2 lib -D DISABLE_DIAGNOSTIC_OUTPUT #Disable diagnostic output for GxEPD2 lib
-D BOARD_OBP60S3 #Board OBP60 V2.1 with ESP32S3 -D BOARD_OBP40S3 #Board OBP40 V1.0 with ESP32S3 SKU:DIE07300S (CrowPanel 4.2)
-D HARDWARE_LIGHT #OBP60 hardware clone (OBP40)
-D DISPLAY_GDEY042T81 #new E-Ink display from Waveshare, R10 2.2 ohm -D DISPLAY_GDEY042T81 #new E-Ink display from Waveshare, R10 2.2 ohm
${env.build_flags} ${env.build_flags}
upload_port = /dev/ttyUSB0 #OBP60 clone upload_port = /dev/ttyUSB0 #OBP60 clone

61
lib/obp60task/platformio.ini.light
View File

@ -1,61 +0,0 @@
[platformio]
#if you want a pio run to only build
#your special environments you can set this here
#by uncommenting the next line
default_envs = obp60_s3
[env:obp60_s3]
platform = espressif32@6.8.1
board_build.variants_dir = variants
#board = obp60_s3_n8 #ESP32-S3 N8, 8MB flash, no PSRAM
#board = obp60_s3_n16 #ESP32-S3 N16,16MB flash, no PSRAM, zero series
#board = obp60_s3_n8r8 #ESP32-S3 N8R8, 8MB flash, 8MB PSRAM
#board = obp60_s3_n16r8 #ESP32-S3 N16R8, 16MB flash, 8MB PSRAM, production series
board = obp60_s3_light_n8r8 #ESP32-S3 N8R8, 8MB flash, 8MB PSRAM, OBP60 clone
board_build.partitions = default_8MB.csv #ESP32-S3 N8, 8MB flash
#board_build.partitions = default_16MB.csv #ESP32-S3 N16, 16MB flash
framework = arduino
lib_deps =
${basedeps.lib_deps}
Wire
SPI
esphome/AsyncTCP-esphome@2.0.1
robtillaart/PCF8574@0.3.9
adafruit/Adafruit Unified Sensor @ 1.1.13
blemasle/MCP23017@2.0.0
adafruit/Adafruit BusIO@1.5.0
adafruit/Adafruit GFX Library@1.11.9
#zinggjm/GxEPD2@1.5.8
#https://github.com/ZinggJM/GxEPD2
https://github.com/thooge/GxEPD2
sstaub/Ticker@4.4.0
adafruit/Adafruit BMP280 Library@2.6.2
adafruit/Adafruit BME280 Library@2.2.2
adafruit/Adafruit BMP085 Library@1.2.1
enjoyneering/HTU21D@1.2.1
robtillaart/INA226@0.2.0
paulstoffregen/OneWire@2.3.8
milesburton/DallasTemperature@3.11.0
signetica/SunRise@2.0.2
adafruit/Adafruit FRAM I2C@^2.0.3
build_flags=
#https://thingpulse.com/usb-settings-for-logging-with-the-esp32-s3-in-platformio/?srsltid=AfmBOopGskbkr4GoeVkNlFaZXe_zXkLceKF6Rn-tmoXABCeAR2vWsdHL
# -D ARDUINO_USB_MODE=1 #0=OTG (to implement other external devices), 1=CDC (is a serial device)
-D ARDUINO_USB_CDC_ON_BOOT=0 #Serial output via RX/TX
# -D CORE_DEBUG_LEVEL=1 #Debug level for CPU core via CDC (seral device)
# -D TIME=$UNIX_TIME #Set PC time for RTC (only settable via VSC)
-D DISABLE_DIAGNOSTIC_OUTPUT #Disable diagnostic output for GxEPD2 lib
-D BOARD_OBP60S3 #Board OBP60 V2.1 with ESP32S3
# -D HARDWARE_V20 #OBP60 hardware revision V2.0
# -D HARDWARE_V21 #OBP60 hardware revision V2.1
-D HARDWARE_LIGHT #OBP60 hardware clone
# -D DISPLAY_GDEW042T2 #old E-Ink display from Waveshare, R10 0.47 ohm
-D DISPLAY_GDEY042T81 #new E-Ink display from Waveshare, R10 2.2 ohm
# -D DISPLAY_GYE042A87 #alternativ E-Ink display from Genyo Optical, R10 2.2 ohm
# -D DISPLAY_SE0420NQ04 #alternativ E-Ink display from SID Technology, R10 2.2 ohm
${env.build_flags}
#CONFIG_ESP_TASK_WDT_TIMEOUT_S = 10 #Task Watchdog timeout period (seconds) [1...60] 5 default
#upload_port = /dev/ttyACM0 #OBP60 original
upload_port = /dev/ttyUSB0 #OBP60 clone
upload_protocol = esptool #firmware upload via USB OTG seriell, by first upload need to set the ESP32-S3 in the upload mode with shortcut GND to Pin27
upload_speed = 230400
monitor_speed = 115200

61
lib/obp60task/platformio.ini.orig
View File

@ -1,61 +0,0 @@
[platformio]
#if you want a pio run to only build
#your special environments you can set this here
#by uncommenting the next line
default_envs = obp60_s3
[env:obp60_s3]
platform = espressif32@6.8.1
board_build.variants_dir = variants
#board = obp60_s3_n8 #ESP32-S3 N8, 8MB flash, no PSRAM
#board = obp60_s3_n16 #ESP32-S3 N16,16MB flash, no PSRAM, zero series
#board = obp60_s3_n8r8 #ESP32-S3 N8R8, 8MB flash, 8MB PSRAM
board = obp60_s3_n16r8 #ESP32-S3 N16R8, 16MB flash, 8MB PSRAM, production series
#board = obp60_s3_light_n8r8 #ESP32-S3 N8R8, 8MB flash, 8MB PSRAM, OBP60 clone
#board_build.partitions = default_8MB.csv #ESP32-S3 N8, 8MB flash
board_build.partitions = default_16MB.csv #ESP32-S3 N16, 16MB flash
framework = arduino
lib_deps =
${basedeps.lib_deps}
Wire
SPI
esphome/AsyncTCP-esphome@2.0.1
robtillaart/PCF8574@0.3.9
adafruit/Adafruit Unified Sensor @ 1.1.13
blemasle/MCP23017@2.0.0
adafruit/Adafruit BusIO@1.5.0
adafruit/Adafruit GFX Library@1.11.9
#zinggjm/GxEPD2@1.5.8
#https://github.com/ZinggJM/GxEPD2
https://github.com/thooge/GxEPD2
sstaub/Ticker@4.4.0
adafruit/Adafruit BMP280 Library@2.6.2
adafruit/Adafruit BME280 Library@2.2.2
adafruit/Adafruit BMP085 Library@1.2.1
enjoyneering/HTU21D@1.2.1
robtillaart/INA226@0.2.0
paulstoffregen/OneWire@2.3.8
milesburton/DallasTemperature@3.11.0
signetica/SunRise@2.0.2
adafruit/Adafruit FRAM I2C@^2.0.3
build_flags=
#https://thingpulse.com/usb-settings-for-logging-with-the-esp32-s3-in-platformio/?srsltid=AfmBOopGskbkr4GoeVkNlFaZXe_zXkLceKF6Rn-tmoXABCeAR2vWsdHL
# -D ARDUINO_USB_MODE=1 #0=OTG (to implement other external devices), 1=CDC (is a serial device)
# -D ARDUINO_USB_CDC_ON_BOOT=1 #0=JTAG, 1=CDC (serial device)
# -D CORE_DEBUG_LEVEL=1 #Debug level for CPU core via CDC (seral device)
# -D TIME=$UNIX_TIME #Set PC time for RTC (only settable via VSC)
-D DISABLE_DIAGNOSTIC_OUTPUT #Disable diagnostic output for GxEPD2 lib
-D BOARD_OBP60S3 #Board OBP60 V2.1 with ESP32S3
# -D HARDWARE_V20 #OBP60 hardware revision V2.0
-D HARDWARE_V21 #OBP60 hardware revision V2.1
# -D HARDWARE_LIGHT #OBP60 hardware clone
# -D DISPLAY_GDEW042T2 #old E-Ink display from Waveshare, R10 0.47 ohm
-D DISPLAY_GDEY042T81 #new E-Ink display from Waveshare, R10 2.2 ohm
# -D DISPLAY_GYE042A87 #alternativ E-Ink display from Genyo Optical, R10 2.2 ohm
# -D DISPLAY_SE0420NQ04 #alternativ E-Ink display from SID Technology, R10 2.2 ohm
${env.build_flags}
#CONFIG_ESP_TASK_WDT_TIMEOUT_S = 10 #Task Watchdog timeout period (seconds) [1...60] 5 default
upload_port = /dev/ttyACM0 #OBP60 original
#upload_port = /dev/ttyUSB0 #OBP60 clone
upload_protocol = esptool #firmware upload via USB OTG seriell, by first upload need to set the ESP32-S3 in the upload mode with shortcut GND to Pin27
upload_speed = 230400
monitor_speed = 115200

2
lib/queue/obp60task/AS5600.cpp
View File

@ -1,4 +1,4 @@
#ifdef BOARD_OBP60S3 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
/**************************************************** /****************************************************
AMS 5600 class for Arduino platform AMS 5600 class for Arduino platform

2
lib/queue/obp60task/OBP60Extensions.cpp
View File

@ -1,4 +1,4 @@
#ifdef BOARD_OBP60S3 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
#include <Arduino.h> #include <Arduino.h>
#define FASTLED_ALL_PINS_HARDWARE_SPI #define FASTLED_ALL_PINS_HARDWARE_SPI

2
lib/queue/obp60task/OBP60Formater.cpp
View File

@ -1,4 +1,4 @@
#ifdef BOARD_OBP60S3 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
#include <Arduino.h> #include <Arduino.h>
#include "GwApi.h" #include "GwApi.h"

2
lib/queue/obp60task/OBPSensorTask.cpp
View File

@ -1,4 +1,4 @@
#ifdef BOARD_OBP60S3 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
#include <Adafruit_Sensor.h> // Adafruit Lib for sensors #include <Adafruit_Sensor.h> // Adafruit Lib for sensors
#include <Adafruit_BME280.h> // Adafruit Lib for BME280 #include <Adafruit_BME280.h> // Adafruit Lib for BME280
#include <Adafruit_BMP280.h> // Adafruit Lib for BMP280 #include <Adafruit_BMP280.h> // Adafruit Lib for BMP280

2
lib/queue/obp60task/PageApparentWind.cpp
View File

@ -1,4 +1,4 @@
#ifdef BOARD_OBP60S3 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
#include "Pagedata.h" #include "Pagedata.h"
#include "OBP60Extensions.h" #include "OBP60Extensions.h"

2
lib/queue/obp60task/PageBME280.cpp
View File

@ -1,4 +1,4 @@
#ifdef BOARD_OBP60S3 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
#include "Pagedata.h" #include "Pagedata.h"
#include "OBP60Extensions.h" #include "OBP60Extensions.h"

2
lib/queue/obp60task/PageBattery.cpp
View File

@ -1,4 +1,4 @@
#ifdef BOARD_OBP60S3 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
#include "Pagedata.h" #include "Pagedata.h"
#include "OBP60Extensions.h" #include "OBP60Extensions.h"

2
lib/queue/obp60task/PageBattery2.cpp
View File

@ -1,4 +1,4 @@
#ifdef BOARD_OBP60S3 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
#include "Pagedata.h" #include "Pagedata.h"
#include "OBP60Extensions.h" #include "OBP60Extensions.h"

2
lib/queue/obp60task/PageClock.cpp
View File

@ -1,4 +1,4 @@
#ifdef BOARD_OBP60S3 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
#include "Pagedata.h" #include "Pagedata.h"
#include "OBP60Extensions.h" #include "OBP60Extensions.h"

2
lib/queue/obp60task/PageDST810.cpp
View File

@ -1,4 +1,4 @@
#ifdef BOARD_OBP60S3 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
#include "Pagedata.h" #include "Pagedata.h"
#include "OBP60Extensions.h" #include "OBP60Extensions.h"

2
lib/queue/obp60task/PageFourValues.cpp
View File

@ -1,4 +1,4 @@
#ifdef BOARD_OBP60S3 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
#include "Pagedata.h" #include "Pagedata.h"
#include "OBP60Extensions.h" #include "OBP60Extensions.h"

2
lib/queue/obp60task/PageFourValues2.cpp
View File

@ -1,4 +1,4 @@
#ifdef BOARD_OBP60S3 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
#include "Pagedata.h" #include "Pagedata.h"
#include "OBP60Extensions.h" #include "OBP60Extensions.h"

2
lib/queue/obp60task/PageGenerator.cpp
View File

@ -1,4 +1,4 @@
#ifdef BOARD_OBP60S3 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3s
#include "Pagedata.h" #include "Pagedata.h"
#include "OBP60Extensions.h" #include "OBP60Extensions.h"

2
lib/queue/obp60task/PageKeelPosition.cpp
View File

@ -1,4 +1,4 @@
#ifdef BOARD_OBP60S3 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
#include "Pagedata.h" #include "Pagedata.h"
#include "OBP60Extensions.h" #include "OBP60Extensions.h"

2
lib/queue/obp60task/PageOneValue.cpp
View File

@ -1,4 +1,4 @@
#ifdef BOARD_OBP60S3 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
#include "Pagedata.h" #include "Pagedata.h"
#include "OBP60Extensions.h" #include "OBP60Extensions.h"

2
lib/queue/obp60task/PageRollPitch.cpp
View File

@ -1,4 +1,4 @@
#ifdef BOARD_OBP60S3 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
#include "Pagedata.h" #include "Pagedata.h"
#include "OBP60Extensions.h" #include "OBP60Extensions.h"

2
lib/queue/obp60task/PageRudderPosition.cpp
View File

@ -1,4 +1,4 @@
#ifdef BOARD_OBP60S3 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
#include "Pagedata.h" #include "Pagedata.h"
#include "OBP60Extensions.h" #include "OBP60Extensions.h"

2
lib/queue/obp60task/PageSolar.cpp
View File

@ -1,4 +1,4 @@
#ifdef BOARD_OBP60S3 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
#include "Pagedata.h" #include "Pagedata.h"
#include "OBP60Extensions.h" #include "OBP60Extensions.h"

2
lib/queue/obp60task/PageThreeValues.cpp
View File

@ -1,4 +1,4 @@
#ifdef BOARD_OBP60S3 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
#include "Pagedata.h" #include "Pagedata.h"
#include "OBP60Extensions.h" #include "OBP60Extensions.h"

2
lib/queue/obp60task/PageTwoValues.cpp
View File

@ -1,4 +1,4 @@
#ifdef BOARD_OBP60S3 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
#include "Pagedata.h" #include "Pagedata.h"
#include "OBP60Extensions.h" #include "OBP60Extensions.h"

2
lib/queue/obp60task/PageVoltage.cpp
View File

@ -1,4 +1,4 @@
#ifdef BOARD_OBP60S3 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
#include "Pagedata.h" #include "Pagedata.h"
#include "OBP60Extensions.h" #include "OBP60Extensions.h"

2
lib/queue/obp60task/PageWhite.cpp
View File

@ -1,4 +1,4 @@
#ifdef BOARD_OBP60S3 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
#include "Pagedata.h" #include "Pagedata.h"
#include "OBP60Extensions.h" #include "OBP60Extensions.h"

2
lib/queue/obp60task/PageWindRose.cpp
View File

@ -1,4 +1,4 @@
#ifdef BOARD_OBP60S3 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
#include "Pagedata.h" #include "Pagedata.h"
#include "OBP60Extensions.h" #include "OBP60Extensions.h"

2
lib/queue/obp60task/obp60task.cpp
View File

@ -1,4 +1,4 @@
#ifdef BOARD_OBP60S3 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
#include "obp60task.h" #include "obp60task.h"
#include "Pagedata.h" // Data exchange for pages #include "Pagedata.h" // Data exchange for pages
#include "OBP60Hardware.h" // PIN definitions #include "OBP60Hardware.h" // PIN definitions

2
lib/queue/obp60task/obp60task.h
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include "GwApi.h" #include "GwApi.h"
//we only compile for some boards //we only compile for some boards
#ifdef BOARD_OBP60S3 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
#define USBSerial Serial #define USBSerial Serial
// CAN NMEA2000 // CAN NMEA2000
#define ESP32_CAN_TX_PIN 46 #define ESP32_CAN_TX_PIN 46

2
variants/obp60s3_light/pins_arduino.h → variants/obp40s3/pins_arduino.h
View File

@ -12,7 +12,7 @@
#define NUM_DIGITAL_PINS 48 #define NUM_DIGITAL_PINS 48
#define NUM_ANALOG_INPUTS 20 #define NUM_ANALOG_INPUTS 20
// Multi Function Display OBP60 V2.0 // Multi Function Display OBP40 V1.0
static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+48; static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+48;
#define BUILTIN_LED LED_BUILTIN // backward compatibility #define BUILTIN_LED LED_BUILTIN // backward compatibility
#define LED_BUILTIN LED_BUILTIN #define LED_BUILTIN LED_BUILTIN