From 5f948c09fe1d6dc49d6cfd768008ca162071e6a1 Mon Sep 17 00:00:00 2001 From: Kevin Hester Date: Wed, 31 Mar 2021 11:05:43 +0800 Subject: [PATCH] update libs to fix CI build, thanks @meehow! --- docs/software/TODO.md | 1 - platformio.ini | 6 +++--- proto | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/docs/software/TODO.md b/docs/software/TODO.md index 9ade0f718..76b1614cd 100644 --- a/docs/software/TODO.md +++ b/docs/software/TODO.md @@ -5,7 +5,6 @@ You probably don't care about this section - skip to the next one. ## before next release * fix github actions per sasha tip -* have simulator save state in ~/.meshtastic/native * DONE sendtext busted in portduino, due to bytetime calculations * remove linux dependency in native build * DONE tcp stream problem in python+pordtuino, server thinks client dropped when client DID NOT DROP diff --git a/platformio.ini b/platformio.ini index 32de8f5fe..92f0f69ac 100644 --- a/platformio.ini +++ b/platformio.ini @@ -9,7 +9,7 @@ ; https://docs.platformio.org/page/projectconf.html [platformio] -;default_envs = tbeam +default_envs = tbeam ;default_envs = tbeam0.7 ;default_envs = heltec ;default_envs = tlora-v1 @@ -18,7 +18,7 @@ ;default_envs = lora-relay-v1 # nrf board ;default_envs = eink ;default_envs = nrf52840dk-geeksville -default_envs = native # lora-relay-v1 # nrf52840dk-geeksville # linux # or if you'd like to change the default to something like lora-relay-v1 put that here +;default_envs = native # lora-relay-v1 # nrf52840dk-geeksville # linux # or if you'd like to change the default to something like lora-relay-v1 put that here [common] ; common is not currently used @@ -110,7 +110,7 @@ lib_deps = # board_build.ldscript = linker/esp32.extram.bss.ld lib_ignore = segger_rtt platform_packages = - framework-arduinoespressif32@https://github.com/meshtastic/arduino-esp32.git#352c8ea7cb73f10433ed139f34251979c470ad56 + framework-arduinoespressif32@https://github.com/meshtastic/arduino-esp32.git#4cde0f5d412d2695184f32e8a47e9bea57b45276 ; leave this commented out to avoid breaking Windows upload_port = /dev/ttyUSB0 diff --git a/proto b/proto index 90e1ddd5d..5cb09ec96 160000 --- a/proto +++ b/proto @@ -1 +1 @@ -Subproject commit 90e1ddd5d065c6907fef94f9d6b955ea1276319c +Subproject commit 5cb09ec96321ce0cfae18141e5da3b75e001c9fe