Merge branch 'h801' of https://github.com/WoLpH/hyperion.ng into WoLpH-h801

Conflicts:
	libsrc/leddevice/LedDeviceTpm2net.cpp
	libsrc/leddevice/LedDeviceUdpRaw.cpp
	libsrc/leddevice/ProviderUdp.cpp
	libsrc/leddevice/ProviderUdp.h
This commit is contained in:
redpanther
2016-09-22 13:57:52 +02:00
9 changed files with 166 additions and 1 deletions

View File

@@ -25,6 +25,7 @@ bool LedDeviceTpm2net::setConfig(const Json::Value &deviceConfig)
{
ProviderUdp::setConfig(deviceConfig,50200,104000);
_tpm2_max = deviceConfig.get("max-packet",170).asInt();
return true;
}