Merge c6db0cc9da into 3ecff48722

Set firmware edition (for events) from userprefs (#7488 )
* Set firmware edition (for events) from userprefs * Spaces in the right places
2025-07-31 02:45:41 +00:00 · 2025-07-28 10:12:18 -04:00 · 2025-07-28 07:31:33 -05:00
2 changed files with 4 additions and 0 deletions
--- a/src/mesh/NodeDB.cpp
+++ b/src/mesh/NodeDB.cpp
@ -406,6 +406,9 @@ NodeDB::NodeDB()
        config.position.gps_mode = meshtastic_Config_PositionConfig_GpsMode_ENABLED;
        config.position.gps_enabled = 0;
    }
+#ifdef USERPREFS_FIRMWARE_EDITION
+    myNodeInfo.firmware_edition = USERPREFS_FIRMWARE_EDITION;
+#endif
 #ifdef USERPREFS_FIXED_GPS
    if (myNodeInfo.reboot_count == 1) { // Check if First boot ever or after Factory Reset.
        meshtastic_Position fixedGPS = meshtastic_Position_init_default;
--- a/userPrefs.jsonc
+++ b/userPrefs.jsonc
@ -23,6 +23,7 @@
  // "USERPREFS_CONFIG_OWNER_SHORT_NAME": "MLN",
  // "USERPREFS_CONFIG_DEVICE_ROLE": "meshtastic_Config_DeviceConfig_Role_CLIENT", // Defaults to CLIENT. ROUTER*, LOST AND FOUND, and REPEATER roles are restricted.
  // "USERPREFS_EVENT_MODE": "1",
+  // "USERPREFS_FIRMWARE_EDITION": "meshtastic_FirmwareEdition_BURNING_MAN",
  // "USERPREFS_FIXED_BLUETOOTH": "121212",
  // "USERPREFS_FIXED_GPS": "",
  // "USERPREFS_FIXED_GPS_ALT": "0",
Author	SHA1	Message	Date
Tom Fifield	abe0e0b116	Merge `c6db0cc9da` into `3ecff48722`	2025-07-28 10:12:18 -04:00
Ben Meadors	3ecff48722	Set firmware edition (for events) from userprefs (#7488 ) * Set firmware edition (for events) from userprefs * Spaces in the right places	2025-07-28 07:31:33 -05:00