Add send_str

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "test/usart"]
 	path = test/usart
-	url = https://git.chch.tech/avr/usart.git
+	url = git@git.chch.tech:avr/usart.git

makefile

@@ -26,3 +26,10 @@ term:
 
 avarice:
 	avarice --program --file bin/main.elf --part atmega32 --dragon :4242
+
+
+fuse:
+	avrdude -p ${MCU} -c ${PROG} -P ${PORT} -U lfuse:w:0xe4:m -U hfuse:w:0xd2:m
+
+lock:
+	avrdude -p ${MCU} -c ${PROG} -P ${PORT} -U lock:w:0xC0:m

src/driver.h

@@ -27,6 +27,9 @@
     #define RESET_DDR DDRB
     #define RESET_PORT PORTB
     #define RESET PB0
+    #define WAKE_PORT PORTB
+    #define WAKE_DDR DDRB
+    #define WAKE_PIN PB1
     #define INTERRUPT ISR(INT2_vect)
 #elif defined RASPBERRYPI
 

src/mrf24j.cpp

@@ -104,12 +104,17 @@ word Mrf24j::address16_read(void) {
     return a16h << 8 | read_short(MRF_SADRL);
 }
 
+
+void Mrf24j::send_str(word dest16, char * data) { 
+    byte len = strlen(data); // get the length of the char* array
+    send(dest16, data, len);
+}
+
 /**
  * Simple send 16, with acks, not much of anything.. assumes src16 and local pan only.
  * @param data
  */
-void Mrf24j::send16(word dest16, char * data) {
+void Mrf24j::send(word dest16, char * data, int len) {
-    byte len = strlen(data); // get the length of the char* array
     int i = 0;
     write_long(i++, bytes_MHR); // header length
     // +ignoreBytes is because some module seems to ignore 2 bytes after the header?!.

src/mrf24j.h

@@ -227,7 +227,8 @@ class Mrf24j
          */
         void set_palna(boolean enabled);
 
-        void send16(word dest16, char * data);
+        void send(word dest16, char * data, int len);
+        void send_str(word dest16, char * data);
 
         void interrupt_handler(void);
 

test/rx/main.cpp

@@ -31,17 +31,21 @@ int main() {
   //mrf.turbo();
 
   sei();
+  DDRD |= (1<<PD4) | (1<<PD5);
   printf("Started");
   while(1) {
     //printf("txxxing...\n\r");
     //mrf.send16(0x4201, "abcd");
     //_delay_ms(5000);
+    PORTD ^= (1<<PD5);
+    _delay_ms(500);
   }
 }
 
 
 
 void handle_rx() {
+    PORTD |= (1<<PD4);
     printf("------------------------------------------------------\n\r");
     printf("received a packet %i  bytes long\n\r", mrf.get_rxinfo()->frame_length);
     
@@ -59,6 +63,7 @@ void handle_rx() {
     
     printf("LQI/RSSI=");
     printf("%i/%i\n\r", mrf.get_rxinfo()->lqi, mrf.get_rxinfo()->rssi);
+    PORTD &= ~(1<<PD4);
 }
 
 void handle_tx() {

test/tx/main.cpp

@@ -17,6 +17,7 @@
 
 
 Mrf24j mrf;
+int i = 0;
 
 void handle_rx();
 void handle_tx();
@@ -36,16 +37,17 @@ int main() {
   //mrf.turbo();
   //mrf.set_power(0b1100000);
   //mrf.sleep();
+  
   sei();
   printf("Started\n\r");
-  int i = 0;
+  
   char tmp[20];
   while(1) {
-    printf("txxxing...\n\r");
+    printf("txxxing... %i\n\r", i++);
     //mrf.wake();
     
-    sprintf(tmp,"Received %i\n\r", i++);
+    sprintf(tmp,"Received %i\n\r", i);
-    mrf.send16(0x4202, tmp);
+    mrf.send_str(0x4202, tmp);
     
     _delay_ms(2000);
   }
@@ -74,7 +76,7 @@ void handle_rx() {
 
 void handle_tx() {
     if (mrf.get_txinfo()->tx_ok) {
-        printf("TX went ok, got ack\n\r");
+        printf("TX went ok, got ack %i\n\r", i);
     } else {
         printf("TX failed after %i retries\n\n\r",  mrf.get_txinfo()->retries);
     }