From 9e56379da8d54979df13e3ac75e9cc1f4ffc1579 Mon Sep 17 00:00:00 2001 From: Brendan <2bndy5@gmail.com> Date: Thu, 25 Feb 2021 17:41:07 -0800 Subject: [PATCH 1/4] fix changes that sparked frustration in community --- RF24.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RF24.cpp b/RF24.cpp index 470570a86..bfa32bed4 100644 --- a/RF24.cpp +++ b/RF24.cpp @@ -754,7 +754,7 @@ bool RF24::begin(void) write_register(DYNPD, 0); // disable dynamic payloads by default (for all pipes) dynamic_payloads_enabled = false; write_register(EN_AA, 0x3F); // enable auto-ack on all pipes - write_register(EN_RXADDR, 0); // close all RX pipes + write_register(EN_RXADDR, 3); // close all RX pipes setPayloadSize(32); // set static payload size to 32 (max) bytes by default setAddressWidth(5); // set default address length to (max) 5 bytes @@ -1355,7 +1355,7 @@ void RF24::enableAckPayload(void) IF_SERIAL_DEBUG(printf("FEATURE=%i\r\n", read_register(FEATURE))); // Enable dynamic payload on pipes 0 - write_register(DYNPD, read_register(DYNPD) | _BV(DPL_P0)); + write_register(DYNPD, read_register(DYNPD) | _BV(DPL_P1) | _BV(DPL_P0)); dynamic_payloads_enabled = true; ack_payloads_enabled = true; } From 81b3ac6fd963f2bc83edad3913fc686ea07b4353 Mon Sep 17 00:00:00 2001 From: Brendan <2bndy5@gmail.com> Date: Thu, 25 Feb 2021 17:43:41 -0800 Subject: [PATCH 2/4] disable building WiringPi build works locally, but only on armhf hardware. --- .github/workflows/build_linux.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml index 61aab8ea2..d0cbe6f09 100644 --- a/.github/workflows/build_linux.yml +++ b/.github/workflows/build_linux.yml @@ -13,7 +13,7 @@ jobs: config-options: - "--soc=BCM2835 --driver=RPi" - "--soc=BCM2836 --driver=RPi" - - "--soc=BCM2835 --driver=wiringPi --extra-cflags=-I/usr/local/include" + # - "--soc=BCM2835 --driver=wiringPi --extra-cflags=-I/usr/local/include" - "--driver=SPIDEV" steps: @@ -28,7 +28,7 @@ jobs: - name: provide WiringPi if: ${{ matrix.config-options == '--soc=BCM2835 --driver=wiringPi --extra-cflags=-I/usr/local/include' }} run: | - git clone https://github.com/CoRfr/WiringPi + git clone https://github.com/WiringPi/WiringPi cd WiringPi/wiringPi CC="arm-linux-gnueabihf-gcc -marm -mtune=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard" V=1 make -j5 sudo make install From 33541ed1801ee98c2d6a3757a9f6f3715d157d9f Mon Sep 17 00:00:00 2001 From: Brendan <2bndy5@gmail.com> Date: Thu, 25 Feb 2021 18:11:12 -0800 Subject: [PATCH 3/4] ammend comment --- RF24.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RF24.cpp b/RF24.cpp index bfa32bed4..3782736ed 100644 --- a/RF24.cpp +++ b/RF24.cpp @@ -754,7 +754,7 @@ bool RF24::begin(void) write_register(DYNPD, 0); // disable dynamic payloads by default (for all pipes) dynamic_payloads_enabled = false; write_register(EN_AA, 0x3F); // enable auto-ack on all pipes - write_register(EN_RXADDR, 3); // close all RX pipes + write_register(EN_RXADDR, 3); // only open RX pipes 0 & 1 setPayloadSize(32); // set static payload size to 32 (max) bytes by default setAddressWidth(5); // set default address length to (max) 5 bytes From 3c69e2655c4e6b2e749529db5a33a1851bbac204 Mon Sep 17 00:00:00 2001 From: Brendan <2bndy5@gmail.com> Date: Thu, 25 Feb 2021 18:12:34 -0800 Subject: [PATCH 4/4] ammend another comment --- RF24.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RF24.cpp b/RF24.cpp index 3782736ed..a09df222c 100644 --- a/RF24.cpp +++ b/RF24.cpp @@ -1354,7 +1354,7 @@ void RF24::enableAckPayload(void) IF_SERIAL_DEBUG(printf("FEATURE=%i\r\n", read_register(FEATURE))); - // Enable dynamic payload on pipes 0 + // Enable dynamic payload on pipes 0 & 1 write_register(DYNPD, read_register(DYNPD) | _BV(DPL_P1) | _BV(DPL_P0)); dynamic_payloads_enabled = true; ack_payloads_enabled = true;