Merge branch 'master' into develop

thebentern · web-flow · commit 49b9d5151d71 · 2025-10-23T11:35:33.000-05:00
diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml
@@ -8,15 +8,15 @@ plugins:
       uri: https://github.com/trunk-io/plugins
 lint:
   enabled:
-    - checkov@3.2.483
-    - renovate@41.148.2
+    - checkov@3.2.486
+    - renovate@41.157.0
     - prettier@3.6.2
-    - trufflehog@3.90.8
+    - trufflehog@3.90.11
     - yamllint@1.37.1
     - bandit@1.8.6
     - trivy@0.67.2
     - taplo@0.10.0
-    - ruff@0.14.0
+    - ruff@0.14.1
     - isort@7.0.0
     - markdownlint@0.45.0
     - oxipng@9.1.5
diff --git a/src/mesh/Default.h b/src/mesh/Default.h
@@ -27,7 +27,7 @@
 #ifdef USERPREFS_RINGTONE_NAG_SECS
 #define default_ringtone_nag_secs USERPREFS_RINGTONE_NAG_SECS
 #else
-#define default_ringtone_nag_secs 60
+#define default_ringtone_nag_secs 15
 #endif
 
 #define default_mqtt_address "mqtt.meshtastic.org"
@@ -84,4 +84,4 @@ class Default
             return 1.0 + (nodesOverForty * throttlingFactor); // Each number of online node scales by 0.075 (default)
         }
     }
-};
+};
diff --git a/src/sleep.cpp b/src/sleep.cpp
@@ -244,6 +244,10 @@ void doDeepSleep(uint32_t msecToWake, bool skipPreflight = false, bool skipSaveN
     // pinMode(PIN_POWER_EN1, INPUT_PULLDOWN);
 #endif
 
+#ifdef RAK_WISMESH_TAP_V2
+    digitalWrite(SDCARD_CS, LOW);
+#endif
+
 #ifdef TRACKER_T1000_E
 #ifdef GNSS_AIROHA
     digitalWrite(GPS_VRTC_EN, LOW);

-Original file line number
+Diff line change
       uri: https://github.com/trunk-io/plugins
 lint:
   enabled:
 -    - [email protected].483
 -    - renovate@41.148.2
 +    - [email protected].486
 +    - renovate@41.157.0
     - [email protected]
 -    - [email protected].8
 +    - [email protected].11
     - [email protected]
     - [email protected]
     - [email protected]
     - [email protected]
 -    - [email protected].0
 +    - [email protected].1
     - [email protected]
     - [email protected]
     - [email protected]
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`#ifdef USERPREFS_RINGTONE_NAG_SECS`
`28`	`28`	`#define default_ringtone_nag_secs USERPREFS_RINGTONE_NAG_SECS`
`29`	`29`	`#else`
`30`		`-#define default_ringtone_nag_secs 60`
	`30`	`+#define default_ringtone_nag_secs 15`
`31`	`31`	`#endif`
`32`	`32`
`33`	`33`	`#define default_mqtt_address "mqtt.meshtastic.org"`
`@@ -84,4 +84,4 @@ class Default`
`84`	`84`	`return 1.0 + (nodesOverForty * throttlingFactor); // Each number of online node scales by 0.075 (default)`
`85`	`85`	`}`
`86`	`86`	`}`
`87`		`-};`
	`87`	`+};`