From 25e64e0ffdac4d52443141d96a35dfdfafa8c33a Mon Sep 17 00:00:00 2001 From: Verkehrsrot Date: Tue, 17 Sep 2019 15:05:35 +0200 Subject: [PATCH 1/4] v1.8.1 dev --- platformio.ini | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/platformio.ini b/platformio.ini index 8278a620..9bd1d6da 100644 --- a/platformio.ini +++ b/platformio.ini @@ -34,16 +34,16 @@ halfile = generic.h [platformio] ; upload firmware to board with usb cable -default_envs = usb +;default_envs = usb ; upload firmware to a jfrog bintray repository ;default_envs = ota ; use latest versions of libraries -;default_envs = dev +default_envs = dev description = Paxcounter is a device for metering passenger flows in realtime. It counts how many mobile devices are around. [common] ; for release_version use max. 10 chars total, use any decimal format like "a.b.c" -release_version = 1.8.031 +release_version = 1.8.1 ; DEBUG LEVEL: For production run set to 0, otherwise device will leak RAM while running! ; 0=None, 1=Error, 2=Warn, 3=Info, 4=Debug, 5=Verbose debug_level = 3 @@ -56,7 +56,7 @@ monitor_speed = 115200 upload_speed = 115200 lib_deps_lora = ;MCCI LoRaWAN LMIC library@2.3.2 - https://github.com/mcci-catena/arduino-lmic.git#76f7bd5 + https://github.com/mcci-catena/arduino-lmic.git lib_deps_display = U8g2@>=2.26.13 lib_deps_matrix_display = @@ -116,7 +116,7 @@ upload_protocol = custom upload_protocol = esptool [env:dev] -upload_protocol = custom +upload_protocol = esptool build_type = debug platform = https://github.com/platformio/platform-espressif32.git#develop platform_packages = From cf6bb5c992ae0c7245576b7bb5f35459eef36093 Mon Sep 17 00:00:00 2001 From: Verkehrsrot Date: Wed, 18 Sep 2019 16:24:25 +0200 Subject: [PATCH 2/4] Heltecv2 battery monitoring disabled --- src/hal/heltecv2.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/hal/heltecv2.h b/src/hal/heltecv2.h index cc7de4d1..adb74981 100644 --- a/src/hal/heltecv2.h +++ b/src/hal/heltecv2.h @@ -20,9 +20,13 @@ #define HAS_LED LED_BUILTIN // white LED on board #define HAS_BUTTON KEY_BUILTIN // button "PROG" on board -#define BAT_MEASURE_ADC ADC2_GPIO13_CHANNEL // battery probe GPIO pin -#define BAT_MEASURE_ADC_UNIT 2 // ADC 2 -#define BAT_VOLTAGE_DIVIDER 2 // voltage divider 220k/100k on board +// caveat: activating ADC2 conflicts with Wifi in current arduino-esp32 +// see https://github.com/espressif/arduino-esp32/issues/3222 +// thus we must waiver of battery monitoring +//#define BAT_MEASURE_ADC ADC2_GPIO13_CHANNEL // battery probe GPIO pin +//#define BAT_MEASURE_ADC_UNIT 2 // ADC 2 +//#define BAT_VOLTAGE_DIVIDER 2 // voltage divider 220k/100k on board + #define EXT_POWER_SW Vext // switches battery power, Vext control 0 = on / 1 = off #define EXT_POWER_ON 0 //#define EXT_POWER_OFF 1 From 1af4eb11a432517930581c293a4ae82dd5af104b Mon Sep 17 00:00:00 2001 From: Verkehrsrot Date: Wed, 18 Sep 2019 16:27:09 +0200 Subject: [PATCH 3/4] fix partition selection bug (#438) --- build.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/build.py b/build.py index 28319853..c4f3ccc3 100644 --- a/build.py +++ b/build.py @@ -7,15 +7,15 @@ import os.path import requests from os.path import basename from platformio import util +from SCons.Script import DefaultEnvironment try: import configparser except ImportError: import ConfigParser as configparser -Import("env") - # get platformio environment variables +env = DefaultEnvironment() config = configparser.ConfigParser() config.read("platformio.ini") @@ -66,7 +66,15 @@ myboard = mykeys["board"] myuploadspeed = mykeys["upload_speed"] env.Replace(BOARD=myboard) env.Replace(UPLOAD_SPEED=myuploadspeed) + +# re-set partition table +mypartitiontable = config.get("env", "board_build.partitions") +board = env.BoardConfig(myboard) +board.manifest['build']['partitions'] = mypartitiontable + +# display target print('\033[94m' + "TARGET BOARD: " + myboard + " @ " + myuploadspeed + "bps" + '\033[0m') +print('\033[94m' + "Partition table: " + mypartitiontable + '\033[0m') # parse ota key file with open(otakeyfile) as myfile: From ad77aa351ffb93054d6c0514f82fde7787ceb800 Mon Sep 17 00:00:00 2001 From: Verkehrsrot Date: Wed, 18 Sep 2019 16:30:09 +0200 Subject: [PATCH 4/4] v1.8.11 --- platformio.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/platformio.ini b/platformio.ini index 9bd1d6da..18caaddc 100644 --- a/platformio.ini +++ b/platformio.ini @@ -34,16 +34,16 @@ halfile = generic.h [platformio] ; upload firmware to board with usb cable -;default_envs = usb +default_envs = usb ; upload firmware to a jfrog bintray repository ;default_envs = ota ; use latest versions of libraries -default_envs = dev +;default_envs = dev description = Paxcounter is a device for metering passenger flows in realtime. It counts how many mobile devices are around. [common] ; for release_version use max. 10 chars total, use any decimal format like "a.b.c" -release_version = 1.8.1 +release_version = 1.8.11 ; DEBUG LEVEL: For production run set to 0, otherwise device will leak RAM while running! ; 0=None, 1=Error, 2=Warn, 3=Info, 4=Debug, 5=Verbose debug_level = 3