6 Commits

Author	SHA1	Message	Date
Kevin Hester	e4eb7ab589	Merge branch 'dev' into dev1.2 ... # Conflicts: # proto # src/mesh/generated/deviceonly.pb.h # src/mesh/generated/mesh.pb.h # src/plugins/esp32/EnvironmentalMeasurementPlugin.cpp	2021-02-25 19:44:08 +08:00
Charles Crossan	ec41c11e58	initialize the last measurement values to something obviously "unread"	2021-02-22 21:00:41 -05:00
Charles Crossan	3f1ada29ac	support independently enabling/disabling the on-device screen and actual measurement	2021-02-22 20:47:35 -05:00
Kevin Hester	3088fe3f91	Stay up-to-date wrt master (cc @mc-hamster) ... # Conflicts: # src/plugins/Plugins.cpp # src/plugins/RangeTestPlugin.cpp # src/plugins/StoreForwardPlugin.cpp	2021-02-22 10:39:46 +08:00
Charles Crossan	ae76ce4024	Implement interface for plugins to have custom UI Frames	2021-02-21 16:46:46 -05:00
Charles Crossan	3c564796e0		2021-02-21 10:55:33 -05:00