Merge branch 'master' into change-pubsubclient

meshtastic · Jan 5, 2025 · e01c7a7 · e01c7a7
2 parents a5dff12 + 6aabbed
commit e01c7a7
Show file tree

Hide file tree

Showing 14 changed files with 81 additions and 10 deletions.
diff --git a/bin/.gitignore b/bin/.gitignore
@@ -0,0 +1 @@
+config.yaml
diff --git a/bin/config-dist.yaml b/bin/config-dist.yaml
@@ -12,12 +12,6 @@ Lora:
 #  IRQ: 17
 #  Reset: 22
 
-#  Module: RF95  # Adafruit RFM9x
-#  Reset: 25
-#  CS: 7
-#  IRQ: 22
-#  Busy: 23
-
 #  Module: RF95  # Elecrow Lora RFM95 IOT https://www.elecrow.com/lora-rfm95-iot-board-for-rpi.html
 #  Reset: 22
 #  CS: 7

diff --git a/bin/config.d/lora-Adafruit-RFM9x b/bin/config.d/lora-Adafruit-RFM9x
@@ -0,0 +1,5 @@
+#  Module: RF95  # Adafruit RFM9x
+#  Reset: 25
+#  CS: 7
+#  IRQ: 22
+#  Busy: 23
diff --git a/debian/.gitignore b/debian/.gitignore
@@ -0,0 +1,6 @@
+.debhelper
+debhelper-build-stamp
+meshtasticd
+files
+meshtasticd.substvars
+meshtasticd.postrm.debhelper
diff --git a/debian/changelog b/debian/changelog
@@ -0,0 +1,5 @@
+meshtasticd (2.5.19) unstable; urgency=medium
+
+  * Initial packaging
+
+ -- Austin Lane <[email protected]>  Thu, 02 Jan 2025 12:00:00 +0000
diff --git a/debian/control b/debian/control
@@ -0,0 +1,25 @@
+Source: meshtasticd
+Section: misc
+Priority: optional
+Maintainer: Austin Lane <[email protected]>
+Build-Depends: debhelper-compat (= 13),
+               python3-pip,
+               python3-venv,
+               git,
+               g++,
+               pkg-config,
+               libyaml-cpp-dev,
+               libgpiod-dev,
+               libbluetooth-dev,
+               libusb-1.0-0-dev,
+               libi2c-dev
+Standards-Version: 4.6.2
+Homepage: https://github.com/meshtastic/firmware
+Rules-Requires-Root: no
+
+Package: meshtasticd
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Meshtastic daemon for communicating with Meshtastic devices
+ Meshtastic is an off-grid text communication platform that uses inexpensive 
+ LoRa radios.
diff --git a/debian/meshtasticd.dirs b/debian/meshtasticd.dirs
@@ -0,0 +1,3 @@
+etc/meshtasticd
+etc/meshtasticd/config.d
+etc/meshtasticd/available.d
diff --git a/debian/meshtasticd.install b/debian/meshtasticd.install
@@ -0,0 +1,6 @@
+.pio/build/native/meshtasticd  usr/sbin
+
+bin/config.yaml                etc/meshtasticd
+bin/config.d/*                 etc/meshtasticd/available.d
+
+bin/meshtasticd.service        lib/systemd/system
diff --git a/debian/rules b/debian/rules
@@ -0,0 +1,17 @@
+#!/usr/bin/make -f
+
+# Use the "dh" sequencer
+%:
+	dh $@
+
+override_dh_auto_build:
+	# Terrible hack to use modern platformio to build the native version
+	# python3 -m venv venv
+	# . venv/bin/activate
+	pip install platformio --break-system-packages
+	platformio run -e native
+	# deactivate
+	# rm -rf venv
+	# Move the binary and default config to the correct name
+	mv .pio/build/native/program .pio/build/native/meshtasticd
+	cp bin/config-dist.yaml bin/config.yaml
diff --git a/debian/source/format b/debian/source/format
@@ -0,0 +1 @@
+3.0 (native)
diff --git a/debian/update_changelog.sh b/debian/update_changelog.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/bash
+export DEBEMAIL="github-actions[bot]@users.noreply.github.com"
+dch --newversion "$(python3 bin/buildinfo.py short)-1" \
+        --distribution unstable \
+        "GitHub Actions Automatic version bump"
diff --git a/src/gps/GPS.cpp b/src/gps/GPS.cpp
@@ -1190,6 +1190,8 @@ GnssModel_t GPS::probe(int serialSpeed)
     PROBE_SIMPLE("L76B", "$PMTK605*31", "Quectel-L76B", GNSS_MODEL_MTK_L76B, 500);
     PROBE_SIMPLE("PA1616S", "$PMTK605*31", "1616S", GNSS_MODEL_MTK_PA1616S, 500);
 
+    PROBE_SIMPLE("LS20031", "$PMTK605*31", "MC-1513", GNSS_MODEL_LS20031, 500);
+
     uint8_t cfg_rate[] = {0xB5, 0x62, 0x06, 0x08, 0x00, 0x00, 0x00, 0x00};
     UBXChecksum(cfg_rate, sizeof(cfg_rate));
     clearBuffer();
@@ -1750,4 +1752,4 @@ void GPS::toggleGpsMode()
         enable();
     }
 }
-#endif // Exclude GPS
+#endif // Exclude GPS
diff --git a/src/gps/GPS.h b/src/gps/GPS.h
@@ -29,7 +29,8 @@ typedef enum {
     GNSS_MODEL_MTK_L76B,
     GNSS_MODEL_MTK_PA1616S,
     GNSS_MODEL_AG3335,
-    GNSS_MODEL_AG3352
+    GNSS_MODEL_AG3352,
+    GNSS_MODEL_LS20031
 } GnssModel_t;
 
 typedef enum {
@@ -239,4 +240,4 @@ class GPS : private concurrency::OSThread
 };
 
 extern GPS *gps;
-#endif // Exclude GPS
+#endif // Exclude GPS
diff --git a/src/mqtt/MQTT.cpp b/src/mqtt/MQTT.cpp
@@ -435,7 +435,7 @@ void MQTT::reconnect()
         serverAddr = hostAndPort.first.c_str();
         serverPort = hostAndPort.second;
         pubSub.setServer(serverAddr, serverPort);
-        pubSub.setBufferSize(512, 512);
+        pubSub.setBufferSize(1024, 1024);
 
         LOG_INFO("Connect directly to MQTT server %s, port: %d, username: %s, password: %s", serverAddr, serverPort, mqttUsername,
                  mqttPassword);