frodovdr
/
hyperion.ng
mirror of https://github.com/hyperion-project/hyperion.ng.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/tvdzwan/hyperion 

Former-commit-id: 57fe3f2c5c05680636ef1317c30355ea7636da3b
This commit is contained in:
johan 2013-11-20 20:54:11 +01:00
parent 409b800a8e 077f88a123
commit 333cecdca8
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/hyperion.config.json
View File

@ -339,7 +339,7 @@
}, },
/// The boot-sequence configuration, contains the following items: /// The boot-sequence configuration, contains the following items:
/// * type : The type of the boot-sequence ('rainbow', 'knight_rider', 'none') /// * type : The type of the boot-sequence ('rainbow', 'knightrider', 'none')
/// * duration_ms : The length of the boot-sequence [ms] /// * duration_ms : The length of the boot-sequence [ms]
"bootsequence" : "bootsequence" :
{ {

2
deploy/HyperCon.jar.REMOVED.git-id
View File

@ -1 +1 @@
97f01ae47416100223417becca5c3a50a773fbfa 944c2292ca55b16a31bdf1d89e0e7849d6879995

2
src/config-tool/ConfigTool/src/org/hyperion/hypercon/spec/BootSequence.java
View File

@ -20,7 +20,7 @@ public enum BootSequence {
case rainbow: case rainbow:
return "Rainbow"; return "Rainbow";
case knightrider: case knightrider:
return "Kinght Rider"; return "Knight Rider";
} }
return "None"; return "None";
} }

2
src/config-tool/ConfigTool/src/org/hyperion/hypercon/spec/MiscConfig.java
View File

@ -68,7 +68,7 @@ public class MiscConfig {
String bootPreamble = mBootsequenceEnabled? "\t" : "//\t"; String bootPreamble = mBootsequenceEnabled? "\t" : "//\t";
strBuf.append(bootPreamble).append("\"bootsequence\" :\n"); strBuf.append(bootPreamble).append("\"bootsequence\" :\n");
strBuf.append(bootPreamble).append("{\n"); strBuf.append(bootPreamble).append("{\n");
strBuf.append(bootPreamble).append(String.format(Locale.ROOT, "\t\"type\" : \"%s\",\n", mBootSequence)); strBuf.append(bootPreamble).append(String.format(Locale.ROOT, "\t\"type\" : \"%s\",\n", mBootSequence.name()));
strBuf.append(bootPreamble).append(String.format(Locale.ROOT, "\t\"duration_ms\" : %d\n", mBootSequenceLength_ms)); strBuf.append(bootPreamble).append(String.format(Locale.ROOT, "\t\"duration_ms\" : %d\n", mBootSequenceLength_ms));
strBuf.append(bootPreamble).append("},\n\n"); strBuf.append(bootPreamble).append("},\n\n");