Merge branch 'meshtastic:master' into master

.trunk/.gitignore

@@ -6,3 +6,4 @@
 plugins
 user_trunk.yaml
 user.yaml
+tmp

.trunk/trunk.yaml

@@ -1,34 +1,36 @@
 version: 0.1
 cli:
-  version: 1.17.2
+  version: 1.20.1
 plugins:
   sources:
     - id: trunk
-      ref: v1.3.0
+      ref: v1.4.3
       uri: https://github.com/trunk-io/plugins
 lint:
   enabled:
-    - bandit@1.7.5
+    - trufflehog@3.68.2
-    - checkov@3.1.9
+    - yamllint@1.35.1
-    - terrascan@1.18.5
+    - bandit@1.7.7
-    - trivy@0.47.0
+    - checkov@3.2.26
+    - terrascan@1.18.11
+    - trivy@0.49.1
     #- trufflehog@3.63.2-rc0
     - taplo@0.8.1
-    - ruff@0.1.6
+    - ruff@0.2.2
-    - isort@5.12.0
+    - isort@5.13.2
-    - markdownlint@0.37.0
+    - markdownlint@0.39.0
     - oxipng@9.0.0
-    - svgo@3.0.5
+    - svgo@3.2.0
-    - actionlint@1.6.26
+    - actionlint@1.6.27
-    - flake8@6.1.0
+    - flake8@7.0.0
     - hadolint@2.12.0
     - shfmt@3.6.0
     - shellcheck@0.9.0
-    - black@23.9.1
+    - black@24.2.0
     - git-diff-check
-    - gitleaks@8.18.1
+    - gitleaks@8.18.2
     - clang-format@16.0.3
-    - prettier@3.1.0
+    - prettier@3.2.5
 runtimes:
   enabled:
     - python@3.10.8

src/gps/GPS.cpp

@@ -319,7 +319,6 @@ bool GPS::setup()
             delay(250);
             _serial_gps->write("$CFGMSG,6,1,0\r\n");
             delay(250);
-
         } else if (gnssModel == GNSS_MODEL_UBLOX) {
             // Configure GNSS system to GPS+SBAS+GLONASS (Module may restart after this command)
             // We need set it because by default it is GPS only, and we want to use GLONASS too
@@ -458,7 +457,6 @@ bool GPS::setup()
                             LOG_WARN("Unable to enable NMEA 4.10.\n");
                         }
                     }
-
                 } else {
                     if (strncmp(info.hwVersion, "00040007", 8) == 0) { // This PSM mode is only for Neo-6
                         msglen = makeUBXPacket(0x06, 0x11, 0x2, _message_CFG_RXM_ECO);
@@ -642,12 +640,12 @@ void GPS::setGPSPower(bool on, bool standbyOnly, uint32_t sleepTime)
 #endif
 #ifdef PIN_GPS_STANDBY // Specifically the standby pin for L76K and clones
     if (on) {
-        LOG_INFO("Waking GPS");
+        LOG_INFO("Waking GPS\n");
         pinMode(PIN_GPS_STANDBY, OUTPUT);
         digitalWrite(PIN_GPS_STANDBY, 1);
         return;
     } else {
-        LOG_INFO("GPS entering sleep");
+        LOG_INFO("GPS entering sleep\n");
         // notifyGPSSleep.notifyObservers(NULL);
         pinMode(PIN_GPS_STANDBY, OUTPUT);
         digitalWrite(PIN_GPS_STANDBY, 0);

src/gps/GeoCoord.cpp

@@ -376,14 +376,17 @@ void GeoCoord::convertWGS84ToOSGB36(const double lat, const double lon, double &
 }
 
 /// Ported from my old java code, returns distance in meters along the globe
-/// surface (by magic?)
+/// surface (by Haversine formula)
 float GeoCoord::latLongToMeter(double lat_a, double lng_a, double lat_b, double lng_b)
 {
-    double pk = (180 / 3.14169);
+    // Don't do math if the points are the same
-    double a1 = lat_a / pk;
+    if (lat_a == lat_b && lng_a == lng_b)
-    double a2 = lng_a / pk;
+        return 0.0;
-    double b1 = lat_b / pk;
+
-    double b2 = lng_b / pk;
+    double a1 = lat_a / DEG_CONVERT;
+    double a2 = lng_a / DEG_CONVERT;
+    double b1 = lat_b / DEG_CONVERT;
+    double b2 = lng_b / DEG_CONVERT;
     double cos_b1 = cos(b1);
     double cos_a1 = cos(a1);
     double t1 = cos_a1 * cos(a2) * cos_b1 * cos(b2);

src/gps/GeoCoord.h

@@ -11,6 +11,7 @@
 
 #define PI 3.1415926535897932384626433832795
 #define OLC_CODE_LEN 11
+#define DEG_CONVERT 180 / PI
 
 // Helper functions
 // Raises a number to an exponent, handling negative exponents.

src/modules/PositionModule.cpp

@@ -372,7 +372,7 @@ struct SmartPosition PositionModule::getDistanceTraveledSinceLastSend(meshtastic
     LOG_DEBUG("currentPosition.latitude_i=%i, currentPosition.longitude_i=%i\n", lastGpsLatitude, lastGpsLongitude);
 
     LOG_DEBUG("--------SMART POSITION-----------------------------------\n");
-    LOG_DEBUG("hasTraveledOverThreshold=%i, distanceTraveled=%d, distanceThreshold=% u\n",
+    LOG_DEBUG("hasTraveledOverThreshold=%i, distanceTraveled=%f, distanceThreshold=%f\n",
               abs(distanceTraveledSinceLastSend) >= distanceTravelThreshold, abs(distanceTraveledSinceLastSend),
               distanceTravelThreshold);
 

variants/heltec_wireless_tracker_V1_0/pins_arduino.h

@@ -26,8 +26,8 @@ static const uint8_t LED_BUILTIN = 18;
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
 
-static const uint8_t SDA = 45;
+static const uint8_t SDA = 5;
-static const uint8_t SCL = 46;
+static const uint8_t SCL = 6;
 
 static const uint8_t SS = 8;
 static const uint8_t MOSI = 10;

variants/heltec_wireless_tracker_V1_0/platformio.ini

@@ -1,7 +1,7 @@
 [env:heltec-wireless-tracker-V1-0]
 extends = esp32s3_base
 board = heltec_wireless_tracker
-upload_protocol = esp-builtin
+upload_protocol = esptool
 
 build_flags = 
   ${esp32s3_base.build_flags} -I variants/heltec_wireless_tracker_V1_0

version.properties

@@ -1,4 +1,4 @@
 [VERSION]  
 major = 2
 minor = 2
-build = 24
+build = 25