sven/libicsneo
1
0
Fork 0
mirror of https://github.com/intrepidcs/libicsneo.git synced 2026-08-05 09:28:40 +02:00
Code Issues Projects Releases Wiki Activity

Rename the USB_PRODUCT_ID to PRODUCT_ID as it is used for Ethernet as well

Browse Source
This commit is contained in:
Paul Hollinsky
2018-09-18 16:59:59 -04:00
parent 8343093708
commit b254ac991d
13 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
device/neovifire2/include/neovifire2eth.h
+3 -3
View File
@@ -8,16 +8,16 @@ namespace icsneo {
class NeoVIFIRE2ETH : public NeoVIFIRE2 {
public:
static constexpr const uint16_t USB_PRODUCT_ID = 0x0004;
static constexpr const uint16_t PRODUCT_ID = 0x0004;
NeoVIFIRE2ETH(neodevice_t neodevice) : NeoVIFIRE2(neodevice) {
com = std::make_shared<Communication>(std::make_shared<PCAP>(getWritableNeoDevice()));
usbProductId = USB_PRODUCT_ID;
productId = PRODUCT_ID;
}
static std::vector<std::shared_ptr<Device>> Find() {
std::vector<std::shared_ptr<Device>> found;
for(auto neodevice : PCAP::FindByProduct(USB_PRODUCT_ID))
for(auto neodevice : PCAP::FindByProduct(PRODUCT_ID))
found.push_back(std::make_shared<NeoVIFIRE2ETH>(neodevice));
return found;
device/neovifire2/include/neovifire2usb.h
+3 -3
View File
@@ -8,16 +8,16 @@ namespace icsneo {
class NeoVIFIRE2USB : public NeoVIFIRE2 {
public:
static constexpr const uint16_t USB_PRODUCT_ID = 0x1000;
static constexpr const uint16_t PRODUCT_ID = 0x1000;
NeoVIFIRE2USB(neodevice_t neodevice) : NeoVIFIRE2(neodevice) {
com = std::make_shared<Communication>(std::make_shared<FTDI>(getWritableNeoDevice()));
usbProductId = USB_PRODUCT_ID;
productId = PRODUCT_ID;
}
static std::vector<std::shared_ptr<Device>> Find() {
std::vector<std::shared_ptr<Device>> found;
for(auto neodevice : FTDI::FindByProduct(USB_PRODUCT_ID))
for(auto neodevice : FTDI::FindByProduct(PRODUCT_ID))
found.push_back(std::make_shared<NeoVIFIRE2USB>(neodevice));
return found;