Skip to content

Commit 0659f09

Browse files
LeStarchKronos3
andauthored
Refactored type organization (nasa#3422)
* Refactored type organization * Creating better configuration/types header hierarchy * Replace FpConfig type aliases with FPP generated aliases * Add the aliases to the FPP model * Config + Type Aliases builds * Renamed Fw/Types.h,hpp to Fw/FPrimeBasicTypes.h,hpp * Updating to FPP-a7 * Adding newline * sp * Fixing minor nit from review * Spurious ; --------- Co-authored-by: Andrei Tumbar <andrei.tumbar@jpl.nasa.gov>
1 parent dcfc109 commit 0659f09

File tree

248 files changed

+616
-539
lines changed

Some content is hidden

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

248 files changed

+616
-539
lines changed

Autocoders/Python/src/fprime_ac/generators/templates/component/cpp.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// ======================================================================
99

1010
\#include <cstdio>
11-
\#include <FpConfig.hpp>
11+
\#include <Fw/FPrimeBasicTypes.hpp>
1212
\#include <${comp_include_path}/${include_name}ComponentAc.hpp>
1313
\#include <Fw/Types/Assert.hpp>
1414
\#if FW_ENABLE_TEXT_LOGGING

Autocoders/Python/src/fprime_ac/generators/templates/impl/cpp.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77

88
\#include <${include_path}/${name}.hpp>
9-
\#include <FpConfig.hpp>
9+
\#include <Fw/FPrimeBasicTypes.hpp>
1010

1111
#if $namespace_list != None
1212
#for $namespace in $namespace_list

Autocoders/Python/templates/ExampleType.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#define EXAMPLE_TYPE_HPP
33

44
// A hand-coded serializable
5-
#include <FpConfig.hpp>
5+
#include <Fw/FPrimeBasicTypes.hpp>
66
#include <Fw/Types/Serializable.hpp>
77
#if FW_SERIALIZABLE_TO_STRING
88
#include <Fw/Types/StringType.hpp>

Autocoders/Python/test/array_xml/ExampleArrayImpl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include <Autocoders/Python/test/array_xml/ExampleArrayImpl.hpp>
2-
#include <FpConfig.hpp>
2+
#include <Fw/FPrimeBasicTypes.hpp>
33
#include <Fw/Types/String.hpp>
44
#include <iostream>
55
#include <cstdio>

Autocoders/Python/test/array_xml/test/ut/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
#include <Fw/Obj/SimpleObjRegistry.hpp>
1111
#include <Fw/Types/SerialBuffer.hpp>
12-
#include <FpConfig.hpp>
12+
#include <Fw/FPrimeBasicTypes.hpp>
1313
#include <Fw/Types/String.hpp>
1414
#include <Fw/Types/Assert.hpp>
1515

Autocoders/Python/test/command1/test/ut/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include <command1GTestBase.hpp>
55
#endif
66
#include "TesterBase.hpp"
7-
#include <FpConfig.hpp>
7+
#include <Fw/FPrimeBasicTypes.hpp>
88

99
// Very minimal to test autocoder. Some day they'll be actual unit test code
1010

Autocoders/Python/test/command2/TestCommandComponentImpl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313

1414
#include <Autocoders/Python/test/command2/TestCommandComponentImpl.hpp>
15-
#include <FpConfig.hpp>
15+
#include <Fw/FPrimeBasicTypes.hpp>
1616

1717
namespace AcTest {
1818

Autocoders/Python/test/command_multi_inst/test/ut/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include <command_multi_instGTestBase.hpp>
55
#endif
66
#include "TesterBase.hpp"
7-
#include <FpConfig.hpp>
7+
#include <Fw/FPrimeBasicTypes.hpp>
88

99
// Very minimal to test autocoder. Some day they'll be actual unit test code
1010

Autocoders/Python/test/command_res/Test1ComponentImpl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313

1414
#include <Autocoders/Python/test/command_res/Test1ComponentImpl.hpp>
15-
#include <FpConfig.hpp>
15+
#include <Fw/FPrimeBasicTypes.hpp>
1616

1717
namespace Cmd {
1818

Autocoders/Python/test/command_string/test/ut/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include <command_stringGTestBase.hpp>
55
#endif
66
#include "TesterBase.hpp"
7-
#include <FpConfig.hpp>
7+
#include <Fw/FPrimeBasicTypes.hpp>
88

99
// Very minimal to test autocoder. Some day they'll be actual unit test code
1010

0 commit comments

Comments
 (0)