From b56a15b012b5516e0d06eb3a3de21ca05f353511 Mon Sep 17 00:00:00 2001 From: johan Date: Sat, 9 Nov 2013 11:19:26 +0100 Subject: [PATCH] Fix config generati Former-commit-id: b125333e82df891b516fbaf6c3e0f599a7699dd6 --- config/hyperion.config.json | 6 ------ .../src/org/hyperion/hypercon/spec/MiscConfig.java | 3 --- 2 files changed, 9 deletions(-) diff --git a/config/hyperion.config.json b/config/hyperion.config.json index c47d6890..360a02ec 100644 --- a/config/hyperion.config.json +++ b/config/hyperion.config.json @@ -338,8 +338,6 @@ "enable" : true }, - - /// The boot-sequence configuration, contains the following items: /// * type : The type of the boot-sequence ('rainbow', 'knight_rider', 'none') /// * duration_ms : The length of the boot-sequence [ms] @@ -349,8 +347,6 @@ "duration_ms" : 3000 }, - - /// The configuration for the frame-grabber, contains the following items: /// * width : The width of the grabbed frames [pixels] /// * height : The height of the grabbed frames [pixels] @@ -362,8 +358,6 @@ "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 /// * xbmcTcpPort : The TCP-port of the XBMC-server 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 42ad85e6..f8fd108a 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,7 +61,6 @@ public class MiscConfig { public String toJsonString() { StringBuffer strBuf = new StringBuffer(); - 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"); strBuf.append("\t/// * duration_ms : The length of the boot-sequence [ms]\n"); @@ -73,7 +72,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"); - 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"); strBuf.append("\t/// * height : The height of the grabbed frames [pixels]\n"); @@ -87,7 +85,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"); - 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"); strBuf.append("\t/// * xbmcTcpPort : The TCP-port of the XBMC-server\n");