summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--dong.c8
-rw-r--r--nrfm.c6
2 files changed, 5 insertions, 9 deletions
diff --git a/dong.c b/dong.c
index fbe4b19..cdf1f08 100644
--- a/dong.c
+++ b/dong.c
@@ -32,7 +32,6 @@ int main(void)
PCICR |= (1 << RX_PCIE);
RX_PCMSK |= (1 << RX_PCINT);
- wdt_stop();
uart_init();
radio_init(rxaddr);
radio_print_config();
@@ -45,16 +44,13 @@ int main(void)
n = radio_recv(buf, MAXPDLEN);
buf[n] = '\0';
rxdr = 0;
- if (strncmp(buf, "SYN", 3) == 0) {
+ if (n > 0) {
uart_write("INFO: ");
uart_write_line(buf);
- radio_sendto(txaddr, "ACK", 3);
}
- } else {
- uart_write_line("No IRQ");
}
- _delay_ms(1000);
+ //_delay_ms(1000);
}
return 0;
diff --git a/nrfm.c b/nrfm.c
index 00c314f..3027084 100644
--- a/nrfm.c
+++ b/nrfm.c
@@ -15,9 +15,9 @@
#define SPI_DDR DDRB
#define SPI_PORT PORTB
-#define NRF_CE PB1
-#define NRF_CE_DDR DDRB
-#define NRF_CE_PORT PORTB
+#define NRF_CE PC0
+#define NRF_CE_DDR DDRC
+#define NRF_CE_PORT PORTC
#define NOP 0xFF
#define R_REGISTER 0x1F