summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/app/nrf24l01test/main.cc4
-rw-r--r--src/driver/nrf24l01.cc29
2 files changed, 29 insertions, 4 deletions
diff --git a/src/app/nrf24l01test/main.cc b/src/app/nrf24l01test/main.cc
index 9dddb58..f1d7ef0 100644
--- a/src/app/nrf24l01test/main.cc
+++ b/src/app/nrf24l01test/main.cc
@@ -35,8 +35,8 @@ void loop(void)
kout << "write: ";
nrf24l01.setRetries(0, 0);
- nrf24l01.enableDynamicPayloads(false);
- nrf24l01.enableDynamicAck(false);
+ nrf24l01.setDynamicPayloads(false);
+ nrf24l01.setDynamicAck(false);
TIMEIT("blocking write(3)", nrf24l01.write("foo", 3, true, true));
TIMEIT("blocking write(10)", nrf24l01.write("123456789", 10, true, true));
TIMEIT("blocking write(20)", nrf24l01.write("123456789123456789", 20, true, true));
diff --git a/src/driver/nrf24l01.cc b/src/driver/nrf24l01.cc
index 194b1b7..921f69d 100644
--- a/src/driver/nrf24l01.cc
+++ b/src/driver/nrf24l01.cc
@@ -338,7 +338,7 @@ uint8_t Nrf24l01::writeRegister(uint8_t reg, uint8_t value)
return rxbuf[0];
}
-void Nrf24l01::enableDynamicPayloads(const bool enabled)
+void Nrf24l01::setDynamicPayloads(const bool enabled)
{
if (enabled)
{
@@ -354,7 +354,7 @@ void Nrf24l01::enableDynamicPayloads(const bool enabled)
dynamic_payloads_enabled = enabled;
}
-void Nrf24l01::enableDynamicAck(const bool enabled)
+void Nrf24l01::setDynamicAck(const bool enabled)
{
if (enabled)
{
@@ -366,6 +366,31 @@ void Nrf24l01::enableDynamicAck(const bool enabled)
}
}
+void Nrf24l01::setAutoAck(bool enable)
+{
+ if ( enable )
+ writeRegister(EN_AA, 0b111111);
+ else
+ writeRegister(EN_AA, 0);
+}
+
+void Nrf24l01::setAutoAck( uint8_t pipe, bool enable )
+{
+ if ( pipe <= 6 )
+ {
+ uint8_t en_aa = readRegister( EN_AA ) ;
+ if( enable )
+ {
+ en_aa |= (1<<pipe) ;
+ }
+ else
+ {
+ en_aa &= ~(1<<pipe) ;
+ }
+ writeRegister( EN_AA, en_aa ) ;
+ }
+}
+
uint8_t Nrf24l01::writePayload(const void *buf, uint8_t data_len, const uint8_t writeType)
{
data_len = rf24_min(data_len, payload_size);