From 728fc8cbad46ef1e0c1836c7b792499e3e13a3dd Mon Sep 17 00:00:00 2001 From: thebentern Date: Tue, 8 Nov 2022 22:51:44 +0000 Subject: [PATCH 1/5] [create-pull-request] automated change --- version.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.properties b/version.properties index da0d02a6d..6f548b7bd 100644 --- a/version.properties +++ b/version.properties @@ -1,4 +1,4 @@ [VERSION] major = 2 minor = 0 -build = 1 +build = 2 From cb283f4c5754bbb7af67b211aad71a28f9e4b75c Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Wed, 9 Nov 2022 07:14:08 -0600 Subject: [PATCH 2/5] Build cleanup and update deprecated platformio cmd --- bin/build-all.sh.legacy | 109 ---------------------------------------- bin/build-esp32.sh | 2 +- bin/build-native.sh | 2 +- bin/build-nrf52.sh | 2 +- bin/build-rpi2040.sh | 2 +- 5 files changed, 4 insertions(+), 113 deletions(-) delete mode 100755 bin/build-all.sh.legacy diff --git a/bin/build-all.sh.legacy b/bin/build-all.sh.legacy deleted file mode 100755 index 55c151da1..000000000 --- a/bin/build-all.sh.legacy +++ /dev/null @@ -1,109 +0,0 @@ -#!/usr/bin/env bash - -set -e - -VERSION=`bin/buildinfo.py long` -SHORT_VERSION=`bin/buildinfo.py short` - -BOARDS_ESP32="rak11200 tlora-v2 tlora-v1 tlora_v1_3 tlora-v2-1-1.6 tbeam heltec-v1 heltec-v2.0 heltec-v2.1 tbeam0.7 meshtastic-diy-v1 nano-g1 station-g1 m5stack-core m5stack-coreink" -#BOARDS_ESP32=tbeam - -# FIXME note nrf52840dk build is for some reason only generating a BIN file but not a HEX file nrf52840dk-geeksville is fine -BOARDS_NRF52="rak4631 rak4631_eink t-echo pca10059_diy_eink" -#BOARDS_NRF52="" - -OUTDIR=release/latest - -# We keep all old builds (and their map files in the archive dir) -ARCHIVEDIR=release/archive - -rm -f $OUTDIR/firmware* - -mkdir -p $OUTDIR/bins $ARCHIVEDIR -rm -r $OUTDIR/bins/* || true -mkdir -p $OUTDIR/bins/universal $OUTDIR/elfs/universal - -# build the named environment and copy the bins to the release directory -function do_build() { - BOARD=$1 - isNrf=$3 - - echo "Building for $BOARD ($isNrf) with $PLATFORMIO_BUILD_FLAGS" - rm -f .pio/build/$BOARD/firmware.* - - # The shell vars the build tool expects to find - export APP_VERSION=$VERSION - - basename=universal/firmware-$BOARD-$VERSION - - pio run --environment $BOARD # -v - SRCELF=.pio/build/$BOARD/firmware.elf - cp $SRCELF $OUTDIR/elfs/$basename.elf - - if [ "$isNrf" = "false" ] - then - echo "Copying ESP32 bin file" - SRCBIN=.pio/build/$BOARD/firmware.bin - cp $SRCBIN $OUTDIR/bins/$basename.bin - else - echo "Generating NRF52 uf2 file" - SRCHEX=.pio/build/$BOARD/firmware.hex - bin/uf2conv.py $SRCHEX -c -o $OUTDIR/bins/$basename.uf2 -f 0xADA52840 - fi -} - -function do_boards() { - declare boards=$1 - declare isNrf=$2 - for board in $boards; do - # Build universal - echo "about to build $board $isNrf" - do_build $board "" "$isNrf" - done -} - -# Make sure our submodules are current -git submodule update - -# Important to pull latest version of libs into all device flavors, otherwise some devices might be stale -platformio lib update - -do_boards "$BOARDS_ESP32" "false" -do_boards "$BOARDS_NRF52" "true" - -pio run --environment native -cp .pio/build/native/program $OUTDIR/bins/universal/meshtasticd_linux_amd64 - -echo "Building Filesystem for ESP32 targets" -pio run --environment tbeam -t buildfs -cp .pio/build/tbeam/spiffs.bin $OUTDIR/bins/universal/littlefs-$VERSION.bin - -# keep the bins in archive also -cp $OUTDIR/bins/universal/littlefs* $OUTDIR/bins/universal/firmware* $OUTDIR/elfs/universal/firmware* $ARCHIVEDIR - -echo Updating android bins $OUTDIR/forandroid -rm -rf $OUTDIR/forandroid -mkdir -p $OUTDIR/forandroid -cp -a $OUTDIR/bins/universal/*.bin $OUTDIR/forandroid/ - -cat >$OUTDIR/curfirmwareversion.xml < - - - - - $VERSION - $SHORT_VERSION - -XML - -echo Generating $ARCHIVEDIR/firmware-$VERSION.zip -rm -f $ARCHIVEDIR/firmware-$VERSION.zip -zip --junk-paths $ARCHIVEDIR/firmware-$VERSION.zip $ARCHIVEDIR/littlefs-$VERSION.bin $OUTDIR/bins/universal/firmware-*-$VERSION.* $OUTDIR/bins/universal/meshtasticd* images/system-info.bin bin/device-install.* bin/device-update.* -echo Generating $ARCHIVEDIR/elfs-$VERSION.zip -rm -f $ARCHIVEDIR/elfs-$VERSION.zip -zip --junk-paths $ARCHIVEDIR/elfs-$VERSION.zip $OUTDIR/elfs/universal/firmware-*-$VERSION.* - -echo BUILT ALL diff --git a/bin/build-esp32.sh b/bin/build-esp32.sh index 40a6c3aee..12961864f 100755 --- a/bin/build-esp32.sh +++ b/bin/build-esp32.sh @@ -14,7 +14,7 @@ rm -r $OUTDIR/* || true git submodule update # Important to pull latest version of libs into all device flavors, otherwise some devices might be stale -platformio lib update +platformio pkg update echo "Building for $1 with $PLATFORMIO_BUILD_FLAGS" rm -f .pio/build/$1/firmware.* diff --git a/bin/build-native.sh b/bin/build-native.sh index 31ef01155..b620a01d8 100755 --- a/bin/build-native.sh +++ b/bin/build-native.sh @@ -16,7 +16,7 @@ rm -r $OUTDIR/* || true git submodule update # Important to pull latest version of libs into all device flavors, otherwise some devices might be stale -platformio lib update +platformio pkg update pio run --environment native cp .pio/build/native/program $OUTDIR/meshtasticd_linux_amd64 diff --git a/bin/build-nrf52.sh b/bin/build-nrf52.sh index 76972b100..6c723e28f 100755 --- a/bin/build-nrf52.sh +++ b/bin/build-nrf52.sh @@ -14,7 +14,7 @@ rm -r $OUTDIR/* || true git submodule update # Important to pull latest version of libs into all device flavors, otherwise some devices might be stale -platformio lib update +platformio pkg update echo "Building for $1 with $PLATFORMIO_BUILD_FLAGS" rm -f .pio/build/$1/firmware.* diff --git a/bin/build-rpi2040.sh b/bin/build-rpi2040.sh index 04fe7106b..670f570f1 100755 --- a/bin/build-rpi2040.sh +++ b/bin/build-rpi2040.sh @@ -14,7 +14,7 @@ rm -r $OUTDIR/* || true git submodule update # Important to pull latest version of libs into all device flavors, otherwise some devices might be stale -platformio lib update +platformio pkg update echo "Building for $1 with $PLATFORMIO_BUILD_FLAGS" rm -f .pio/build/$1/firmware.* From d77bc239c17c7cba08143b532cf37ab10461517c Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Wed, 9 Nov 2022 07:20:53 -0600 Subject: [PATCH 3/5] Changed retention policy --- .github/workflows/main_matrix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main_matrix.yml b/.github/workflows/main_matrix.yml index aacdc72af..62a2477bf 100644 --- a/.github/workflows/main_matrix.yml +++ b/.github/workflows/main_matrix.yml @@ -410,7 +410,7 @@ jobs: with: name: debug-elfs-${{ steps.version.outputs.version }}.zip path: ./*.elf - retention-days: 90 + retention-days: 30 - name: Create request artifacts if: ${{ github.event_name == 'pull_request_target' || github.event_name == 'pull_request' }} From 1213ec2d5794af4682c117ab723f2460411b7c26 Mon Sep 17 00:00:00 2001 From: GUVWAF Date: Wed, 9 Nov 2022 21:21:50 +0100 Subject: [PATCH 4/5] Set preamble length back to 32 --- src/mesh/RadioInterface.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mesh/RadioInterface.h b/src/mesh/RadioInterface.h index 8570d7b39..e9f725c89 100644 --- a/src/mesh/RadioInterface.h +++ b/src/mesh/RadioInterface.h @@ -65,7 +65,7 @@ class RadioInterface - Tx/Rx turnaround time (maximum of SX126x and SX127x); - MAC processing time (measured on T-beam) */ uint32_t slotTimeMsec = 8.5 * pow(2, sf)/bw + 0.2 + 0.4 + 7; - uint16_t preambleLength = 8; // 8 is default + uint16_t preambleLength = 32; // 8 is default, but we use longer to increase the amount of sleep time when receiving const uint32_t PROCESSING_TIME_MSEC = 4500; // time to construct, process and construct a packet again (empirically determined) const uint8_t CWmin = 2; // minimum CWsize const uint8_t CWmax = 8; // maximum CWsize From 2247e71a52c5ae5f1b53ea1bd71c6ab14c857dca Mon Sep 17 00:00:00 2001 From: thebentern Date: Wed, 9 Nov 2022 21:39:27 +0000 Subject: [PATCH 5/5] [create-pull-request] automated change --- version.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.properties b/version.properties index 6f548b7bd..303bb9783 100644 --- a/version.properties +++ b/version.properties @@ -1,4 +1,4 @@ [VERSION] major = 2 minor = 0 -build = 2 +build = 3