From 17949a56da3521526088bc3dac2a5492a5c4a837 Mon Sep 17 00:00:00 2001 From: Mit4el Date: Wed, 27 Nov 2024 01:00:43 +0300 Subject: [PATCH] undo ~, try exception --- tools/patch32_ws.py | 22 ++++++++++++---------- tools/patch32c6.py | 29 ++++++++++++++++------------- 2 files changed, 28 insertions(+), 23 deletions(-) diff --git a/tools/patch32_ws.py b/tools/patch32_ws.py index c30cfa43..5c7d21c6 100644 --- a/tools/patch32_ws.py +++ b/tools/patch32_ws.py @@ -10,18 +10,20 @@ from sys import platform if platform == "linux" or platform == "linux2": # linux - mainPyPath = '~/.platformio/packages/framework-arduinoespressif32/libraries/WiFi/src/WiFiClient.cpp' + mainPyPath = '/home/rise/.platformio/packages/framework-arduinoespressif32/libraries/WiFi/src/WiFiClient.cpp' else: # windows mainPyPath = os.environ['USERPROFILE'] + '\\.platformio\\packages\\framework-arduinoespressif32\\libraries\\WiFi\\src\\WiFiClient.cpp' # print(mainPyPath) - -with open(mainPyPath) as fr: - oldData = fr.read() - if not 'if WIFI_CLIENT_MAX_WRITE_RETRY (10)' in oldData: - shutil.copyfile(mainPyPath, mainPyPath+'.bak') - newData = oldData.replace('#define WIFI_CLIENT_MAX_WRITE_RETRY (10)', '#define WIFI_CLIENT_MAX_WRITE_RETRY (2)') - newData = newData.replace('#define WIFI_CLIENT_SELECT_TIMEOUT_US (1000000)', '#define WIFI_CLIENT_SELECT_TIMEOUT_US (500000)') - 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 WIFI_CLIENT_MAX_WRITE_RETRY (10)' in oldData: + shutil.copyfile(mainPyPath, mainPyPath+'.bak') + newData = oldData.replace('#define WIFI_CLIENT_MAX_WRITE_RETRY (10)', '#define WIFI_CLIENT_MAX_WRITE_RETRY (2)') + newData = newData.replace('#define WIFI_CLIENT_SELECT_TIMEOUT_US (1000000)', '#define WIFI_CLIENT_SELECT_TIMEOUT_US (500000)') + with open(mainPyPath, 'w') as fw: + fw.write(newData) +except FileNotFoundError: + print("Файл не найден или не удается открыть") \ No newline at end of file diff --git a/tools/patch32c6.py b/tools/patch32c6.py index b05c8da7..adaa1fc6 100644 --- a/tools/patch32c6.py +++ b/tools/patch32c6.py @@ -5,25 +5,28 @@ from sys import platform if platform == "linux" or platform == "linux2": # linux - devkitm = '~/.platformio/platforms/espressif32/boards/esp32-c6-devkitm-1.json' - devkitc = '~/.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' 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' def add_arduino_to_frameworks(file_name): - with open(file_name, 'r+') as f: - data = json.load(f) - frameworks = data['frameworks'] - if 'arduino' not in frameworks: - frameworks.insert(frameworks.index('espidf') + 1, 'arduino') - data['frameworks'] = frameworks - f.seek(0) - json.dump(data, f, indent=4) - f.truncate() - else: - print(f"Arduino already exists in {file_name}") + try: + with open(file_name, 'r+') as f: + data = json.load(f) + frameworks = data['frameworks'] + if 'arduino' not in frameworks: + frameworks.insert(frameworks.index('espidf') + 1, 'arduino') + data['frameworks'] = frameworks + f.seek(0) + json.dump(data, f, indent=4) + f.truncate() + else: + print(f"Arduino already exists in {file_name}") + except FileNotFoundError: + print("Файл не найден или не удается открыть") if os.path.exists(devkitm) and os.path.exists(devkitc): add_arduino_to_frameworks(devkitm)