 
 	if (current > nextReportInterval) {
 		Thingplus.gatewayStatusPublish(true, reportIntervalSec * 3);
+		Thingplus.sensorStatusPublish(ledId, true, reportIntervalSec * 3);
+		Thingplus.sensorStatusPublish(buzzerId, true, reportIntervalSec * 3);
+		Thingplus.sensorStatusPublish(buttonId, true, reportIntervalSec * 3);
 		Thingplus.sensorStatusPublish(temperatureId, true, reportIntervalSec * 3);
-		Thingplus.sensorStatusPublish(ledId, true, reportIntervalSec * 3);
 		Thingplus.valuePublish(temperatureId, temperatureGet());
+		Thingplus.sensorStatusPublish(lightId, true, reportIntervalSec * 3);
+		Thingplus.valuePublish(lightId, lightGet());
+		Thingplus.sensorStatusPublish(noiseId, true, reportIntervalSec * 3);
+		Thingplus.valuePublish(noiseId, noiseGet());
 		nextReportInterval = current + reportIntervalSec;
 	}
 }

#include <Arduino.h>
#include <SPI.h>
#include <Ethernet.h> 

#include <Timer.h>
#include <Thingplus.h>

//////////////////////////////////////////////////////////////////
byte mac[6] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; 		//FIXME MAC ADDRESS
const char *apikey = "";  					//FIXME APIKEY
const char *ledId = "led-000000000000-0";			//FIXME LED ID
const char *temperatureId = "temperature-000000000000-0";	//FIXME TEMPERATURE ID
//////////////////////////////////////////////////////////////////

Timer t;

int ledOffTimer = 0;
int ledBlinkTimer = 0;

int LED_GPIO = 8;
int TEMP_GPIO = A0;
int reportIntervalSec = 60;

static EthernetClient ethernetClient;

	return temperature;
}

int lightGet() {
	int light = analogRead(LIGHT_GPIO);
	return light;
}

int noiseGet() {
	int noise = analogRead(NOISE_GPIO);
	return noise;
}

void loop() {
	Thingplus.loop();
	t.update();
