mirror of
https://github.com/agessaman/MeshCore.git
synced 2026-07-21 04:41:08 +00:00
Resolved conflicts in: - examples/simple_repeater/MyMesh.cpp: merged comparison functions with new handler functions - src/helpers/CommonCLI.cpp: merged MQTT fields handling with adc_multiplier and owner_info - src/helpers/CommonCLI.h: merged NodePrefs struct changes - variants/heltec_v3/platformio.ini: kept upstream WiFi settings - variants/xiao_s3_wio/platformio.ini: added upstream environment definitions Verified observer firmwares compile successfully.