Skip to content

Commit

Permalink
fix: removing trouble causing lines in USBreader
Browse files Browse the repository at this point in the history
+some lines were causing trouble with the build on centOS so i have removed them.
  • Loading branch information
CooperW824 committed Aug 13, 2021
1 parent 5c05fa4 commit 94e6151
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,6 @@ int USBDevice::setupLibusb(){
if(r < 0){ //checking for errors, if r < 0 then there is an error
return -1;
}
libusb_set_option(m_ctx, LIBUSB_OPTION_LOG_LEVEL, 2 ); //set terminal output for errors and warnings only
libusb_get_device_list(m_ctx, &m_devs);
m_dev = m_devs[m_deviceNum];
libusb_free_device_list(m_devs, m_deviceNum);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@ void USBDeviceImportEditor::initLibusb(){
std::runtime_error libusb_init_error("Error while trying to initialize Libusb");
throw libusb_init_error;
}
libusb_set_option(m_ctx, LIBUSB_OPTION_LOG_LEVEL, 2 ); //set so that we see warning and error messages in the terminal
m_cnt = libusb_get_device_list(m_ctx, &m_devs);
if (m_cnt < 0){ //check if there is an error, if there is an error m_cnt will be less than 0
std::runtime_error libusb_device_list_error("Error getting device list");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select an Alternate Setting from this Dropdown box, the possible alternate settings change based off of the Interface selected, choose a Device and Interface before choosing an Alternate Setting. Alternate Settings are displayed with their number and their number of Endpoints to choose from.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="placeholderText">
<string>Select an Alternate Setting</string>
<string/>
</property>
</widget>
</item>
Expand All @@ -113,7 +113,7 @@
<string/>
</property>
<property name="placeholderText">
<string>Select a Device:</string>
<string/>
</property>
</widget>
</item>
Expand All @@ -133,7 +133,7 @@
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select a Device Interface from this Dropdown box, Interfaces change depending on the device selected, please select a device before selecting an Interface. Interfaces are displayed, with their number and then their number of possible Alternate Settings. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="placeholderText">
<string>Select an Interface</string>
<string/>
</property>
</widget>
</item>
Expand All @@ -143,7 +143,7 @@
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select an Endpoint from the Dropdown below, the endpoint is the location that data is read from. Endpoints are dependent on the Alternate Setting chosen, choose a Device, Interface, and Alternate Setting before choosing an Endpoint. Keep in mind that not all Endpoints may be shown, only endpoints that transfer data Device to Host (IN Endpoints) are shown.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="placeholderText">
<string>Select an Endpoint:</string>
<string/>
</property>
</widget>
</item>
Expand Down

0 comments on commit 94e6151

Please sign in to comment.