Remove TactilityC and Firmware subprojects (#638)
- Removed TactilityC, moved its symbols to existing modules and several new ones (pthread-module, c-symbols-module, cpp-symbols-module, posix-symbols-module, freertos-module). - Removed Firmware subproject and moved main() into Tactility subproject. - Strengthened application archive, path, version, stack-size, and device validation. - Moved symbol resolution for elf_loader to app-esp32-module. - Improved `struct Module` declarations and made module and symbol definitions in modules more consistent. - Removed old http download code from Tactility subproject. - Rename app-module's source files for consistency. - Add missing pthread symbols. - Kernel module symbols are now resolvable on all platforms.
This commit is contained in:
committed by
GitHub
parent
d3556fb536
commit
19b11eb9a8
@@ -1,6 +1,5 @@
|
||||
idf_component_register(
|
||||
INCLUDE_DIRS
|
||||
"Libraries/TactilityC/include"
|
||||
"Libraries/TactilityKernel/include"
|
||||
"Libraries/TactilityFreeRtos/Include"
|
||||
"Libraries/lvgl/include"
|
||||
@@ -11,13 +10,11 @@ idf_component_register(
|
||||
)
|
||||
|
||||
# Regular and core features
|
||||
add_prebuilt_library(TactilityC Libraries/TactilityC/binary/libTactilityC.a)
|
||||
add_prebuilt_library(TactilityKernel Libraries/TactilityKernel/binary/libTactilityKernel.a)
|
||||
add_prebuilt_library(lvgl Libraries/lvgl/binary/liblvgl.a)
|
||||
add_prebuilt_library(minmea Libraries/minmea/binary/libminmea.a)
|
||||
add_prebuilt_library(minitar Libraries/minitar/binary/libminitar.a)
|
||||
|
||||
target_link_libraries(${COMPONENT_LIB} INTERFACE TactilityC)
|
||||
target_link_libraries(${COMPONENT_LIB} INTERFACE TactilityKernel)
|
||||
target_link_libraries(${COMPONENT_LIB} INTERFACE lvgl)
|
||||
target_link_libraries(${COMPONENT_LIB} INTERFACE minmea)
|
||||
|
||||
@@ -5,7 +5,6 @@ import time
|
||||
|
||||
def build(device: str) -> bool:
|
||||
print(f"Building {device}...")
|
||||
shutil.rmtree(os.path.join('Firmware', 'Generated'), ignore_errors=True)
|
||||
result = subprocess.run(['python', 'device.py', device], capture_output=True, text=True)
|
||||
if result.returncode != 0:
|
||||
print(f"Failed to select device {device}")
|
||||
|
||||
@@ -131,11 +131,6 @@ def main():
|
||||
# Mapping logic
|
||||
mappings = [
|
||||
{'src': 'version.txt', 'dst': ''},
|
||||
# TactilityC
|
||||
{'src': 'build/esp-idf/TactilityC/libTactilityC.a', 'dst': 'Libraries/TactilityC/binary/'},
|
||||
{'src': 'TactilityC/Include/*', 'dst': 'Libraries/TactilityC/include/'},
|
||||
{'src': 'TactilityC/CMakeLists.txt', 'dst': 'Libraries/TactilityC/'},
|
||||
{'src': 'TactilityC/LICENSE*.*', 'dst': 'Libraries/TactilityC/'},
|
||||
# TactilityFreeRtos
|
||||
{'src': 'TactilityFreeRtos/Include/**', 'dst': 'Libraries/TactilityFreeRtos/Include/'},
|
||||
{'src': 'TactilityFreeRtos/CMakeLists.txt', 'dst': 'Libraries/TactilityFreeRtos/'},
|
||||
|
||||
@@ -9,9 +9,9 @@
|
||||
build_path=$1
|
||||
target_path=$2
|
||||
|
||||
mkdir -p $target_path
|
||||
mkdir -p "$target_path"
|
||||
|
||||
cp version.txt $target_path
|
||||
cp $build_path/Firmware/FirmwareSim $target_path/
|
||||
cp -r Data/data $target_path/
|
||||
cp -r Data/system $target_path/
|
||||
cp version.txt "$target_path"
|
||||
cp "$build_path/Tactility/Tactility" "$target_path/"
|
||||
cp -r Data/data "$target_path/"
|
||||
cp -r Data/system "$target_path/"
|
||||
|
||||
Reference in New Issue
Block a user