frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added first quick and dirty implementation of own server (HyperionDispmanX.cpp).

Browse Source
This commit is contained in:
T. van der Zwan
2013-08-01 17:08:58 +02:00
parent a65305dbdb
commit f6672499f5
12 changed files with 167 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
src/CMakeLists.txt
View File

@@ -1,48 +1,7 @@
# Find the libPNG
find_package(PNG REQUIRED QUIET)
# Add additional includes dirs
include_directories(${PNG_INCLUDE_DIR})
# Add the simple test executable 'TestSpi'
add_executable(TestSpi
TestSpi.cpp)
target_link_libraries(TestSpi
hyperion
hyperion-utils)
add_executable(TestHyperionPng
TestHyperionPng.cpp)
target_link_libraries(TestHyperionPng
hyperion-png)
add_executable(WriteConfig
WriteConfig.cpp)
add_executable(TestConfigFile
TestConfigFile.cpp)
target_link_libraries(TestConfigFile
hyperion-utils
hyperion)
add_executable(ViewPng
ViewPng.cpp)
target_link_libraries(ViewPng
hyperion
hyperion-utils
${PNG_LIBRARIES})
add_executable(Test2BobLight
Test2BobLight.cpp)
target_link_libraries(Test2BobLight
bob2hyperion)
add_executable(boblight-dispmanx
boblight-dispmanx.cpp
flagmanager.h
@@ -58,31 +17,36 @@ add_executable(boblight-dispmanx
timeutils.h
timeutils.cpp)
FIND_PATH(VC_INCLUDE_DIR
bcm_host.h
/usr/include
/usr/local/include
/opt/vc/include)
SET(VC_INCLUDE_DIRS
${VC_INCLUDE_DIR}
${VC_INCLUDE_DIR}/interface/vcos/pthreads
${VC_INCLUDE_DIR}/interface/vmcs_host/linux)
FIND_LIBRARY(VC_LIBS
NAMES bcm_host
PATHS /usr/lib /usr/local/lib /opt/vc/lib)
message("{VC_LIBS} = ${VC_LIBS}")
# Find the BCM-package (VC control)
find_package(BCM REQUIRED)
#SET(VC_LIBS
# /home/pi/.xbmc-current/xbmc-bin/lib/xbmc/system/libbcm_host.so)
# /home/pi/.xbmc-current/xbmc-bin/lib/xbmc/system/libGLESv2.so
# /home/pi/.xbmc-current/xbmc-bin/lib/xbmc/system/libEGL.so
# /home/pi/.xbmc-current/xbmc-bin/lib/xbmc/system/libopenmaxil.so
# /home/pi/.xbmc-current/xbmc-bin/lib/xbmc/system/libvcos.so
# /home/pi/.xbmc-current/xbmc-bin/lib/xbmc/system/libvchiq_arm.so)
include_directories(${VC_INCLUDE_DIRS})
include_directories(${BCM_INCLUDE_DIRS})
target_link_libraries(boblight-dispmanx
# hyperion-png
bob2hyperion
${VC_LIBS})
${BCM_LIBS})
add_executable(HyperionDispmanX
HyperionDispmanX.cpp)
target_link_libraries(HyperionDispmanX
hyperion
${BCM_LIBS})
# Find the libPNG
find_package(PNG QUIET)
if(PNG_FOUND)
# Add additional includes dirs
include_directories(${PNG_INCLUDE_DIR})
add_executable(ViewPng
ViewPng.cpp)
target_link_libraries(ViewPng
hyperion
hyperion-utils
${PNG_LIBRARIES})
endif(PNG_FOUND)

75
src/HyperionDispmanX.cpp Normal file
View File

