Skip to content

Commit 1374c9f

Browse files
authored
Merge pull request #14 from lasp/feature/update-all-components
Update all components
2 parents 1618b96 + cf2d3a0 commit 1374c9f

File tree

53 files changed

+846
-1032
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+846
-1032
lines changed

.github/workflows/publish_all.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,22 @@ jobs:
2626
uses: actions/checkout@v4
2727
with:
2828
set-safe-directory: true
29-
# Use dinkelk cmake-update fork for now until compilation is fixed for Linux
30-
repository: dinkelk/fp32-fsw-xmera
29+
repository: lasp/fp32-fsw-xmera
3130
path: fp32-fsw-xmera
32-
ref: cmake-update
31+
ref: develop
3332
- name: Clone adamant repository
3433
uses: actions/checkout@v4
3534
with:
3635
set-safe-directory: true
3736
repository: lasp/adamant
3837
path: adamant
39-
- name: Clone Eigen 3.4.1 from GitLab
40-
run: |
41-
git clone --depth 1 --branch 3.4.1 https://gitlab.com/libeigen/eigen.git eigen
38+
- name: Clone Eigen with freestanding support
39+
uses: actions/checkout@v4
40+
with:
41+
set-safe-directory: true
42+
repository: lasp/eigen
43+
path: eigen
44+
ref: feature/freestanding
4245
- name: Build all documentation
4346
run: bash adamant-xmera-components/env/github_run.sh "redo adamant-xmera-components/publish"
4447
- run: echo "Finished with status - ${{ job.status }}."

.github/workflows/publish_all_arm64.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,17 @@ jobs:
3131
uses: actions/checkout@v4
3232
with:
3333
set-safe-directory: true
34-
# Use dinkelk cmake-update fork for now until compilation is fixed for Linux
35-
repository: dinkelk/fp32-fsw-xmera
34+
repository: lasp/fp32-fsw-xmera
3635
path: fp32-fsw-xmera
37-
ref: cmake-update
36+
ref: develop
3837

39-
- name: Clone Eigen 3.4.1 from GitLab
40-
run: |
41-
git clone --depth 1 --branch 3.4.1 https://gitlab.com/libeigen/eigen.git eigen
38+
- name: Clone Eigen with freestanding support
39+
uses: actions/checkout@v4
40+
with:
41+
set-safe-directory: true
42+
repository: lasp/eigen
43+
path: eigen
44+
ref: feature/freestanding
4245

4346
- name: Build all documentation
4447
run: |

.github/workflows/style_all.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,22 @@ jobs:
2626
uses: actions/checkout@v4
2727
with:
2828
set-safe-directory: true
29-
# Use dinkelk cmake-update fork for now until compilation is fixed for Linux
30-
repository: dinkelk/fp32-fsw-xmera
29+
repository: lasp/fp32-fsw-xmera
3130
path: fp32-fsw-xmera
32-
ref: cmake-update
31+
ref: develop
3332
- name: Clone adamant repository
3433
uses: actions/checkout@v4
3534
with:
3635
set-safe-directory: true
3736
repository: lasp/adamant
3837
path: adamant
39-
- name: Clone Eigen 3.4.1 from GitLab
40-
run: |
41-
git clone --depth 1 --branch 3.4.1 https://gitlab.com/libeigen/eigen.git eigen
38+
- name: Clone Eigen with freestanding support
39+
uses: actions/checkout@v4
40+
with:
41+
set-safe-directory: true
42+
repository: lasp/eigen
43+
path: eigen
44+
ref: feature/freestanding
4245
- name: Check all style
4346
run: bash adamant-xmera-components/env/github_run.sh "redo adamant-xmera-components/style_all"
4447
- name: Archive logs for failed style checks

.github/workflows/style_all_arm64.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,17 @@ jobs:
3131
uses: actions/checkout@v4
3232
with:
3333
set-safe-directory: true
34-
# Use dinkelk cmake-update fork for now until compilation is fixed for Linux
35-
repository: dinkelk/fp32-fsw-xmera
34+
repository: lasp/fp32-fsw-xmera
3635
path: fp32-fsw-xmera
37-
ref: cmake-update
36+
ref: develop
3837

39-
- name: Clone Eigen 3.4.1 from GitLab
40-
run: |
41-
git clone --depth 1 --branch 3.4.1 https://gitlab.com/libeigen/eigen.git eigen
38+
- name: Clone Eigen with freestanding support
39+
uses: actions/checkout@v4
40+
with:
41+
set-safe-directory: true
42+
repository: lasp/eigen
43+
path: eigen
44+
ref: feature/freestanding
4245

4346
- name: Check all style
4447
run: |

