From ee739d3414d9cd824107e8bcb0edd3e82d5bde9e Mon Sep 17 00:00:00 2001 From: Mike Kinney Date: Sun, 30 Jan 2022 17:36:15 -0800 Subject: [PATCH] add more info about some devices; fix tlora info --- info/mac/tlora_2.1.6.txt | 85 ++++++++++++++++++++++++++++++++++ info/ubuntu/diy.txt | 67 +++++++++++++++++++++++++++ info/windows/tlora_v1.txt | 71 ++++++++++++++++++++++++++++ meshtastic/supported_device.py | 13 +++--- 4 files changed, 230 insertions(+), 6 deletions(-) create mode 100644 info/mac/tlora_2.1.6.txt create mode 100644 info/ubuntu/diy.txt create mode 100644 info/windows/tlora_v1.txt diff --git a/info/mac/tlora_2.1.6.txt b/info/mac/tlora_2.1.6.txt new file mode 100644 index 0000000..10e98f3 --- /dev/null +++ b/info/mac/tlora_2.1.6.txt @@ -0,0 +1,85 @@ +lsusb + +Bus 001 Device 001: ID 0bda:2172 Realtek Semiconductor Corp. BillBoard Device Serial: 00000000000000000 +Bus 000 Device 002: ID 2109:0817 VIA Labs, Inc. USB3.0 Hub Serial: 000000000 +Bus 000 Device 003: ID 2109:0715 VIA Labs, Inc. VLI Product String Serial: 000000075003 +Bus 000 Device 004: ID 0bda:0306 Realtek Semiconductor Corp. USB3.0-CRW Serial: 60000719201300000 +Bus 000 Device 005: ID 2109:0817 VIA Labs, Inc. USB3.0 Hub Serial: 000000000 +Bus 000 Device 001: ID 2109:2817 VIA Labs, Inc. USB2.0 Hub Serial: 000000000 +Bus 000 Device 009: ID 1a86:55d4 1a86 USB Single Serial Serial: 533C005215 +Bus 000 Device 006: ID 2109:2817 VIA Labs, Inc. USB2.0 Hub Serial: 000000000 +Bus 000 Device 007: ID 2109:8817 VIA Labs, Inc. USB Billboard Device Serial: 0000000000000001 +Bus 000 Device 008: ID 2109:8817 VIA Labs, Inc. USB Billboard Device Serial: 0000000000000001 +Bus 002 Device 001: ID 1a40:0101 TERMINUS TECHNOLOGY INC. USB 2.0 Hub +Bus 002 Device 003: ID 0922:001f Dymo Corporation DYMO LabelWriter 4XL Serial: 17032316350940 +Bus 002 Device 002: ID 046d:082d Logitech Inc. HD Pro Webcam C920 Serial: A21C905F +Bus 000 Device 000: ID 0bda:2172 Realtek Semiconductor Corp. USB 3.1 Bus +Bus 000 Device 000: ID 2109:0817 VIA Labs, Inc. USB 3.1 Bus +Bus 000 Device 001: ID 1d6b:1100 Linux Foundation USB 3.0 Bus + +% lsusb -v (with parts snipped) + + USB2.0 Hub : + + Product ID: 0x2817 + Vendor ID: 0x2109 (VIA Labs, Inc.) + Version: 6.03 + Serial Number: 000000000 + Speed: Up to 480 Mb/s + Manufacturer: VIA Labs, Inc. + Location ID: 0x00100000 / 1 + Current Available (mA): 500 + Current Required (mA): 0 + Extra Operating Current (mA): 0 + + USB Single Serial: + + Product ID: 0x55d4 + Vendor ID: 0x1a86 + Version: 4.43 + Serial Number: 533C005215 + Speed: Up to 12 Mb/s + Location ID: 0x00140000 / 9 + Current Available (mA): 500 + Current Required (mA): 134 + Extra Operating Current (mA): 0 + + USB2.0 Hub : + + Product ID: 0x2817 + Vendor ID: 0x2109 (VIA Labs, Inc.) + Version: 6.03 + Serial Number: 000000000 + Speed: Up to 480 Mb/s + Manufacturer: VIA Labs, Inc. + Location ID: 0x00110000 / 6 + Current Available (mA): 500 + Current Required (mA): 0 + Extra Operating Current (mA): 0 + + USB Billboard Device : + + Product ID: 0x8817 + Vendor ID: 0x2109 (VIA Labs, Inc.) + Version: 0.01 + Serial Number: 0000000000000001 + Speed: Up to 480 Mb/s + Manufacturer: VIA Labs, Inc. + Location ID: 0x00115000 / 7 + Current Available (mA): 500 + Current Required (mA): 100 + Extra Operating Current (mA): 0 + + USB Billboard Device : + + Product ID: 0x8817 + Vendor ID: 0x2109 (VIA Labs, Inc.) + Version: 0.01 + Serial Number: 0000000000000001 + Speed: Up to 480 Mb/s + Manufacturer: VIA Labs, Inc. + Location ID: 0x00150000 / 8 + Current Available (mA): 500 + Current Required (mA): 100 + Extra Operating Current (mA): 0 + diff --git a/info/ubuntu/diy.txt b/info/ubuntu/diy.txt new file mode 100644 index 0000000..f686da9 --- /dev/null +++ b/info/ubuntu/diy.txt @@ -0,0 +1,67 @@ +lsusb + +Bus 002 Device 001: ID 1d6b:0003 Linux Foundation 3.0 root hub +Bus 001 Device 004: ID 10c4:ea60 Silicon Labs CP210x UART Bridge +Bus 001 Device 003: ID 0bda:2838 Realtek Semiconductor Corp. RTL2838 DVB-T +Bus 001 Device 002: ID 2109:3431 VIA Labs, Inc. Hub +Bus 001 Device 001: ID 1d6b:0002 Linux Foundation 2.0 root hub + +lsusb -d 10c4: -v + +Bus 001 Device 004: ID 10c4:ea60 Silicon Labs CP210x UART Bridge +Couldn't open device, some information will be missing +Device Descriptor: + bLength 18 + bDescriptorType 1 + bcdUSB 2.00 + bDeviceClass 0 + bDeviceSubClass 0 + bDeviceProtocol 0 + bMaxPacketSize0 64 + idVendor 0x10c4 Silicon Labs + idProduct 0xea60 CP210x UART Bridge + bcdDevice 1.00 + iManufacturer 1 + iProduct 2 + iSerial 3 + bNumConfigurations 1 + Configuration Descriptor: + bLength 9 + bDescriptorType 2 + wTotalLength 0x0020 + bNumInterfaces 1 + bConfigurationValue 1 + iConfiguration 0 + bmAttributes 0x80 + (Bus Powered) + MaxPower 100mA + Interface Descriptor: + bLength 9 + bDescriptorType 4 + bInterfaceNumber 0 + bAlternateSetting 0 + bNumEndpoints 2 + bInterfaceClass 255 Vendor Specific Class + bInterfaceSubClass 0 + bInterfaceProtocol 0 + iInterface 2 + Endpoint Descriptor: + bLength 7 + bDescriptorType 5 + bEndpointAddress 0x01 EP 1 OUT + bmAttributes 2 + Transfer Type Bulk + Synch Type None + Usage Type Data + wMaxPacketSize 0x0040 1x 64 bytes + bInterval 0 + Endpoint Descriptor: + bLength 7 + bDescriptorType 5 + bEndpointAddress 0x82 EP 2 IN + bmAttributes 2 + Transfer Type Bulk + Synch Type None + Usage Type Data + wMaxPacketSize 0x0040 1x 64 bytes + bInterval 0 diff --git a/info/windows/tlora_v1.txt b/info/windows/tlora_v1.txt new file mode 100644 index 0000000..8988e4a --- /dev/null +++ b/info/windows/tlora_v1.txt @@ -0,0 +1,71 @@ +InputObject SideIn + dicato + r +----------- ------ +Caption : Silicon Labs CP210x USB to UART Bridge (COM5) => +Description : Silicon Labs CP210x USB to UART Bridge => +Name : Silicon Labs CP210x USB to UART Bridge (COM5) => +DeviceID : USB\VID_10C4&PID_EA60\0001 => +PNPDeviceID : USB\VID_10C4&PID_EA60\0001 => +HardwareID : {USB\VID_10C4&PID_EA60&REV_0100, USB\VID_10C4&PID_EA60} => +Manufacturer : Silicon Laboratories => +Service : silabser => +FriendlyName : Silicon Labs CP210x USB to UART Bridge (COM5) => +InstanceId : USB\VID_10C4&PID_EA60\0001 => +CompatibleID : {USB\Class_ff&SubClass_00&Prot_00, USB\Class_ff&SubClass_00, USB\Class_ff} => +ClassGuid : {4d36e978-e325-11ce-bfc1-08002be10318} => +PNPClass : Ports => +Class : Ports => +InstallDate : => +Status : OK => +Availability : => +ConfigManagerErrorCode : CM_PROB_NONE => +ConfigManagerUserConfig : False => +CreationClassName : Win32_PnPEntity => +ErrorCleared : => +ErrorDescription : => +LastErrorCode : => +PowerManagementCapabilities : => +PowerManagementSupported : => +StatusInfo : => +SystemCreationClassName : Win32_ComputerSystem => +SystemName : MTI-ATPLT1 => +Present : True => +PSComputerName : => +Problem : CM_PROB_NONE => +ProblemDescription : => +Caption : Microsoft Serial Mouse => +Description : Microsoft Serial Mouse => +InstallDate : => +Name : Microsoft Serial Mouse => +Status : Error => +Availability : => +ConfigManagerErrorCode : CM_PROB_FAILED_START => +ConfigManagerUserConfig : False => +CreationClassName : Win32_PnPEntity => +DeviceID : SILABENM\MOUSE\C&1EBF522&0&0000 => +ErrorCleared : => +ErrorDescription : => +LastErrorCode : => +PNPDeviceID : SILABENM\MOUSE\C&1EBF522&0&0000 => +PowerManagementCapabilities : => +PowerManagementSupported : => +StatusInfo : => +SystemCreationClassName : Win32_ComputerSystem => +SystemName : MTI-ATPLT1 => +ClassGuid : {4d36e96f-e325-11ce-bfc1-08002be10318} => +CompatibleID : {SERIAL_MOUSE} => +HardwareID : {*PNP0F01} => +Manufacturer : Microsoft => +PNPClass : Mouse => +Present : True => +Service : sermouse => +PSComputerName : => +Class : Mouse => +FriendlyName : Microsoft Serial Mouse => +InstanceId : SILABENM\MOUSE\C&1EBF522&0&0000 => +Problem : CM_PROB_FAILED_START => +ProblemDescription : => + => + => + diff --git a/meshtastic/supported_device.py b/meshtastic/supported_device.py index e0de3f1..f49b049 100755 --- a/meshtastic/supported_device.py +++ b/meshtastic/supported_device.py @@ -43,11 +43,11 @@ tbeam_M8N_SX1262 = SupportedDevice(name="T-Beam", version="M8N_SX1262", for_firm baseport_on_linux="ttyACM", baseport_on_mac="cu.usbmodem", usb_vendor_id_in_hex="1a86", usb_product_id_in_hex="55d4") tlora_v1_1 = SupportedDevice(name="T-Lora", version="1.1", for_firmware="tlora-v1", - baseport_on_linux="ttyACM", baseport_on_mac="cu.usbmodem", - usb_vendor_id_in_hex="1a86", usb_product_id_in_hex="55d4") + baseport_on_linux="ttyUSB", baseport_on_mac="cu.usbserial", + usb_vendor_id_in_hex="10c4", usb_product_id_in_hex="ea60") tlora_v1_3 = SupportedDevice(name="T-Lora", version="1.3", for_firmware="tlora-v1-3", - baseport_on_linux="ttyACM", baseport_on_mac="cu.usbmodem", - usb_vendor_id_in_hex="1a86", usb_product_id_in_hex="55d4") + baseport_on_linux="ttyUSB", baseport_on_mac="cu.usbserial", + usb_vendor_id_in_hex="10c4", usb_product_id_in_hex="ea60") tlora_v2_0 = SupportedDevice(name="T-Lora", version="2.0", for_firmware="tlora-v2-1", baseport_on_linux="ttyACM", baseport_on_mac="cu.usbmodem", usb_vendor_id_in_hex="1a86", usb_product_id_in_hex="55d4") @@ -66,8 +66,9 @@ heltec_v2_0 = SupportedDevice(name="Heltec", version="2.0", for_firmware="heltec heltec_v2_1 = SupportedDevice(name="Heltec", version="2.1", for_firmware="heltec-v2.1", baseport_on_linux="ttyUSB", baseport_on_mac="cu.usbserial-", usb_vendor_id_in_hex="10c4", usb_product_id_in_hex="ea60") -# TODO: get info on diy -meshtastic_diy_v1 = SupportedDevice(name="Meshtastic DIY", version="1", for_firmware="meshtastic-diy-v1") +meshtastic_diy_v1 = SupportedDevice(name="Meshtastic DIY", version="1", for_firmware="meshtastic-diy-v1", + baseport_on_linux="ttyUSB", baseport_on_mac="cu.usbserial-", + usb_vendor_id_in_hex="10c4", usb_product_id_in_hex="ea60") # TODO: get info on TEcho techo_1 = SupportedDevice(name="T-Echo", version="1", for_firmware="t-echo-1", device_class="nrf52") rak4631_5005 = SupportedDevice(name="RAK 4631 5005", version="", for_firmware="rak4631_5005",