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 05:15:50 +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
@ -1,54 +1,53 @@
 {
-    "build": {
-      "arduino": {
-        "ldscript": "nrf52840_s140_v6.ld"
-      },
-      "core": "nRF5",
-      "cpu": "cortex-m4",
-      "extra_flags": "-DNRF52840_XXAA",
-      "f_cpu": "64000000L",
-      "hwids": [
-        ["0x239A", "0x4405"],
-        ["0x239A", "0x0029"],
-        ["0x239A", "0x002A"]
-      ],
-      "usb_product": "HT-n5262",
-      "mcu": "nrf52840",
-      "variant": "heltec_mesh_pocket",
-      "variants_dir": "variants",
-      "bsp": {
-        "name": "adafruit"
-      },
-      "softdevice": {
-        "sd_flags": "-DS140",
-        "sd_name": "s140",
-        "sd_version": "6.1.1",
-        "sd_fwid": "0x00B6"
-      },
-      "bootloader": {
-        "settings_addr": "0xFF000"
-      }
+  "build": {
+    "arduino": {
+      "ldscript": "nrf52840_s140_v6.ld"
    },
-    "connectivity": ["bluetooth"],
-    "debug": {
-      "jlink_device": "nRF52840_xxAA",
-      "onboard_tools": ["jlink"],
-      "svd_path": "nrf52840.svd",
-      "openocd_target": "nrf52840-mdk-rs"
+    "core": "nRF5",
+    "cpu": "cortex-m4",
+    "extra_flags": "-DNRF52840_XXAA",
+    "f_cpu": "64000000L",
+    "hwids": [
+      ["0x239A", "0x4405"],
+      ["0x239A", "0x0029"],
+      ["0x239A", "0x002A"]
+    ],
+    "usb_product": "HT-n5262",
+    "mcu": "nrf52840",
+    "variant": "heltec_mesh_pocket",
+    "variants_dir": "variants",
+    "bsp": {
+      "name": "adafruit"
    },
-    "frameworks": ["arduino"],
-    "name": "Heltec nrf (Adafruit BSP)",
-    "upload": {
-      "maximum_ram_size": 248832,
-      "maximum_size": 815104,
-      "speed": 115200,
-      "protocol": "nrfutil",
-      "protocols": ["jlink", "nrfjprog", "nrfutil", "stlink"],
-      "use_1200bps_touch": true,
-      "require_upload_port": true,
-      "wait_for_upload_port": true
+    "softdevice": {
+      "sd_flags": "-DS140",
+      "sd_name": "s140",
+      "sd_version": "6.1.1",
+      "sd_fwid": "0x00B6"
    },
-    "url": "https://heltec.org/project/meshpocket/",
-    "vendor": "Heltec"
-  }
-  
+    "bootloader": {
+      "settings_addr": "0xFF000"
+    }
+  },
+  "connectivity": ["bluetooth"],
+  "debug": {
+    "jlink_device": "nRF52840_xxAA",
+    "onboard_tools": ["jlink"],
+    "svd_path": "nrf52840.svd",
+    "openocd_target": "nrf52840-mdk-rs"
+  },
+  "frameworks": ["arduino"],
+  "name": "Heltec nrf (Adafruit BSP)",
+  "upload": {
+    "maximum_ram_size": 248832,
+    "maximum_size": 815104,
+    "speed": 115200,
+    "protocol": "nrfutil",
+    "protocols": ["jlink", "nrfjprog", "nrfutil", "stlink"],
+    "use_1200bps_touch": true,
+    "require_upload_port": true,
+    "wait_for_upload_port": true
+  },
+  "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/graphics/EInkDisplay2.cpp
+++ b/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()
--- a/src/graphics/niche/Drivers/EInk/LCMEN2R13ECC1.cpp
+++ b/src/graphics/niche/Drivers/EInk/LCMEN2R13ECC1.cpp
@ -23,16 +23,16 @@ void LCMEN2R13ECC1::configScanning()
 void LCMEN2R13ECC1::configWaveform()
 {
    switch (updateType) {
-        case FAST:
-            sendCommand(0x3C); // Border waveform:
-            sendData(0x85);
-            break;
-    
-        case FULL:
-        default:
-            // From OTP memory
-            break;
-        }
+    case FAST:
+        sendCommand(0x3C); // Border waveform:
+        sendData(0x85);
+        break;
+
+    case FULL:
+    default:
+        // From OTP memory
+        break;
+    }
 }

 void LCMEN2R13ECC1::configUpdateSequence()
@ -65,4 +65,4 @@ void LCMEN2R13ECC1::detachFromUpdate()
    }
 }

-#endif   // MESHTASTIC_INCLUDE_NICHE_GRAPHICS
+#endif // MESHTASTIC_INCLUDE_NICHE_GRAPHICS
--- a/src/graphics/niche/Drivers/EInk/LCMEN2R13ECC1.h
+++ b/src/graphics/niche/Drivers/EInk/LCMEN2R13ECC1.h
@ -28,13 +28,13 @@ class LCMEN2R13ECC1 : public SSD16XX
    static constexpr UpdateTypes supported = (UpdateTypes)(FULL | FAST);

  public:
-  LCMEN2R13ECC1() : SSD16XX(width, height, supported, 1) {} // Note: left edge of this display is offset by 1 byte
+    LCMEN2R13ECC1() : SSD16XX(width, height, supported, 1) {} // Note: left edge of this display is offset by 1 byte

  protected:
-  virtual void configScanning() override;
-  virtual void configWaveform() override;
-  virtual void configUpdateSequence() override;
-  void detachFromUpdate() override;
+    virtual void configScanning() override;
+    virtual void configWaveform() override;
+    virtual void configUpdateSequence() override;
+    void detachFromUpdate() override;
 };

 } // namespace NicheGraphics::Drivers
--- 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/nicheGraphics.h
+++ b/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

--- 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
@ -49,16 +49,16 @@ No longer populated on PCB
    */
 #define WIRE_INTERFACES_COUNT 1

-#define PIN_WIRE_SDA (32+15)
-#define PIN_WIRE_SCL (32+13)
+#define PIN_WIRE_SDA (32 + 15)
+#define PIN_WIRE_SCL (32 + 13)

 /*
 * Lora radio
 */

 #define USE_SX1262
-#define SX126X_CS   (0 + 26) // FIXME - we really should define LORA_CS instead
-#define LORA_CS     (0 + 26)
+#define SX126X_CS (0 + 26) // FIXME - we really should define LORA_CS instead
+#define LORA_CS (0 + 26)
 #define SX126X_DIO1 (0 + 16)
 // Note DIO2 is attached internally to the module to an analog switch for TX/RX switching
 // #define SX1262_DIO3 (0 + 21)
@ -72,25 +72,23 @@ No longer populated on PCB
 #define SX126X_DIO3_TCXO_VOLTAGE 1.8

 // Display (E-Ink)
-#define PIN_EINK_CS   24
-#define PIN_EINK_BUSY 32+6
-#define PIN_EINK_DC   31
-#define PIN_EINK_RES  32+4
+#define PIN_EINK_CS 24
+#define PIN_EINK_BUSY 32 + 6
+#define PIN_EINK_DC 31
+#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_TX 32+7
+#define PIN_SERIAL1_RX 32 + 5
+#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
@ -124,12 +122,11 @@ No longer populated on PCB
 #define VBAT_AR_INTERNAL AR_INTERNAL_3_0
 #define ADC_MULTIPLIER (4.90F)

-#undef  HAS_GPS
+#undef HAS_GPS
 #define HAS_GPS 0
 #define HAS_RTC 0
 #ifdef __cplusplus
 }
 #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