Diff: master.cpp

Revision:

37:1251e35fe43e

Parent:

34:e67581c9b50d

Child:

39:381993764b40

--- a/master.cpp	Tue Jan 17 11:44:16 2017 +0100
+++ b/master.cpp	Tue Jan 17 12:00:43 2017 +0100
@@ -1,24 +1,21 @@
 #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;
     const unsigned long long TX_ADDRESS = BOARD1_ADDRESS;
 
     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() );
@@ -27,22 +24,11 @@
     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) );
 
-    //wifi.printf("test test test\n");
-    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::stringstream ss;
-
-            for (int i = 0; i < rx_bytes; ++i) {
-                ss << std::hex << rxData[i] / 16 << rxData[i] % 16; // ugly!
-            }
-            pc.printf("received: %s\r\n", ss.str().c_str());
-            wifi.printf("received: %s\r\n", ss.str().c_str());
+            std::string output = str_hex(rxData, rx_bytes); 
+            pc.printf("received: %s\r\n", output.c_str());
         }
     }
 }