 
   // Debug
   Serial.begin(9600);
-  Serial.println("setup");
+  Serial.println("--- TTK Weather Station ---");
 
   // Set Up RX
   vw_set_rx_pin(rxPin);
   vw_setup(2000);
 
   // Set Up LCD
-  lcd.begin (16,2); // <<----- My LCD was 16x2
-  // Switch on the backlight
-  lcd.setBacklightPin(BACKLIGHT_PIN,POSITIVE);
-  lcd.setBacklight(HIGH);
-  lcd.home (); // go home
-
-    lcd.print("TTK is here !");
+  _lcd.begin (16,2); // 16x2 LCD
+  _lcd.setBacklightPin(BACKLIGHT_PIN,POSITIVE);
+  _lcd.setBacklight(HIGH);
+  _lcd.home();
+  _lcd.print("--- Welcome ---");
 
   // Start the receiver
-  vw_rx_start();      
+  vw_rx_start();
+
+  // Initialise 
+  if(!_bmp.begin())
+  {
+    /* There was a problem detecting the BMP085 ... check your connections */
+    Serial.print("Ooops, no BMP085 detected ...");
+  }
+
+  // Remote sensore Static Def
+  _remoteSensors = new remoteSensorDef_t[2];
+
+  _remoteSensors[0].name="Sonde 1";
+  _remoteSensors[0].id=42;
+
+  _remoteSensors[0].name="Sonde 2";
+  _remoteSensors[0].id=69;
 }
 
 void loop() {
 
   // Turn the ligth ?
-  long touched =  touch.capacitiveSensor(30);
-  
+  long touched =  _touch.capacitiveSensor(30);
+
   unsigned long currentTime = millis();
-  
-  if(touched>100)
+
+  if(touched>=TOUCH_SENSIBILITY)
   {
     Serial.print("Touch ");
-     Serial.println(touched);   
-    lcd.setBacklight(HIGH); // Backlight on
-    lastTouch = currentTime;
-  }
-  else if( currentTime - lastTouch > 10000)
-  {
-    lcd.setBacklight(LOW); // Backlight off
-  }
-
-  // Wait Message (max 200ms)
-  if( vw_wait_rx_max(200))
-  {
-    // message size
+    Serial.println(touched);   
+    _lcd.setBacklight(HIGH); // Backlight on
+    _lastTouch = currentTime;
+  }
+  else if( currentTime - _lastTouch > BACKLIGHT_DURATION)
+  {
+    _lcd.setBacklight(LOW); // Backlight off
+  }
+
+
+  updateSensor();
+
+  // Wait some time
+  delay(20);
+}
+
+
+/*
+ * Update all sensors
+ *
+ */
+void  updateSensor()
+{
+  // Message Received ?
+  if( vw_have_message())
+  {
+    // max message size
     uint8_t messageLen = VW_MAX_MESSAGE_LEN;
 
-    if (vw_get_message(message, &messageLen)) // Read if OK
+    if (vw_get_message(_message, &messageLen)) // Read message
     {
       digitalWrite(rxLed, HIGH);
 

        Serial.println(sensor.data.value);

        // LCD
        lcd.setCursor (0,1); // go to start of 2nd line
        lcd.print(sensor.data.value);
      } 
      else
      {

      digitalWrite(rxLed, LOW);
    }
  }


}





