Snapshot of JC3636W518EN kit before demo folder cleanup
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
patriandClaude Opus 5.5 committed
commit
9ee85bfd86
1862 files changed
+668877
No files matched your search
+157
@@ -0,0 +1,157 @@
|
||||
# SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
import os
|
||||
import sys
|
||||
import re
|
||||
|
||||
internal_version_file = "src/ESP_PanelVersions.h"
|
||||
internal_version_macross = [
|
||||
{
|
||||
"file": "library.properties",
|
||||
"macro": {
|
||||
"major": "ESP_PANEL_VERSION_MAJOR",
|
||||
"minor": "ESP_PANEL_VERSION_MINOR",
|
||||
"patch": "ESP_PANEL_VERSION_PATCH"
|
||||
},
|
||||
},
|
||||
{
|
||||
"file": "ESP_Panel_Conf.h",
|
||||
"macro": {
|
||||
"major": "ESP_PANEL_CONF_VERSION_MAJOR",
|
||||
"minor": "ESP_PANEL_CONF_VERSION_MINOR",
|
||||
"patch": "ESP_PANEL_CONF_VERSION_PATCH"
|
||||
},
|
||||
},
|
||||
{
|
||||
"file": "ESP_Panel_Board_Custom.h",
|
||||
"macro": {
|
||||
"major": "ESP_PANEL_BOARD_CUSTOM_VERSION_MAJOR",
|
||||
"minor": "ESP_PANEL_BOARD_CUSTOM_VERSION_MINOR",
|
||||
"patch": "ESP_PANEL_BOARD_CUSTOM_VERSION_PATCH"
|
||||
},
|
||||
},
|
||||
{
|
||||
"file": "ESP_Panel_Board_Supported.h",
|
||||
"macro": {
|
||||
"major": "ESP_PANEL_BOARD_SUPPORTED_VERSION_MAJOR",
|
||||
"minor": "ESP_PANEL_BOARD_SUPPORTED_VERSION_MINOR",
|
||||
"patch": "ESP_PANEL_BOARD_SUPPORTED_VERSION_PATCH"
|
||||
},
|
||||
},
|
||||
]
|
||||
file_version_macros = [
|
||||
{
|
||||
"file": "ESP_Panel_Conf.h",
|
||||
"macro": {
|
||||
"major": "ESP_PANEL_CONF_FILE_VERSION_MAJOR",
|
||||
"minor": "ESP_PANEL_CONF_FILE_VERSION_MINOR",
|
||||
"patch": "ESP_PANEL_CONF_FILE_VERSION_PATCH"
|
||||
},
|
||||
},
|
||||
{
|
||||
"file": "ESP_Panel_Board_Custom.h",
|
||||
"macro": {
|
||||
"major": "ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_MAJOR",
|
||||
"minor": "ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_MINOR",
|
||||
"patch": "ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_PATCH"
|
||||
},
|
||||
},
|
||||
{
|
||||
"file": "ESP_Panel_Board_Supported.h",
|
||||
"macro": {
|
||||
"major": "ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MAJOR",
|
||||
"minor": "ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MINOR",
|
||||
"patch": "ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_PATCH"
|
||||
},
|
||||
},
|
||||
]
|
||||
arduino_version_file = "library.properties"
|
||||
|
||||
|
||||
def extract_file_version(file_path, version_dict):
|
||||
file_contents = []
|
||||
content_str = ""
|
||||
with open(file_path, 'r') as file:
|
||||
file_contents.append(file.readlines())
|
||||
for content in file_contents:
|
||||
content_str = ''.join(content)
|
||||
|
||||
version_macro = version_dict['macro']
|
||||
major_version = re.search(r'#define ' + version_macro["major"] + r' (\d+)', content_str)
|
||||
minor_version = re.search(r'#define ' + version_macro["minor"] + r' (\d+)', content_str)
|
||||
patch_version = re.search(r'#define ' + version_macro["patch"] + r' (\d+)', content_str)
|
||||
|
||||
if major_version and minor_version and patch_version:
|
||||
return {"file": version_dict['file'], "version": major_version.group(1) + '.' + minor_version.group(1) + '.' + patch_version.group(1)}
|
||||
|
||||
return None
|
||||
|
||||
|
||||
def extract_arduino_version(file_path):
|
||||
file_contents = []
|
||||
content_str = ""
|
||||
with open(file_path, 'r') as file:
|
||||
file_contents.append(file.readlines())
|
||||
for content in file_contents:
|
||||
content_str = ''.join(content)
|
||||
|
||||
version = re.search(r'version=(\d+\.\d+\.\d+)', content_str)
|
||||
|
||||
if version:
|
||||
return {"file": os.path.basename(file_path), "version": version.group(1)}
|
||||
|
||||
return None
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
if len(sys.argv) >= 3:
|
||||
search_directory = sys.argv[1]
|
||||
|
||||
# Extract internal versions
|
||||
internal_version_path = os.path.join(search_directory, internal_version_file)
|
||||
internal_versions = []
|
||||
print(f"Internal version extracted from '{internal_version_path}")
|
||||
for internal_version_macros in internal_version_macross:
|
||||
version = extract_file_version(internal_version_path, internal_version_macros)
|
||||
if version:
|
||||
print(f"Internal version: '{internal_version_macros['file']}': {version}")
|
||||
internal_versions.append(version)
|
||||
else:
|
||||
print(f"'{internal_version_macros['file']}' version not found")
|
||||
sys.exit(1)
|
||||
|
||||
# Check file versions
|
||||
for i in range(2, len(sys.argv)):
|
||||
file_path = sys.argv[i]
|
||||
|
||||
if file_path in internal_version_file:
|
||||
print(f"Skipping '{file_path}'")
|
||||
continue
|
||||
|
||||
src_file = os.path.join(search_directory, os.path.basename(file_path))
|
||||
for file_version in file_version_macros:
|
||||
versions = extract_file_version(src_file, file_version)
|
||||
if versions:
|
||||
print(f"File version extracted from '{src_file}': {versions}")
|
||||
for internal_version in internal_versions:
|
||||
if (internal_version['file'] == versions['file']) and (internal_version['version'] != versions['version']):
|
||||
print(f"Version mismatch: '{internal_version['file']}'")
|
||||
sys.exit(1)
|
||||
print(f"Version matched")
|
||||
|
||||
# Extract arduino version
|
||||
arduino_version_path = os.path.join(search_directory, arduino_version_file)
|
||||
arduino_version = extract_arduino_version(arduino_version_path)
|
||||
print(f"Arduino version extracted from '{arduino_version_path}")
|
||||
if arduino_version:
|
||||
print(f"Arduino version: {arduino_version}")
|
||||
else:
|
||||
print(f"Arduino version not found")
|
||||
|
||||
# Check arduino version
|
||||
for internal_version in internal_versions:
|
||||
if (internal_version['file'] == arduino_version_file) and (internal_version['version'] != arduino_version['version']):
|
||||
print(f"Arduino version mismatch: '{internal_version['file']}'")
|
||||
sys.exit(1)
|
||||
print(f"Arduino Version matched")
|
||||
@@ -0,0 +1,64 @@
|
||||
# SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
import os
|
||||
import sys
|
||||
import shutil
|
||||
|
||||
exclude_dirs = ["./build"]
|
||||
|
||||
|
||||
def is_in_directory(file_path, directory):
|
||||
directory = os.path.realpath(directory)
|
||||
file_path = os.path.realpath(file_path)
|
||||
|
||||
return file_path.startswith(directory)
|
||||
|
||||
|
||||
def is_same_file(file1, file2):
|
||||
with open(file1, 'r') as f1, open(file2, 'r') as f2:
|
||||
file1_content = f1.read()
|
||||
file2_content = f2.read()
|
||||
|
||||
return file1_content == file2_content
|
||||
|
||||
|
||||
def replace_files(search_directory, file_path):
|
||||
if os.path.dirname(file_path) == "":
|
||||
file_path = os.path.join(search_directory, file_path)
|
||||
|
||||
filename = os.path.basename(file_path)
|
||||
src_file = os.path.join(search_directory, filename)
|
||||
|
||||
if file_path == src_file:
|
||||
for root, dirs, files in os.walk(search_directory):
|
||||
need_exclude = False
|
||||
for exclude_dir in exclude_dirs:
|
||||
if is_in_directory(root, exclude_dir):
|
||||
need_exclude = True
|
||||
break
|
||||
|
||||
if root == search_directory or need_exclude:
|
||||
continue
|
||||
|
||||
for file in files:
|
||||
if file == filename:
|
||||
dst_file = os.path.join(root, file)
|
||||
if not is_same_file(src_file, dst_file):
|
||||
print(f"Replacing '{dst_file}' with '{src_file}'...")
|
||||
shutil.copy(src_file, dst_file)
|
||||
else:
|
||||
if not is_same_file(src_file, file_path):
|
||||
print(f"Restoring '{file_path}' with '{src_file}'...")
|
||||
shutil.copy(src_file, file_path)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
if len(sys.argv) >= 3:
|
||||
search_directory = sys.argv[1]
|
||||
|
||||
for i in range(2, len(sys.argv)):
|
||||
file_path = sys.argv[i]
|
||||
replace_files(search_directory, file_path)
|
||||
|
||||
print("Replacement completed.")
|
||||
Reference in new issue
Block a user