Skip to content

Commit 36d5278

Browse files
asiemsenasiemsen
committed
finished renaming to build
1 parent 4ad69fc commit 36d5278

File tree

16 files changed

+87
-90
lines changed

16 files changed

+87
-90
lines changed

‎FprimeZephyrReference/Components/Drv/CMakeLists.txt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# Include project-wide components here
2-
32
add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/Helpers/")
4-
add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/Lis2mdlDriver/")
5-
add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/Lsm6dsoDriver/")
3+
add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/Lis2mdlManager/")
4+
add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/Lsm6dsoManager/")
65
add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/Types/")

‎FprimeZephyrReference/Components/Drv/Helpers/CMakeLists.txt‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,10 @@
1515
# `Ref/SignalGen/CMakeLists.txt` will be named `Ref_SignalGen`.
1616

1717
register_fprime_library(
18-
AUTOCODER_INPUTS
19-
"${CMAKE_CURRENT_LIST_DIR}/Helpers.fpp"
2018
SOURCES
2119
"${CMAKE_CURRENT_LIST_DIR}/Helpers.cpp"
22-
# DEPENDS
23-
# MyPackage_MyOtherModule
20+
DEPENDS
21+
Fw_Types
2422
)
2523

2624
### Unit Tests ###

‎FprimeZephyrReference/Components/Drv/Lis2mdlDriver/CMakeLists.txt‎ renamed to ‎FprimeZephyrReference/Components/Drv/Lis2mdlManager/CMakeLists.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,20 @@
1616

1717
register_fprime_library(
1818
AUTOCODER_INPUTS
19-
"${CMAKE_CURRENT_LIST_DIR}/Lis2mdlDriver.fpp"
19+
"${CMAKE_CURRENT_LIST_DIR}/Lis2mdlManager.fpp"
2020
SOURCES
21-
"${CMAKE_CURRENT_LIST_DIR}/Lis2mdlDriver.cpp"
21+
"${CMAKE_CURRENT_LIST_DIR}/Lis2mdlManager.cpp"
2222
DEPENDS
2323
FprimeZephyrReference_Components_Drv_Helpers
2424
)
2525

2626
### Unit Tests ###
2727
# register_fprime_ut(
2828
# AUTOCODER_INPUTS
29-
# "${CMAKE_CURRENT_LIST_DIR}/Lis2mdlDriver.fpp"
29+
# "${CMAKE_CURRENT_LIST_DIR}/Lis2mdlManager.fpp"
3030
# SOURCES
31-
# "${CMAKE_CURRENT_LIST_DIR}/test/ut/Lis2mdlDriverTestMain.cpp"
32-
# "${CMAKE_CURRENT_LIST_DIR}/test/ut/Lis2mdlDriverTester.cpp"
31+
# "${CMAKE_CURRENT_LIST_DIR}/test/ut/Lis2mdlManagerTestMain.cpp"
32+
# "${CMAKE_CURRENT_LIST_DIR}/test/ut/Lis2mdlManagerTester.cpp"
3333
# DEPENDS
3434
# STest # For rules-based testing
3535
# UT_AUTO_HELPERS

‎FprimeZephyrReference/Components/Drv/Lis2mdlDriver/Lis2mdlDriver.cpp‎ renamed to ‎FprimeZephyrReference/Components/Drv/Lis2mdlManager/Lis2mdlManager.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// ======================================================================
2-
// \title Lis2mdlDriver.cpp
3-
// \brief cpp file for Lis2mdlDriver component implementation class
2+
// \title Lis2mdlManager.cpp
3+
// \brief cpp file for Lis2mdlManager component implementation class
44
// ======================================================================
55

6-
#include "FprimeZephyrReference/Components/Drv/Lis2mdlDriver/Lis2mdlDriver.hpp"
6+
#include "FprimeZephyrReference/Components/Drv/Lis2mdlManager/Lis2mdlManager.hpp"
77

88
#include <Fw/Types/Assert.hpp>
99

