diff --git a/src/tests/radio/sx1278/fsk/test-sx1278-bidir.cpp b/src/tests/radio/sx1278/fsk/test-sx1278-bidir.cpp index 0472f464d36ffc91f25d700cc2e8e8facecc36bc..0772d57e40dd48b53ec4892625809ba690b3aaaf 100644 --- a/src/tests/radio/sx1278/fsk/test-sx1278-bidir.cpp +++ b/src/tests/radio/sx1278/fsk/test-sx1278-bidir.cpp @@ -51,7 +51,7 @@ using rxen = Gpio<GPIOD_BASE, 4>; #define SX1278_SPI SPI4 #define SX1278_IRQ_DIO0 EXTI6_IRQHandlerImpl -#define SX1278_IRQ_DIO1 EXTI2_IRQHandlerImpl +#define SX1278_IRQ_DIO1 EXTI4_IRQHandlerImpl #define SX1278_IRQ_DIO3 EXTI11_IRQHandlerImpl #else diff --git a/src/tests/radio/sx1278/fsk/test-sx1278-mavlink.cpp b/src/tests/radio/sx1278/fsk/test-sx1278-mavlink.cpp index 109315e1b0475c4c2e3bbef0f2763977105c8850..095dc3076805fd4532ac3f73671ccafd06835dca 100644 --- a/src/tests/radio/sx1278/fsk/test-sx1278-mavlink.cpp +++ b/src/tests/radio/sx1278/fsk/test-sx1278-mavlink.cpp @@ -67,7 +67,7 @@ using mosi = interfaces::spi4::mosi; #define SX1278_SPI SPI4 #define SX1278_IRQ_DIO0 EXTI6_IRQHandlerImpl -#define SX1278_IRQ_DIO1 EXTI2_IRQHandlerImpl +#define SX1278_IRQ_DIO1 EXTI4_IRQHandlerImpl #define SX1278_IRQ_DIO3 EXTI11_IRQHandlerImpl #else diff --git a/src/tests/radio/sx1278/lora/test-sx1278-bidir.cpp b/src/tests/radio/sx1278/lora/test-sx1278-bidir.cpp index 79ee1725dbcc4ca3e6dd6e57ab4dfd318cf2cfef..ec794656690fe720404fccb7317a8342d89286f3 100644 --- a/src/tests/radio/sx1278/lora/test-sx1278-bidir.cpp +++ b/src/tests/radio/sx1278/lora/test-sx1278-bidir.cpp @@ -54,7 +54,7 @@ using rxen = Gpio<GPIOD_BASE, 4>; #define SX1278_SPI SPI4 #define SX1278_IRQ_DIO0 EXTI6_IRQHandlerImpl -#define SX1278_IRQ_DIO1 EXTI2_IRQHandlerImpl +#define SX1278_IRQ_DIO1 EXTI4_IRQHandlerImpl #define SX1278_IRQ_DIO3 EXTI11_IRQHandlerImpl #else diff --git a/src/tests/radio/sx1278/lora/test-sx1278-mavlink.cpp b/src/tests/radio/sx1278/lora/test-sx1278-mavlink.cpp index 63ed5eeb7e1b8074b1523598f0cc3a8051833487..a35320666c5e340ec32787578df59f1ace39710b 100644 --- a/src/tests/radio/sx1278/lora/test-sx1278-mavlink.cpp +++ b/src/tests/radio/sx1278/lora/test-sx1278-mavlink.cpp @@ -74,7 +74,7 @@ using rxen = Gpio<GPIOD_BASE, 4>; #define SX1278_SPI SPI4 #define SX1278_IRQ_DIO0 EXTI6_IRQHandlerImpl -#define SX1278_IRQ_DIO1 EXTI2_IRQHandlerImpl +#define SX1278_IRQ_DIO1 EXTI4_IRQHandlerImpl #define SX1278_IRQ_DIO3 EXTI11_IRQHandlerImpl #else diff --git a/src/tests/radio/sx1278/lora/test-sx1278-simple.cpp b/src/tests/radio/sx1278/lora/test-sx1278-simple.cpp index 02bbe54894940798c4083142ef49cc76705cea3d..8bd407e8ef3121ab9fec97c8e860be2610dbeacb 100644 --- a/src/tests/radio/sx1278/lora/test-sx1278-simple.cpp +++ b/src/tests/radio/sx1278/lora/test-sx1278-simple.cpp @@ -50,7 +50,7 @@ using rxen = Gpio<GPIOD_BASE, 4>; #define SX1278_SPI SPI4 #define SX1278_IRQ_DIO0 EXTI6_IRQHandlerImpl -#define SX1278_IRQ_DIO1 EXTI2_IRQHandlerImpl +#define SX1278_IRQ_DIO1 EXTI4_IRQHandlerImpl #define SX1278_IRQ_DIO3 EXTI11_IRQHandlerImpl #else diff --git a/src/tests/radio/sx1278/sx1278-init.h b/src/tests/radio/sx1278/sx1278-init.h index 2ed08f3aff834c08925c045e2f893387ce95a5e1..30cc3ae33d156038c7ff2713539990828fd4ada3 100644 --- a/src/tests/radio/sx1278/sx1278-init.h +++ b/src/tests/radio/sx1278/sx1278-init.h @@ -58,7 +58,7 @@ using rxen = miosix::Gpio<GPIOD_BASE, 4>; #define SX1278_SPI SPI4 #define SX1278_IRQ_DIO0 EXTI6_IRQHandlerImpl -#define SX1278_IRQ_DIO1 EXTI2_IRQHandlerImpl +#define SX1278_IRQ_DIO1 EXTI4_IRQHandlerImpl #define SX1278_IRQ_DIO3 EXTI11_IRQHandlerImpl #elif defined _BOARD_STM32F429ZI_SKYWARD_RIG @@ -132,19 +132,19 @@ void initBoard() #ifdef SX1278_IRQ_DIO0 miosix::GpioPin dio0_pin = dio0::getPin(); enableExternalInterrupt(dio0_pin.getPort(), dio0_pin.getNumber(), - InterruptTrigger::RISING_EDGE); + InterruptTrigger::RISING_FALLING_EDGE); #endif #ifdef SX1278_IRQ_DIO1 miosix::GpioPin dio1_pin = dio1::getPin(); enableExternalInterrupt(dio1_pin.getPort(), dio1_pin.getNumber(), - InterruptTrigger::RISING_EDGE); + InterruptTrigger::RISING_FALLING_EDGE); #endif #ifdef SX1278_IRQ_DIO3 miosix::GpioPin dio3_pin = dio3::getPin(); enableExternalInterrupt(dio3_pin.getPort(), dio3_pin.getNumber(), - InterruptTrigger::RISING_EDGE); + InterruptTrigger::RISING_FALLING_EDGE); #endif } diff --git a/src/tests/radio/sx1278/test-sx1278-bench.cpp b/src/tests/radio/sx1278/test-sx1278-bench.cpp index a68dcbff56e4863a7abbd9ddf96c29da37d1547e..fd0607ad35230b67ee6b50a5091883a401a9baf7 100644 --- a/src/tests/radio/sx1278/test-sx1278-bench.cpp +++ b/src/tests/radio/sx1278/test-sx1278-bench.cpp @@ -114,7 +114,7 @@ void recvLoop() TestMsg msg = {}; sx1278->receive((uint8_t *)&msg, sizeof(msg)); - if (true) + if (msg.validate()) { stats.recv_count++; @@ -167,14 +167,14 @@ void spawnThreads() send.detach(); #endif - /* For now, I'll keep it here, just in case ... - std::thread watchdog([]() { + // For now, I'll keep it here, just in case ... + /* std::thread watchdog([]() { while(1) { { FastInterruptDisableLock dlock; sx1278->handleDioIRQ(); } - Thread::sleep(200); + Thread::sleep(2); } }); watchdog.detach();