Diff: common.h

Revision:

27:27cffdb2e9d3

Parent:

10:869163c7929d

Child:

37:1251e35fe43e

Child:

40:40d4161fe1ad

--- a/common.h	Mon Jan 09 17:12:34 2017 +0100
+++ b/common.h	Mon Jan 09 23:26:52 2017 +0000
@@ -11,11 +11,10 @@
 #define CHANNEL         2
 #define TRANSFER_SIZE   32
 
-const unsigned long long MASTER_ADDRESS = 0xABCDEF00;
-const unsigned long long PIR1_ADDRESS = 0xABCDEF01;
-const unsigned long long PIR2_ADDRESS = 0xABCDEF02;
-const unsigned long long DISTANCE_SENSOR_ADDRESS = 0xABCDEF02;
-const unsigned long long SOUND_SENSOR_ADDRESS = 0xABCDEF03;
+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;
 
 enum SENSOR_TYPE {
     PIR1 = 1,
@@ -24,18 +23,6 @@
     SOUND = 4,
 };
 
-inline bool is_sensor_float(SENSOR_TYPE t) {
-    return t == SOUND;
-}
-
-struct SensorDescription {
-    SensorDescription(int _sensor_id, unsigned long long _rx_address, unsigned long long _tx_address)
-        : sensor_id(_sensor_id), rx_address(_rx_address), tx_address(_tx_address) {}
-    int sensor_id;
-    unsigned long long rx_address;
-    unsigned long long tx_address;
-};
-
 struct Data {
     Data(uint8_t type_, int32_t i_val)
         : type(type_) {