@@ -13,19 +13,19 @@ namespace Drv {
1313
// Component construction and destruction
1414
// ----------------------------------------------------------------------
1515

16-
Lis2mdlDriver ::Lis2mdlDriver(const char* const compName) : Lis2mdlDriverComponentBase(compName) {
16+
Lis2mdlManager ::Lis2mdlManager(const char* const compName) : Lis2mdlManagerComponentBase(compName) {
1717
// Initialize the lis2mdl sensor
1818
lis2mdl = device_get_binding("LIS2MDL");
1919
FW_ASSERT(device_is_ready(lis2mdl));
2020
}
2121

22-
Lis2mdlDriver ::~Lis2mdlDriver() {}
22+
Lis2mdlManager ::~Lis2mdlManager() {}
2323

2424
// ----------------------------------------------------------------------
2525
// Handler implementations for typed input ports
2626
// ----------------------------------------------------------------------
2727

28-
Drv::MagneticField Lis2mdlDriver ::magneticFieldRead_handler(FwIndexType portNum) {
28+
Drv::MagneticField Lis2mdlManager ::magneticFieldRead_handler(FwIndexType portNum) {
2929
if (!device_is_ready(lis2mdl)) {
3030
this->log_WARNING_HI_DeviceNotReady();
3131
return Drv::MagneticField(0.0, 0.0, 0.0);

‎FprimeZephyrReference/Components/Drv/Lis2mdlDriver/Lis2mdlDriver.fpp‎ renamed to ‎FprimeZephyrReference/Components/Drv/Lis2mdlManager/Lis2mdlManager.fpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ module Drv {
55

66
# Component definition
77
module Drv {
8-
@ LIS2MDL Driver Component for F Prime FSW framework.
9-
passive component Lis2mdlDriver {
8+
@ LIS2MDL Manager Component for F Prime FSW framework.
9+
passive component Lis2mdlManager {
1010
@ Port to read the current magnetic field in gauss.
1111
sync input port magneticFieldRead: MagneticFieldRead
1212

‎FprimeZephyrReference/Components/Drv/Lis2mdlDriver/Lis2mdlDriver.hpp‎ renamed to ‎FprimeZephyrReference/Components/Drv/Lis2mdlManager/Lis2mdlManager.hpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
// ======================================================================
2-
// \title Lis2mdlDriver.hpp
3-
// \brief hpp file for Lis2mdlDriver component implementation class
2+
// \title Lis2mdlManager.hpp
3+
// \brief hpp file for Lis2mdlManager component implementation class
44
// ======================================================================
55

6-
#ifndef Components_Lis2mdlDriver_HPP
7-
#define Components_Lis2mdlDriver_HPP
6+
#ifndef Components_Lis2mdlManager_HPP
7+
#define Components_Lis2mdlManager_HPP
88

99
// clang-format off
1010
// Keep the includes in this order
11-
#include "FprimeZephyrReference/Components/Drv/Lis2mdlDriver/Lis2mdlDriverComponentAc.hpp"
11+
#include "FprimeZephyrReference/Components/Drv/Lis2mdlManager/Lis2mdlManagerComponentAc.hpp"
1212
#include "FprimeZephyrReference/Components/Drv/Helpers/Helpers.hpp"
1313
// clang-format on
1414

@@ -18,17 +18,17 @@
1818

1919
namespace Drv {
2020

21-
class Lis2mdlDriver final : public Lis2mdlDriverComponentBase {
21+
class Lis2mdlManager final : public Lis2mdlManagerComponentBase {
2222
public:
2323
// ----------------------------------------------------------------------
2424
// Component construction and destruction
2525
// ----------------------------------------------------------------------
2626

27-
//! Construct Lis2mdlDriver object
28-
Lis2mdlDriver(const char* const compName);
27+
//! Construct Lis2mdlManager object
28+
Lis2mdlManager(const char* const compName);
2929

30-
//! Destroy Lis2mdlDriver object
31-
~Lis2mdlDriver();
30+
//! Destroy Lis2mdlManager object
31+
~Lis2mdlManager();
3232

3333
private:
3434
// ----------------------------------------------------------------------

‎FprimeZephyrReference/Components/Drv/Lis2mdlDriver/docs/sdd.md‎ renamed to ‎FprimeZephyrReference/Components/Drv/Lis2mdlManager/docs/sdd.md‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
# Components::Lis2mdlDriver
1+
# Components::Lis2mdlManager
22

3-
The LIS2MDL Driver component interfaces with the LIS2MDL magnetometer to provide magnetic field measurements.
3+
The LIS2MDL Manager component interfaces with the LIS2MDL magnetometer to provide magnetic field measurements.
44

55
## Usage Examples
66

7-
The LIS2MDL Driver component is designed to be called periodically to collect and return sensor data. It operates as a passive component that responds to manager calls.
7+
The LIS2MDL Manager component is designed to be called periodically to collect and return sensor data. It operates as a passive component that responds to manager calls.
88

99
### Typical Usage
1010

@@ -20,17 +20,17 @@ The LIS2MDL Driver component is designed to be called periodically to collect an
2020
```mermaid
2121
classDiagram
2222
namespace Components {
23-
class Lis2mdlDriverComponentBase {
23+
class Lis2mdlManagerComponentBase {
2424
<<Auto-generated>>
2525
}
26-
class Lis2mdlDriver {
26+
class Lis2mdlManager {
2727
- lis2mdl: device*
28-
+ Lis2mdlDriver(char* compName)
29-
+ ~Lis2mdlDriver()
28+
+ Lis2mdlManager(char* compName)
29+
+ ~Lis2mdlManager()
3030
- magneticFieldRead_handler(FwIndexType portNum): Drv::MagneticField
3131
}
3232
}
33-
Lis2mdlDriverComponentBase <|-- Lis2mdlDriver : inherits
33+
Lis2mdlManagerComponentBase <|-- Lis2mdlManager : inherits
3434
```
3535

3636
## Port Descriptions
@@ -43,16 +43,16 @@ classDiagram
4343
```mermaid
4444
sequenceDiagram
4545
participant Manager
46-
participant LIS2MDL Driver
46+
participant LIS2MDL Manager
4747
participant Zephyr Sensor API
4848
participant LIS2MDL Sensor
4949
50-
Manager-->>LIS2MDL Driver: Call MagneticFieldRead synchronous input port
51-
LIS2MDL Driver->>Zephyr Sensor API: Fetch sensor data
50+
Manager-->>LIS2MDL Manager: Call MagneticFieldRead synchronous input port
51+
LIS2MDL Manager->>Zephyr Sensor API: Fetch sensor data
5252
Zephyr Sensor API->>LIS2MDL Sensor: Read sensor
5353
LIS2MDL Sensor->>Zephyr Sensor API: Return sensor data
54-
Zephyr Sensor API->>LIS2MDL Driver: Return x, y, z sensor_value structs
55-
LIS2MDL Driver-->>Manager: Return MagneticField struct
54+
Zephyr Sensor API->>LIS2MDL Manager: Return x, y, z sensor_value structs
55+
LIS2MDL Manager-->>Manager: Return MagneticField struct
5656
```
5757

5858
## Requirements
@@ -64,4 +64,4 @@ Add requirements in the chart below
6464
## Change Log
6565
| Date | Description |
6666
|---|---|
67-
| 2025-9-15 | Initial LIS2MDL Driver component |
67+
| 2025-9-15 | Initial LIS2MDL Manager component |

‎FprimeZephyrReference/Components/Drv/Lsm6dsoDriver/CMakeLists.txt‎ renamed to ‎FprimeZephyrReference/Components/Drv/Lsm6dsoManager/CMakeLists.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,20 @@
1616

1717
register_fprime_library(
1818
AUTOCODER_INPUTS
19-
"${CMAKE_CURRENT_LIST_DIR}/Lsm6dsoDriver.fpp"
19+
"${CMAKE_CURRENT_LIST_DIR}/Lsm6dsoManager.fpp"
2020
SOURCES
21-
"${CMAKE_CURRENT_LIST_DIR}/Lsm6dsoDriver.cpp"
21+
"${CMAKE_CURRENT_LIST_DIR}/Lsm6dsoManager.cpp"
2222
DEPENDS
2323
FprimeZephyrReference_Components_Drv_Helpers
2424
)
2525

2626
### Unit Tests ###
2727
# register_fprime_ut(
2828
# AUTOCODER_INPUTS
29-
# "${CMAKE_CURRENT_LIST_DIR}/Lsm6dsoDriver.fpp"
29+
# "${CMAKE_CURRENT_LIST_DIR}/Lsm6dsoManager.fpp"
3030
# SOURCES
31-
# "${CMAKE_CURRENT_LIST_DIR}/test/ut/Lsm6dsoDriverTestMain.cpp"
32-
# "${CMAKE_CURRENT_LIST_DIR}/test/ut/Lsm6dsoDriverTester.cpp"
31+
# "${CMAKE_CURRENT_LIST_DIR}/test/ut/Lsm6dsoManagerTestMain.cpp"
32+
# "${CMAKE_CURRENT_LIST_DIR}/test/ut/Lsm6dsoManagerTester.cpp"
3333
# DEPENDS
3434
# STest # For rules-based testing
3535
# UT_AUTO_HELPERS

‎FprimeZephyrReference/Components/Drv/Lsm6dsoDriver/Lsm6dsoDriver.cpp‎ renamed to ‎FprimeZephyrReference/Components/Drv/Lsm6dsoManager/Lsm6dsoManager.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// ======================================================================
2-
// \title Lsm6dsoDriver.cpp
3-
// \brief cpp file for Lsm6dsoDriver component implementation class
2+
// \title Lsm6dsoManager.cpp
3+
// \brief cpp file for Lsm6dsoManager component implementation class
44
// ======================================================================
55

6-
#include "FprimeZephyrReference/Components/Drv/Lsm6dsoDriver/Lsm6dsoDriver.hpp"
6+
#include "FprimeZephyrReference/Components/Drv/Lsm6dsoManager/Lsm6dsoManager.hpp"
77

88
#include <Fw/Types/Assert.hpp>
99

@@ -13,7 +13,7 @@ namespace Drv {
1313
// Component construction and destruction
1414
// ----------------------------------------------------------------------
1515

16-
Lsm6dsoDriver ::Lsm6dsoDriver(const char* const compName) : Lsm6dsoDriverComponentBase(compName) {
16+
Lsm6dsoManager ::Lsm6dsoManager(const char* const compName) : Lsm6dsoManagerComponentBase(compName) {
1717
// Initialize the LSM6DSO sensor
1818
lsm6dso = DEVICE_DT_GET_ONE(st_lsm6dso);
1919
FW_ASSERT(device_is_ready(lsm6dso));
@@ -24,13 +24,13 @@ Lsm6dsoDriver ::Lsm6dsoDriver(const char* const compName) : Lsm6dsoDriverCompone
2424
FW_ASSERT(sensor_attr_set(lsm6dso, SENSOR_CHAN_GYRO_XYZ, SENSOR_ATTR_SAMPLING_FREQUENCY, &odr) == 0);
2525
}
2626

27-
Lsm6dsoDriver ::~Lsm6dsoDriver() {}
27+
Lsm6dsoManager ::~Lsm6dsoManager() {}
2828

2929
// ----------------------------------------------------------------------
3030
// Handler implementations for typed input ports
3131
// ----------------------------------------------------------------------
3232

33-
Drv::Acceleration Lsm6dsoDriver ::accelerationRead_handler(FwIndexType portNum) {
33+
Drv::Acceleration Lsm6dsoManager ::accelerationRead_handler(FwIndexType portNum) {
3434
if (!device_is_ready(lsm6dso)) {
3535
this->log_WARNING_HI_DeviceNotReady();
3636
return Drv::Acceleration(0.0, 0.0, 0.0);
@@ -49,7 +49,7 @@ Drv::Acceleration Lsm6dsoDriver ::accelerationRead_handler(FwIndexType portNum)
4949
return Drv::Acceleration(Drv::sensor_value_to_f64(x), Drv::sensor_value_to_f64(y), Drv::sensor_value_to_f64(z));
5050
}
5151

52-
Drv::AngularVelocity Lsm6dsoDriver ::angularVelocityRead_handler(FwIndexType portNum) {
52+
Drv::AngularVelocity Lsm6dsoManager ::angularVelocityRead_handler(FwIndexType portNum) {
5353
if (!device_is_ready(lsm6dso)) {
5454
this->log_WARNING_HI_DeviceNotReady();
5555
return Drv::AngularVelocity(0.0, 0.0, 0.0);
@@ -68,7 +68,7 @@ Drv::AngularVelocity Lsm6dsoDriver ::angularVelocityRead_handler(FwIndexType por
6868
return Drv::AngularVelocity(Drv::sensor_value_to_f64(x), Drv::sensor_value_to_f64(y), Drv::sensor_value_to_f64(z));
6969
}
7070

71-
F64 Lsm6dsoDriver ::temperatureRead_handler(FwIndexType portNum) {
71+
F64 Lsm6dsoManager ::temperatureRead_handler(FwIndexType portNum) {
7272
if (!device_is_ready(lsm6dso)) {
7373
this->log_WARNING_HI_DeviceNotReady();
7474
return 0;

‎FprimeZephyrReference/Components/Drv/Lsm6dsoDriver/Lsm6dsoDriver.fpp‎ renamed to ‎FprimeZephyrReference/Components/Drv/Lsm6dsoManager/Lsm6dsoManager.fpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module Drv {
88
# Component definition
99
module Drv {
1010
@ LSM6DSO Driver Component for F Prime FSW framework.
11-
passive component Lsm6dsoDriver {
11+
passive component Lsm6dsoManager {
1212
@ Port to read the current acceleration in m/s^2.
1313
sync input port accelerationRead: AccelerationRead
1414

0 commit comments

Comments
 (0)