diff --git a/examples/RX_only/RX_only.pde b/examples/RX_only/RX_only.pde index 07d598c..624dc2c 100644 --- a/examples/RX_only/RX_only.pde +++ b/examples/RX_only/RX_only.pde @@ -10,8 +10,8 @@ #include const int pin_reset = 6; -const int pin_cs = 7; -const int pin_interrupt = 5; +const int pin_cs = 10; // default CS pin on ATMEGA8 +const int pin_interrupt = 2; // default interrupt pin on ATMEGA8 Mrf24j mrf(pin_reset, pin_cs, pin_interrupt); @@ -26,46 +26,32 @@ void setup() { // uncomment if you want to receive any packet on this channel // mrf.set_promiscuous(true); - attachInterrupt(0, interrupt_routine, CHANGE); + attachInterrupt(0, interrupt_routine, CHANGE); // interrupt 0 equivalent to pin 2 on ATMEGA8 + interrupts(); } -volatile uint8_t gotrx; - void interrupt_routine() { - // read and clear from the radio - byte last_interrupt = mrf.read_short(MRF_INTSTAT); - if (last_interrupt & MRF_I_RXIF) { - gotrx = 1; - } + mrf.interrupt_handler(); } void loop() { - int tmp; - interrupts(); - if (gotrx) { - gotrx = 0; - noInterrupts(); - mrf.rx_disable(); - - // read start of rxfifo - byte frame_length = mrf.read_long(0x300); - Serial.print("received a packet "); - Serial.print(frame_length, DEC); - Serial.println(" bytes long"); - - Serial.println("Packet data:"); - for (int i = 1; i <= frame_length; i++) { - tmp = mrf.read_long(0x300 + i); - Serial.print(tmp, HEX); - } - - Serial.print("\r\nLQI/RSSI="); - byte lqi = mrf.read_long(0x300 + frame_length + 1); - byte rssi = mrf.read_long(0x300 + frame_length + 2); - Serial.print(lqi, HEX); - Serial.println(rssi, HEX); - - mrf.rx_enable(); - interrupts(); - } + mrf.check_flags(&handle_rx, &handle_tx); } + +void handle_rx() { + Serial.print("received a packet ");Serial.print(mrf.get_rxinfo()->frame_length, DEC);Serial.println(" bytes long"); + + Serial.println("Packet data:"); + for (int i = 0; i < mrf.rx_datalength(); i++) { + Serial.write(mrf.get_rxinfo()->rx_data[i]); + } + + Serial.print("\r\nLQI/RSSI="); + Serial.print(mrf.get_rxinfo()->lqi, DEC); + Serial.print("/"); + Serial.println(mrf.get_rxinfo()->rssi, DEC); +} + +void handle_tx() { + // code to transmit, nothing to do +} \ No newline at end of file