Merge pull request #307 from mkinney/master

there is no tlora_v2.1
2025-12-26 01:17:51 -05:00 · 2022-03-15 20:13:51 -07:00 · 2022-03-15 20:11:14 -07:00 · 2022-03-15 19:57:45 -07:00 · 2022-03-15 19:54:18 -07:00 · 2022-03-15 19:30:54 -07:00
5 changed files with 157 additions and 200 deletions
--- a/meshtastic/mesh_pb2.py
+++ b/meshtastic/mesh_pb2.py
--- a/meshtastic/radioconfig_pb2.py
+++ b/meshtastic/radioconfig_pb2.py
--- a/meshtastic/supported_device.py
+++ b/meshtastic/supported_device.py
@@ -38,16 +38,13 @@ tbeam_M8N = SupportedDevice(name="T-Beam", version="M8N", for_firmware="tbeam",
 tbeam_M8N_SX1262 = SupportedDevice(name="T-Beam", version="M8N_SX1262", for_firmware="tbeam",
                                   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",
+tlora_v1 = SupportedDevice(name="T-Lora", version="1", for_firmware="tlora-v1",
                             baseport_on_linux="ttyUSB", baseport_on_mac="cu.usbserial",
-                             usb_vendor_id_in_hex="10c4", usb_product_id_in_hex="ea60")
+                             usb_vendor_id_in_hex="1a86", usb_product_id_in_hex="55d4")
 tlora_v1_3 = SupportedDevice(name="T-Lora", version="1.3", for_firmware="tlora-v1-3",
                             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")
-tlora_v2_1 = SupportedDevice(name="T-Lora", version="2.1", for_firmware="tlora-v2-1",
+tlora_v2 = SupportedDevice(name="T-Lora", version="2", for_firmware="tlora-v2",
                             baseport_on_linux="ttyACM", baseport_on_mac="cu.usbmodem",
                             usb_vendor_id_in_hex="1a86", usb_product_id_in_hex="55d4")
 tlora_v2_1_1_6 = SupportedDevice(name="T-Lora", version="2.1-1.6", for_firmware="tlora-v2-1-1.6",
@@ -83,7 +80,7 @@ rak4631_19003 = SupportedDevice(name="RAK 4631 19003", version="", for_firmware=
                                usb_vendor_id_in_hex="239a", usb_product_id_in_hex="8029")

 supported_devices = [tbeam_v0_7, tbeam_v1_1, tbeam_M8N, tbeam_M8N_SX1262,
-                     tlora_v1_1, tlora_v1_3, tlora_v2_0, tlora_v2_1, tlora_v2_1_1_6,
+                     tlora_v1, tlora_v1_3, tlora_v2, tlora_v2_1_1_6,
                     heltec_v1, heltec_v2_0, heltec_v2_1,
                     meshtastic_diy_v1, techo_1, rak4631_5005, rak4631_19003,
                     rak11200]
--- a/2
+++ b/2
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ with open("README.md", "r") as fh:
 # This call to setup() does all the work
 setup(
    name="meshtastic",
-    version="1.3alpha.5",
+    version="1.3alpha.6",
    description="Python API & client shell for talking to Meshtastic devices",
    long_description=long_description,
    long_description_content_type="text/markdown",
Author	SHA1	Message	Date
mkinney	8ec5dbbf38	Merge pull request #307 from mkinney/master there is no tlora_v2.1	2022-03-15 20:13:51 -07:00
Mike Kinney	0c760f3721	there is no tlora_v2.1	2022-03-15 20:11:14 -07:00
mkinney	c45568731f	Merge pull request #306 from mkinney/master regen protobuf code; tlora v1 vendor/product id fix	2022-03-15 19:57:45 -07:00
Mike Kinney	ef4c9dc338	fix the vendor and product id for tlora v1	2022-03-15 19:54:18 -07:00
Mike Kinney	89de553aba	regen python based on updated protobufs	2022-03-15 19:30:54 -07:00
mkinney	247e7b2605	Merge pull request #303 from mkinney/supported_devices_fixes fix some tlora entries	2022-03-15 19:27:42 -07:00
Mike Kinney	f81ba64b91	fix some tlora entries	2022-03-15 19:25:04 -07:00
Jm Casler	d6fbca1bf1	updating proto submodule to latest	2022-03-15 15:46:02 -07:00
Jm Casler	6fbf78fa19	updating proto submodule to latest	2022-03-14 18:05:28 -07:00
github-actions	e38a614c37	bump version	2022-03-11 23:08:22 +00:00