Diff: common.h

Revision:

56:065bd3a75d97

Parent:

54:2551a3c781cf

--- a/common.h	Thu Jan 19 02:42:15 2017 +0100
+++ b/common.h	Thu Jan 19 11:26:38 2017 +0100
@@ -3,7 +3,6 @@
 
 #include <sstream>
 #include <stdint.h>
-#include <vector>
 #include <string>
 #include "nRF24L01P.h"
 #include "mbed.h"
@@ -13,15 +12,11 @@
 #define CHANNEL         2
 #define TRANSFER_SIZE   32
 
-// STUPID LEGACY, DON'T USE
 const unsigned long long MASTER_ADDRESS = 0xBACDFF00;
 const unsigned long long BOARD1_ADDRESS = 0xBACDFF01;
 const unsigned long long BOARD2_ADDRESS = 0xBACDFF02;
 const unsigned long long BOARD3_ADDRESS = 0xBACDFF03;
 
-extern const int pipes[];
-extern const unsigned long long addresses[];
-
 enum SENSOR_TYPE {
     PIR1 = 1,
     PIR2 = 2,
@@ -56,7 +51,7 @@
 
 std::string str_hex(const char* text, int len);
 
-void radio_init_sensor_board(nRF24L01P* radio, unsigned long long tx_address);
-void radio_init_master(nRF24L01P* radio, const std::vector<unsigned long long> &rx_addresses);
+void radio_init(nRF24L01P* radio, unsigned long long rx_address,
+        unsigned long long tx_address);
 
 #endif /* JNP3_COMMON */