diff --git a/src/main/webapp/WEB-INF/jsp/index.jsp b/src/main/webapp/WEB-INF/jsp/index.jsp
index 2add903..204d0ea 100644
--- a/src/main/webapp/WEB-INF/jsp/index.jsp
+++ b/src/main/webapp/WEB-INF/jsp/index.jsp
@@ -9,7 +9,7 @@
" rel="stylesheet" />
" rel="stylesheet" />
- " rel="stylesheet" />
+ " rel="stylesheet" />
">
">
">
@@ -22,12 +22,13 @@
function() {
var dataChanged = false;
var par56eins = $.parseJSON('{"deviceId":1, "options": {"red":0,"blue":0,"green":0} }');
+ var par56null = $.parseJSON('{"deviceId":0, "options": {"red":0,"blue":0,"green":0} }');
var volumes = $.parseJSON('{"room1":0,"room2":0,"room3":0,"room4":0}');
function sendData(data) {
$.ajax({
type: 'POST',
- url: "/control/devices/1",
+ url: "/control/devices/0",
contentType: "application/json",
dataType: "json",
data: JSON.stringify(data)
@@ -37,13 +38,16 @@
var senden = function sendOutAllDevices() {
if(dataChanged) {
dataChanged = false;
- sendData(par56eins);
+ sendData(par56null);
+ console.log("send data");
}
+ console.log("set new interval for sending");
+ window.setTimeout(senden, 200);
};
// vielleicht baut man lieber was mit setTimeout und setzt das jeweils neu wenn man daten ändert
// das könnte den Browser entlasten, sofern den das 200ms Aufrufen überhaupt stört :D
- window.setInterval(senden, 200);
+ senden();
$("#slider1").slider({ min: 0, max: 100, slide: function(event, ui) {
volumes.room1 = ui.value;
@@ -84,7 +88,18 @@
}
});
var colorpicker_raum1 = new jQuery.ColorPicker('#colorpicker-raum1', {
- imagepath: '/resources/images/colorpicker/'
+ imagepath: '/resources/images/colorpicker/',
+ change: function(hexcolor) {
+ red = hexcolor.substr(1,2);
+ green = hexcolor.substr(3,2);
+ blue = hexcolor.substr(5,2);
+ par56null.options.red = parseInt(red, 16);
+ par56null.options.blue = parseInt(blue, 16);
+ par56null.options.green = parseInt(green, 16);
+ console.log("data changed");
+ dataChanged = true;
+
+ }
});
});
}