From bea4c8298ec21379047da17e60e9db74eeda0ce7 Mon Sep 17 00:00:00 2001 From: norbert-walter Date: Tue, 21 Jan 2025 16:32:40 +0100 Subject: [PATCH] Modify files for Gitpod --- lib/obp60task/Using_Gitpod.txt | 24 ++++++++++++-- lib/obp60task/howto_compile.txt | 2 -- ...partition_tale.txt => partition_table.txt} | 0 lib/obp60task/platformio.ini | 6 ++-- lib/obp60task/run | 33 ------------------- lib/obp60task/run_installing_tools | 13 ++++++++ lib/obp60task/run_obp40_s3 | 10 ++++++ lib/obp60task/run_obp60_s3 | 10 ++++++ 8 files changed, 57 insertions(+), 41 deletions(-) delete mode 100644 lib/obp60task/howto_compile.txt rename lib/obp60task/{partition_tale.txt => partition_table.txt} (100%) delete mode 100644 lib/obp60task/run create mode 100644 lib/obp60task/run_installing_tools create mode 100644 lib/obp60task/run_obp40_s3 create mode 100644 lib/obp60task/run_obp60_s3 diff --git a/lib/obp60task/Using_Gitpod.txt b/lib/obp60task/Using_Gitpod.txt index 64d28af..1f93298 100644 --- a/lib/obp60task/Using_Gitpod.txt +++ b/lib/obp60task/Using_Gitpod.txt @@ -6,10 +6,12 @@ https://gitpod.io/#https://github.com/norbert-walter/esp32-nmea2000-obp60/tree/m Input in terminal: cd /workspace/esp32-nmea2000-obp60 -bash /workspace/esp32-nmea2000-obp60/lib/obp60task/run +bash /workspace/esp32-nmea2000-obp60/lib/obp60task/run_installing_tools +bash /workspace/esp32-nmea2000-obp60/lib/obp60task/run_obp60_s3 +bash /workspace/esp32-nmea2000-obp60/lib/obp60task/run_obp40_s3 -Compile result in: -/workspace/esp32-nmea2000-obp60/.pio/build/obp60_s3/obp60_s3-all.bin, ready to flash to offset 0x0000 +Compile result for OBP60 +######################## /workspace/esp32-nmea2000-obp60/.pio/build/obp60_s3/bootloader.bin /workspace/esp32-nmea2000-obp60/.pio/build/obp60_s3/firmware.bin @@ -18,3 +20,19 @@ Compile result in: /workspace/esp32-nmea2000-obp60/.pio/build/obp60_s3/obp60_s3-all.bin /workspace/esp32-nmea2000-obp60/.pio/build/obp60_s3/obp60_s3-dev20231220-all.bin /workspace/esp32-nmea2000-obp60/.pio/build/obp60_s3/obp60_s3-dev20231220-update.bin + +/workspace/esp32-nmea2000-obp60/.pio/build/obp60_s3/obp60_s3-all.bin, ready to flash to offset 0x0000 + +Compile result for OBP40 (CrowPanel 4.2) +######################################## + +/workspace/esp32-nmea2000-obp60/.pio/build/obp40_s3/bootloader.bin +/workspace/esp32-nmea2000-obp60/.pio/build/obp40_s3/firmware.bin +/workspace/esp32-nmea2000-obp60/.pio/build/obp40_s3/partitions.bin + +/workspace/esp32-nmea2000-obp60/.pio/build/obp40_s3/obp40_s3-all.bin +/workspace/esp32-nmea2000-obp60/.pio/build/obp40_s3/obp40_s3-dev20231220-all.bin +/workspace/esp32-nmea2000-obp60/.pio/build/obp40_s3/obp40_s3-dev20231220-update.bin + +/workspace/esp32-nmea2000-obp60/.pio/build/obp40_s3/obp40_s3-all.bin, ready to flash to offset 0x0000 + diff --git a/lib/obp60task/howto_compile.txt b/lib/obp60task/howto_compile.txt deleted file mode 100644 index a5d28ce..0000000 --- a/lib/obp60task/howto_compile.txt +++ /dev/null @@ -1,2 +0,0 @@ -cd /workspace/esp32-nmea2000-obp60 -bash /workspace/esp32-nmea2000-obp60/lib/obp60task/run \ No newline at end of file diff --git a/lib/obp60task/partition_tale.txt b/lib/obp60task/partition_table.txt similarity index 100% rename from lib/obp60task/partition_tale.txt rename to lib/obp60task/partition_table.txt diff --git a/lib/obp60task/platformio.ini b/lib/obp60task/platformio.ini index d9d633f..da78f39 100644 --- a/lib/obp60task/platformio.ini +++ b/lib/obp60task/platformio.ini @@ -3,6 +3,7 @@ #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 @@ -50,8 +51,7 @@ build_flags= # -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_port = /dev/ttyACM0 #OBP60 download via USB-C direct 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 @@ -92,7 +92,7 @@ build_flags= -D BOARD_OBP40S3 #Board OBP40 V1.0 with ESP32S3 SKU:DIE07300S (CrowPanel 4.2) -D DISPLAY_GDEY042T81 #new E-Ink display from Waveshare, R10 2.2 ohm ${env.build_flags} -upload_port = /dev/ttyUSB0 #OBP60 clone +upload_port = /dev/ttyUSB0 #OBP40 download via external USB/Serail converter 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 diff --git a/lib/obp60task/run b/lib/obp60task/run deleted file mode 100644 index 19a8960..0000000 --- a/lib/obp60task/run +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash - -# This script compile the software and loads the bin files into the web flash tool -# in the Gitpod Docker container. -# The web flashtool can be started from the Github website with: -# http://YourGitHubName.github.io/LoRa-Boat-Monitor/flash_tool/esp_flash_tool.html - -# Attention! Start this cript only in the Gitpod Docker container. -# Start the script with: bash run - -# Path definitions -projectpath="./.pio/build/nodemcu-32s" -toolpath="./docs/flash_tool" - -# Install tools -echo "Installing tools" -cd /workspace/esp32-nmea2000 -pip3 install -U esptool -pip3 install platformio - -# Compile the firmware -echo "Compiling Firmware" -platformio run -e obp60_s3 - -# Copy all bin files in docs folder for online flash tool -#echo "Copy bin files" -#cp $projectpath/bootloader.bin $toolpath/bootloader.bin -#cp $projectpath/partitions.bin $toolpath/partitions.bin -#cp $projectpath/firmware.bin $toolpath/firmware.bin - -# Merge all bin files to one merge file -#echo "Merge all bin files" -#esptool.py --chip ESP32 merge_bin -o $toolpath/merged-firmware.bin --flash_mode dio --flash_size 4MB 0x1000 $toolpath/bootloader.bin 0x8000 $toolpath/partitions.bin 0x10000 $toolpath/firmware.bin diff --git a/lib/obp60task/run_installing_tools b/lib/obp60task/run_installing_tools new file mode 100644 index 0000000..9c4667e --- /dev/null +++ b/lib/obp60task/run_installing_tools @@ -0,0 +1,13 @@ +#!/bin/bash + +# This script installing the tool chain +# in the Gitpod Docker container. + +# Attention! Start this cript only in the Gitpod Docker container. +# Start the script with: bash run + +# Install tools +echo "Installing tools" +cd /workspace/esp32-nmea2000 +pip3 install -U esptool +pip3 install platformio diff --git a/lib/obp60task/run_obp40_s3 b/lib/obp60task/run_obp40_s3 new file mode 100644 index 0000000..f3b9f65 --- /dev/null +++ b/lib/obp60task/run_obp40_s3 @@ -0,0 +1,10 @@ +#!/bin/bash + +# This script compile the software für OBP40-S3 + +# Attention! Start this cript only in the Gitpod Docker container. +# Start the script with: bash run + +# Compile the firmware +echo "Compiling Firmware" +platformio run -e obp60_s3 \ No newline at end of file diff --git a/lib/obp60task/run_obp60_s3 b/lib/obp60task/run_obp60_s3 new file mode 100644 index 0000000..cdc9637 --- /dev/null +++ b/lib/obp60task/run_obp60_s3 @@ -0,0 +1,10 @@ +#!/bin/bash + +# This script compile the software für OBP60-S3 + +# Attention! Start this cript only in the Gitpod Docker container. +# Start the script with: bash run + +# Compile the firmware +echo "Compiling Firmware" +platformio run -e obp60_s3 \ No newline at end of file