From 90f1f282e26cc852480b0da91a34e70a662c7caa Mon Sep 17 00:00:00 2001
From: johan <johanpol@hotmail.com>
Date: Sat, 9 Nov 2013 11:36:08 +0100
Subject: [PATCH] Fix generation of color smoothing parameters

Former-commit-id: 44b606e833451ee5795d92fd0bef3acb2dd8d47c
---
 config/hyperion.config.json                          | 12 ++++++------
 deploy/HyperCon.jar.REMOVED.git-id                   |  2 +-
 .../src/org/hyperion/hypercon/spec/ColorConfig.java  |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/config/hyperion.config.json b/config/hyperion.config.json
index dd426137..eac7c282 100644
--- a/config/hyperion.config.json
+++ b/config/hyperion.config.json
@@ -60,12 +60,12 @@
 			"blacklevel" : 0.0000,
 			"whitelevel" : 1.0000
 		},
-//		"smoothing" :
-//		{
-//			"type"            : "linear",
-//			"time_ms"         : 200,
-//			"updateFrequency" : 20.0000
-//		}
+		"smoothing" :
+		{
+			"type"            : "none",
+			"time_ms"         : 200,
+			"updateFrequency" : 20.0000
+		}
 	},
 
 	/// The configuration for each individual led. This contains the specification of the area 
diff --git a/deploy/HyperCon.jar.REMOVED.git-id b/deploy/HyperCon.jar.REMOVED.git-id
index 17d0ad20..dd3a10e5 100644
--- a/deploy/HyperCon.jar.REMOVED.git-id
+++ b/deploy/HyperCon.jar.REMOVED.git-id
@@ -1 +1 @@
-7079c4843fecd32e0914e10a06cf4fe99d89ab9d
\ No newline at end of file
+1c3031eb536b2af5ced172f1eb071011f705cc86
\ No newline at end of file
diff --git a/src/config-tool/ConfigTool/src/org/hyperion/hypercon/spec/ColorConfig.java b/src/config-tool/ConfigTool/src/org/hyperion/hypercon/spec/ColorConfig.java
index 9dbd0946..ea4c2279 100644
--- a/src/config-tool/ConfigTool/src/org/hyperion/hypercon/spec/ColorConfig.java
+++ b/src/config-tool/ConfigTool/src/org/hyperion/hypercon/spec/ColorConfig.java
@@ -137,10 +137,10 @@ public class ColorConfig {
 	private String smoothingToString() {
 		StringBuffer strBuf = new StringBuffer();
 		
-		String preamble = (mSmoothingEnabled)? "\t\t" : "//\t\t";
+		String preamble = "\t\t";
 		strBuf.append(preamble).append("\"smoothing\" :\n");
 		strBuf.append(preamble).append("{\n");
-		strBuf.append(preamble).append(String.format(Locale.ROOT, "\t\"type\"            : \"%s\",\n", mSmoothingType.name()));
+		strBuf.append(preamble).append(String.format(Locale.ROOT, "\t\"type\"            : \"%s\",\n", (mSmoothingEnabled) ? mSmoothingType.name() : "none"));
 		strBuf.append(preamble).append(String.format(Locale.ROOT, "\t\"time_ms\"         : %d,\n", mSmoothingTime_ms));
 		strBuf.append(preamble).append(String.format(Locale.ROOT, "\t\"updateFrequency\" : %.4f\n", mSmoothingUpdateFrequency_Hz));