@@ -0,0 +1,75 @@
// VC includes
#include <bcm_host.h>
// Hyperion includes
#include <hyperion/Hyperion.h>
#include <json/json.h>
#include <utils/jsonschema/JsonFactory.h>
int main(int /*argc*/, char** /*argv*/)
{
const char* homeDir = getenv("RASPILIGHT_HOME");
if (!homeDir)
{
homeDir = "/etc";
}
std::cout << "RASPILIGHT HOME DIR: " << homeDir << std::endl;
const std::string schemaFile = std::string(homeDir) + "/hyperion.schema.json";
const std::string configFile = std::string(homeDir) + "/hyperion.config.json";
Json::Value raspiConfig;
if (JsonFactory::load(schemaFile, configFile, raspiConfig) < 0)
{
std::cerr << "UNABLE TO LOAD CONFIGURATION" << std::endl;
return -1;
}
Hyperion hyperion(raspiConfig);
const unsigned width = 64;
const unsigned height = 64;
hyperion.setInputSize(width, height);
volatile bool running = true;
// Open the connection to the displaydisplay
DISPMANX_DISPLAY_HANDLE_T display = vc_dispmanx_display_open(0);
DISPMANX_MODEINFO_T info;
int ret = vc_dispmanx_display_get_info(display, &info);
assert(ret == 0);
// Create the resources for capturing image
uint32_t vc_image_ptr;
DISPMANX_RESOURCE_HANDLE_T resource = vc_dispmanx_resource_create(
VC_IMAGE_RGB888,
width,
height,
&vc_image_ptr);
assert(resource);
VC_RECT_T rectangle;
vc_dispmanx_rect_set(&rectangle, 0, 0, width, height);
RgbImage* image_ptr = &(hyperion.image());
void* image_vp = reinterpret_cast<void*>(image_ptr);
const unsigned imageSize_bytes = width*height*3;
timespec updateInterval;
updateInterval.tv_sec = 0;
updateInterval.tv_nsec = 100000000000;
while(running)
{
vc_dispmanx_snapshot(display, resource, VC_IMAGE_ROT0);
vc_dispmanx_resource_read_data(resource, &rectangle, image_vp, imageSize_bytes);
hyperion.commit();
nanosleep(&updateInterval, NULL);
}
return 0;
}

39
src/Test2BobLight.cpp
View File

@@ -1,39 +0,0 @@
// STL includes
#include <iostream>
#include <vector>
#include <unistd.h>
// Boblight includes
#include <boblight.h>
int main()
{
void* boblight_ptr = boblight_init();
if (!boblight_ptr)
{
std::cerr << "Failed to initialise bob-light" << std::endl;
return -1;
}
const unsigned width = 112;
const unsigned height = 63;
boblight_setscanrange(boblight_ptr, width, height);
std::vector<int> rgbColor = { 255, 255, 0 };
for (unsigned iY=0; iY<height; ++iY)
{
for (unsigned iX=0; iX<width; ++iX)
{
boblight_addpixelxy(boblight_ptr, iX, iY, rgbColor.data());
}
}
boblight_sendrgb(boblight_ptr, 0, nullptr);
//sleep(5);
boblight_destroy(boblight_ptr);
return 0;
}

16
src/TestBoblightOrig.cpp
View File

@@ -1,16 +0,0 @@
// STL includes
#include <iostream>
// Boblight includes
#include <boblight.h>
int main()
{
std::cout << "TestBoblightOrig started" << std::endl;
std::cout << "TestBoblightOrig finished" << std::endl;
return 0;
}

38
src/TestConfigFile.cpp
View File

@@ -1,38 +0,0 @@
// STL includes
#include <cstdlib>
// JsonSchema includes
#include <utils/jsonschema/JsonFactory.h>
// hyperion includes
#include <hyperion/LedString.h>
int main()
{
std::string homeDir = getenv("RASPILIGHT_HOME");
const std::string schemaFile = homeDir + "/hyperion.schema.json";
const std::string configFile = homeDir + "/hyperion.config.json";
Json::Value config;
if (JsonFactory::load(schemaFile, configFile, config) < 0)
{
std::cerr << "UNABLE TO LOAD CONFIGURATION" << std::endl;
return -1;
}
const Json::Value& deviceConfig = config["device"];
const Json::Value& ledConfig = config["leds"];
const Json::Value& colorConfig = config["color"];
std::cout << "COLOR CONFIGURATION: " << colorConfig.toStyledString() << std::endl;
const Json::Value& redConfig = colorConfig["red"];
double redGamma = redConfig["gamma"].asDouble();
std::cout << "RED GAMMA = " << redGamma << std::endl;
std::cout << "RED GAMMA = " << colorConfig["red.gamma"].asDouble() << std::endl;
LedString ledString = LedString::construct(ledConfig, colorConfig);
return 0;
}

43
src/TestHyperionPng.cpp
View File

