From 136dd1fa30ea3a75525b56f627cce3aa4921be2a Mon Sep 17 00:00:00 2001 From: norbert-walter Date: Fri, 22 Mar 2024 23:46:57 +0100 Subject: [PATCH] add new obp60 board definitions --- boards/obp60_s3_n16.json | 54 +++++++++++++++++++++ boards/obp60_s3_n16r8.json | 56 ++++++++++++++++++++++ boards/{obp60_s3.json => obp60_s3_n8.json} | 3 ++ boards/obp60_s3_n8r8.json | 56 ++++++++++++++++++++++ lib/obp60task/OBP60Hardware.h | 2 +- lib/obp60task/OBPSensorTask.cpp | 2 +- lib/obp60task/obp60task.h | 2 +- lib/obp60task/platformio.ini | 5 +- 8 files changed, 176 insertions(+), 4 deletions(-) create mode 100644 boards/obp60_s3_n16.json create mode 100644 boards/obp60_s3_n16r8.json rename boards/{obp60_s3.json => obp60_s3_n8.json} (92%) create mode 100644 boards/obp60_s3_n8r8.json diff --git a/boards/obp60_s3_n16.json b/boards/obp60_s3_n16.json new file mode 100644 index 00000000..7bc3013b --- /dev/null +++ b/boards/obp60_s3_n16.json @@ -0,0 +1,54 @@ +{ + "build": { + "arduino":{ + "ldscript": "esp32s3_out.ld", + "partitions": "default_16MB.csv" + }, + "core": "esp32", + "extra_flags": [ + "-DARDUINO_ESP32S3_DEV", + "-DARDUINO_USB_MODE=1", + "-DARDUINO_USB_CDC_ON_BOOT=1", + "-DARDUINO_RUNNING_CORE=1", + "-DARDUINO_EVENT_RUNNING_CORE=1" + ], + "f_cpu": "240000000L", + "f_flash": "80000000L", + "flash_mode": "qio", + "hwids": [ + [ + "0x303A", + "0x1001" + ] + ], + "mcu": "esp32s3", + "variant": "obp60s3" + }, + "connectivity": [ + "bluetooth", + "wifi" + ], + "debug": { + "default_tool": "esp-builtin", + "onboard_tools": [ + "esp-builtin" + ], + "openocd_target": "esp32s3.cfg" + }, + "frameworks": [ + "arduino", + "espidf" + ], + "name": "OBP60 ESP32-S3-N8 (8 MB QD, No PSRAM)", + "upload": { + "flash_size": "16MB", + "maximum_ram_size": 327680, + "maximum_size": 16777216, + "use_1200bps_touch": true, + "wait_for_upload_port": true, + "require_upload_port": true, + "speed": 460800 + }, + "url": "https://open-boat-projects.org/en/diy-multifunktionsdisplay-obp-60/", + "vendor": "Open Boat Projects" +} diff --git a/boards/obp60_s3_n16r8.json b/boards/obp60_s3_n16r8.json new file mode 100644 index 00000000..171107b2 --- /dev/null +++ b/boards/obp60_s3_n16r8.json @@ -0,0 +1,56 @@ +{ + "build": { + "arduino":{ + "ldscript": "esp32s3_out.ld", + "partitions": "default_16MB.csv", + "memory_type": "qio_opi" + }, + "core": "esp32", + "extra_flags": [ + "-DBOARD_HAS_PSRAM", + "-DARDUINO_ESP32S3_DEV", + "-DARDUINO_USB_MODE=1", + "-DARDUINO_USB_CDC_ON_BOOT=1", + "-DARDUINO_RUNNING_CORE=1", + "-DARDUINO_EVENT_RUNNING_CORE=1" + ], + "f_cpu": "240000000L", + "f_flash": "80000000L", + "flash_mode": "qio", + "hwids": [ + [ + "0x303A", + "0x1001" + ] + ], + "mcu": "esp32s3", + "variant": "obp60s3" + }, + "connectivity": [ + "bluetooth", + "wifi" + ], + "debug": { + "default_tool": "esp-builtin", + "onboard_tools": [ + "esp-builtin" + ], + "openocd_target": "esp32s3.cfg" + }, + "frameworks": [ + "arduino", + "espidf" + ], + "name": "OBP60 ESP32-S3-N16R8 16 MB QD, 8 MB PSRAM)", + "upload": { + "flash_size": "16MB", + "maximum_ram_size": 327680, + "maximum_size": 16777216, + "use_1200bps_touch": true, + "wait_for_upload_port": true, + "require_upload_port": true, + "speed": 460800 + }, + "url": "https://open-boat-projects.org/en/diy-multifunktionsdisplay-obp-60/", + "vendor": "Open Boat Projects" +} diff --git a/boards/obp60_s3.json b/boards/obp60_s3_n8.json similarity index 92% rename from boards/obp60_s3.json rename to boards/obp60_s3_n8.json index b249da0a..fe79b26c 100644 --- a/boards/obp60_s3.json +++ b/boards/obp60_s3_n8.json @@ -25,6 +25,7 @@ "variant": "obp60s3" }, "connectivity": [ + "bluetooth", "wifi" ], "debug": { @@ -43,6 +44,8 @@ "flash_size": "8MB", "maximum_ram_size": 327680, "maximum_size": 8388608, + "use_1200bps_touch": true, + "wait_for_upload_port": true, "require_upload_port": true, "speed": 460800 }, diff --git a/boards/obp60_s3_n8r8.json b/boards/obp60_s3_n8r8.json new file mode 100644 index 00000000..83066baf --- /dev/null +++ b/boards/obp60_s3_n8r8.json @@ -0,0 +1,56 @@ +{ + "build": { + "arduino":{ + "ldscript": "esp32s3_out.ld", + "partitions": "default_8MB.csv", + "memory_type": "qio_opi" + }, + "core": "esp32", + "extra_flags": [ + "-DBOARD_HAS_PSRAM", + "-DARDUINO_ESP32S3_DEV", + "-DARDUINO_USB_MODE=1", + "-DARDUINO_USB_CDC_ON_BOOT=1", + "-DARDUINO_RUNNING_CORE=1", + "-DARDUINO_EVENT_RUNNING_CORE=1" + ], + "f_cpu": "240000000L", + "f_flash": "80000000L", + "flash_mode": "qio", + "hwids": [ + [ + "0x303A", + "0x1001" + ] + ], + "mcu": "esp32s3", + "variant": "obp60s3" + }, + "connectivity": [ + "bluetooth", + "wifi" + ], + "debug": { + "default_tool": "esp-builtin", + "onboard_tools": [ + "esp-builtin" + ], + "openocd_target": "esp32s3.cfg" + }, + "frameworks": [ + "arduino", + "espidf" + ], + "name": "OBP60 ESP32-S3-N16R8 16 MB QD, 8 MB PSRAM)", + "upload": { + "flash_size": "8MB", + "maximum_ram_size": 327680, + "maximum_size": 8388608, + "use_1200bps_touch": true, + "wait_for_upload_port": true, + "require_upload_port": true, + "speed": 460800 + }, + "url": "https://open-boat-projects.org/en/diy-multifunktionsdisplay-obp-60/", + "vendor": "Open Boat Projects" +} diff --git a/lib/obp60task/OBP60Hardware.h b/lib/obp60task/OBP60Hardware.h index 67825464..ae4a4d76 100644 --- a/lib/obp60task/OBP60Hardware.h +++ b/lib/obp60task/OBP60Hardware.h @@ -33,7 +33,7 @@ #define OBP_SPI_BUSY 42 #define OBP_SPI_CLK 38 #define OBP_SPI_DIN 48 - #define SHOW_TIME 6000 // Show time for logo and WiFi QR code + #define SHOW_TIME 6000 // Show time in [ms] for logo and WiFi QR code #define FULL_REFRESH_TIME 600 // Refresh cycle time in [s][600...3600] for full display update (very important healcy function) #define MAX_PAGE_NUMBER 10 // Max number of pages for show data #define FONT1 "Ubuntu_Bold8pt7b" diff --git a/lib/obp60task/OBPSensorTask.cpp b/lib/obp60task/OBPSensorTask.cpp index ee22e382..6d561217 100644 --- a/lib/obp60task/OBPSensorTask.cpp +++ b/lib/obp60task/OBPSensorTask.cpp @@ -579,6 +579,6 @@ void sensorTask(void *param){ void createSensorTask(SharedData *shared){ - xTaskCreate(sensorTask,"readSensors",8000,shared,3,NULL); + xTaskCreate(sensorTask,"readSensors",10000,shared,3,NULL); } #endif \ No newline at end of file diff --git a/lib/obp60task/obp60task.h b/lib/obp60task/obp60task.h index 19775a1c..c81e68fc 100644 --- a/lib/obp60task/obp60task.h +++ b/lib/obp60task/obp60task.h @@ -21,6 +21,6 @@ // OBP60 Task void OBP60Task(GwApi *param); - DECLARE_USERTASK_PARAM(OBP60Task, 8000) // Need 8k RAM as stack size + DECLARE_USERTASK_PARAM(OBP60Task, 10000) // Need 8k RAM as stack size DECLARE_CAPABILITY(obp60,true); #endif \ No newline at end of file diff --git a/lib/obp60task/platformio.ini b/lib/obp60task/platformio.ini index c33efddd..f359d89d 100644 --- a/lib/obp60task/platformio.ini +++ b/lib/obp60task/platformio.ini @@ -5,7 +5,10 @@ default_envs = obp60_s3 [env:obp60_s3] platform = espressif32@6.3.2 -board = obp60_s3 +#board = obp60_s3_n8 #8MB flash, no PSRAM +board = obp60_s3_n16 #16MB flash, no PSRAM, zero series +#board = obp60_s3_n8r8 #8MB flash, 8MB PSRAM +#board = obp60_s3_n16r8 #16MB flash, 8MB PSRAM, production series board_build.variants_dir = variants framework = arduino lib_deps =