Merge remote-tracking branch 'root/master' into eink

This commit is contained in:
Kevin Hester
2021-01-28 10:31:56 +08:00
22 changed files with 1360 additions and 1132 deletions
+1 -1
View File
@@ -14,7 +14,7 @@ BOARDS_ESP32="tlora-v2 tlora-v1 tlora-v2-1-1.6 tbeam heltec tbeam0.7"
# FIXME note nrf52840dk build is for some reason only generating a BIN file but not a HEX file nrf52840dk-geeksville is fine
BOARDS_NRF52="lora-relay-v1"
NUM_JOBS=2
NUM_JOBS=2 || true
OUTDIR=release/latest