From 73243eb593d9acaf3f00fc96f0435421d1931606 Mon Sep 17 00:00:00 2001 From: johan Date: Sun, 27 Oct 2013 13:15:48 +0100 Subject: [PATCH] Fixed generation of device config type string Former-commit-id: ec245b9fae3f2bae690e985657807389770539d9 --- config/hyperion.config.json | 2 +- deploy/HyperCon.jar.REMOVED.git-id | 2 +- .../ConfigTool/src/org/hyperion/hypercon/spec/DeviceConfig.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/hyperion.config.json b/config/hyperion.config.json index 8ef13f06..09235203 100644 --- a/config/hyperion.config.json +++ b/config/hyperion.config.json @@ -13,7 +13,7 @@ "device" : { "name" : "MyPi", - "type" : "WS2801", + "type" : "ws2801", "output" : "/dev/spidev0.0", "rate" : 1000000, "bgr-output" : false diff --git a/deploy/HyperCon.jar.REMOVED.git-id b/deploy/HyperCon.jar.REMOVED.git-id index 1da5f8bd..544ca37a 100644 --- a/deploy/HyperCon.jar.REMOVED.git-id +++ b/deploy/HyperCon.jar.REMOVED.git-id @@ -1 +1 @@ -001950ae6499ac83babe8e563be11b8daacd554c \ No newline at end of file +948743846fb38a0f1f9a91ebb721884f3890f965 \ No newline at end of file diff --git a/src/config-tool/ConfigTool/src/org/hyperion/hypercon/spec/DeviceConfig.java b/src/config-tool/ConfigTool/src/org/hyperion/hypercon/spec/DeviceConfig.java index e99341fb..9ef573a7 100644 --- a/src/config-tool/ConfigTool/src/org/hyperion/hypercon/spec/DeviceConfig.java +++ b/src/config-tool/ConfigTool/src/org/hyperion/hypercon/spec/DeviceConfig.java @@ -37,7 +37,7 @@ public class DeviceConfig { strBuf.append("\t{\n"); strBuf.append("\t\t\"name\" : \"").append(mName).append("\",\n"); - strBuf.append("\t\t\"type\" : \"").append(mType).append("\",\n"); + strBuf.append("\t\t\"type\" : \"").append(mType.name()).append("\",\n"); strBuf.append("\t\t\"output\" : \"").append(mOutput).append("\",\n"); strBuf.append("\t\t\"rate\" : ").append(mBaudrate).append(",\n"); strBuf.append("\t\t\"bgr-output\" : ").append(mBgrOutput).append("\n");