fix абсолютных путей скриптов

This commit is contained in:
Mit4el
2025-01-07 16:49:18 +03:00
parent 24430de25f
commit 79c1810be8
4 changed files with 29 additions and 15 deletions

View File

@@ -1,5 +1,5 @@
env: env:
BOARDS: '["esp8266_4mb", "esp8266_16mb", "esp32_4mb3f", "esp32c3m_4mb", "esp32s2_4mb", "esp32s3_16mb"]' BOARDS: '["esp8266_4mb", "esp8266_16mb", "esp32_4mb3f", "esp32c3m_4mb", "esp32s2_4mb", "esp32s3_16mb", "esp32c6_4mb"]'
name: Build Firmware name: Build Firmware

View File

@@ -3,17 +3,22 @@
# #define WIFI_CLIENT_MAX_WRITE_RETRY (10) # #define WIFI_CLIENT_MAX_WRITE_RETRY (10)
# #define WIFI_CLIENT_SELECT_TIMEOUT_US (1000000) # #define WIFI_CLIENT_SELECT_TIMEOUT_US (1000000)
# Прописать скрипт в platformio.ini внутри [env:esp32_4mb3f] написать extra_scripts = pre:tools/patch32_ws.py # Прописать скрипт в platformio.ini внутри [env:esp32_4mb3f] написать extra_scripts = pre:tools/patch32_ws.py
Import("env")
import os import os
import shutil import shutil
from sys import platform from sys import platform
pio_home = env.subst("$PROJECT_CORE_DIR")
print(pio_home)
if platform == "linux" or platform == "linux2": if platform == "linux" or platform == "linux2":
# linux # linux
mainPyPath = '/home/rise/.platformio/packages/framework-arduinoespressif32/libraries/WiFi/src/WiFiClient.cpp' #mainPyPath = '/home/rise/.platformio/packages/framework-arduinoespressif32/libraries/WiFi/src/WiFiClient.cpp'
mainPyPath = pio_home + '/packages/framework-arduinoespressif32/libraries/WiFi/src/WiFiClient.cpp'
else: else:
# windows # windows
mainPyPath = os.environ['USERPROFILE'] + '\\.platformio\\packages\\framework-arduinoespressif32\\libraries\\WiFi\\src\\WiFiClient.cpp' #mainPyPath = os.environ['USERPROFILE'] + '\\.platformio\\packages\\framework-arduinoespressif32\\libraries\\WiFi\\src\\WiFiClient.cpp'
mainPyPath = pio_home + '\\packages\\framework-arduinoespressif32\\libraries\\WiFi\\src\\WiFiClient.cpp'
# print(mainPyPath) # print(mainPyPath)
try: try:

View File

@@ -1,16 +1,22 @@
Import("env")
import json import json
import os import os
import shutil import shutil
from sys import platform from sys import platform
pio_home = env.subst("$PROJECT_CORE_DIR")
print(pio_home)
if platform == "linux" or platform == "linux2": if platform == "linux" or platform == "linux2":
# linux # linux
devkitm = '/home/rise/.platformio/platforms/espressif32/boards/esp32-c6-devkitm-1.json' #devkitm = '/home/rise/.platformio/platforms/espressif32/boards/esp32-c6-devkitm-1.json'
devkitc = '/home/rise/.platformio/platforms/espressif32/boards/esp32-c6-devkitc-1.json' #devkitc = '/home/rise/.platformio/platforms/espressif32/boards/esp32-c6-devkitc-1.json'
devkitm = pio_home + '/platforms/espressif32/boards/esp32-c6-devkitm-1.json'
devkitc = pio_home + '/platforms/espressif32/boards/esp32-c6-devkitc-1.json'
else: else:
# windows # windows
devkitm = os.environ['USERPROFILE'] + '\\.platformio\\platforms\\espressif32\\boards\\esp32-c6-devkitm-1.json' devkitm = pio_home + '\\platforms\\espressif32\\boards\\esp32-c6-devkitm-1.json'
devkitc = os.environ['USERPROFILE'] + '\\.platformio\\platforms\\espressif32\\boards\\esp32-c6-devkitc-1.json' devkitc = pio_home + '\\platforms\\espressif32\\boards\\esp32-c6-devkitc-1.json'
def add_arduino_to_frameworks(file_name): def add_arduino_to_frameworks(file_name):
try: try:

View File

@@ -18,10 +18,13 @@ else:
print("FIX 16Mb path: " + mainPyPath) print("FIX 16Mb path: " + mainPyPath)
with open(mainPyPath) as fr: try:
with open(mainPyPath) as fr:
oldData = fr.read() oldData = fr.read()
if not 'if _value == -0x6000:' in oldData: if not 'if _value == -0x6000:' in oldData:
shutil.copyfile(mainPyPath, mainPyPath+'.bak') shutil.copyfile(mainPyPath, mainPyPath+'.bak')
newData = oldData.replace('_value += 0xE00000 # correction', '_value += 0xE00000 # correction\n\n if _value == -0x6000:\n _value = env[k]-0x40200000') newData = oldData.replace('_value += 0xE00000 # correction', '_value += 0xE00000 # correction\n\n if _value == -0x6000:\n _value = env[k]-0x40200000')
with open(mainPyPath, 'w') as fw: with open(mainPyPath, 'w') as fw:
fw.write(newData) fw.write(newData)
except FileNotFoundError:
print("Файл не найден или не удается открыть")