@@ -1,43 +0,0 @@
// STL includes
#include <iostream>
// Boblight includes
#include <boblight.h>
int main()
{
std::cout << "Initialisaing Boblight" << std::endl;
void* blPng = boblight_init();
int width = 112;
int height = 64;
std::cout << "Defining scan range (" << width << "x" << height << ")" << std::endl;
boblight_setscanrange(blPng, width, height);
int colorPtr[3];
colorPtr[0] = 255;
colorPtr[1] = 0;
colorPtr[2] = 0;
std::cout << "Using color [" << colorPtr[0] << "; " << colorPtr[1] << "; " << colorPtr[2] << "]" << std::endl;
int nrOfFrames = 150;
std::cout << "Generating " << nrOfFrames << " frames" << std::endl;
for (int iFrame=0; iFrame<nrOfFrames; ++iFrame)
{
for (int iWidth=0; iWidth<width; ++iWidth)
{
for (int iHeight=0; iHeight<height; ++iHeight)
{
boblight_addpixelxy(blPng, iWidth, iHeight, colorPtr);
}
}
boblight_sendrgb(blPng, 0, NULL);
}
std::cout << "Destroying Boblight" << std::endl;
boblight_destroy(blPng);
return 0;
}

161
src/TestSpi.cpp
View File

@@ -1,161 +0,0 @@
// STL includes
#include <vector>
#include <ctime>
#include <cstring>
#include <string>
#include <unistd.h>
#include <iostream>
// Local includes
#include <utils/RgbColor.h>
#include "../libsrc/hyperion/LedDeviceWs2801.h"
void setColor(char* colorStr)
{
RgbColor color = RgbColor::BLACK;
std::cout << "Switching all leds to: ";
if (strncmp("red", colorStr, 3) == 0)
{
std::cout << "red";
color = RgbColor::RED;
}
else if (strncmp("green", colorStr, 5) == 0)
{
std::cout << "green";
color = RgbColor::GREEN;
}
else if (strncmp("blue", colorStr, 5) == 0)
{
std::cout << "blue";
color = RgbColor::BLUE;
}
else if (strncmp("cyan", colorStr, 5) == 0)
{
std::cout << "cyan";
}
else if (strncmp("gray", colorStr, 4) == 0)
{
std::cout << "gray";
}
else if (strncmp("white", colorStr, 5) == 0)
{
std::cout << "white";
color = RgbColor::WHITE;
}
else if (strncmp("black", colorStr, 5) == 0)
{
std::cout << "black";
color = RgbColor::BLACK;
}
std::cout << std::endl;
unsigned ledCnt = 50;
std::vector<RgbColor> buff(ledCnt, color);
LedDeviceWs2801 ledDevice("SpiPi", "/dev/spidev0.0", 20000, 40000);
ledDevice.open();
ledDevice.write(buff);
}
bool _running = true;
void doCircle()
{
RgbColor color_1 = RgbColor::RED;
RgbColor color_2 = RgbColor::YELLOW;
unsigned ledCnt = 50;
std::vector<RgbColor> data(ledCnt, RgbColor::BLACK);
LedDeviceWs2801 ledDevice("SpiPi", "/dev/spidev0.0", 20000, 40000);
ledDevice.open();
timespec loopTime;
loopTime.tv_sec = 0;
loopTime.tv_nsec = 100000000; // 100 ms
int curLed_1 = 0;
int nextLed_1 = 1;
int curLed_2 = 49;
int nextLed_2 = 48;
while (_running)
{
data[curLed_1] = RgbColor::BLACK;
data[curLed_2] = RgbColor::BLACK;
// Move the current and the next pointer
curLed_1 = nextLed_1;
curLed_2 = nextLed_2;
++nextLed_1;
--nextLed_2;
if (nextLed_1 == int(ledCnt))
{
nextLed_1 = 0;
}
if (nextLed_2 < 0)
{
nextLed_2 = 49;
}
data[curLed_1] = color_1;
data[curLed_2] = color_2;
ledDevice.write(data);
nanosleep(&loopTime, NULL);
}
// Switch the current leds off
data[curLed_1] = RgbColor::BLACK;
data[curLed_2] = RgbColor::BLACK;
ledDevice.write(data);
}
#include <csignal>
void signal_handler(int signum)
{
_running = false;
}
int main(int argc, char** argv)
{
if (sizeof(RgbColor) != 3)
{
std::cout << "sizeof(RgbColor) = " << sizeof(RgbColor) << std::endl;
return -1;
}
// Install signal handlers to stop loops
signal(SIGTERM, &signal_handler);
signal(SIGINT, &signal_handler);
if (argc < 2)
{
std::cerr << "Missing argument" << std::endl;
return -1;
}
if (strncmp("fixed", argv[1], 5) == 0)
{
setColor(argv[2]);
return 0;
}
else if (strncmp("circle", argv[1], 6) == 0)
{
doCircle();
}
else
{
std::cerr << "Unknown option: " << argv[1] << std::endl;
}
return 0;
}