Added leds and ears state to karotz.

.gitignore

@@ -9,6 +9,7 @@ lib-cov
 
 /.settings
 /.buildpath
+/.jshintrc
 /.project
 /.README.md.html
 

handlers.js

@@ -137,14 +137,15 @@ function status(res, req) {
 	log.trace('status: begin');
 
 	var sleep = karotz.isSleeping() ? 1 : 0;
-	var sleepTime = karotz.getSleepTime();
+	var pulse = karotz.isLedsPulse() ? 1 : 0;
+	var earsDisabled = karotz.isEarsDisabled() ? 1 : 0;
 
-	var data = '{"version":"201",'
-		+ '"ears_disabled":"0",'
+	var data = '{"version":"' + karotz.getVersion() + '",'
+		+ '"ears_disabled":"' + earsDisabled + '",'
 		+ '"sleep":"' + sleep + '",'
-		+ '"sleep_time":"' + sleepTime + '",'
-		+ '"led_color":"0000FF",'
-		+ '"led_pulse":"1",'
+		+ '"sleep_time":"' + karotz.getSleepTime() + '",'
+		+ '"led_color":"' + karotz.getLedsColor() + '",'
+		+ '"led_pulse":"' + pulse + '",'
 		+ '"tts_cache_size":"4",'
 		+ '"usb_free_space":"-1",'
 		+ '"karotz_free_space":"148.4M",'
@@ -164,7 +165,7 @@ exports.status = status;
 
 function get_version(res, req) {
 	log.trace('get_version: begin');
-	var data = '{"version":"200","return":"0"}';
+	var data = '{"version":"' + karotz.getVersion() + '","return":"0"}';
 	sendResponse(res, data);
 	log.trace('get_version: end');
 }
@@ -192,13 +193,13 @@ function leds(res, req) {
 		var speed = getParameter(req, "speed", "");
 		// TODO: handle blink parameter?
 
-		// TODO: store this data in karotz
+		karotz.leds(color, color2, pulse, speed);
 
-		data = '{"color":"' + color + '",'
-			+ '"secondary_color":"' + color2 + '",'
-			+ '"pulse":"' + pulse + '",'
+		data = '{"color":"' + karotz.getLedsColor() + '",'
+			+ '"secondary_color":"' + karotz.getLedsColor2() + '",'
+			+ '"pulse":"' + karotz.isLedsPulse() + '",'
 			+ '"no_memory":"' + no_memory + '",'
-			+ '"speed":"' + speed + '",'
+			+ '"speed":"' + karotz.getLedsSpeed() + '",'
 			+ '"return":"0"}';
 	}
 
@@ -223,7 +224,7 @@ function ears(res, req) {
 		if (left === undefined || right === undefined) {
 			data = '{"return":"1","msg":"Missing mandatory parameters."}';
 		} else {
-			// TODO: store this data in karotz
+			karotz.ears(left, right);
 			data = '{"left":"' + left + '","right":"' + right + '","return":"0"}';
 		}
 	}
@@ -242,7 +243,7 @@ function ears_reset(res, req) {
 	} else if (karotz.isEarsDisabled()){
 		data = '{"return":"1","msg":"Unable to perform action, ears disabled."}';
 	} else {
-		// TODO: store this data in karotz
+		karotz.ears(0, 0);
 		data = '{"return":"0"}';
 	}
 
@@ -263,11 +264,10 @@ function ears_random(res, req) {
 		var left = Math.floor((Math.random() * 15) + 1);
 		var right = Math.floor((Math.random() * 15) + 1);
 
-		// TODO: store this data in karotz
+		karotz.ears(left, right);
 		data = '{"left":"' + left + '","right":"' + right + '","return":"0"}';
 	}
 
-
 	sendResponse(res, data);
 	log.trace('ears_random: end');
 }

karotz.js

@@ -29,9 +29,21 @@
 
 var log = require('./log');
 
+var version = "200";
 var sleeping = true;
 var sleepTime = new Date().getTime();
 var earsDisabled = false;
+var earsLeft = 0;
+var earsRight = 0;
+var ledsColor1 = "00FF00";
+var ledsColor2 = "000000";
+var ledsPulse = false;
+var ledsSpeed = 700;
+
+
+exports.getVersion = function() {
+	return version;
+};
 
 exports.isSleeping = function() {
 	return sleeping;
@@ -45,6 +57,31 @@ exports.isEarsDisabled = function() {
 	return earsDisabled;
 };
 
+exports.getEarsLeft = function() {
+	return earsLeft;
+};
+
+exports.getEarsRight = function() {
+	return earsRight;
+};
+
+exports.getLedsColor = function() {
+	return ledsColor1;
+};
+
+exports.getLedsColor2 = function() {
+	return ledsColor2;
+};
+
+exports.isLedsPulse = function() {
+	return ledsPulse;
+};
+
+exports.getLedsSpeed = function() {
+	return ledsSpeed;
+};
+
+
 function sleep() {
 	sleeping = true;
 	sleepTime = new Date().getTime();
@@ -63,4 +100,18 @@ function reboot() {
 	wakeup();
 	return sleeping;
 };
-exports.reboot = reboot;
+exports.reboot = reboot;
+
+function leds(color1, color2, pulse, speed) {
+	if (color1) ledsColor1 = color1;
+	if (color2) ledsColor2 = color2;
+	if (pulse) ledsPulse = pulse;
+	if (speed) ledsSpeed = speed;
+}
+exports.leds = leds;
+
+function ears(left, right) {
+	if (left) earsLeft = left;
+	if (right) earsRight = right;
+}
+exports.ears = ears;