diff --git a/.github/workflows/build_iotm.yml b/.github/workflows/build_iotm.yml index d30a26da..78ed394d 100644 --- a/.github/workflows/build_iotm.yml +++ b/.github/workflows/build_iotm.yml @@ -1,5 +1,5 @@ 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 diff --git a/tools/patch32_ws.py b/tools/patch32_ws.py index 5c7d21c6..b56d5159 100644 --- a/tools/patch32_ws.py +++ b/tools/patch32_ws.py @@ -3,17 +3,22 @@ # #define WIFI_CLIENT_MAX_WRITE_RETRY (10) # #define WIFI_CLIENT_SELECT_TIMEOUT_US (1000000) # Прописать скрипт в platformio.ini внутри [env:esp32_4mb3f] написать extra_scripts = pre:tools/patch32_ws.py - +Import("env") import os import shutil from sys import platform +pio_home = env.subst("$PROJECT_CORE_DIR") +print(pio_home) + if platform == "linux" or platform == "linux2": # 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: # 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) try: diff --git a/tools/patch32c6.py b/tools/patch32c6.py index adaa1fc6..3264c06f 100644 --- a/tools/patch32c6.py +++ b/tools/patch32c6.py @@ -1,16 +1,22 @@ +Import("env") import json import os import shutil from sys import platform +pio_home = env.subst("$PROJECT_CORE_DIR") +print(pio_home) + if platform == "linux" or platform == "linux2": # linux - devkitm = '/home/rise/.platformio/platforms/espressif32/boards/esp32-c6-devkitm-1.json' - devkitc = '/home/rise/.platformio/platforms/espressif32/boards/esp32-c6-devkitc-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' + devkitm = pio_home + '/platforms/espressif32/boards/esp32-c6-devkitm-1.json' + devkitc = pio_home + '/platforms/espressif32/boards/esp32-c6-devkitc-1.json' else: # windows - devkitm = os.environ['USERPROFILE'] + '\\.platformio\\platforms\\espressif32\\boards\\esp32-c6-devkitm-1.json' - devkitc = os.environ['USERPROFILE'] + '\\.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' def add_arduino_to_frameworks(file_name): try: diff --git a/tools/patch8266_16m.py b/tools/patch8266_16m.py index 5e170751..89311217 100644 --- a/tools/patch8266_16m.py +++ b/tools/patch8266_16m.py @@ -18,10 +18,13 @@ else: print("FIX 16Mb path: " + mainPyPath) -with open(mainPyPath) as fr: - oldData = fr.read() - if not 'if _value == -0x6000:' in oldData: - shutil.copyfile(mainPyPath, mainPyPath+'.bak') - 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: - fw.write(newData) \ No newline at end of file +try: + with open(mainPyPath) as fr: + oldData = fr.read() + if not 'if _value == -0x6000:' in oldData: + shutil.copyfile(mainPyPath, mainPyPath+'.bak') + 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: + fw.write(newData) +except FileNotFoundError: + print("Файл не найден или не удается открыть") \ No newline at end of file