diff --git a/src/descriptor.c b/src/descriptor.c index 3849ea0..21e3a81 100644 --- a/src/descriptor.c +++ b/src/descriptor.c @@ -64,53 +64,53 @@ struct dc_descriptor_t { static const dc_descriptor_t g_descriptors[] = { /* Suunto Solution */ - {"Suunto", "Solution", DC_FAMILY_SUUNTO_SOLUTION, 0}, // FTDI + {"Suunto", "Solution", DC_FAMILY_SUUNTO_SOLUTION, 0}, /* Suunto Eon */ - {"Suunto", "Eon", DC_FAMILY_SUUNTO_EON, 0}, // FTDI - {"Suunto", "Solution Alpha", DC_FAMILY_SUUNTO_EON, 0}, // FTDI - {"Suunto", "Solution Nitrox", DC_FAMILY_SUUNTO_EON, 0}, // FTDI + {"Suunto", "Eon", DC_FAMILY_SUUNTO_EON, 0}, + {"Suunto", "Solution Alpha", DC_FAMILY_SUUNTO_EON, 0}, + {"Suunto", "Solution Nitrox", DC_FAMILY_SUUNTO_EON, 0}, /* Suunto Vyper */ - {"Suunto", "Spyder", DC_FAMILY_SUUNTO_VYPER, 0x01}, // FTDI - {"Suunto", "Stinger", DC_FAMILY_SUUNTO_VYPER, 0x03}, // FTDI - {"Suunto", "Mosquito", DC_FAMILY_SUUNTO_VYPER, 0x04}, // FTDI - {"Suunto", "D3", DC_FAMILY_SUUNTO_VYPER, 0x05}, // FTDI - {"Suunto", "Vyper", DC_FAMILY_SUUNTO_VYPER, 0x0A}, // FTDI - {"Suunto", "Vytec", DC_FAMILY_SUUNTO_VYPER, 0X0B}, // FTDI - {"Suunto", "Cobra", DC_FAMILY_SUUNTO_VYPER, 0X0C}, // FTDI - {"Suunto", "Gekko", DC_FAMILY_SUUNTO_VYPER, 0X0D}, // FTDI - {"Suunto", "Zoop", DC_FAMILY_SUUNTO_VYPER, 0x16}, // FTDI + {"Suunto", "Spyder", DC_FAMILY_SUUNTO_VYPER, 0x01}, + {"Suunto", "Stinger", DC_FAMILY_SUUNTO_VYPER, 0x03}, + {"Suunto", "Mosquito", DC_FAMILY_SUUNTO_VYPER, 0x04}, + {"Suunto", "D3", DC_FAMILY_SUUNTO_VYPER, 0x05}, + {"Suunto", "Vyper", DC_FAMILY_SUUNTO_VYPER, 0x0A}, + {"Suunto", "Vytec", DC_FAMILY_SUUNTO_VYPER, 0X0B}, + {"Suunto", "Cobra", DC_FAMILY_SUUNTO_VYPER, 0X0C}, + {"Suunto", "Gekko", DC_FAMILY_SUUNTO_VYPER, 0X0D}, + {"Suunto", "Zoop", DC_FAMILY_SUUNTO_VYPER, 0x16}, /* Suunto Vyper 2 */ - {"Suunto", "Vyper 2", DC_FAMILY_SUUNTO_VYPER2, 0x10}, // FTDI - {"Suunto", "Cobra 2", DC_FAMILY_SUUNTO_VYPER2, 0x11}, // FTDI - {"Suunto", "Vyper Air", DC_FAMILY_SUUNTO_VYPER2, 0x13}, // FTDI - {"Suunto", "Cobra 3", DC_FAMILY_SUUNTO_VYPER2, 0x14}, // FTDI - {"Suunto", "HelO2", DC_FAMILY_SUUNTO_VYPER2, 0x15}, // FTDI + {"Suunto", "Vyper 2", DC_FAMILY_SUUNTO_VYPER2, 0x10}, + {"Suunto", "Cobra 2", DC_FAMILY_SUUNTO_VYPER2, 0x11}, + {"Suunto", "Vyper Air", DC_FAMILY_SUUNTO_VYPER2, 0x13}, + {"Suunto", "Cobra 3", DC_FAMILY_SUUNTO_VYPER2, 0x14}, + {"Suunto", "HelO2", DC_FAMILY_SUUNTO_VYPER2, 0x15}, /* Suunto D9 */ - {"Suunto", "D9", DC_FAMILY_SUUNTO_D9, 0x0E}, // FTDI - {"Suunto", "D6", DC_FAMILY_SUUNTO_D9, 0x0F}, // FTDI - {"Suunto", "D4", DC_FAMILY_SUUNTO_D9, 0x12}, // FTDI - {"Suunto", "D4i", DC_FAMILY_SUUNTO_D9, 0x19}, // FTDI - {"Suunto", "D6i", DC_FAMILY_SUUNTO_D9, 0x1A}, // FTDI - {"Suunto", "D9tx", DC_FAMILY_SUUNTO_D9, 0x1B}, // FTDI - {"Suunto", "DX", DC_FAMILY_SUUNTO_D9, 0x1C}, // FTDI - {"Suunto", "Vyper Novo", DC_FAMILY_SUUNTO_D9, 0x1D}, // FTDI - {"Suunto", "Zoop Novo", DC_FAMILY_SUUNTO_D9, 0x1E}, // FTDI - {"Suunto", "D4f", DC_FAMILY_SUUNTO_D9, 0x20}, // FTDI + {"Suunto", "D9", DC_FAMILY_SUUNTO_D9, 0x0E}, + {"Suunto", "D6", DC_FAMILY_SUUNTO_D9, 0x0F}, + {"Suunto", "D4", DC_FAMILY_SUUNTO_D9, 0x12}, + {"Suunto", "D4i", DC_FAMILY_SUUNTO_D9, 0x19}, + {"Suunto", "D6i", DC_FAMILY_SUUNTO_D9, 0x1A}, + {"Suunto", "D9tx", DC_FAMILY_SUUNTO_D9, 0x1B}, + {"Suunto", "DX", DC_FAMILY_SUUNTO_D9, 0x1C}, + {"Suunto", "Vyper Novo", DC_FAMILY_SUUNTO_D9, 0x1D}, + {"Suunto", "Zoop Novo", DC_FAMILY_SUUNTO_D9, 0x1E}, + {"Suunto", "D4f", DC_FAMILY_SUUNTO_D9, 0x20}, /* Suunto EON Steel */ #if defined(USBHID) || defined(ENABLE_BLE) - {"Suunto", "EON Steel", DC_FAMILY_SUUNTO_EONSTEEL, 0}, // BLE - {"Suunto", "EON Core", DC_FAMILY_SUUNTO_EONSTEEL, 1}, // BLE + {"Suunto", "EON Steel", DC_FAMILY_SUUNTO_EONSTEEL, 0}, + {"Suunto", "EON Core", DC_FAMILY_SUUNTO_EONSTEEL, 1}, #endif /* Uwatec Aladin */ - {"Uwatec", "Aladin Air Twin", DC_FAMILY_UWATEC_ALADIN, 0x1C}, // FTDI - {"Uwatec", "Aladin Sport Plus", DC_FAMILY_UWATEC_ALADIN, 0x3E}, // FTDI - {"Uwatec", "Aladin Pro", DC_FAMILY_UWATEC_ALADIN, 0x3F}, // FTDI - {"Uwatec", "Aladin Air Z", DC_FAMILY_UWATEC_ALADIN, 0x44}, // FTDI - {"Uwatec", "Aladin Air Z O2", DC_FAMILY_UWATEC_ALADIN, 0xA4}, // FTDI - {"Uwatec", "Aladin Air Z Nitrox", DC_FAMILY_UWATEC_ALADIN, 0xF4}, // FTDI - {"Uwatec", "Aladin Pro Ultra", DC_FAMILY_UWATEC_ALADIN, 0xFF}, // FTDI + {"Uwatec", "Aladin Air Twin", DC_FAMILY_UWATEC_ALADIN, 0x1C}, + {"Uwatec", "Aladin Sport Plus", DC_FAMILY_UWATEC_ALADIN, 0x3E}, + {"Uwatec", "Aladin Pro", DC_FAMILY_UWATEC_ALADIN, 0x3F}, + {"Uwatec", "Aladin Air Z", DC_FAMILY_UWATEC_ALADIN, 0x44}, + {"Uwatec", "Aladin Air Z O2", DC_FAMILY_UWATEC_ALADIN, 0xA4}, + {"Uwatec", "Aladin Air Z Nitrox", DC_FAMILY_UWATEC_ALADIN, 0xF4}, + {"Uwatec", "Aladin Pro Ultra", DC_FAMILY_UWATEC_ALADIN, 0xFF}, /* Uwatec Memomouse */ - {"Uwatec", "Memomouse", DC_FAMILY_UWATEC_MEMOMOUSE, 0}, // FTDI + {"Uwatec", "Memomouse", DC_FAMILY_UWATEC_MEMOMOUSE, 0}, /* Uwatec Smart */ #ifdef IRDA {"Uwatec", "Smart Pro", DC_FAMILY_UWATEC_SMART, 0x10}, @@ -139,90 +139,90 @@ static const dc_descriptor_t g_descriptors[] = { {"Scubapro", "Mantis 2", DC_FAMILY_UWATEC_MERIDIAN, 0x26}, /* Scubapro G2 */ #if defined(USBHID) || defined(ENABLE_BLE) - {"Scubapro", "Aladin Sport Matrix", DC_FAMILY_UWATEC_G2, 0x17}, // BLE + {"Scubapro", "Aladin Sport Matrix", DC_FAMILY_UWATEC_G2, 0x17}, {"Scubapro", "Aladin Square", DC_FAMILY_UWATEC_G2, 0x22}, - {"Scubapro", "G2", DC_FAMILY_UWATEC_G2, 0x32}, // BLE + {"Scubapro", "G2", DC_FAMILY_UWATEC_G2, 0x32}, #endif /* Reefnet */ {"Reefnet", "Sensus", DC_FAMILY_REEFNET_SENSUS, 1}, {"Reefnet", "Sensus Pro", DC_FAMILY_REEFNET_SENSUSPRO, 2}, {"Reefnet", "Sensus Ultra", DC_FAMILY_REEFNET_SENSUSULTRA, 3}, /* Oceanic VT Pro */ - {"Aeris", "500 AI", DC_FAMILY_OCEANIC_VTPRO, 0x4151}, // FTDI - {"Oceanic", "Versa Pro", DC_FAMILY_OCEANIC_VTPRO, 0x4155}, // FTDI - {"Aeris", "Atmos 2", DC_FAMILY_OCEANIC_VTPRO, 0x4158}, // FTDI - {"Oceanic", "Pro Plus 2", DC_FAMILY_OCEANIC_VTPRO, 0x4159}, // FTDI - {"Aeris", "Atmos AI", DC_FAMILY_OCEANIC_VTPRO, 0x4244}, // FTDI - {"Oceanic", "VT Pro", DC_FAMILY_OCEANIC_VTPRO, 0x4245}, // FTDI - {"Sherwood", "Wisdom", DC_FAMILY_OCEANIC_VTPRO, 0x4246}, // FTDI - {"Aeris", "Elite", DC_FAMILY_OCEANIC_VTPRO, 0x424F}, // FTDI + {"Aeris", "500 AI", DC_FAMILY_OCEANIC_VTPRO, 0x4151}, + {"Oceanic", "Versa Pro", DC_FAMILY_OCEANIC_VTPRO, 0x4155}, + {"Aeris", "Atmos 2", DC_FAMILY_OCEANIC_VTPRO, 0x4158}, + {"Oceanic", "Pro Plus 2", DC_FAMILY_OCEANIC_VTPRO, 0x4159}, + {"Aeris", "Atmos AI", DC_FAMILY_OCEANIC_VTPRO, 0x4244}, + {"Oceanic", "VT Pro", DC_FAMILY_OCEANIC_VTPRO, 0x4245}, + {"Sherwood", "Wisdom", DC_FAMILY_OCEANIC_VTPRO, 0x4246}, + {"Aeris", "Elite", DC_FAMILY_OCEANIC_VTPRO, 0x424F}, /* Oceanic Veo 250 */ - {"Genesis", "React Pro", DC_FAMILY_OCEANIC_VEO250, 0x4247}, // FTDI - {"Oceanic", "Veo 200", DC_FAMILY_OCEANIC_VEO250, 0x424B}, // FTDI - {"Oceanic", "Veo 250", DC_FAMILY_OCEANIC_VEO250, 0x424C}, // FTDI - {"Seemann", "XP5", DC_FAMILY_OCEANIC_VEO250, 0x4251}, // FTDI - {"Oceanic", "Veo 180", DC_FAMILY_OCEANIC_VEO250, 0x4252}, // FTDI - {"Aeris", "XR-2", DC_FAMILY_OCEANIC_VEO250, 0x4255}, // FTDI - {"Sherwood", "Insight", DC_FAMILY_OCEANIC_VEO250, 0x425A}, // FTDI - {"Hollis", "DG02", DC_FAMILY_OCEANIC_VEO250, 0x4352}, // FTDI + {"Genesis", "React Pro", DC_FAMILY_OCEANIC_VEO250, 0x4247}, + {"Oceanic", "Veo 200", DC_FAMILY_OCEANIC_VEO250, 0x424B}, + {"Oceanic", "Veo 250", DC_FAMILY_OCEANIC_VEO250, 0x424C}, + {"Seemann", "XP5", DC_FAMILY_OCEANIC_VEO250, 0x4251}, + {"Oceanic", "Veo 180", DC_FAMILY_OCEANIC_VEO250, 0x4252}, + {"Aeris", "XR-2", DC_FAMILY_OCEANIC_VEO250, 0x4255}, + {"Sherwood", "Insight", DC_FAMILY_OCEANIC_VEO250, 0x425A}, + {"Hollis", "DG02", DC_FAMILY_OCEANIC_VEO250, 0x4352}, /* Oceanic Atom 2.0 */ - {"Oceanic", "Atom 1.0", DC_FAMILY_OCEANIC_ATOM2, 0x4250}, // FTDI - {"Aeris", "Epic", DC_FAMILY_OCEANIC_ATOM2, 0x4257}, // FTDI - {"Oceanic", "VT3", DC_FAMILY_OCEANIC_ATOM2, 0x4258}, // FTDI - {"Aeris", "Elite T3", DC_FAMILY_OCEANIC_ATOM2, 0x4259}, // FTDI - {"Oceanic", "Atom 2.0", DC_FAMILY_OCEANIC_ATOM2, 0x4342}, // FTDI - {"Oceanic", "Geo", DC_FAMILY_OCEANIC_ATOM2, 0x4344}, // FTDI - {"Aeris", "Manta", DC_FAMILY_OCEANIC_ATOM2, 0x4345}, // FTDI - {"Aeris", "XR-1 NX", DC_FAMILY_OCEANIC_ATOM2, 0x4346}, // FTDI - {"Oceanic", "Datamask", DC_FAMILY_OCEANIC_ATOM2, 0x4347}, // FTDI - {"Aeris", "Compumask", DC_FAMILY_OCEANIC_ATOM2, 0x4348}, // FTDI - {"Aeris", "F10", DC_FAMILY_OCEANIC_ATOM2, 0x434D}, // FTDI - {"Oceanic", "OC1", DC_FAMILY_OCEANIC_ATOM2, 0x434E}, // FTDI - {"Sherwood", "Wisdom 2", DC_FAMILY_OCEANIC_ATOM2, 0x4350}, // FTDI - {"Sherwood", "Insight 2", DC_FAMILY_OCEANIC_ATOM2, 0x4353}, // FTDI - {"Genesis", "React Pro White", DC_FAMILY_OCEANIC_ATOM2, 0x4354}, // FTDI - {"Tusa", "Element II (IQ-750)", DC_FAMILY_OCEANIC_ATOM2, 0x4357}, // FTDI - {"Oceanic", "Veo 1.0", DC_FAMILY_OCEANIC_ATOM2, 0x4358}, // FTDI - {"Oceanic", "Veo 2.0", DC_FAMILY_OCEANIC_ATOM2, 0x4359}, // FTDI - {"Oceanic", "Veo 3.0", DC_FAMILY_OCEANIC_ATOM2, 0x435A}, // FTDI - {"Tusa", "Zen (IQ-900)", DC_FAMILY_OCEANIC_ATOM2, 0x4441}, // FTDI - {"Tusa", "Zen Air (IQ-950)", DC_FAMILY_OCEANIC_ATOM2, 0x4442}, // FTDI - {"Aeris", "Atmos AI 2", DC_FAMILY_OCEANIC_ATOM2, 0x4443}, // FTDI - {"Oceanic", "Pro Plus 2.1", DC_FAMILY_OCEANIC_ATOM2, 0x4444}, // FTDI - {"Oceanic", "Geo 2.0", DC_FAMILY_OCEANIC_ATOM2, 0x4446}, // FTDI - {"Oceanic", "VT4", DC_FAMILY_OCEANIC_ATOM2, 0x4447}, // FTDI - {"Oceanic", "OC1", DC_FAMILY_OCEANIC_ATOM2, 0x4449}, // FTDI - {"Beuchat", "Voyager 2G", DC_FAMILY_OCEANIC_ATOM2, 0x444B}, // FTDI - {"Oceanic", "Atom 3.0", DC_FAMILY_OCEANIC_ATOM2, 0x444C}, // FTDI - {"Hollis", "DG03", DC_FAMILY_OCEANIC_ATOM2, 0x444D}, // FTDI - {"Oceanic", "OCS", DC_FAMILY_OCEANIC_ATOM2, 0x4450}, // FTDI - {"Oceanic", "OC1", DC_FAMILY_OCEANIC_ATOM2, 0x4451}, // FTDI - {"Oceanic", "VT 4.1", DC_FAMILY_OCEANIC_ATOM2, 0x4452}, // FTDI - {"Aeris", "Epic", DC_FAMILY_OCEANIC_ATOM2, 0x4453}, // FTDI - {"Aeris", "Elite T3", DC_FAMILY_OCEANIC_ATOM2, 0x4455}, // FTDI - {"Oceanic", "Atom 3.1", DC_FAMILY_OCEANIC_ATOM2, 0x4456}, // FTDI - {"Aeris", "A300 AI", DC_FAMILY_OCEANIC_ATOM2, 0x4457}, // FTDI - {"Sherwood", "Wisdom 3", DC_FAMILY_OCEANIC_ATOM2, 0x4458}, // FTDI - {"Aeris", "A300", DC_FAMILY_OCEANIC_ATOM2, 0x445A}, // FTDI - {"Hollis", "TX1", DC_FAMILY_OCEANIC_ATOM2, 0x4542}, // FTDI - {"Beuchat", "Mundial 2", DC_FAMILY_OCEANIC_ATOM2, 0x4543}, // FTDI - {"Sherwood", "Amphos", DC_FAMILY_OCEANIC_ATOM2, 0x4545}, // FTDI - {"Sherwood", "Amphos Air", DC_FAMILY_OCEANIC_ATOM2, 0x4546}, // FTDI - {"Oceanic", "Pro Plus 3", DC_FAMILY_OCEANIC_ATOM2, 0x4548}, // FTDI - {"Aeris", "F11", DC_FAMILY_OCEANIC_ATOM2, 0x4549}, // FTDI - {"Oceanic", "OCi", DC_FAMILY_OCEANIC_ATOM2, 0x454B}, // FTDI - {"Aeris", "A300CS", DC_FAMILY_OCEANIC_ATOM2, 0x454C}, // FTDI - {"Beuchat", "Mundial 3", DC_FAMILY_OCEANIC_ATOM2, 0x4550}, // FTDI - {"Oceanic", "F10", DC_FAMILY_OCEANIC_ATOM2, 0x4553}, // FTDI - {"Oceanic", "F11", DC_FAMILY_OCEANIC_ATOM2, 0x4554}, // FTDI - {"Subgear", "XP-Air", DC_FAMILY_OCEANIC_ATOM2, 0x4555}, // FTDI - {"Sherwood", "Vision", DC_FAMILY_OCEANIC_ATOM2, 0x4556}, // FTDI - {"Oceanic", "VTX", DC_FAMILY_OCEANIC_ATOM2, 0x4557}, // FTDI - {"Aqualung", "i300", DC_FAMILY_OCEANIC_ATOM2, 0x4559}, // FTDI - {"Aqualung", "i750TC", DC_FAMILY_OCEANIC_ATOM2, 0x455A}, // FTDI - {"Aqualung", "i450T", DC_FAMILY_OCEANIC_ATOM2, 0x4641}, // FTDI - {"Aqualung", "i550", DC_FAMILY_OCEANIC_ATOM2, 0x4642}, // FTDI - {"Aqualung", "i200", DC_FAMILY_OCEANIC_ATOM2, 0x4646}, // FTDI + {"Oceanic", "Atom 1.0", DC_FAMILY_OCEANIC_ATOM2, 0x4250}, + {"Aeris", "Epic", DC_FAMILY_OCEANIC_ATOM2, 0x4257}, + {"Oceanic", "VT3", DC_FAMILY_OCEANIC_ATOM2, 0x4258}, + {"Aeris", "Elite T3", DC_FAMILY_OCEANIC_ATOM2, 0x4259}, + {"Oceanic", "Atom 2.0", DC_FAMILY_OCEANIC_ATOM2, 0x4342}, + {"Oceanic", "Geo", DC_FAMILY_OCEANIC_ATOM2, 0x4344}, + {"Aeris", "Manta", DC_FAMILY_OCEANIC_ATOM2, 0x4345}, + {"Aeris", "XR-1 NX", DC_FAMILY_OCEANIC_ATOM2, 0x4346}, + {"Oceanic", "Datamask", DC_FAMILY_OCEANIC_ATOM2, 0x4347}, + {"Aeris", "Compumask", DC_FAMILY_OCEANIC_ATOM2, 0x4348}, + {"Aeris", "F10", DC_FAMILY_OCEANIC_ATOM2, 0x434D}, + {"Oceanic", "OC1", DC_FAMILY_OCEANIC_ATOM2, 0x434E}, + {"Sherwood", "Wisdom 2", DC_FAMILY_OCEANIC_ATOM2, 0x4350}, + {"Sherwood", "Insight 2", DC_FAMILY_OCEANIC_ATOM2, 0x4353}, + {"Genesis", "React Pro White", DC_FAMILY_OCEANIC_ATOM2, 0x4354}, + {"Tusa", "Element II (IQ-750)", DC_FAMILY_OCEANIC_ATOM2, 0x4357}, + {"Oceanic", "Veo 1.0", DC_FAMILY_OCEANIC_ATOM2, 0x4358}, + {"Oceanic", "Veo 2.0", DC_FAMILY_OCEANIC_ATOM2, 0x4359}, + {"Oceanic", "Veo 3.0", DC_FAMILY_OCEANIC_ATOM2, 0x435A}, + {"Tusa", "Zen (IQ-900)", DC_FAMILY_OCEANIC_ATOM2, 0x4441}, + {"Tusa", "Zen Air (IQ-950)", DC_FAMILY_OCEANIC_ATOM2, 0x4442}, + {"Aeris", "Atmos AI 2", DC_FAMILY_OCEANIC_ATOM2, 0x4443}, + {"Oceanic", "Pro Plus 2.1", DC_FAMILY_OCEANIC_ATOM2, 0x4444}, + {"Oceanic", "Geo 2.0", DC_FAMILY_OCEANIC_ATOM2, 0x4446}, + {"Oceanic", "VT4", DC_FAMILY_OCEANIC_ATOM2, 0x4447}, + {"Oceanic", "OC1", DC_FAMILY_OCEANIC_ATOM2, 0x4449}, + {"Beuchat", "Voyager 2G", DC_FAMILY_OCEANIC_ATOM2, 0x444B}, + {"Oceanic", "Atom 3.0", DC_FAMILY_OCEANIC_ATOM2, 0x444C}, + {"Hollis", "DG03", DC_FAMILY_OCEANIC_ATOM2, 0x444D}, + {"Oceanic", "OCS", DC_FAMILY_OCEANIC_ATOM2, 0x4450}, + {"Oceanic", "OC1", DC_FAMILY_OCEANIC_ATOM2, 0x4451}, + {"Oceanic", "VT 4.1", DC_FAMILY_OCEANIC_ATOM2, 0x4452}, + {"Aeris", "Epic", DC_FAMILY_OCEANIC_ATOM2, 0x4453}, + {"Aeris", "Elite T3", DC_FAMILY_OCEANIC_ATOM2, 0x4455}, + {"Oceanic", "Atom 3.1", DC_FAMILY_OCEANIC_ATOM2, 0x4456}, + {"Aeris", "A300 AI", DC_FAMILY_OCEANIC_ATOM2, 0x4457}, + {"Sherwood", "Wisdom 3", DC_FAMILY_OCEANIC_ATOM2, 0x4458}, + {"Aeris", "A300", DC_FAMILY_OCEANIC_ATOM2, 0x445A}, + {"Hollis", "TX1", DC_FAMILY_OCEANIC_ATOM2, 0x4542}, + {"Beuchat", "Mundial 2", DC_FAMILY_OCEANIC_ATOM2, 0x4543}, + {"Sherwood", "Amphos", DC_FAMILY_OCEANIC_ATOM2, 0x4545}, + {"Sherwood", "Amphos Air", DC_FAMILY_OCEANIC_ATOM2, 0x4546}, + {"Oceanic", "Pro Plus 3", DC_FAMILY_OCEANIC_ATOM2, 0x4548}, + {"Aeris", "F11", DC_FAMILY_OCEANIC_ATOM2, 0x4549}, + {"Oceanic", "OCi", DC_FAMILY_OCEANIC_ATOM2, 0x454B}, + {"Aeris", "A300CS", DC_FAMILY_OCEANIC_ATOM2, 0x454C}, + {"Beuchat", "Mundial 3", DC_FAMILY_OCEANIC_ATOM2, 0x4550}, + {"Oceanic", "F10", DC_FAMILY_OCEANIC_ATOM2, 0x4553}, + {"Oceanic", "F11", DC_FAMILY_OCEANIC_ATOM2, 0x4554}, + {"Subgear", "XP-Air", DC_FAMILY_OCEANIC_ATOM2, 0x4555}, + {"Sherwood", "Vision", DC_FAMILY_OCEANIC_ATOM2, 0x4556}, + {"Oceanic", "VTX", DC_FAMILY_OCEANIC_ATOM2, 0x4557}, + {"Aqualung", "i300", DC_FAMILY_OCEANIC_ATOM2, 0x4559}, + {"Aqualung", "i750TC", DC_FAMILY_OCEANIC_ATOM2, 0x455A}, + {"Aqualung", "i450T", DC_FAMILY_OCEANIC_ATOM2, 0x4641}, + {"Aqualung", "i550", DC_FAMILY_OCEANIC_ATOM2, 0x4642}, + {"Aqualung", "i200", DC_FAMILY_OCEANIC_ATOM2, 0x4646}, /* Mares Nemo */ {"Mares", "Nemo", DC_FAMILY_MARES_NEMO, 0}, {"Mares", "Nemo Steel", DC_FAMILY_MARES_NEMO, 0}, @@ -252,22 +252,22 @@ static const dc_descriptor_t g_descriptors[] = { {"Mares", "Quad Air", DC_FAMILY_MARES_ICONHD , 0x23}, {"Mares", "Quad", DC_FAMILY_MARES_ICONHD , 0x29}, /* Heinrichs Weikamp */ - {"Heinrichs Weikamp", "OSTC", DC_FAMILY_HW_OSTC, 0}, // FTDI - {"Heinrichs Weikamp", "OSTC Mk2", DC_FAMILY_HW_OSTC, 1}, // FTDI - {"Heinrichs Weikamp", "OSTC 2N", DC_FAMILY_HW_OSTC, 2}, // FTDI - {"Heinrichs Weikamp", "OSTC 2C", DC_FAMILY_HW_OSTC, 3}, // FTDI - {"Heinrichs Weikamp", "Frog", DC_FAMILY_HW_FROG, 0}, // FTDI - {"Heinrichs Weikamp", "OSTC 2", DC_FAMILY_HW_OSTC3, 0x11}, // FTDI - {"Heinrichs Weikamp", "OSTC 2", DC_FAMILY_HW_OSTC3, 0x13}, // FTDI - {"Heinrichs Weikamp", "OSTC 2", DC_FAMILY_HW_OSTC3, 0x1B}, // FTDI - {"Heinrichs Weikamp", "OSTC 3", DC_FAMILY_HW_OSTC3, 0x0A}, // FTDI - {"Heinrichs Weikamp", "OSTC Plus", DC_FAMILY_HW_OSTC3, 0x13}, // FTDI // BT - {"Heinrichs Weikamp", "OSTC Plus", DC_FAMILY_HW_OSTC3, 0x1A}, // FTDI // BT - {"Heinrichs Weikamp", "OSTC 4", DC_FAMILY_HW_OSTC3, 0x3B}, // BT - {"Heinrichs Weikamp", "OSTC cR", DC_FAMILY_HW_OSTC3, 0x05}, // FTDI - {"Heinrichs Weikamp", "OSTC cR", DC_FAMILY_HW_OSTC3, 0x07}, // FTDI - {"Heinrichs Weikamp", "OSTC Sport", DC_FAMILY_HW_OSTC3, 0x12}, // FTDI // BT - {"Heinrichs Weikamp", "OSTC Sport", DC_FAMILY_HW_OSTC3, 0x13}, // FTDI // BT + {"Heinrichs Weikamp", "OSTC", DC_FAMILY_HW_OSTC, 0}, + {"Heinrichs Weikamp", "OSTC Mk2", DC_FAMILY_HW_OSTC, 1}, + {"Heinrichs Weikamp", "OSTC 2N", DC_FAMILY_HW_OSTC, 2}, + {"Heinrichs Weikamp", "OSTC 2C", DC_FAMILY_HW_OSTC, 3}, + {"Heinrichs Weikamp", "Frog", DC_FAMILY_HW_FROG, 0}, + {"Heinrichs Weikamp", "OSTC 2", DC_FAMILY_HW_OSTC3, 0x11}, + {"Heinrichs Weikamp", "OSTC 2", DC_FAMILY_HW_OSTC3, 0x13}, + {"Heinrichs Weikamp", "OSTC 2", DC_FAMILY_HW_OSTC3, 0x1B}, + {"Heinrichs Weikamp", "OSTC 3", DC_FAMILY_HW_OSTC3, 0x0A}, + {"Heinrichs Weikamp", "OSTC Plus", DC_FAMILY_HW_OSTC3, 0x13}, + {"Heinrichs Weikamp", "OSTC Plus", DC_FAMILY_HW_OSTC3, 0x1A}, + {"Heinrichs Weikamp", "OSTC 4", DC_FAMILY_HW_OSTC3, 0x3B}, + {"Heinrichs Weikamp", "OSTC cR", DC_FAMILY_HW_OSTC3, 0x05}, + {"Heinrichs Weikamp", "OSTC cR", DC_FAMILY_HW_OSTC3, 0x07}, + {"Heinrichs Weikamp", "OSTC Sport", DC_FAMILY_HW_OSTC3, 0x12}, + {"Heinrichs Weikamp", "OSTC Sport", DC_FAMILY_HW_OSTC3, 0x13}, /* Cressi Edy */ {"Tusa", "IQ-700", DC_FAMILY_CRESSI_EDY, 0x05}, {"Cressi", "Edy", DC_FAMILY_CRESSI_EDY, 0x08}, @@ -287,14 +287,14 @@ static const dc_descriptor_t g_descriptors[] = { {"Atomic Aquatics", "Cobalt 2", DC_FAMILY_ATOMICS_COBALT, 2}, #endif /* Shearwater Predator */ - {"Shearwater", "Predator", DC_FAMILY_SHEARWATER_PREDATOR, 2}, // BT + {"Shearwater", "Predator", DC_FAMILY_SHEARWATER_PREDATOR, 2}, /* Shearwater Petrel family */ - {"Shearwater", "Petrel", DC_FAMILY_SHEARWATER_PETREL, 3}, // BT // BLE - {"Shearwater", "Petrel 2", DC_FAMILY_SHEARWATER_PETREL, 3}, // BT // BLE - {"Shearwater", "Nerd", DC_FAMILY_SHEARWATER_PETREL, 4}, // BT - {"Shearwater", "Perdix", DC_FAMILY_SHEARWATER_PETREL, 5}, // BT // BLE - {"Shearwater", "Perdix AI", DC_FAMILY_SHEARWATER_PETREL, 6}, // BLE - {"Shearwater", "Nerd 2", DC_FAMILY_SHEARWATER_PETREL, 7}, // BLE + {"Shearwater", "Petrel", DC_FAMILY_SHEARWATER_PETREL, 3}, + {"Shearwater", "Petrel 2", DC_FAMILY_SHEARWATER_PETREL, 3}, + {"Shearwater", "Nerd", DC_FAMILY_SHEARWATER_PETREL, 4}, + {"Shearwater", "Perdix", DC_FAMILY_SHEARWATER_PETREL, 5}, + {"Shearwater", "Perdix AI", DC_FAMILY_SHEARWATER_PETREL, 6}, + {"Shearwater", "Nerd 2", DC_FAMILY_SHEARWATER_PETREL, 7}, /* Dive Rite NiTek Q */ {"Dive Rite", "NiTek Q", DC_FAMILY_DIVERITE_NITEKQ, 0}, /* Citizen Hyper Aqualand */ @@ -323,12 +323,12 @@ static const dc_descriptor_t g_descriptors[] = { {"Ratio", "iDive Tech+", DC_FAMILY_DIVESYSTEM_IDIVE, 0x45}, {"Seac", "Jack", DC_FAMILY_DIVESYSTEM_IDIVE, 0x1000}, /* Cochran Commander */ - {"Cochran", "Commander TM", DC_FAMILY_COCHRAN_COMMANDER, 0}, // FTDI - {"Cochran", "Commander I", DC_FAMILY_COCHRAN_COMMANDER, 1}, // FTDI - {"Cochran", "Commander II", DC_FAMILY_COCHRAN_COMMANDER, 2}, // FTDI - {"Cochran", "EMC-14", DC_FAMILY_COCHRAN_COMMANDER, 3}, // FTDI - {"Cochran", "EMC-16", DC_FAMILY_COCHRAN_COMMANDER, 4}, // FTDI - {"Cochran", "EMC-20H", DC_FAMILY_COCHRAN_COMMANDER, 5}, // FTDI + {"Cochran", "Commander TM", DC_FAMILY_COCHRAN_COMMANDER, 0}, + {"Cochran", "Commander I", DC_FAMILY_COCHRAN_COMMANDER, 1}, + {"Cochran", "Commander II", DC_FAMILY_COCHRAN_COMMANDER, 2}, + {"Cochran", "EMC-14", DC_FAMILY_COCHRAN_COMMANDER, 3}, + {"Cochran", "EMC-16", DC_FAMILY_COCHRAN_COMMANDER, 4}, + {"Cochran", "EMC-20H", DC_FAMILY_COCHRAN_COMMANDER, 5}, }; typedef struct dc_descriptor_iterator_t {