From 7e23bf856922b580f5f8212cb1a6363f0ae05e0d Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Wed, 13 Nov 2019 16:09:16 +0200 Subject: [PATCH 1/6] Define custom GDB "pio_reset_run_target" function --- platform.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/platform.py b/platform.py index e2ecbbe..d751914 100644 --- a/platform.py +++ b/platform.py @@ -102,16 +102,16 @@ class Espressif32Platform(PlatformBase): "init_break": "thb app_main", "init_cmds": [ "define pio_reset_halt_target", - " mon reset halt", + " monitor reset halt", " flushregs", "end", - "define pio_reset_target", - " mon reset", + "define pio_reset_run_target", + " monitor reset", "end", "target extended-remote $DEBUG_PORT", - "$INIT_BREAK", - "$LOAD_CMD", - "pio_reset_halt_target" + "$LOAD_CMDS", + "pio_reset_halt_target", + "$INIT_BREAK" ], "onboard": link in debug.get("onboard_tools", []), "default": link == debug.get("default_tool") From 61bebeba58dea9744f56defb6d18ba5b04a552f6 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Fri, 15 Nov 2019 18:10:54 +0200 Subject: [PATCH 2/6] Force Python 3 PATH for Appveyor --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 48718dd..e57652a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -19,7 +19,7 @@ environment: install: - cmd: git submodule update --init --recursive -- cmd: SET PATH=%PATH%;C:\Python36\Scripts +- cmd: SET PATH=C:\Python36\Scripts;%PATH% - cmd: pip3 install -U https://github.com/platformio/platformio/archive/develop.zip - cmd: platformio platform install file://. From da87d3785a53caecd8eddc6ebd134dd647a465bb Mon Sep 17 00:00:00 2001 From: donnacha Date: Wed, 18 Dec 2019 00:58:34 +1300 Subject: [PATCH 3/6] Add proper link to ttgo-lora32-v1 board description Add link to vendor github page for board, rather than just a google search link. --- boards/ttgo-lora32-v1.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boards/ttgo-lora32-v1.json b/boards/ttgo-lora32-v1.json index 7f58dcd..e93301b 100644 --- a/boards/ttgo-lora32-v1.json +++ b/boards/ttgo-lora32-v1.json @@ -30,6 +30,6 @@ "require_upload_port": true, "speed": 460800 }, - "url": "https://www.google.com.ua/search?q=TTGO+LoRa32-OLED+V1", + "url": "https://github.com/Xinyuan-LilyGO/TTGO-LoRa-Series", "vendor": "TTGO" } From 264999a7d35648757530f3dda44c6c5223a249ab Mon Sep 17 00:00:00 2001 From: Valerii Koval Date: Thu, 19 Dec 2019 17:57:44 +0200 Subject: [PATCH 4/6] Fix multiple symbol definition when two frameworks selected // Resolve #259 --- builder/frameworks/_embed_files.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder/frameworks/_embed_files.py b/builder/frameworks/_embed_files.py index 1df8b02..c6f3cc1 100644 --- a/builder/frameworks/_embed_files.py +++ b/builder/frameworks/_embed_files.py @@ -94,7 +94,7 @@ def embed_files(files, files_type): if files_type == "embed_txtfiles": env.AddPreAction(file_target, prepare_file) env.AddPostAction(file_target, revert_original_file) - env.Append(PIOBUILDFILES=[env.File(join("$BUILD_DIR", filename))]) + env.AppendUnique(PIOBUILDFILES=[env.File(join("$BUILD_DIR", filename))]) env.Append( From f5110ff21e9f94fd4d8c9c40fffd456b5a487cca Mon Sep 17 00:00:00 2001 From: Bauyrzhan Ospan Date: Fri, 20 Dec 2019 02:16:01 +0600 Subject: [PATCH 5/6] Add support for Qchip board --- boards/qchip.json | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 boards/qchip.json diff --git a/boards/qchip.json b/boards/qchip.json new file mode 100644 index 0000000..0339eb2 --- /dev/null +++ b/boards/qchip.json @@ -0,0 +1,32 @@ +{ + "build": { + "core": "esp32", + "extra_flags": "-DARDUINO_HELTEC_WIFI_KIT_32", + "f_cpu": "240000000L", + "f_flash": "40000000L", + "flash_mode": "dio", + "ldscript": "esp32_out.ld", + "mcu": "esp32", + "variant": "heltec_wifi_kit_32" + }, + "connectivity": [ + "wifi", + "bluetooth", + "ethernet", + "can" + ], + "frameworks": [ + "arduino", + "espidf" + ], + "name": "Qchip", + "upload": { + "flash_size": "4MB", + "maximum_ram_size": 327680, + "maximum_size": 4194304, + "require_upload_port": true, + "speed": 460800 + }, + "url": "http://qmobot.com/", + "vendor": "Qmobot LLP" + } \ No newline at end of file From ae8543c620fcd94b7b9d5022134895ecc52d61ae Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Mon, 30 Dec 2019 12:41:32 +0200 Subject: [PATCH 6/6] Bump version to 2.0.0 --- platform.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform.json b/platform.json index c319a11..0e1b887 100644 --- a/platform.json +++ b/platform.json @@ -12,7 +12,7 @@ "type": "git", "url": "https://github.com/platformio/platform-espressif32.git" }, - "version": "1.11.1", + "version": "2.0.0", "packageRepositories": [ "https://dl.bintray.com/platformio/dl-packages/manifest.json", "http://dl.platformio.org/packages/manifest.json",