Trunk fixes for heltec mesh pocket. (#6588 )

https://github.com/meshtastic/firmware/pull/6533 was merged without running trunk. This patch fixes the newly introduced trunk errors.
Switch to actually maintained thingsboard pubsubclient (#5204 )
2025-10-01 21:31:04 +00:00 · 2025-04-15 16:37:09 -05:00 · 2025-04-15 10:50:24 -05:00
9 changed files with 82 additions and 88 deletions
--- a/boards/heltec_mesh_pocket.json
+++ b/boards/heltec_mesh_pocket.json
@ -51,4 +51,3 @@
  "url": "https://heltec.org/project/meshpocket/",
  "vendor": "Heltec"
 }
-  
--- a/platformio.ini
+++ b/platformio.ini
@ -93,8 +93,8 @@ build_src_filter = ${env.build_src_filter} -<platform/portduino/> -<graphics/nic
 ; Common libs for communicating over TCP/IP networks such as MQTT
 [networking_base]
 lib_deps =
-	# renovate: datasource=custom.pio depName=PubSubClient packageName=knolleary/library/PubSubClient
-	knolleary/PubSubClient@2.8
+	# renovate: datasource=custom.pio depName=TBPubSubClient packageName=thingsboard/library/TBPubSubClient
+	thingsboard/TBPubSubClient@2.12.1
 	# renovate: datasource=custom.pio depName=NTPClient packageName=arduino-libraries/library/NTPClient
 	arduino-libraries/NTPClient@3.2.1
 	# renovate: datasource=custom.pio depName=Syslog packageName=arcao/library/Syslog
--- a/src/mqtt/MQTT.cpp
+++ b/src/mqtt/MQTT.cpp
@ -281,7 +281,7 @@ struct PubSubConfig {
 #if HAS_NETWORKING
 bool connectPubSub(const PubSubConfig &config, PubSubClient &pubSub, Client &client)
 {
-    pubSub.setBufferSize(1024);
+    pubSub.setBufferSize(1024, 1024);
    pubSub.setClient(client);
    pubSub.setServer(config.serverAddr.c_str(), config.serverPort);

--- a/variants/heltec_mesh_pocket/variant.cpp
+++ b/variants/heltec_mesh_pocket/variant.cpp
@ -9,5 +9,3 @@ const uint32_t g_ADigitalPinMap[] = {

    // P1
    32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47};
-
-
--- a/variants/heltec_mesh_pocket/variant.h
+++ b/variants/heltec_mesh_pocket/variant.h
@ -79,12 +79,10 @@ No longer populated on PCB
 #define PIN_EINK_SCLK 22
 #define PIN_EINK_MOSI 20

-
 #define PIN_SPI1_MISO -1
 #define PIN_SPI1_MOSI PIN_EINK_MOSI
 #define PIN_SPI1_SCK PIN_EINK_SCLK

-
 /*
 * GPS pins
 */
@ -131,5 +129,4 @@ No longer populated on PCB
 }
 #endif

-
 #endif
Author	SHA1	Message	Date
Tom Fifield	98411d408a	Trunk fixes for heltec mesh pocket. (#6588 ) Some checks are pending CI / build-esp32 (push) Blocked by required conditions Details CI / build-esp32-s3 (push) Blocked by required conditions Details CI / build-esp32-c3 (push) Blocked by required conditions Details CI / build-esp32-c6 (push) Blocked by required conditions Details CI / build-nrf52 (push) Blocked by required conditions Details CI / build-rpi2040 (push) Blocked by required conditions Details CI / build-stm32 (push) Blocked by required conditions Details CI / build-debian-src (push) Waiting to run Details CI / package-pio-deps-native-tft (push) Waiting to run Details CI / test-native (push) Waiting to run Details CI / docker-debian-amd64 (push) Waiting to run Details CI / docker-alpine-amd64 (push) Waiting to run Details CI / docker-debian-arm64 (push) Waiting to run Details CI / docker-debian-armv7 (push) Waiting to run Details CI / after-checks (push) Blocked by required conditions Details CI / gather-artifacts (esp32) (push) Blocked by required conditions Details CI / gather-artifacts (esp32c3) (push) Blocked by required conditions Details CI / gather-artifacts (esp32c6) (push) Blocked by required conditions Details CI / gather-artifacts (esp32s3) (push) Blocked by required conditions Details CI / gather-artifacts (nrf52840) (push) Blocked by required conditions Details CI / gather-artifacts (rp2040) (push) Blocked by required conditions Details CI / gather-artifacts (stm32) (push) Blocked by required conditions Details CI / release-artifacts (push) Blocked by required conditions Details CI / release-firmware (esp32) (push) Blocked by required conditions Details CI / release-firmware (esp32c3) (push) Blocked by required conditions Details CI / release-firmware (esp32c6) (push) Blocked by required conditions Details CI / release-firmware (esp32s3) (push) Blocked by required conditions Details CI / release-firmware (nrf52840) (push) Blocked by required conditions Details CI / release-firmware (rp2040) (push) Blocked by required conditions Details CI / release-firmware (stm32) (push) Blocked by required conditions Details https://github.com/meshtastic/firmware/pull/6533 was merged without running trunk. This patch fixes the newly introduced trunk errors.	2025-04-15 16:37:09 -05:00
Ben Meadors	040a34fca8	Switch to actually maintained thingsboard pubsubclient (#5204 ) * Switch to actually maintained thingsboard pubsubclient * .0 * TBPubSubClient * SetBufferSize is split into Send and Receive. * Update TBPubSubClient to 2.11 * Update platformio.ini Co-authored-by: Austin <vidplace7@gmail.com> * Re-add setBufferSize fix --------- Co-authored-by: Tom Fifield <tom@tomfifield.net> Co-authored-by: Austin <vidplace7@gmail.com>	2025-04-15 10:50:24 -05:00