From 0eca6305b434f270e36ef17db435fa888603b095 Mon Sep 17 00:00:00 2001 From: ljk Date: Mon, 26 May 2025 16:48:35 +0800 Subject: [PATCH 1/5] The Bluetooth service has been enhanced to support the output of waypoints in GPWPL format. --- src/BluetoothCommon.h | 3 ++ src/mesh/NodeDB.cpp | 2 ++ src/nimble/NimbleBluetooth.cpp | 66 ++++++++++++++++++++++++++++++++++ src/nimble/NimbleBluetooth.h | 9 +++++ 4 files changed, 80 insertions(+) diff --git a/src/BluetoothCommon.h b/src/BluetoothCommon.h index 440d13844..84fa970b6 100644 --- a/src/BluetoothCommon.h +++ b/src/BluetoothCommon.h @@ -14,6 +14,9 @@ #define LEGACY_LOGRADIO_UUID "6c6fd238-78fa-436b-aacf-15c5be1ef2e2" #define LOGRADIO_UUID "5a3d6e49-06e6-4423-9944-e9de8cdf9547" +#define GPWPL_SERVICE_UUID "0000181A-0000-1000-8000-00805f9b34fb"//gpwpl service uuid +#define GPWPL_UUID "00002A6F-0000-1000-8000-00805f9b34fb"//gpwpl uuid + // NRF52 wants these constants as byte arrays // Generated here https://yupana-engineering.com/online-uuid-to-c-array-converter - but in REVERSE BYTE ORDER extern const uint8_t MESH_SERVICE_UUID_16[], TORADIO_UUID_16[16u], FROMRADIO_UUID_16[], FROMNUM_UUID_16[], LOGRADIO_UUID_16[]; diff --git a/src/mesh/NodeDB.cpp b/src/mesh/NodeDB.cpp index 28af7d308..af73d67ef 100644 --- a/src/mesh/NodeDB.cpp +++ b/src/mesh/NodeDB.cpp @@ -1479,6 +1479,8 @@ void NodeDB::updatePosition(uint32_t nodeId, const meshtastic_Position &p, RxSou info->has_position = true; updateGUIforNode = info; notifyObservers(true); // Force an update whether or not our node counts have changed + + nimbleBluetooth->Send_GPWPL(nodeId, info->user.short_name, info->position.latitude_i, info->position.longitude_i); } /** Update telemetry info for this node based on received metrics diff --git a/src/nimble/NimbleBluetooth.cpp b/src/nimble/NimbleBluetooth.cpp index 009439f25..25369cf0c 100644 --- a/src/nimble/NimbleBluetooth.cpp +++ b/src/nimble/NimbleBluetooth.cpp @@ -13,6 +13,7 @@ NimBLECharacteristic *fromNumCharacteristic; NimBLECharacteristic *BatteryCharacteristic; NimBLECharacteristic *logRadioCharacteristic; +NimBLECharacteristic *gpwplCharacteristic; NimBLEServer *bleServer; static bool passkeyShowing; @@ -265,6 +266,11 @@ void NimbleBluetooth::setupService() batteryLevelDescriptor->setUnit(0x27ad); batteryService->start(); + + // Setup the gpwpl service + NimBLEService *gpwplService = bleServer->createService(GPWPL_SERVICE_UUID); + gpwplCharacteristic = gpwplService->createCharacteristic(GPWPL_UUID, NIMBLE_PROPERTY::NOTIFY); + gpwplService->start(); } void NimbleBluetooth::startAdvertising() @@ -273,6 +279,7 @@ void NimbleBluetooth::startAdvertising() pAdvertising->reset(); pAdvertising->addServiceUUID(MESH_SERVICE_UUID); pAdvertising->addServiceUUID(NimBLEUUID((uint16_t)0x180f)); // 0x180F is the Battery Service + pAdvertising->addServiceUUID(GPWPL_SERVICE_UUID);//ljk pAdvertising->start(0); } @@ -299,6 +306,65 @@ void NimbleBluetooth::sendLog(const uint8_t *logMessage, size_t length) logRadioCharacteristic->notify(logMessage, length, true); } +// Convert the decimal format of latitude and longitude to NMEA format (degrees and minutes) +void convertToNMEAFormat(double value, char* buffer, int bufferSize, int isLatitude) { + int degrees = (int)value; + double minutes = (value - degrees) * 60.0; + + if (isLatitude) { + snprintf(buffer, bufferSize, "%02d%07.4f", degrees, minutes); + } else { + snprintf(buffer, bufferSize, "%03d%07.4f", degrees, minutes); + } +} + +void NimbleBluetooth::Send_GPWPL(uint32_t node, char* name, int32_t latitude_i, int32_t longitude_i) +{ + double f_latitude = (double)latitude_i * (double)0.0000001; + double f_longitude = (double)longitude_i * (double)0.0000001; + char str_latitude_head[20] = {0}; + char str_longitude_head[20] = {0}; + convertToNMEAFormat(fabs(f_latitude), str_latitude_head, sizeof(str_latitude_head), 1); + convertToNMEAFormat(fabs(f_longitude), str_longitude_head, sizeof(str_longitude_head), 0); + + char str_latitude_symbol[2] = {0}; + char str_longitude_symbol[2] = {0}; + str_latitude_symbol[0] = (f_latitude >= 0) ? 'N' : 'S'; + str_longitude_symbol[0] = (f_longitude >= 0) ? 'E' : 'W'; + + char strGPWPL[100] = {0}; + snprintf(strGPWPL, sizeof(strGPWPL), "$GPWPL,%s,%s,%s,%s,%s", + str_latitude_head, str_latitude_symbol, + str_longitude_head, str_longitude_symbol, + name); + + // Calculate the check value + uint8_t checksum = 0; + for (int i = 1; i < strlen(strGPWPL); i++) + { + checksum ^= (uint8_t)strGPWPL[i]; + } + snprintf(strGPWPL + strlen(strGPWPL), sizeof(strGPWPL) - strlen(strGPWPL), "*%02X\r\n\r\n", (uint8_t)checksum); + + // Split the long string and send it. + int nOffset = 0; + int nHaveLen = strlen(strGPWPL); + while (true) + { + int nSendLen = min(20, nHaveLen); + gpwplCharacteristic->setValue(((uint8_t*)strGPWPL) + nOffset, nSendLen); + gpwplCharacteristic->notify(); + delay(50); // 为了稳定传输，添加一点延时 + + nOffset += nSendLen; + nHaveLen -= nSendLen; + if (nHaveLen <= 0) + { + break; + } + } +} + void clearNVS() { NimBLEDevice::deleteAllBonds(); diff --git a/src/nimble/NimbleBluetooth.h b/src/nimble/NimbleBluetooth.h index 45602e088..772a9814c 100644 --- a/src/nimble/NimbleBluetooth.h +++ b/src/nimble/NimbleBluetooth.h @@ -1,3 +1,11 @@ +/* + * @Author: ljk lcflyr@qq.com + * @Date: 2025-05-26 16:16:45 + * @LastEditors: ljk lcflyr@qq.com + * @LastEditTime: 2025-05-26 16:33:36 + * @FilePath: \meshtastic_firmware\src\nimble\NimbleBluetooth.h + * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE + */ #pragma once #include "BluetoothCommon.h" @@ -12,6 +20,7 @@ class NimbleBluetooth : BluetoothApi bool isConnected(); int getRssi(); void sendLog(const uint8_t *logMessage, size_t length); + void Send_GPWPL(uint32_t node, char* name,int32_t latitude_i,int32_t longitude_i); private: void setupService(); From d0849f72ae3cb27d4ea3615cf841c862d0480cd7 Mon Sep 17 00:00:00 2001 From: ljk Date: Mon, 26 May 2025 16:53:53 +0800 Subject: [PATCH 2/5] Delete the incorrect comments. --- src/nimble/NimbleBluetooth.cpp | 2 +- src/nimble/NimbleBluetooth.h | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/nimble/NimbleBluetooth.cpp b/src/nimble/NimbleBluetooth.cpp index 25369cf0c..1c36eaed7 100644 --- a/src/nimble/NimbleBluetooth.cpp +++ b/src/nimble/NimbleBluetooth.cpp @@ -279,7 +279,7 @@ void NimbleBluetooth::startAdvertising() pAdvertising->reset(); pAdvertising->addServiceUUID(MESH_SERVICE_UUID); pAdvertising->addServiceUUID(NimBLEUUID((uint16_t)0x180f)); // 0x180F is the Battery Service - pAdvertising->addServiceUUID(GPWPL_SERVICE_UUID);//ljk + pAdvertising->addServiceUUID(GPWPL_SERVICE_UUID); pAdvertising->start(0); } diff --git a/src/nimble/NimbleBluetooth.h b/src/nimble/NimbleBluetooth.h index 772a9814c..0ece07306 100644 --- a/src/nimble/NimbleBluetooth.h +++ b/src/nimble/NimbleBluetooth.h @@ -1,11 +1,3 @@ -/* - * @Author: ljk lcflyr@qq.com - * @Date: 2025-05-26 16:16:45 - * @LastEditors: ljk lcflyr@qq.com - * @LastEditTime: 2025-05-26 16:33:36 - * @FilePath: \meshtastic_firmware\src\nimble\NimbleBluetooth.h - * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE - */ #pragma once #include "BluetoothCommon.h" From 279fefebe3887418d2d95b1a3c93e2d181a1d182 Mon Sep 17 00:00:00 2001 From: ljk Date: Mon, 26 May 2025 16:55:36 +0800 Subject: [PATCH 3/5] The Bluetooth service has been enhanced to support the output of waypoints in GPWPL format. --- src/nimble/NimbleBluetooth.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nimble/NimbleBluetooth.cpp b/src/nimble/NimbleBluetooth.cpp index 1c36eaed7..675c6ccc4 100644 --- a/src/nimble/NimbleBluetooth.cpp +++ b/src/nimble/NimbleBluetooth.cpp @@ -354,7 +354,7 @@ void NimbleBluetooth::Send_GPWPL(uint32_t node, char* name, int32_t latitude_i, int nSendLen = min(20, nHaveLen); gpwplCharacteristic->setValue(((uint8_t*)strGPWPL) + nOffset, nSendLen); gpwplCharacteristic->notify(); - delay(50); // 为了稳定传输，添加一点延时 + delay(50); // To ensure stable transmission, add a little delay. nOffset += nSendLen; nHaveLen -= nSendLen; From 4f11be79afe795dc447f72e0da83ae2664f85801 Mon Sep 17 00:00:00 2001 From: ljk Date: Wed, 28 May 2025 16:46:30 +0800 Subject: [PATCH 4/5] The issue of compiling Nimble Bluetooth in non-ESP32 environments and the problem of undefined variables have been resolved. --- src/mesh/NodeDB.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/mesh/NodeDB.cpp b/src/mesh/NodeDB.cpp index af73d67ef..c2089fbff 100644 --- a/src/mesh/NodeDB.cpp +++ b/src/mesh/NodeDB.cpp @@ -1480,7 +1480,9 @@ void NodeDB::updatePosition(uint32_t nodeId, const meshtastic_Position &p, RxSou updateGUIforNode = info; notifyObservers(true); // Force an update whether or not our node counts have changed +#ifdef ARCH_ESP32 nimbleBluetooth->Send_GPWPL(nodeId, info->user.short_name, info->position.latitude_i, info->position.longitude_i); +#endif } /** Update telemetry info for this node based on received metrics From d20dc842b4d01411cdc4eb9feb8c0c81a86e8b50 Mon Sep 17 00:00:00 2001 From: ljk Date: Wed, 28 May 2025 17:16:29 +0800 Subject: [PATCH 5/5] The issue of compiling Nimble Bluetooth in tlora-c6 environments and the problem of undefined variables have been resolved. --- src/mesh/NodeDB.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/mesh/NodeDB.cpp b/src/mesh/NodeDB.cpp index c2089fbff..04c010e8b 100644 --- a/src/mesh/NodeDB.cpp +++ b/src/mesh/NodeDB.cpp @@ -1480,9 +1480,11 @@ void NodeDB::updatePosition(uint32_t nodeId, const meshtastic_Position &p, RxSou updateGUIforNode = info; notifyObservers(true); // Force an update whether or not our node counts have changed +#if !MESHTASTIC_EXCLUDE_BLUETOOTH #ifdef ARCH_ESP32 nimbleBluetooth->Send_GPWPL(nodeId, info->user.short_name, info->position.latitude_i, info->position.longitude_i); #endif +#endif } /** Update telemetry info for this node based on received metrics