mirror/OpenRGB
1
0
Fork 0
mirror of https://github.com/CalcProgrammer1/OpenRGB.git synced 2026-05-19 12:06:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add ability to override host ip from yeelight settings

Browse Source
This commit is contained in:
morg
2021-11-12 01:56:31 +00:00
committed by Adam Honse
parent eaf42dfa0a
commit 8900cb00e4
7 changed files with 98 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Controllers/YeelightController/YeelightController.cpp
View File

@@ -9,13 +9,14 @@
using json = nlohmann::json;
YeelightController::YeelightController(std::string ip, bool music_mode_val)
YeelightController::YeelightController(std::string ip, std::string host_ip, bool music_mode_val)
{
/*-----------------------------------------------------------------*\
| Fill in location string with device's IP address |
\*-----------------------------------------------------------------*/
location = "IP: " + ip;
music_mode = music_mode_val;
this->host_ip = host_ip;
/*-----------------------------------------------------------------*\
| Open a TCP client sending to the device's IP, port 38899 |
@@ -120,11 +121,19 @@ void YeelightController::SetMusicMode()
/*-----------------------------------------------------------------*\
| The Yeelight bulb requires this PC's local IP address for music |
| mode. Get the first IP address of this computer's hostname |
| mode. Get the first IP address of this computer's hostname, or |
| use the one defined |
\*-----------------------------------------------------------------*/
gethostname(hostname, 256);
host_entry = gethostbyname(hostname);
ip_addr = inet_ntoa(*((struct in_addr*) host_entry->h_addr_list[0]));
if(host_ip.empty())
{
gethostname(hostname, 256);
host_entry = gethostbyname(hostname);
ip_addr = inet_ntoa(*((struct in_addr*) host_entry->h_addr_list[0]));
}
else
{
ip_addr = &host_ip[0];
}
/*-----------------------------------------------------------------*\
| Fill in the set_rgb command with RGB information. |

3
Controllers/YeelightController/YeelightController.h
View File

@@ -16,7 +16,7 @@
class YeelightController
{
public:
YeelightController(std::string ip, bool music_mode_val);
YeelightController(std::string ip, std::string host_ip, bool music_mode_val);
~YeelightController();
std::string GetLocation();
@@ -33,6 +33,7 @@ public:
private:
std::string location;
std::string host_ip;
net_port port;
bool music_mode;
unsigned int music_mode_port;

9
Controllers/YeelightController/YeelightControllerDetect.cpp
View File

@@ -34,6 +34,13 @@ void DetectYeelightControllers(std::vector<RGBController*> &rgb_controllers)
{
for(unsigned int device_idx = 0; device_idx < yeelight_settings["devices"].size(); device_idx++)
{
std::string yeelight_host_ip;
if(yeelight_settings["devices"][device_idx].contains("host_ip"))
{
yeelight_host_ip = yeelight_settings["devices"][device_idx]["host_ip"];
}
if(yeelight_settings["devices"][device_idx].contains("ip"))
{
std::string yeelight_ip = yeelight_settings["devices"][device_idx]["ip"];
@@ -44,7 +51,7 @@ void DetectYeelightControllers(std::vector<RGBController*> &rgb_controllers)
music_mode = yeelight_settings["devices"][device_idx]["music_mode"];
}
new_controller = new YeelightController(yeelight_ip, music_mode);
new_controller = new YeelightController(yeelight_ip, yeelight_host_ip, music_mode);
new_rgbcontroller = new RGBController_Yeelight(new_controller);
rgb_controllers.push_back(new_rgbcontroller);