From 7dce3ab798879bc75948579febc71d6bc254ac98 Mon Sep 17 00:00:00 2001 From: penfold42 Date: Wed, 23 Mar 2016 21:12:34 +1100 Subject: [PATCH] renamed the "Test" device to be "File" No functional changes, but - files have been renamed - the device name is now "file" not "test" Former-commit-id: 3fbc03c3fe1d764654c1d28ebb80562ce6276ab1 --- config/hyperion.config.json | 2 +- config/hyperion_x86.config.json | 2 +- libsrc/leddevice/CMakeLists.txt | 6 +++--- libsrc/leddevice/LedDeviceFactory.cpp | 6 +++--- .../leddevice/{LedDeviceTest.cpp => LedDeviceFile.cpp} | 10 +++++----- libsrc/leddevice/{LedDeviceTest.h => LedDeviceFile.h} | 6 +++--- 6 files changed, 16 insertions(+), 16 deletions(-) rename libsrc/leddevice/{LedDeviceTest.cpp => LedDeviceFile.cpp} (55%) rename libsrc/leddevice/{LedDeviceTest.h => LedDeviceFile.h} (86%) diff --git a/config/hyperion.config.json b/config/hyperion.config.json index 0b8c5d8c..748781fd 100644 --- a/config/hyperion.config.json +++ b/config/hyperion.config.json @@ -5,7 +5,7 @@ /// Device configuration contains the following fields: /// * 'name' : The user friendly name of the device (only used for display purposes) /// * 'type' : The type of the device or leds (known types for now are - /// APA102, Adalight, AmbiLed, Atmo, Hyperion-USBASP-WS2801, Hyperion-USBASP-WS2812, Lightberry, Lightpack, LPD6803, LPD8806, Multi-Lightpack, P9813, Paintpack, PhilipsHUE, PiBlaster, SEDU, Test, ThinkerForge, TPM2, WS2801, WS2812b, None) + /// APA102, Adalight, AmbiLed, Atmo, Hyperion-USBASP-WS2801, Hyperion-USBASP-WS2812, Lightberry, Lightpack, LPD6803, LPD8806, Multi-Lightpack, P9813, Paintpack, PhilipsHUE, PiBlaster, SEDU, file, ThinkerForge, TPM2, WS2801, WS2812b, None) /// * [device type specific configuration] /// * 'colorOrder' : The order of the color bytes ('rgb', 'rbg', 'bgr', etc.). "device" : diff --git a/config/hyperion_x86.config.json b/config/hyperion_x86.config.json index 79a02589..a17801b9 100644 --- a/config/hyperion_x86.config.json +++ b/config/hyperion_x86.config.json @@ -5,7 +5,7 @@ /// Device configuration contains the following fields: /// * 'name' : The user friendly name of the device (only used for display purposes) /// * 'type' : The type of the device or leds (known types for now are 'ws2801', 'ldp8806', - /// 'lpd6803', 'sedu', 'adalight', 'lightpack', 'test' and 'none') + /// 'lpd6803', 'sedu', 'adalight', 'lightpack', 'file' and 'none') /// * 'output' : The output specification depends on selected device. This can for example be the /// device specifier, device serial number, or the output file name /// * 'rate' : The baudrate of the output to the device diff --git a/libsrc/leddevice/CMakeLists.txt b/libsrc/leddevice/CMakeLists.txt index 66d61efd..6d89205a 100755 --- a/libsrc/leddevice/CMakeLists.txt +++ b/libsrc/leddevice/CMakeLists.txt @@ -21,7 +21,7 @@ SET(Leddevice_QT_HEADERS ${CURRENT_SOURCE_DIR}/LedDevicePhilipsHue.h ${CURRENT_SOURCE_DIR}/LedHIDDevice.h ${CURRENT_SOURCE_DIR}/LedDeviceRawHID.h - ${CURRENT_SOURCE_DIR}/LedDeviceTest.h + ${CURRENT_SOURCE_DIR}/LedDeviceFile.h ${CURRENT_SOURCE_DIR}/LedDeviceFadeCandy.h ) @@ -34,7 +34,7 @@ SET(Leddevice_HEADERS ${CURRENT_SOURCE_DIR}/LedDevicePaintpack.h ${CURRENT_SOURCE_DIR}/LedDevicePiBlaster.h ${CURRENT_SOURCE_DIR}/LedDeviceSedu.h - ${CURRENT_SOURCE_DIR}/LedDeviceTest.h + ${CURRENT_SOURCE_DIR}/LedDeviceFile.h ${CURRENT_SOURCE_DIR}/LedDeviceFadeCandy.h ${CURRENT_SOURCE_DIR}/LedDeviceUdp.h ${CURRENT_SOURCE_DIR}/LedDeviceHyperionUsbasp.h @@ -58,7 +58,7 @@ SET(Leddevice_SOURCES ${CURRENT_SOURCE_DIR}/LedDevicePaintpack.cpp ${CURRENT_SOURCE_DIR}/LedDevicePiBlaster.cpp ${CURRENT_SOURCE_DIR}/LedDeviceSedu.cpp - ${CURRENT_SOURCE_DIR}/LedDeviceTest.cpp + ${CURRENT_SOURCE_DIR}/LedDeviceFile.cpp ${CURRENT_SOURCE_DIR}/LedDeviceFadeCandy.cpp ${CURRENT_SOURCE_DIR}/LedDeviceUdp.cpp ${CURRENT_SOURCE_DIR}/LedDeviceHyperionUsbasp.cpp diff --git a/libsrc/leddevice/LedDeviceFactory.cpp b/libsrc/leddevice/LedDeviceFactory.cpp index a3dd87af..37f22511 100755 --- a/libsrc/leddevice/LedDeviceFactory.cpp +++ b/libsrc/leddevice/LedDeviceFactory.cpp @@ -29,7 +29,7 @@ #include "LedDevicePaintpack.h" #include "LedDevicePiBlaster.h" #include "LedDeviceSedu.h" -#include "LedDeviceTest.h" +#include "LedDeviceFile.h" #include "LedDeviceFadeCandy.h" #include "LedDeviceUdp.h" #include "LedDeviceHyperionUsbasp.h" @@ -275,10 +275,10 @@ LedDevice * LedDeviceFactory::construct(const Json::Value & deviceConfig) device = new LedDeviceAtmoOrb(output, switchOffOnBlack, transitiontime, port, numLeds, orbIds); } - else if (type == "test") + else if (type == "file") { const std::string output = deviceConfig["output"].asString(); - device = new LedDeviceTest(output); + device = new LedDeviceFile(output); } else if (type == "fadecandy") { diff --git a/libsrc/leddevice/LedDeviceTest.cpp b/libsrc/leddevice/LedDeviceFile.cpp similarity index 55% rename from libsrc/leddevice/LedDeviceTest.cpp rename to libsrc/leddevice/LedDeviceFile.cpp index 4a616d2e..87085f39 100644 --- a/libsrc/leddevice/LedDeviceTest.cpp +++ b/libsrc/leddevice/LedDeviceFile.cpp @@ -1,19 +1,19 @@ // Local-Hyperion includes -#include "LedDeviceTest.h" +#include "LedDeviceFile.h" -LedDeviceTest::LedDeviceTest(const std::string& output) : +LedDeviceFile::LedDeviceFile(const std::string& output) : _ofs(output.empty()?"/home/pi/LedDevice.out":output.c_str()) { // empty } -LedDeviceTest::~LedDeviceTest() +LedDeviceFile::~LedDeviceFile() { // empty } -int LedDeviceTest::write(const std::vector & ledValues) +int LedDeviceFile::write(const std::vector & ledValues) { _ofs << "["; for (const ColorRgb& color : ledValues) @@ -25,7 +25,7 @@ int LedDeviceTest::write(const std::vector & ledValues) return 0; } -int LedDeviceTest::switchOff() +int LedDeviceFile::switchOff() { return 0; } diff --git a/libsrc/leddevice/LedDeviceTest.h b/libsrc/leddevice/LedDeviceFile.h similarity index 86% rename from libsrc/leddevice/LedDeviceTest.h rename to libsrc/leddevice/LedDeviceFile.h index cc4a6f32..ef7a54f7 100644 --- a/libsrc/leddevice/LedDeviceTest.h +++ b/libsrc/leddevice/LedDeviceFile.h @@ -10,18 +10,18 @@ /// Implementation of the LedDevice that write the led-colors to an /// ASCII-textfile('/home/pi/LedDevice.out') /// -class LedDeviceTest : public LedDevice +class LedDeviceFile : public LedDevice { public: /// /// Constructs the test-device, which opens an output stream to the file /// - LedDeviceTest(const std::string& output); + LedDeviceFile(const std::string& output); /// /// Destructor of this test-device /// - virtual ~LedDeviceTest(); + virtual ~LedDeviceFile(); /// /// Writes the given led-color values to the output stream