Skip to content

Commit

Permalink
XPanel.cpp: use hid_enumerate()
Browse files Browse the repository at this point in the history 
Signed-off-by: Norbert Takacs <norberttak@gmail.com>
  • Loading branch information
@norberttak
norberttak committed Mar 31, 2024
1 parent d5d639e commit a1de060
Showing 1 changed file with 53 additions and 50 deletions.
103 changes: 53 additions & 50 deletions src/core/XPanel.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,29 +127,29 @@ PLUGIN_API int XPluginEnable(void)

float flight_loop_callback(float, float, int, void*)
{
for (const auto &it : config.device_configs)
for (const auto& it : config.device_configs)
{
// check and set LED states
for (const auto &triggers : it.light_triggers)
for (const auto& triggers : it.light_triggers)
{
for (auto &trigger : triggers.second)
for (auto& trigger : triggers.second)
{
trigger->evaluate_and_store_action();
}
}
// check and set 7 segment display states
for (const auto &display : it.multi_displays)
for (const auto& display : it.multi_displays)
{
display.second->evaluate_and_store_dataref_value();
}

for (const auto &display : it.generic_displays)
for (const auto& display : it.generic_displays)
{
display.second->evaluate_and_store_dataref_value();
}

// update the FIP devices
for (auto &screen : it.fip_screens)
for (auto& screen : it.fip_screens)
{
screen.second->evaluate_and_store_screen_action();
}
Expand Down Expand Up @@ -183,7 +183,7 @@ void stop_and_clear_xpanel_plugin()
XPLMUnregisterFlightLoopCallback(flight_loop_callback, NULL);
LuaHelper::get_instace()->close();

for (auto &dev : devices)
for (auto& dev : devices)
{
if (dev != NULL)
{
Expand Down Expand Up @@ -226,6 +226,39 @@ extern std::filesystem::path get_plugin_path()
return plugin_path;
}

template <class T>
int enumerate_and_add_hid_devices(DeviceConfiguration& it)
{
Device* device;
struct hid_device_info* dev_info;
struct hid_device_info* dev_info_first;

dev_info = hid_enumerate(it.vid, it.pid);
if (!dev_info) {
Logger(TLogLevel::logERROR) << "error enumerating hid device with vid=" << it.vid << " pid=" << it.pid << std::endl;
hid_free_enumeration(dev_info);
return EXIT_FAILURE;
}
dev_info_first = dev_info;
do
{
Logger(TLogLevel::logDEBUG) << "add new panel device. vid =" << it.vid << " pid = " << it.pid << std::endl;
device = new T(it);
devices.push_back(device);

hid_device* hid_dev = hid_open_path(dev_info->path);
hid_set_nonblocking(hid_dev, 1);
((T*)device)->connect(hid_dev);
device->start();
device->thread_handle = new std::thread(&T::thread_func, (T*)device);
LuaHelper::get_instace()->register_hid_device((UsbHidDevice*)device);
dev_info = dev_info->next;
} while (dev_info);
hid_free_enumeration(dev_info_first);

return EXIT_SUCCESS;
}

int init_and_start_xpanel_plugin(void)
{
char aircraft_file_name[256];
Expand Down Expand Up @@ -277,7 +310,7 @@ int init_and_start_xpanel_plugin(void)

Device* device;

for (auto &it : config.device_configs)
for (auto& it : config.device_configs)
{
switch (it.device_type) {
case DeviceType::SAITEK_MULTI:
Expand All @@ -287,54 +320,34 @@ int init_and_start_xpanel_plugin(void)
if (it.pid == 0)
it.pid = 0x0d06;
Logger(TLogLevel::logDEBUG) << "add new saitek multi panel device" << std::endl;
device = new SaitekMultiPanel(it);
devices.push_back(device);
device->connect();
device->start();
device->thread_handle = new std::thread(&SaitekMultiPanel::thread_func, (SaitekMultiPanel*)device);
LuaHelper::get_instace()->register_hid_device((UsbHidDevice*)device);
enumerate_and_add_hid_devices<SaitekMultiPanel>(it);
break;
case DeviceType::HOME_COCKPIT:
// set default vid & pid if it's not set in config file
if (it.vid == 0)
it.vid = 0x2341;
if (it.pid == 0)
it.pid = 0x8036;
Logger(TLogLevel::logDEBUG) << "add new homecockpit device" << std::endl;
device = new ArduinoHomeCockpit(it);
devices.push_back(device);
device->connect();
device->start();
device->thread_handle = new std::thread(&ArduinoHomeCockpit::thread_func, (ArduinoHomeCockpit*)device);
LuaHelper::get_instace()->register_hid_device((UsbHidDevice*)device);
Logger(TLogLevel::logDEBUG) << "add new homecockpit devices" << std::endl;
enumerate_and_add_hid_devices<ArduinoHomeCockpit>(it);
break;
case DeviceType::SAITEK_RADIO:
// set default vid & pid if it's not set in config file
if (it.vid == 0)
it.vid = 0x06a3;
if (it.pid == 0)
it.pid = 0x0d05;
Logger(TLogLevel::logDEBUG) << "add new saitek radio panel device" << std::endl;
device = new SaitekRadioPanel(it);
devices.push_back(device);
device->connect();
device->start();
device->thread_handle = new std::thread(&SaitekRadioPanel::thread_func, (SaitekRadioPanel*)device);
LuaHelper::get_instace()->register_hid_device((UsbHidDevice*)device);
Logger(TLogLevel::logDEBUG) << "add new saitek radio devices" << std::endl;
enumerate_and_add_hid_devices<SaitekRadioPanel>(it);
break;
case DeviceType::SAITEK_SWITCH:
// set default vid & pid if it's not set in config file
if (it.vid == 0)
it.vid = 0x06a3;
if (it.pid == 0)
it.pid = 0x0d67;
Logger(TLogLevel::logDEBUG) << "add new saitek switch panel device" << std::endl;
device = new SaitekSwitchPanel(it);
devices.push_back(device);
device->connect();
device->start();
device->thread_handle = new std::thread(&SaitekSwitchPanel::thread_func, (SaitekSwitchPanel*)device);
LuaHelper::get_instace()->register_hid_device((UsbHidDevice*)device);
Logger(TLogLevel::logDEBUG) << "add new saitek switch panel devices" << std::endl;
enumerate_and_add_hid_devices<SaitekSwitchPanel>(it);
break;
case DeviceType::LOGITECH_FIP:
Logger(TLogLevel::logDEBUG) << "add new FIP device" << std::endl;
Expand All @@ -345,22 +358,12 @@ int init_and_start_xpanel_plugin(void)
device->thread_handle = new std::thread(&FIPDevice::thread_func, (FIPDevice*)device);
break;
case DeviceType::TRC1000_PFD:
Logger(TLogLevel::logDEBUG) << "add new TRC1000 PFD device" << std::endl;
device = new TRC1000PFD(it);
devices.push_back(device);
device->connect();
device->start();
device->thread_handle = new std::thread(&TRC1000PFD::thread_func, (TRC1000PFD*)device);
LuaHelper::get_instace()->register_hid_device((UsbHidDevice*)device);
Logger(TLogLevel::logDEBUG) << "add new TRC1000 PFD devices" << std::endl;
enumerate_and_add_hid_devices<TRC1000PFD>(it);
break;
case DeviceType::TRC1000_AUDIO:
Logger(TLogLevel::logDEBUG) << "add new TRC1000 Audio device" << std::endl;
device = new TRC1000Audio(it);
devices.push_back(device);
device->connect();
device->start();
device->thread_handle = new std::thread(&TRC1000Audio::thread_func, (TRC1000Audio*)device);
LuaHelper::get_instace()->register_hid_device((UsbHidDevice*)device);
Logger(TLogLevel::logDEBUG) << "add new TRC1000 Audio devices" << std::endl;
enumerate_and_add_hid_devices<TRC1000Audio>(it);
break;
default:
Logger(TLogLevel::logERROR) << "unknown device type" << std::endl;
Expand All @@ -382,7 +385,7 @@ PLUGIN_API void XPluginReceiveMessage(XPLMPluginID inFrom, int inMsg, void*)
switch (inMsg) {
case XPLM_MSG_AIRPORT_LOADED:
Logger(TLogLevel::logTRACE) << "XPLM_MSG_AIRPORT_LOADED: message received" << std::endl;

if (plugin_already_initialized)
stop_and_clear_xpanel_plugin();

Expand Down

0 comments on commit a1de060

Please sign in to comment.