Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added Channel Interface for Telemetry #2757

Merged
merged 13 commits into from
Jun 7, 2024
Merged

Added Channel Interface for Telemetry #2757

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b47e509
Added Chennel Interface for Telemtry
menaman123 Jun 4, 2024
7c64709
Merge branch 'nasa:devel' into telemtry_inter
menaman123 Jun 5, 2024
39aaf32
Added interfaces to tests
menaman123 Jun 5, 2024
44780d3
Merge branch 'telemtry_inter' of https://github.com/menaman123/fprime…
menaman123 Jun 5, 2024
e7bde2c
Added interfaces to tests
menaman123 Jun 5, 2024
253d32b
Fixed Events typo
menaman123 Jun 5, 2024
c22dec4
modified: cmake/test/src/test_unittests.py
menaman123 Jun 5, 2024
cde4c28
Removed spaces
menaman123 Jun 7, 2024
37d7b42
modified: cmake/test/src/test_unittests.py
menaman123 Jun 7, 2024
212fd75
Reverting LinuxSpiDriver.fpp
LeStarch Jun 7, 2024
7e229f9
Fixing formatting
LeStarch Jun 7, 2024
28c99ce
Missing comma for formatting
LeStarch Jun 7, 2024
5520d05
Removing trailing spaces
LeStarch Jun 7, 2024
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: 2 additions & 0 deletions Fw/Interfaces/ChannelInterface.fppi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@ Telemetry port
telemetry port tlmOut
4 changes: 1 addition & 3 deletions Ref/SignalGen/SignalGen.fpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,6 @@ module Ref {
@ Time get port
time get port timeCaller

@ Telemetry port
telemetry port tlmOut

@ Signal generation data product record
product record DataRecord: SignalInfo id 0

Expand Down Expand Up @@ -83,6 +80,7 @@ module Ref {
# ----------------------------------------------------------------------
include "../../Fw/Interfaces/EventsInterface.fppi"
include "../../Fw/Interfaces/CommandInterface.fppi"
include "../../Fw/Interfaces/ChannelInterface.fppi"

}

Expand Down
10 changes: 9 additions & 1 deletion cmake/test/src/test_ref_shared.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,15 @@ def test_ref_module_info(REF_BUILD):
assert ["SignalGen.cpp"] == [
Path(source).name for source in sources
], "Did not find expected sources"
expected_ac = ["SignalGen.fpp", "Commands.fppi", "Events.fppi", "Telemetry.fppi"]
expected_ac = [
"SignalGen.fpp",
"Commands.fppi",
"Events.fppi",
"Telemetry.fppi",
"CommandInterface.fppi",
"ChannelInterface.fppi",
"EventsInterface.fppi",
LeStarch marked this conversation as resolved.
Show resolved Hide resolved
]
actual_ac = [Path(source).name for source in ac_sources]
assert sorted(expected_ac) == sorted(
actual_ac
Expand Down
10 changes: 9 additions & 1 deletion cmake/test/src/test_unittests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,15 @@ def test_unittest_module_ut_info(UT_BUILD):
assert sorted(["SignalGenTester.cpp", "SignalGenTestMain.cpp"]) == sorted(
[Path(source).name for source in sources]
), "Did not find expected sources"
expected_ac = ["SignalGen.fpp", "Commands.fppi", "Events.fppi", "Telemetry.fppi"]
expected_ac = [
"SignalGen.fpp",
"Commands.fppi",
"Events.fppi",
"Telemetry.fppi",
"CommandInterface.fppi",
"ChannelInterface.fppi",
"EventsInterface.fppi",
]
actual_ac = [Path(source).name for source in ac_sources]
assert sorted(expected_ac) == sorted(
actual_ac
Expand Down
Loading