Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/skills/fprime-fpp-navigation/SKILL.md
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,6 @@ Argument passing: primitives by value, enums/structs/arrays `const T&`,
- `fprime-util generate` refuses to run when the installed `fpp` does
not match `cmake/required.cmake`; build the venv from the
framework's `requirements.txt`.
- `fpp-to-json` is **not** a shortcut: it emits 15–30× the size of the
source file.

---

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-test-rhel8.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
ccache: "false"
- name: Build Framework
run: |
fprime-util generate -DFPRIME_ENABLE_JSON_MODEL_GENERATION=ON 2>&1 | output-cleaner
fprime-util generate 2>&1 | output-cleaner
fprime-util build --all -j4 2>&1 | output-cleaner
shell: bash

Expand Down Expand Up @@ -80,7 +80,7 @@ jobs:
- name: Build Ref
run: |
cd TestDeploymentsProject
fprime-util generate -DFPRIME_ENABLE_JSON_MODEL_GENERATION=ON 2>&1 | output-cleaner
fprime-util generate 2>&1 | output-cleaner
fprime-util build -j4 2>&1 | output-cleaner
shell: bash

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/fpp-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
- name: "Generate UT build cache"
working-directory: ./FppTestProject
run: |
fprime-util generate --ut -DFPRIME_ENABLE_JSON_MODEL_GENERATION=ON 2>&1 | output-cleaner
fprime-util generate --ut 2>&1 | output-cleaner
shell: bash
- name: "Build UTs"
working-directory: ./FppTestProject/FppTest
Expand Down Expand Up @@ -81,7 +81,7 @@ jobs:
- name: "Generate UT build cache"
working-directory: ./FppTestProject
run: |
fprime-util generate --ut -DFPRIME_ENABLE_DIRECT_PORT_CALLS=ON -DFPRIME_ENABLE_JSON_MODEL_GENERATION=ON 2>&1 | output-cleaner
fprime-util generate --ut -DFPRIME_ENABLE_DIRECT_PORT_CALLS=ON 2>&1 | output-cleaner
shell: bash
- name: "Build UTs"
working-directory: ./FppTestProject/FppTest
Expand Down
53 changes: 0 additions & 53 deletions .github/workflows/fpp-to-json.yml

This file was deleted.

4 changes: 3 additions & 1 deletion Os/Generic/docs/sdd.md
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,8 @@ F´ provides `priority_buffer_analyzer.py` to automatically calculate the maximu

**Script Location**: `${FPRIME_FRAMEWORK_PATH}/cmake/autocoder/scripts/priority_buffer_analyzer.py`

**Requirements**: the `fprime-fpp-python` package (installed by F´'s `requirements.txt`). The script analyzes the topology's FPP model in-process and needs no extra CMake options.

**Integration Steps**:

1. **Add CMake hook in Deployment CMakeLists.txt**:
Expand Down Expand Up @@ -310,7 +312,7 @@ namespace PriorityBufferConfig {
```

**How It Works**:
1. Script parses topology dictionaries to identify all port connections by priority
1. Script analyzes the topology's FPP model to find each instantiated component's async input ports, internal ports, and async commands by priority
2. For each component and priority, finds maximum serialized size across all port types
3. Adds `DATA_OFFSET` (priority + port ID overhead) to each size
4. Generates namespaced constants for use in configuration
Expand Down
9 changes: 0 additions & 9 deletions cmake/FPrime.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -153,15 +153,6 @@ macro(fprime_initialize_build_system)
# Perform necessary sub-builds
if (NOT FPRIME_IS_SUB_BUILD)
set(SUB_BUILD_TARGETS target/sub-build/fpp_locs target/sub-build/fpp_depend)
if (FPRIME_ENABLE_JSON_MODEL_GENERATION)
fprime_cmake_warning(
"FPRIME_ENABLE_JSON_MODEL_GENERATION is deprecated and will be removed in a future release.\n"
"The FPP JSON model is superseded by the native FPP Python bindings (fprime-fpp-python).\n"
"FPP 3.4.0, shipped with F Prime 4.4.0, is the last version to support the JSON model.\n"
"Migration guide: https://github.com/fprime-community/fprime-python-model/blob/main/MIGRATION.md\n"
)
list(APPEND SUB_BUILD_TARGETS target/sub-build/fpp_to_json)
endif()
list(APPEND SUB_BUILD_TARGETS target/sub-build/module_info)
run_sub_build(info-cache ${SUB_BUILD_TARGETS})
# Import the pre-computed properties!
Expand Down
Loading
Loading