.github/workflows/test_all.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,22 @@ jobs:
2626
uses: actions/checkout@v4
2727
with:
2828
set-safe-directory: true
29-
# Use dinkelk cmake-update fork for now until compilation is fixed for Linux
30-
repository: dinkelk/fp32-fsw-xmera
29+
repository: lasp/fp32-fsw-xmera
3130
path: fp32-fsw-xmera
32-
ref: cmake-update
31+
ref: develop
3332
- name: Clone adamant repository
3433
uses: actions/checkout@v4
3534
with:
3635
set-safe-directory: true
3736
repository: lasp/adamant
3837
path: adamant
39-
- name: Clone Eigen 3.4.1 from GitLab
40-
run: |
41-
git clone --depth 1 --branch 3.4.1 https://gitlab.com/libeigen/eigen.git eigen
38+
- name: Clone Eigen with freestanding support
39+
uses: actions/checkout@v4
40+
with:
41+
set-safe-directory: true
42+
repository: lasp/eigen
43+
path: eigen
44+
ref: feature/freestanding
4245
- name: Run all unit tests and coverage
4346
run: bash adamant-xmera-components/env/github_run.sh "redo adamant-xmera-components/coverage_all"
4447
- name: Archive logs for failed unit tests

.github/workflows/test_all_arm64.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,17 @@ jobs:
3131
uses: actions/checkout@v4
3232
with:
3333
set-safe-directory: true
34-
# Use dinkelk cmake-update fork for now until compilation is fixed for Linux
35-
repository: dinkelk/fp32-fsw-xmera
34+
repository: lasp/fp32-fsw-xmera
3635
path: fp32-fsw-xmera
37-
ref: cmake-update
36+
ref: develop
3837

39-
- name: Clone Eigen 3.4.1 from GitLab
40-
run: |
41-
git clone --depth 1 --branch 3.4.1 https://gitlab.com/libeigen/eigen.git eigen
38+
- name: Clone Eigen with freestanding support
39+
uses: actions/checkout@v4
40+
with:
41+
set-safe-directory: true
42+
repository: lasp/eigen
43+
path: eigen
44+
ref: feature/freestanding
4245

4346
- name: Run all unit tests and coverage
4447
run: |

src/components/attitude_tracking_error/att_tracking_error_algorithm_c.ads

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,14 @@ package Att_Tracking_Error_Algorithm_C is
3030
External_Name => "AttTrackingErrorAlgorithm_destroy";
3131

3232
--* @brief Run the update step of the attitude tracking error algorithm.
33-
--* @param Self The algorithm instance.
34-
--* @param Current_Sim_Nanos Current simulation time (ns).
35-
--* @param Att_Ref_In Pointer to reference-frame message payload.
36-
--* @param Att_Nav_In Pointer to navigation attitude message payload.
33+
--* @param Self The algorithm instance.
34+
--* @param Att_Ref_In Pointer to reference-frame message payload.
35+
--* @param Att_Nav_In Pointer to navigation attitude message payload.
3736
--* @return Computed guidance message payload.
3837
function Update
39-
(Self : Att_Tracking_Error_Algorithm_Access;
40-
Current_Sim_Nanos : Unsigned_64;
41-
Att_Ref_In : Att_Ref.C.U_C_Access;
42-
Att_Nav_In : Nav_Att.C.U_C_Access)
38+
(Self : Att_Tracking_Error_Algorithm_Access;
39+
Att_Ref_In : Att_Ref.C.U_C_Access;
40+
Att_Nav_In : Nav_Att.C.U_C_Access)
4341
return Att_Guid.C.U_C
4442
with Import => True,
4543
Convention => C,

src/components/attitude_tracking_error/component-attitude_tracking_error-implementation.adb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@ package body Component.Attitude_Tracking_Error.Implementation is
6060
Nav_C : aliased Nav_Att.C.U_C := Nav_Att.C.To_C (Nav_Att.Unpack (Nav));
6161
Guid : constant Att_Guid.C.U_C := Update (
6262
Self.Alg,
63-
-- TODO, this is unused by algorithm, need to remove from C interface
64-
Current_Sim_Nanos => 0,
6563
Att_Ref_In => Ref_C'Unchecked_Access,
6664
Att_Nav_In => Nav_C'Unchecked_Access
6765
);
File renamed without changes.

src/components/stepper_motor_controller/stepper_motor_controller.component.yaml renamed to src/components/body_rate_miscompare/body_rate_miscompare.component.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
2-
description: Stepper motor controller algorithm computes commanded motor steps from the reference angle input.
2+
description: Compares IMU and star tracker body rates and falls back to IMU solution if they disagree.
33
execution: passive
44
init:
5-
description: Initializes the stepper motor controller algorithm.
5+
description: Initializes the body rate miscompare algorithm.
66
connectors:
77
- description: Run the algorithm up to the current time.
88
type: Tick.T
@@ -11,8 +11,8 @@ connectors:
1111
type: Data_Product_Fetch.T
1212
return_type: Data_Product_Return.T
1313
kind: request
14-
- description: The motor step command output connector
15-
type: Motor_Step_Command.T
14+
- description: The data product invoker connector
15+
type: Data_Product.T
1616
kind: send
1717
- description: The parameter update connector.
1818
type: Parameter_Update.T

0 commit comments

Comments
 (0)