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

[nasa/Nos3#325 ] Equuleus upgrade #373

Merged
merged 6 commits into from
Oct 10, 2024
Merged

[nasa/Nos3#325 ] Equuleus upgrade #373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a36e163
[nasa/nos3#325] Updates to cFE, OSAL, PSP, TOOLS
rjbrown2 Sep 25, 2024
476912c
[nasa/nos3#325] Updates to CFE, PSP, OSAL
rjbrown2 Sep 25, 2024
7bdbc7f
[nasa/nos3#25] Update Submodule OSAL
rjbrown2 Sep 25, 2024
4981ca2
[nasa/nos3#325] Update Cfe snprintf
rjbrown2 Sep 25, 2024
062fcb0
[nasa/nos3#325] Revert nos3-mission.xml to sc-full-config instead of …
rjbrown2 Oct 10, 2024
de897ef
[nasa/nos3#325] Quick fix to change the IMU 42 IPC port to avoid conf…
jlucas9 Oct 10, 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: 1 addition & 1 deletion cfg/InOut/Inp_IPC.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ TX ! IPC Mode (OFF,TX,RX,TXRX,ACS,WRITEFILE
0 ! AC.ID for ACS mode
"IMU.42" ! File name for WRITE or READ
SERVER ! Socket Role (SERVER,CLIENT,GMSEC_CLIENT)
fortytwo 4280 ! Server Host Name, Port
fortytwo 4281 ! Server Host Name, Port
FALSE ! Allow Blocking (i.e. wait on RX)
FALSE ! Echo to stdout
1 ! Number of TX prefixes
Expand Down
2 changes: 1 addition & 1 deletion cfg/nos3-mission.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
<!--
<sc-2-cfg>sc-minimal-config.xml</sc-2-cfg>
-->
</nos3-mission-cfg>
</nos3-mission-cfg>
2 changes: 1 addition & 1 deletion cfg/sims/nos3-simulator.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,7 @@
<data-provider>
<type>GENERIC_IMU_42_PROVIDER</type>
<hostname>fortytwo</hostname>
<port>4280</port>
<port>4281</port>
<max-connection-attempts>30</max-connection-attempts>
<retry-wait-seconds>1</retry-wait-seconds>
<spacecraft>0</spacecraft>
Expand Down
2 changes: 1 addition & 1 deletion fsw/cfe
Open in desktop
Submodule cfe updated 198 files
2 changes: 1 addition & 1 deletion fsw/osal
Open in desktop
Submodule osal updated 54 files
+57 −0 .github/actions/check-coverage/action.yml
+105 −0 .github/actions/check-coverage/lcov-output.xslt
+74 −0 .github/workflows/icbundle.yml
+0 −70 .github/workflows/local_unit_test.yml
+120 −0 .github/workflows/standalone-build.yml
+39 −0 CHANGELOG.md
+48 −1 CMakeLists.txt
+4 −0 check_header.c.in
+7 −0 check_header.cpp.in
+12 −6 src/os/inc/osapi-clock.h
+1 −1 src/os/inc/osapi-file.h
+4 −2 src/os/inc/osapi-idmap.h
+11 −0 src/os/inc/osapi-macros.h
+1 −0 src/os/inc/osapi-select.h
+45 −5 src/os/inc/osapi-sockets.h
+1 −1 src/os/inc/osapi-version.h
+23 −12 src/os/portable/os-impl-bsd-sockets.c
+11 −1 src/os/portable/os-impl-no-sockets.c
+3 −3 src/os/rtems/src/os-impl-timebase.c
+9 −1 src/os/shared/inc/os-shared-sockets.h
+1 −2 src/os/shared/src/osapi-idmap.c
+80 −1 src/os/shared/src/osapi-sockets.c
+27 −6 src/tests/condvar-test/condvar-test.c
+26 −14 src/unit-test-coverage/portable/src/coveragetest-bsd-sockets.c
+2 −1 src/unit-test-coverage/portable/src/coveragetest-no-sockets.c
+105 −12 src/unit-test-coverage/shared/src/coveragetest-sockets.c
+2 −0 src/unit-test-coverage/ut-stubs/src/os-shared-common-impl-stubs.c
+23 −7 src/unit-test-coverage/ut-stubs/src/os-shared-sockets-impl-stubs.c
+1 −0 src/unit-test-coverage/ut-stubs/src/os-shared-task-impl-stubs.c
+4 −4 src/ut-stubs/osapi-binsem-stubs.c
+2 −2 src/ut-stubs/osapi-clock-stubs.c
+3 −0 src/ut-stubs/osapi-common-stubs.c
+4 −4 src/ut-stubs/osapi-countsem-stubs.c
+3 −3 src/ut-stubs/osapi-dir-stubs.c
+1 −1 src/ut-stubs/osapi-error-stubs.c
+9 −9 src/ut-stubs/osapi-file-stubs.c
+5 −5 src/ut-stubs/osapi-filesys-stubs.c
+1 −1 src/ut-stubs/osapi-heap-stubs.c
+6 −6 src/ut-stubs/osapi-idmap-stubs.c
+5 −5 src/ut-stubs/osapi-module-stubs.c
+4 −4 src/ut-stubs/osapi-mutex-stubs.c
+1 −1 src/ut-stubs/osapi-network-stubs.c
+3 −1 src/ut-stubs/osapi-printf-stubs.c
+6 −6 src/ut-stubs/osapi-queue-stubs.c
+42 −9 src/ut-stubs/osapi-sockets-stubs.c
+7 −6 src/ut-stubs/osapi-task-stubs.c
+5 −5 src/ut-stubs/osapi-timebase-stubs.c
+5 −5 src/ut-stubs/osapi-timer-stubs.c
+3 −2 src/ut-stubs/osapi-version-stubs.c
+285 −116 ut_assert/inc/utassert.h
+2 −2 ut_assert/inc/utgenstub.h
+67 −38 ut_assert/inc/utstubs.h
+194 −77 ut_assert/src/utassert.c
+346 −129 ut_assert/src/utstubs.c
2 changes: 1 addition & 1 deletion fsw/psp
Open in desktop
Submodule psp updated 28 files
+79 −0 .github/workflows/icbundle.yml
+13 −0 CHANGELOG.md
+1 −1 fsw/mcp750-vxworks/inc/psp_version.h
+2 −0 fsw/mcp750-vxworks/psp_module_list.cmake
+9 −0 fsw/modules/iodriver/CMakeLists.txt
+71 −0 fsw/modules/iodriver/inc/iodriver_analog_io.h
+172 −0 fsw/modules/iodriver/inc/iodriver_base.h
+64 −0 fsw/modules/iodriver/inc/iodriver_discrete_io.h
+55 −0 fsw/modules/iodriver/inc/iodriver_impl.h
+65 −0 fsw/modules/iodriver/inc/iodriver_memory_io.h
+71 −0 fsw/modules/iodriver/inc/iodriver_packet_io.h
+66 −0 fsw/modules/iodriver/inc/iodriver_stream_io.h
+153 −0 fsw/modules/iodriver/src/iodriver.c
+15 −0 fsw/modules/iodriver/ut-stubs/CMakeLists.txt
+51 −0 fsw/modules/iodriver/ut-stubs/iodriver_base_stubs.c
+49 −0 fsw/modules/iodriver/ut-stubs/iodriver_impl_stubs.c
+4 −0 fsw/modules/linux_sysmon/CMakeLists.txt
+593 −0 fsw/modules/linux_sysmon/linux_sysmon.c
+5 −0 fsw/modules/rtems_sysmon/CMakeLists.txt
+498 −0 fsw/modules/rtems_sysmon/rtems_sysmon.c
+5 −0 fsw/modules/vxworks_sysmon/CMakeLists.txt
+493 −0 fsw/modules/vxworks_sysmon/vxworks_sysmon.c
+1 −1 fsw/pc-linux/inc/psp_version.h
+2 −0 fsw/pc-linux/psp_module_list.cmake
+1 −1 fsw/pc-rtems/inc/psp_version.h
+2 −0 fsw/pc-rtems/psp_module_list.cmake
+3 −1 fsw/shared/inc/cfe_psp_module.h
+39 −6 fsw/shared/src/cfe_psp_module.c
Loading