diff --git a/bin/org.meshtastic.meshtasticd.metainfo.xml b/bin/org.meshtastic.meshtasticd.metainfo.xml index 61ecf9fb5..b59bb6202 100644 --- a/bin/org.meshtastic.meshtasticd.metainfo.xml +++ b/bin/org.meshtastic.meshtasticd.metainfo.xml @@ -87,6 +87,9 @@ + + https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.15 + https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.14 diff --git a/debian/changelog b/debian/changelog index a387cc3c5..437e1645b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +meshtasticd (2.7.15.0) unstable; urgency=medium + + * Version 2.7.15 + + -- GitHub Actions Thu, 13 Nov 2025 12:31:57 +0000 + meshtasticd (2.7.14.0) unstable; urgency=medium * Version 2.7.14 diff --git a/platformio.ini b/platformio.ini index 09c924f47..f9e2dd898 100644 --- a/platformio.ini +++ b/platformio.ini @@ -115,7 +115,8 @@ lib_deps = [radiolib_base] lib_deps = # renovate: datasource=custom.pio depName=RadioLib packageName=jgromes/library/RadioLib - jgromes/RadioLib@7.4.0 + # jgromes/RadioLib@7.4.0 + https://github.com/jgromes/RadioLib/archive/536c7267362e2c1345be7054ba45e503252975ff.zip [device-ui_base] lib_deps = diff --git a/src/main.cpp b/src/main.cpp index c65482292..8fec62953 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1401,7 +1401,7 @@ void setup() #endif // check if the radio chip matches the selected region - if ((config.lora.region == meshtastic_Config_LoRaConfig_RegionCode_LORA_24) && (!rIf->wideLora())) { + if ((config.lora.region == meshtastic_Config_LoRaConfig_RegionCode_LORA_24) && rIf && (!rIf->wideLora())) { LOG_WARN("LoRa chip does not support 2.4GHz. Revert to unset"); config.lora.region = meshtastic_Config_LoRaConfig_RegionCode_UNSET; nodeDB->saveToDisk(SEGMENT_CONFIG); diff --git a/src/mesh/CryptoEngine.cpp b/src/mesh/CryptoEngine.cpp index 82d0a9f57..9ca16878d 100644 --- a/src/mesh/CryptoEngine.cpp +++ b/src/mesh/CryptoEngine.cpp @@ -92,10 +92,10 @@ bool CryptoEngine::encryptCurve25519(uint32_t toNode, uint32_t fromNode, meshtas LOG_DEBUG("Node %d or their public_key not found", toNode); return false; } - if (!crypto->setDHPublicKey(remotePublic.bytes)) { + if (!setDHPublicKey(remotePublic.bytes)) { return false; } - crypto->hash(shared_key, 32); + hash(shared_key, 32); initNonce(fromNode, packetNum, extraNonceTmp); // Calculate the shared secret with the destination node and encrypt @@ -134,10 +134,10 @@ bool CryptoEngine::decryptCurve25519(uint32_t fromNode, meshtastic_UserLite_publ } // Calculate the shared secret with the sending node and decrypt - if (!crypto->setDHPublicKey(remotePublic.bytes)) { + if (!setDHPublicKey(remotePublic.bytes)) { return false; } - crypto->hash(shared_key, 32); + hash(shared_key, 32); initNonce(fromNode, packetNum, extraNonce); printBytes("Attempt decrypt with nonce: ", nonce, 13); diff --git a/version.properties b/version.properties index fe1a5b31b..165f476df 100644 --- a/version.properties +++ b/version.properties @@ -1,4 +1,4 @@ [VERSION] major = 2 minor = 7 -build = 14 +build = 15