From b254ac991d4380ec77823370e941d0a0378b2b5f Mon Sep 17 00:00:00 2001 From: Paul Hollinsky Date: Tue, 18 Sep 2018 16:59:59 -0400 Subject: [PATCH] Rename the USB_PRODUCT_ID to PRODUCT_ID as it is used for Ethernet as well --- device/include/device.h | 4 ++-- device/neoobd2pro/include/neoobd2pro.h | 6 +++--- device/neovifire/include/neovifire.h | 6 +++--- device/neovifire2/include/neovifire2eth.h | 6 +++--- device/neovifire2/include/neovifire2usb.h | 6 +++--- device/plasion/include/neoviion.h | 6 +++--- device/plasion/include/neoviplasma.h | 6 +++--- device/radgalaxy/include/radgalaxy.h | 6 +++--- device/radstar2/include/radstar2.h | 6 +++--- device/radsupermoon/include/radsupermoon.h | 6 +++--- device/valuecan3/include/valuecan3.h | 6 +++--- device/valuecan4/include/valuecan4.h | 6 +++--- device/vividcan/include/vividcan.h | 6 +++--- 13 files changed, 38 insertions(+), 38 deletions(-) diff --git a/device/include/device.h b/device/include/device.h index 3dff63c..890fa63 100644 --- a/device/include/device.h +++ b/device/include/device.h @@ -27,7 +27,7 @@ public: static bool SerialStringIsNumeric(const std::string& serial); std::string getProductName() const { return data.type; } - uint16_t getUSBProductId() const { return usbProductId; } + uint16_t getProductId() const { return productId; } std::string getSerial() const { return data.serial; } uint32_t getSerialNumber() const { return Device::SerialStringToNum(getSerial()); } const neodevice_t& getNeoDevice() const { return data; } @@ -51,7 +51,7 @@ public: } protected: - uint16_t usbProductId = 0; + uint16_t productId = 0; bool online = false; int messagePollingCallbackID = 0; std::shared_ptr com; diff --git a/device/neoobd2pro/include/neoobd2pro.h b/device/neoobd2pro/include/neoobd2pro.h index d5afa45..4ada734 100644 --- a/device/neoobd2pro/include/neoobd2pro.h +++ b/device/neoobd2pro/include/neoobd2pro.h @@ -10,17 +10,17 @@ class NeoOBD2PRO : public Device { public: // Serial numbers are NP**** static constexpr const char* PRODUCT_NAME = "neoOBD2 PRO"; - static constexpr const uint16_t USB_PRODUCT_ID = 0x1103; + static constexpr const uint16_t PRODUCT_ID = 0x1103; NeoOBD2PRO(neodevice_t neodevice) : Device(neodevice) { com = std::make_shared(std::make_shared(getWritableNeoDevice())); setProductName(PRODUCT_NAME); - usbProductId = USB_PRODUCT_ID; + productId = PRODUCT_ID; } static std::vector> Find() { std::vector> found; - for(auto neodevice : STM32::FindByProduct(USB_PRODUCT_ID)) + for(auto neodevice : STM32::FindByProduct(PRODUCT_ID)) found.push_back(std::make_shared(neodevice)); return found; diff --git a/device/neovifire/include/neovifire.h b/device/neovifire/include/neovifire.h index bae223f..5a40402 100644 --- a/device/neovifire/include/neovifire.h +++ b/device/neovifire/include/neovifire.h @@ -9,11 +9,11 @@ namespace icsneo { class NeoVIFIRE : public Device { public: static constexpr const char* PRODUCT_NAME = "neoVI FIRE"; - static constexpr const uint16_t USB_PRODUCT_ID = 0x0701; + static constexpr const uint16_t PRODUCT_ID = 0x0701; NeoVIFIRE(neodevice_t neodevice) : Device(neodevice) { com = std::make_shared(std::make_shared(getWritableNeoDevice())); setProductName(PRODUCT_NAME); - usbProductId = USB_PRODUCT_ID; + productId = PRODUCT_ID; } enum class Mode : char { @@ -43,7 +43,7 @@ public: static std::vector> Find() { std::vector> found; - for(auto neodevice : FTDI::FindByProduct(USB_PRODUCT_ID)) + for(auto neodevice : FTDI::FindByProduct(PRODUCT_ID)) found.push_back(std::make_shared(neodevice)); return found; diff --git a/device/neovifire2/include/neovifire2eth.h b/device/neovifire2/include/neovifire2eth.h index e479116..b000d96 100644 --- a/device/neovifire2/include/neovifire2eth.h +++ b/device/neovifire2/include/neovifire2eth.h @@ -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(std::make_shared(getWritableNeoDevice())); - usbProductId = USB_PRODUCT_ID; + productId = PRODUCT_ID; } static std::vector> Find() { std::vector> found; - for(auto neodevice : PCAP::FindByProduct(USB_PRODUCT_ID)) + for(auto neodevice : PCAP::FindByProduct(PRODUCT_ID)) found.push_back(std::make_shared(neodevice)); return found; diff --git a/device/neovifire2/include/neovifire2usb.h b/device/neovifire2/include/neovifire2usb.h index 69ab73a..0f8e9a3 100644 --- a/device/neovifire2/include/neovifire2usb.h +++ b/device/neovifire2/include/neovifire2usb.h @@ -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(std::make_shared(getWritableNeoDevice())); - usbProductId = USB_PRODUCT_ID; + productId = PRODUCT_ID; } static std::vector> Find() { std::vector> found; - for(auto neodevice : FTDI::FindByProduct(USB_PRODUCT_ID)) + for(auto neodevice : FTDI::FindByProduct(PRODUCT_ID)) found.push_back(std::make_shared(neodevice)); return found; diff --git a/device/plasion/include/neoviion.h b/device/plasion/include/neoviion.h index c62aa6d..12275df 100644 --- a/device/plasion/include/neoviion.h +++ b/device/plasion/include/neoviion.h @@ -9,16 +9,16 @@ namespace icsneo { class NeoVIION : public Plasion { public: static constexpr const char* PRODUCT_NAME = "neoVI ION"; - static constexpr const uint16_t USB_PRODUCT_ID = 0x0901; + static constexpr const uint16_t PRODUCT_ID = 0x0901; NeoVIION(neodevice_t neodevice) : Plasion(neodevice) { setProductName(PRODUCT_NAME); - usbProductId = USB_PRODUCT_ID; + productId = PRODUCT_ID; } static std::vector> Find() { std::vector> found; - for(auto neodevice : FTDI::FindByProduct(USB_PRODUCT_ID)) + for(auto neodevice : FTDI::FindByProduct(PRODUCT_ID)) found.push_back(std::make_shared(neodevice)); return found; diff --git a/device/plasion/include/neoviplasma.h b/device/plasion/include/neoviplasma.h index a5f2561..84520af 100644 --- a/device/plasion/include/neoviplasma.h +++ b/device/plasion/include/neoviplasma.h @@ -9,16 +9,16 @@ namespace icsneo { class NeoVIPLASMA : public Plasion { public: static constexpr const char* PRODUCT_NAME = "neoVI PLASMA"; - static constexpr const uint16_t USB_PRODUCT_ID = 0x0801; + static constexpr const uint16_t PRODUCT_ID = 0x0801; NeoVIPLASMA(neodevice_t neodevice) : Plasion(neodevice) { setProductName(PRODUCT_NAME); - usbProductId = USB_PRODUCT_ID; + productId = PRODUCT_ID; } static std::vector> Find() { std::vector> found; - for(auto neodevice : FTDI::FindByProduct(USB_PRODUCT_ID)) + for(auto neodevice : FTDI::FindByProduct(PRODUCT_ID)) found.push_back(std::make_shared(neodevice)); return found; diff --git a/device/radgalaxy/include/radgalaxy.h b/device/radgalaxy/include/radgalaxy.h index 7b96f11..d9e99ce 100644 --- a/device/radgalaxy/include/radgalaxy.h +++ b/device/radgalaxy/include/radgalaxy.h @@ -10,17 +10,17 @@ class RADGalaxy : public Device { public: // Serial numbers start with RG static constexpr const char* PRODUCT_NAME = "RADGalaxy"; - static constexpr const uint16_t USB_PRODUCT_ID = 0x0003; + static constexpr const uint16_t PRODUCT_ID = 0x0003; RADGalaxy(neodevice_t neodevice) : Device(neodevice) { com = std::make_shared(std::make_shared(getWritableNeoDevice())); setProductName(PRODUCT_NAME); - usbProductId = USB_PRODUCT_ID; + productId = PRODUCT_ID; } static std::vector> Find() { std::vector> found; - for(auto neodevice : PCAP::FindByProduct(USB_PRODUCT_ID)) + for(auto neodevice : PCAP::FindByProduct(PRODUCT_ID)) found.push_back(std::make_shared(neodevice)); return found; diff --git a/device/radstar2/include/radstar2.h b/device/radstar2/include/radstar2.h index 33b9c1b..d550b5b 100644 --- a/device/radstar2/include/radstar2.h +++ b/device/radstar2/include/radstar2.h @@ -10,17 +10,17 @@ class RADStar2 : public Device { public: // Serial numbers start with RS static constexpr const char* PRODUCT_NAME = "RADStar 2"; - static constexpr const uint16_t USB_PRODUCT_ID = 0x0005; + static constexpr const uint16_t PRODUCT_ID = 0x0005; RADStar2(neodevice_t neodevice) : Device(neodevice) { com = std::make_shared(std::make_shared(getWritableNeoDevice())); setProductName(PRODUCT_NAME); - usbProductId = USB_PRODUCT_ID; + productId = PRODUCT_ID; } static std::vector> Find() { std::vector> found; - for(auto neodevice : FTDI::FindByProduct(USB_PRODUCT_ID)) + for(auto neodevice : FTDI::FindByProduct(PRODUCT_ID)) found.push_back(std::make_shared(neodevice)); return found; diff --git a/device/radsupermoon/include/radsupermoon.h b/device/radsupermoon/include/radsupermoon.h index b688366..dee9d61 100644 --- a/device/radsupermoon/include/radsupermoon.h +++ b/device/radsupermoon/include/radsupermoon.h @@ -10,19 +10,19 @@ class RADSupermoon : public Device { public: // Serial numbers start with VV static constexpr const char* PRODUCT_NAME = "RADSupermoon"; - static constexpr const uint16_t USB_PRODUCT_ID = 0x1201; + static constexpr const uint16_t PRODUCT_ID = 0x1201; RADSupermoon(neodevice_t neodevice) : Device(neodevice) { com = std::make_shared(std::make_shared(getWritableNeoDevice())); com->setAlign16Bit(false); setProductName(PRODUCT_NAME); - usbProductId = USB_PRODUCT_ID; + productId = PRODUCT_ID; } // RSM does not connect at all yet (needs FTDI D3xx driver, not the 2xx compatible one) static std::vector> Find() { std::vector> found; - for(auto neodevice : FTDI::FindByProduct(USB_PRODUCT_ID)) + for(auto neodevice : FTDI::FindByProduct(PRODUCT_ID)) found.push_back(std::make_shared(neodevice)); return found; diff --git a/device/valuecan3/include/valuecan3.h b/device/valuecan3/include/valuecan3.h index 6b68065..f812238 100644 --- a/device/valuecan3/include/valuecan3.h +++ b/device/valuecan3/include/valuecan3.h @@ -9,17 +9,17 @@ namespace icsneo { class ValueCAN3 : public Device { public: static constexpr const char* PRODUCT_NAME = "ValueCAN 3"; - static constexpr const uint16_t USB_PRODUCT_ID = 0x0601; + static constexpr const uint16_t PRODUCT_ID = 0x0601; ValueCAN3(neodevice_t neodevice) : Device(neodevice) { com = std::make_shared(std::make_shared(getWritableNeoDevice())); setProductName(PRODUCT_NAME); - usbProductId = USB_PRODUCT_ID; + productId = PRODUCT_ID; } static std::vector> Find() { std::vector> found; - for(auto neodevice : FTDI::FindByProduct(USB_PRODUCT_ID)) + for(auto neodevice : FTDI::FindByProduct(PRODUCT_ID)) found.push_back(std::make_shared(neodevice)); return found; diff --git a/device/valuecan4/include/valuecan4.h b/device/valuecan4/include/valuecan4.h index e663f6d..283e8a2 100644 --- a/device/valuecan4/include/valuecan4.h +++ b/device/valuecan4/include/valuecan4.h @@ -10,17 +10,17 @@ class ValueCAN4 : public Device { public: // Serial numbers are V0 for 4-4, VE for 4-2EL, V2 for 4-2, and V1 for 4-1 static constexpr const char* PRODUCT_NAME = "ValueCAN 4"; - static constexpr const uint16_t USB_PRODUCT_ID = 0x1101; + static constexpr const uint16_t PRODUCT_ID = 0x1101; ValueCAN4(neodevice_t neodevice) : Device(neodevice) { com = std::make_shared(std::make_shared(getWritableNeoDevice())); setProductName(PRODUCT_NAME); - usbProductId = USB_PRODUCT_ID; + productId = PRODUCT_ID; } static std::vector> Find() { std::vector> found; - for(auto neodevice : STM32::FindByProduct(USB_PRODUCT_ID)) + for(auto neodevice : STM32::FindByProduct(PRODUCT_ID)) found.push_back(std::make_shared(neodevice)); return found; diff --git a/device/vividcan/include/vividcan.h b/device/vividcan/include/vividcan.h index 902bc0a..172048c 100644 --- a/device/vividcan/include/vividcan.h +++ b/device/vividcan/include/vividcan.h @@ -10,11 +10,11 @@ class VividCAN : public Device { public: // Serial numbers start with VV static constexpr const char* PRODUCT_NAME = "VividCAN"; - static constexpr const uint16_t USB_PRODUCT_ID = 0x1102; + static constexpr const uint16_t PRODUCT_ID = 0x1102; VividCAN(neodevice_t neodevice) : Device(neodevice) { com = std::make_shared(std::make_shared(getWritableNeoDevice())); setProductName(PRODUCT_NAME); - usbProductId = USB_PRODUCT_ID; + productId = PRODUCT_ID; } bool goOnline() { return false; } @@ -22,7 +22,7 @@ public: static std::vector> Find() { std::vector> found; - for(auto neodevice : STM32::FindByProduct(USB_PRODUCT_ID)) + for(auto neodevice : STM32::FindByProduct(PRODUCT_ID)) found.push_back(std::make_shared(neodevice)); return found;