Merge branch 'master' into transactional-config-edits

This commit is contained in:
Ben Meadors
2022-11-21 12:10:49 -06:00
committed by GitHub
24 changed files with 105 additions and 118 deletions

View File

@@ -194,6 +194,10 @@ extern NodeDB nodeDB;
#define default_min_wake_secs 10
#define default_screen_on_secs 60 * 10
#define default_mqtt_address "mqtt.meshtastic.org"
#define default_mqtt_username "meshdev"
#define default_mqtt_password "large4cats"
inline uint32_t getConfiguredOrDefaultMs(uint32_t configuredInterval)
{
if (configuredInterval > 0) return configuredInterval * 1000;