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.

boards/heltec_mesh_pocket.json

@@ -50,5 +50,4 @@
   },
   "url": "https://heltec.org/project/meshpocket/",
   "vendor": "Heltec"
-  }
+}
-  

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
+	# renovate: datasource=custom.pio depName=TBPubSubClient packageName=thingsboard/library/TBPubSubClient
-	knolleary/PubSubClient@2.8
+	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

src/graphics/EInkDisplay2.cpp

@@ -219,7 +219,7 @@ bool EInkDisplay::connect()
     }
 #elif defined(HELTEC_MESH_POCKET)
     {
-        spi1=&SPI1;
+        spi1 = &SPI1;
         spi1->begin();
         // VExt already enabled in setup()
         // RTC GPIO hold disabled in setup()

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);
 

variants/heltec_mesh_pocket/nicheGraphics.h

@@ -34,7 +34,7 @@ void setupNicheGraphics()
 
     // SPI
     // -----------------------------
-    SPIClass *spi1=&SPI1;
+    SPIClass *spi1 = &SPI1;
     spi1->begin();
     // Display is connected to SPI1
 

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};
-
-

variants/heltec_mesh_pocket/variant.h

@@ -49,8 +49,8 @@ No longer populated on PCB
     */
 #define WIRE_INTERFACES_COUNT 1
 
-#define PIN_WIRE_SDA (32+15)
+#define PIN_WIRE_SDA (32 + 15)
-#define PIN_WIRE_SCL (32+13)
+#define PIN_WIRE_SCL (32 + 13)
 
 /*
  * Lora radio
@@ -73,24 +73,22 @@ No longer populated on PCB
 
 // Display (E-Ink)
 #define PIN_EINK_CS 24
-#define PIN_EINK_BUSY 32+6
+#define PIN_EINK_BUSY 32 + 6
 #define PIN_EINK_DC 31
-#define PIN_EINK_RES  32+4
+#define PIN_EINK_RES 32 + 4
 #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
  */
 
-#define PIN_SERIAL1_RX 32+5
+#define PIN_SERIAL1_RX 32 + 5
-#define PIN_SERIAL1_TX 32+7
+#define PIN_SERIAL1_TX 32 + 7
 
 /*
  * SPI Interfaces
@@ -112,7 +110,7 @@ No longer populated on PCB
 // it is defined in the anlaolgue pin section of this file
 // and has 12 bit resolution
 
-#define ADC_CTRL 32+2
+#define ADC_CTRL 32 + 2
 #define ADC_CTRL_ENABLED HIGH
 #define BATTERY_PIN 29
 #define ADC_RESOLUTION 14
@@ -131,5 +129,4 @@ No longer populated on PCB
 }
 #endif
 
-
 #endif