Merge branch 'portduino' into dev

# Conflicts: # platformio.ini
2025-12-20 09:43:03 +00:00 · 2020-09-07 16:31:17 -07:00
parent 170f0693c6 f3d38d84c9
commit 46ba36511a
42 changed files with 495 additions and 205 deletions
--- a/src/graphics/Screen.cpp
+++ b/src/graphics/Screen.cpp
@@ -31,6 +31,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "graphics/images.h"
 #include "main.h"
 #include "mesh-pb-constants.h"
+#include "target_specific.h"
 #include "utils.h"

 using namespace meshtastic; /** @todo remove */