Diff: master.cpp

Revision:

39:381993764b40

Parent:

37:1251e35fe43e

Child:

50:e83e38fece23

Child:

52:917b3f31cad3

diff -r 861d2b296ef3 -r 381993764b40 master.cpp
--- a/master.cpp	Tue Jan 17 12:19:41 2017 +0100
+++ b/master.cpp	Tue Jan 17 12:32:12 2017 +0100
@@ -1,10 +1,12 @@
 #include "common.h"
 #include "master.h"
 
+#include "cantcoap.h"
 #include <sstream>
 
 int master_loop() {
     Serial pc(USBTX, USBRX); // tx, rx
+    Serial wifi(PA_9, PA_10);
     nRF24L01P radio(PB_15, PB_14, PB_13, PB_12, PB_1, PB_2);    // mosi, miso, sck, csn, ce, irq
     
     const unsigned long long RX_ADDRESS = MASTER_ADDRESS;
@@ -13,9 +15,10 @@
     char rxData[TRANSFER_SIZE];
 
     pc.baud(115200);
+    wifi.baud(115200);
     
     radio_init(&radio, RX_ADDRESS, TX_ADDRESS);
-    
+
     // Display the (default) setup of the nRF24L01+ chip
     pc.printf( "nRF24L01+ Frequency    : %d MHz\r\n",  radio.getRfFrequency() );
     pc.printf( "nRF24L01+ Output power : %d dBm\r\n",  radio.getRfOutputPower() );
@@ -24,10 +27,16 @@
     pc.printf( "nRF24L01+ RX0 Address   : 0x%010llX\r\n", radio.getRxAddress(NRF24L01P_PIPE_P0) );
     pc.printf( "nRF24L01+ RX1 Address   : 0x%010llX\r\n", radio.getRxAddress(NRF24L01P_PIPE_P1) );
 
+    CoapPDU *pdu = new CoapPDU();
+    pdu->setType(CoapPDU::COAP_NON_CONFIRMABLE);
+    pdu->setCode(CoapPDU::COAP_POST);
+    pdu->setURI((char*)"pir1",4);
+
     while (1) {
         if(radio.readable(NRF24L01P_PIPE_P1)){
             int rx_bytes = radio.read(NRF24L01P_PIPE_P1, rxData, sizeof(rxData));
             std::string output = str_hex(rxData, rx_bytes); 
+            wifi.printf("received: %s\r\n", output.c_str());
             pc.printf("received: %s\r\n", output.c_str());
         }
     }