diff --git a/OpenRGBE131ReceiverDialog.cpp b/OpenRGBE131ReceiverDialog.cpp index aedbbad..a43c21a 100644 --- a/OpenRGBE131ReceiverDialog.cpp +++ b/OpenRGBE131ReceiverDialog.cpp @@ -317,7 +317,6 @@ void OpenRGBE131ReceiverDialog::E131ReceiverThreadFunction() int sockfd; e131_packet_t packet; e131_error_t error; - uint8_t last_seq = 0x00; std::chrono::time_point last_update_time; /*-----------------------------------------------------*\ @@ -392,13 +391,6 @@ void OpenRGBE131ReceiverDialog::E131ReceiverThreadFunction() continue; } -// if(e131_pkt_discard(&packet, last_seq)) -// { -// //printf("Warning: packet out of order received\r\n"); -// last_seq = packet.frame.seq_number; -// continue; -// } - received_count++; if((std::chrono::steady_clock::now() - last_update_time) > std::chrono::milliseconds(500)) @@ -409,8 +401,6 @@ void OpenRGBE131ReceiverDialog::E131ReceiverThreadFunction() last_update_time = std::chrono::steady_clock::now(); } - last_seq = packet.frame.seq_number; - /*-------------------------------------------------*\ | If received packet is from a valid universe, | | update the corresponding devices | @@ -510,172 +500,168 @@ void OpenRGBE131ReceiverDialog::LoadMap() \*-----------------------------------------------------*/ json universe_map; - /*---------------------------------------------------------*\ - | Open input file in binary mode | - \*---------------------------------------------------------*/ - std::ifstream universe_file(resource_manager->GetConfigurationDirectory() / "plugins" - / "settings" / "E131UniverseMap.json", - std::ios::in | std::ios::binary); + /*-----------------------------------------------------*\ + | Open input file in binary mode | + \*-----------------------------------------------------*/ + std::ifstream universe_file(resource_manager->GetConfigurationDirectory() / "plugins" / "settings" / "E131UniverseMap.json", std::ios::in | std::ios::binary); - /*---------------------------------------------------------*\ - | Read settings into JSON store | - \*---------------------------------------------------------*/ - if (universe_file) { - try { + /*-----------------------------------------------------*\ + | Read settings into JSON store | + \*-----------------------------------------------------*/ + if(universe_file) + { + try + { universe_file >> universe_map; - } catch (std::exception e) { - /*-------------------------------------------------*\ - | If an exception was caught, that means the JSON | - | parsing failed. Clear out any data in the store | - | as it is corrupt. | - \*-------------------------------------------------*/ + } + catch(std::exception &e) + { + /*---------------------------------------------*\ + | If an exception was caught, that means the | + | JSON parsing failed. Clear out any data in | + | the store as it is corrupt. | + \*---------------------------------------------*/ universe_map.clear(); } } - /*---------------------------------------------------------*\ - | Load checkboxes state | - \*---------------------------------------------------------*/ - if (universe_map.contains("enable_multicast")) { - if (universe_map["enable_multicast"]) { + /*-----------------------------------------------------*\ + | Load checkboxes state | + \*-----------------------------------------------------*/ + if(universe_map.contains("enable_multicast")) + { + if(universe_map["enable_multicast"]) + { ui->EnableMulticastBox->setCheckState(Qt::Checked); - } else { + } + else + { ui->EnableMulticastBox->setCheckState(Qt::Unchecked); } } - if (universe_map.contains("enable_autostart")) { - if (universe_map["enable_autostart"]) { + if(universe_map.contains("enable_autostart")) + { + if(universe_map["enable_autostart"]) + { ui->EnableAutoStartBox->setCheckState(Qt::Checked); - } else { + } + else + { ui->EnableAutoStartBox->setCheckState(Qt::Unchecked); } } - /*---------------------------------------------------------*\ - | Clear the universe map | - \*---------------------------------------------------------*/ + /*-----------------------------------------------------*\ + | Clear the universe map | + \*-----------------------------------------------------*/ universe_list.clear(); - /*---------------------------------------------------------*\ - | Loop through all saved universes and create list entries | - \*---------------------------------------------------------*/ - if (universe_map.contains("universes")) { - for (unsigned int universe_index = 0; universe_index < universe_map["universes"].size(); - universe_index++) { - if (universe_map["universes"][universe_index].contains("universe")) { + /*-----------------------------------------------------*\ + | Loop through all saved universes and create list | + | entries | + \*-----------------------------------------------------*/ + if(universe_map.contains("universes")) + { + for(unsigned int universe_index = 0; universe_index < universe_map["universes"].size(); universe_index++) + { + if(universe_map["universes"][universe_index].contains("universe")) + { universe_entry new_universe; new_universe.universe = universe_map["universes"][universe_index]["universe"]; - if (universe_map["universes"][universe_index].contains("members")) { - for (unsigned int member_index = 0; - member_index < universe_map["universes"][universe_index]["members"].size(); - member_index++) { + if(universe_map["universes"][universe_index].contains("members")) + { + for(unsigned int member_index = 0; member_index < universe_map["universes"][universe_index]["members"].size(); member_index++) + { universe_member new_member; - /*---------------------------------------------------------*\ - | Fill in default values in case entries are missing | - \*---------------------------------------------------------*/ - new_member.controller = NULL; - new_member.start_channel = 1; - new_member.start_led = 0; - new_member.num_leds = 0; - new_member.update = false; + /*---------------------------------*\ + | Fill in default values in case | + | entries are missing | + \*---------------------------------*/ + new_member.controller = NULL; + new_member.start_channel = 1; + new_member.start_led = 0; + new_member.num_leds = 0; + new_member.update = false; - if (universe_map["universes"][universe_index]["members"][member_index] - .contains("start_channel")) { - new_member.start_channel - = universe_map["universes"][universe_index]["members"][member_index] - ["start_channel"]; + if(universe_map["universes"][universe_index]["members"][member_index].contains("start_channel")) + { + new_member.start_channel = universe_map["universes"][universe_index]["members"][member_index]["start_channel"]; } - if (universe_map["universes"][universe_index]["members"][member_index] - .contains("start_led")) { - new_member.start_led - = universe_map["universes"][universe_index]["members"][member_index] - ["start_led"]; + if(universe_map["universes"][universe_index]["members"][member_index].contains("start_led")) + { + new_member.start_led = universe_map["universes"][universe_index]["members"][member_index]["start_led"]; } - if (universe_map["universes"][universe_index]["members"][member_index] - .contains("num_leds")) { - new_member.num_leds = universe_map["universes"][universe_index] - ["members"][member_index]["num_leds"]; + if(universe_map["universes"][universe_index]["members"][member_index].contains("num_leds")) + { + new_member.num_leds = universe_map["universes"][universe_index]["members"][member_index]["num_leds"]; } - if (universe_map["universes"][universe_index]["members"][member_index] - .contains("update")) { - new_member.update = universe_map["universes"][universe_index]["members"] - [member_index]["update"]; + if(universe_map["universes"][universe_index]["members"][member_index].contains("update")) + { + new_member.update = universe_map["universes"][universe_index]["members"][member_index]["update"]; } - /*---------------------------------------------------------*\ - | Get controller information | - \*---------------------------------------------------------*/ - std::string controller_name = ""; - std::string controller_description = ""; - std::string controller_location = ""; - std::string controller_serial = ""; - unsigned int controller_led_count = 0; + /*---------------------------------*\ + | Get controller information | + \*---------------------------------*/ + std::string controller_name = ""; + std::string controller_description = ""; + std::string controller_location = ""; + std::string controller_serial = ""; + unsigned int controller_led_count = 0; - if (universe_map["universes"][universe_index]["members"][member_index] - .contains("controller_name")) { - controller_name = universe_map["universes"][universe_index]["members"] - [member_index]["controller_name"]; + if(universe_map["universes"][universe_index]["members"][member_index].contains("controller_name")) + { + controller_name = universe_map["universes"][universe_index]["members"][member_index]["controller_name"]; } - if (universe_map["universes"][universe_index]["members"][member_index] - .contains("controller_description")) { - controller_description - = universe_map["universes"][universe_index]["members"][member_index] - ["controller_description"]; + if(universe_map["universes"][universe_index]["members"][member_index].contains("controller_description")) + { + controller_description = universe_map["universes"][universe_index]["members"][member_index]["controller_description"]; } - if (universe_map["universes"][universe_index]["members"][member_index] - .contains("controller_location")) { - controller_location - = universe_map["universes"][universe_index]["members"][member_index] - ["controller_location"]; + if(universe_map["universes"][universe_index]["members"][member_index].contains("controller_location")) + { + controller_location = universe_map["universes"][universe_index]["members"][member_index]["controller_location"]; } - if (universe_map["universes"][universe_index]["members"][member_index] - .contains("controller_serial")) { - controller_serial = universe_map["universes"][universe_index]["members"] - [member_index]["controller_serial"]; + if(universe_map["universes"][universe_index]["members"][member_index].contains("controller_serial")) + { + controller_serial = universe_map["universes"][universe_index]["members"][member_index]["controller_serial"]; } - if (universe_map["universes"][universe_index]["members"][member_index] - .contains("controller_led_count")) { - controller_led_count - = universe_map["universes"][universe_index]["members"][member_index] - ["controller_led_count"]; + if(universe_map["universes"][universe_index]["members"][member_index].contains("controller_led_count")) + { + controller_led_count = universe_map["universes"][universe_index]["members"][member_index]["controller_led_count"]; } - /*---------------------------------------------------------*\ - | Search the controller list for a matching controller | - \*---------------------------------------------------------*/ - for (unsigned int controller_index = 0; - controller_index < resource_manager->GetRGBControllers().size(); - controller_index++) { - if ((resource_manager->GetRGBControllers()[controller_index]->name - == controller_name) - && (resource_manager->GetRGBControllers()[controller_index]->description - == controller_description) - && (resource_manager->GetRGBControllers()[controller_index]->location - == controller_location) - && (resource_manager->GetRGBControllers()[controller_index]->serial - == controller_serial) - && (resource_manager->GetRGBControllers()[controller_index] - ->colors.size() - == controller_led_count)) { - new_member.controller = resource_manager - ->GetRGBControllers()[controller_index]; + /*---------------------------------*\ + | Search the controller list for a | + | matching controller | + \*---------------------------------*/ + for(unsigned int controller_index = 0; controller_index < resource_manager->GetRGBControllers().size(); controller_index++) + { + if((resource_manager->GetRGBControllers()[controller_index]->name == controller_name) + && (resource_manager->GetRGBControllers()[controller_index]->description == controller_description) + && (resource_manager->GetRGBControllers()[controller_index]->location == controller_location) + && (resource_manager->GetRGBControllers()[controller_index]->serial == controller_serial) + && (resource_manager->GetRGBControllers()[controller_index]->colors.size() == controller_led_count)) + { + new_member.controller = resource_manager->GetRGBControllers()[controller_index]; } } - /*---------------------------------------------------------*\ - | If a controller was found, add the member to the universe | - \*---------------------------------------------------------*/ - if (new_member.controller != NULL) { + /*---------------------------------*\ + | If a controller was found, add | + | the member to the universe | + \*---------------------------------*/ + if(new_member.controller != NULL) + { new_universe.members.push_back(new_member); } } @@ -694,7 +680,8 @@ void OpenRGBE131ReceiverDialog::LoadMap() void OpenRGBE131ReceiverDialog::StartReceiver() { - if (!online) { + if(!online) + { // Start the receiver thread E131ReceiverThread = new std::thread(&OpenRGBE131ReceiverDialog::E131ReceiverThreadFunction, this); } @@ -1032,7 +1019,8 @@ void OpenRGBE131ReceiverDialog::on_ButtonSaveMap_clicked() \*-----------------------------------------------------*/ filesystem::path settings_dir = resource_manager->GetConfigurationDirectory() / "plugins" / "settings"; - if (!std::filesystem::is_directory(settings_dir) || !std::filesystem::exists(settings_dir)) { + if(!std::filesystem::is_directory(settings_dir) || !std::filesystem::exists(settings_dir)) + { std::filesystem::create_directories(settings_dir); } @@ -1044,7 +1032,7 @@ void OpenRGBE131ReceiverDialog::on_ButtonSaveMap_clicked() { universe_file << universe_map.dump(4); } - catch(std::exception e) + catch(std::exception &e) { }