From f9ff06b2967fc81bd6e49e1e8439e7d7eb4aaf83 Mon Sep 17 00:00:00 2001 From: Jm Casler Date: Wed, 12 Jan 2022 21:54:32 -0800 Subject: [PATCH 1/5] Bump to 1.2.51 --- version.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.properties b/version.properties index 7c9e94a60..6020781b6 100644 --- a/version.properties +++ b/version.properties @@ -1,4 +1,4 @@ [VERSION] major = 1 minor = 2 -build = 50 +build = 51 From 975f7c0332c6733f47ae607e65d730de8eafc8d1 Mon Sep 17 00:00:00 2001 From: Mark Trevor Birss Date: Thu, 13 Jan 2022 10:28:02 +0200 Subject: [PATCH 2/5] Fix SSD1306 OLED pinout on TLORA_V1_3 The V1.3 board OLED pinout changed from V1 Now on pin SDA(21) and SCL(22) not SDA(4) and SCL(15) LILYGO Product Page http://www.lilygo.cn/prod_view.aspx?TypeId=50060&Id=1253&FId=t3:50060:3 Product Pin https://ae01.alicdn.com/kf/H098cb5d5159841b398fcfd4ebf705725W.jpg --- src/configuration.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/configuration.h b/src/configuration.h index 57469bfd5..7a482151a 100644 --- a/src/configuration.h +++ b/src/configuration.h @@ -428,8 +428,8 @@ along with this program. If not, see . #define BATTERY_PIN 35 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage -#define I2C_SDA 4 // I2C pins for this board -#define I2C_SCL 15 +#define I2C_SDA 21 // I2C pins for this board +#define I2C_SCL 22 #define RESET_OLED 16 // If defined, this pin will be used to reset the display controller From b63802cef31adc0251bc5102817e8344e635072e Mon Sep 17 00:00:00 2001 From: Jm Casler Date: Thu, 13 Jan 2022 06:49:55 -0800 Subject: [PATCH 3/5] 1.2.52 --- version.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.properties b/version.properties index 6020781b6..5b1bdaf4d 100644 --- a/version.properties +++ b/version.properties @@ -1,4 +1,4 @@ [VERSION] major = 1 minor = 2 -build = 51 +build = 52 From d900847bab7084bfc5256641d01f2b11fb742757 Mon Sep 17 00:00:00 2001 From: Jm Casler Date: Thu, 13 Jan 2022 16:55:20 -0800 Subject: [PATCH 4/5] updating proto submodule to latest --- proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proto b/proto index 18fc4cdb5..e992214ce 160000 --- a/proto +++ b/proto @@ -1 +1 @@ -Subproject commit 18fc4cdb522cb3740b3b547b3eac57781ca9c1f0 +Subproject commit e992214cefbf9eb6e291eaab064333ae88610809 From 8a6bbcb985608839fef3e905195bcb3707573c66 Mon Sep 17 00:00:00 2001 From: Mike Kinney Date: Fri, 14 Jan 2022 10:40:18 -0800 Subject: [PATCH 5/5] add quotes around PYTHON; add check for esptool --- bin/device-install.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/bin/device-install.sh b/bin/device-install.sh index b0ba6ef37..f0157da2d 100755 --- a/bin/device-install.sh +++ b/bin/device-install.sh @@ -11,7 +11,7 @@ Usage: $(basename $0) [-h] [-p ESPTOOL_PORT] [-P PYTHON] [-f FILENAME|FILENAME] Flash image file to device, but first erasing and writing system information" -h Display this help and exit - -p ESPTOOL_PORT Set the environment variable for ESPTOOL_PORT. If not set, ESPTOOL iterates all ports (Dangerrous). + -p ESPTOOL_PORT Set the environment variable for ESPTOOL_PORT. If not set, ESPTOOL iterates all ports (Dangerous). -P PYTHON Specify alternate python interpreter to use to invoke esptool. (Default: "$PYTHON") -f FILENAME The .bin file to flash. Custom to your device type and region. EOF @@ -44,12 +44,15 @@ shift "$((OPTIND-1))" shift } +# check that esptool is installed +"$PYTHON" -m esptool -h >/dev/null 2>&1 || echo "Error: esptool was not found."; exit 1 + if [ -f "${FILENAME}" ]; then echo "Trying to flash ${FILENAME}, but first erasing and writing system information" - $PYTHON -m esptool erase_flash - $PYTHON -m esptool write_flash 0x1000 system-info.bin - $PYTHON -m esptool write_flash 0x00390000 spiffs-*.bin - $PYTHON -m esptool write_flash 0x10000 ${FILENAME} + "$PYTHON" -m esptool erase_flash + "$PYTHON" -m esptool write_flash 0x1000 system-info.bin + "$PYTHON" -m esptool write_flash 0x00390000 spiffs-*.bin + "$PYTHON" -m esptool write_flash 0x10000 ${FILENAME} else echo "Invalid file: ${FILENAME}" show_help