 boolean ThreadComplete;
 
 //----- MQTT -----
-<<<<<<< HEAD
-#define MQTT_PROXY_IP "gpssensor.ddns.net"  // Current LASD server
-#define DEVICE_TYPE  "LinkItONE"
-#define DEVICE_ID "FT1_001"    // REPLACE: The device ID you like, please start from LASD. Without this prefix, maybe it will be filter out.
-#define MQTT_TOPIC_PREFIX "LASS/Test" 
-#define PARTNER_ID "LASS-Partner1"
-=======
-
->>>>>>> 86b2c10252a118e57a9ab6cc3fc8f3db3b7565a3
+
 char mqttTopic[64];
 char mqttTopicSelf[64]; // The topic used for central alarm
 char mqttTopicPartner[64]; // The topic used for partner alarm

          AP1-SENSOR_ID_DUST: Dust sensor: http://www.seeedstudio.com/depot/Grove-Dust-Sensor-p-1050.html
          AP1-SENSOR_ID_UV: UV sensor: http://www.seeedstudio.com/depot/Grove-UV-Sensor-p-1540.html
          AP1-SENSOR_ID_SOUND: Sound sensor: http://www.seeedstudio.com/depot/Grove-Sound-Sensor-p-752.html
      	  AP2-SENSOR_ID_DUST: Dust sensor http://tw.taobao.com/item/43750623059.htm
          AP3-SENSOR_ID_BAROMETER: Barometer sensor (high accuracy): http://www.seeedstudio.com/wiki/Grove_-_Barometer_(High-Accuracy)
          AP3-SENSOR_ID_TEMPERATURE: Temperture and Humidity sensor pro: http://www.seeedstudio.com/wiki/Grove_-_Temperature_and_Humidity_Sensor_Pro
          AP3-SENSOR_ID_HUMIDITY: Temperture and Humidity sensor pro: http://www.seeedstudio.com/wiki/Grove_-_Temperature_and_Humidity_Sensor_Pro



enum pinSensorConfig{
  DUST_SENSOR_PIN = 8,  
  SOUND_SENSOR_PIN = A1,
  UV_SENSOR_PIN = A0,
  BUZZER_ALARM_PIN = 3,
