From 0f8278cb7918c966086dbbbfd01fd445a47348e6 Mon Sep 17 00:00:00 2001
From: johan <johanpol@hotmail.com>
Date: Sat, 9 Nov 2013 11:17:23 +0100
Subject: [PATCH] Fix config generation

Former-commit-id: c908b74ba8bd8dfc3aa2a6f31d97bda28c343447
---
 config/hyperion.config.json                              | 6 +++---
 .../src/org/hyperion/hypercon/spec/MiscConfig.java       | 9 ---------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/config/hyperion.config.json b/config/hyperion.config.json
index b0cd2eb1..c47d6890 100644
--- a/config/hyperion.config.json
+++ b/config/hyperion.config.json
@@ -338,7 +338,7 @@
 		"enable" : true
 	},
 
-,
+
 
 	/// The boot-sequence configuration, contains the following items: 
 	///  * type        : The type of the boot-sequence ('rainbow', 'knight_rider', 'none') 
@@ -349,7 +349,7 @@
 		"duration_ms" : 3000
 	},
 
-,
+
 
 	/// The configuration for the frame-grabber, contains the following items: 
 	///  * width        : The width of the grabbed frames [pixels]
@@ -362,7 +362,7 @@
 		"frequency_Hz" : 10.0
 	},
 
-,
+
 
 	/// The configuration of the XBMC connection used to enable and disable the frame-grabber. Contains the following fields: 
 	///  * xbmcAddress  : The IP address of the XBMC-host
diff --git a/src/config-tool/ConfigTool/src/org/hyperion/hypercon/spec/MiscConfig.java b/src/config-tool/ConfigTool/src/org/hyperion/hypercon/spec/MiscConfig.java
index 6dfe08fa..42ad85e6 100644
--- a/src/config-tool/ConfigTool/src/org/hyperion/hypercon/spec/MiscConfig.java
+++ b/src/config-tool/ConfigTool/src/org/hyperion/hypercon/spec/MiscConfig.java
@@ -61,9 +61,6 @@ public class MiscConfig {
 	public String toJsonString() {
 		StringBuffer strBuf = new StringBuffer();
 
-		if (mBootsequenceEnabled) {
-			strBuf.append(",");
-		}
 		strBuf.append("\n\n");
 		strBuf.append("\t/// The boot-sequence configuration, contains the following items: \n");
 		strBuf.append("\t///  * type        : The type of the boot-sequence ('rainbow', 'knight_rider', 'none') \n");
@@ -76,9 +73,6 @@ public class MiscConfig {
 		strBuf.append(bootPreamble).append(String.format(Locale.ROOT, "\t\"duration_ms\" : %d\n", mBootSequenceLength_ms));
 		strBuf.append(bootPreamble).append("},\n\n");
 
-		if (mFrameGrabberEnabled) {
-			strBuf.append(",");
-		}
 		strBuf.append("\n\n");
 		strBuf.append("\t/// The configuration for the frame-grabber, contains the following items: \n");
 		strBuf.append("\t///  * width        : The width of the grabbed frames [pixels]\n");
@@ -93,9 +87,6 @@ public class MiscConfig {
 		strBuf.append(grabPreamble).append(String.format(Locale.ROOT, "\t\"frequency_Hz\" : %.1f\n", 1000.0/mFrameGrabberInterval_ms));
 		strBuf.append(grabPreamble).append("},\n\n");
 
-		if (mXbmcCheckerEnabled) {
-			strBuf.append(",");
-		}
 		strBuf.append("\n\n");
 		strBuf.append("\t/// The configuration of the XBMC connection used to enable and disable the frame-grabber. Contains the following fields: \n");
 		strBuf.append("\t///  * xbmcAddress  : The IP address of the XBMC-host\n");