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.

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

Fix minor typos in error message strings and descriptive comments #1033

Merged
merged 1 commit into from
Sep 16, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ else if (searchPCT.sourcePortType.equals("Cmd")){
}

if(noCompanionConn){
Utils.throwConnectorException("The connection from " + searchPCT.source + " in subsystem " + searchPCT.sourceRoleParentName + " to " + searchPCT.target + " in subsystem " + searchPCT.targetRoleParentName + " of type " + searchPCT.sourcePortType + " does not have an connection going from the same objects of the opposite type. Auto-assigning indexes cannot be continued.");
Utils.throwConnectorException("The connection from " + searchPCT.source + " in subsystem " + searchPCT.sourceRoleParentName + " to " + searchPCT.target + " in subsystem " + searchPCT.targetRoleParentName + " of type " + searchPCT.sourcePortType + " does not have a connection going from the same objects of the opposite type. Auto-assigning indexes cannot be continued.");
}
else{
pctList.add(searchPCT);
Expand Down
2 changes: 1 addition & 1 deletion Autocoders/Python/src/fprime_ac/parsers/XmlEnumParser.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ def __init__(self, xml_file=None):

enum = element_tree.getroot()
if enum.tag != "enum":
PRINT.info("%s is not a enum definition file" % xml_file)
PRINT.info("%s is not an enum definition file" % xml_file)
sys.exit(-1)

print("Parsing Enum %s" % enum.attrib["name"])
Expand Down
6 changes: 3 additions & 3 deletions Autocoders/Python/src/fprime_ac/parsers/XmlPortsParser.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ def __init__(self, xml_file=None):

interface = element_tree.getroot()
if interface.tag != "interface":
PRINT.info("%s is not a interface file" % xml_file)
PRINT.info("%s is not an interface file" % xml_file)
sys.exit(-1)

print("Parsing Interface %s" % interface.attrib["name"])
Expand Down Expand Up @@ -238,7 +238,7 @@ def get_include_array_files(self):

def get_interface(self):
"""
Returns a interface object.
Returns an interface object.
"""
return self.__port

Expand All @@ -253,7 +253,7 @@ class Interface:
"""
Data container for an interface.
Note in the context of this architecture
a port has just on interface and this is
a port has just one interface and this is
it.
"""

Expand Down
4 changes: 2 additions & 2 deletions Autocoders/Python/test/app2/VoidArgComponentAi.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@
<comment>The output port of type Void has no args</comment>
</port>

<!-- Forth port defined is input with three args of type Msg -->
<!-- Fourth port defined is input with three args of type Msg -->
<port name="ExtMsgIn" data_type="Msg" kind="async_input">
<comment>The input port of type Msg has three args and is external interface</comment>
</port>

<!-- Fith port defined is input with three args of type Msg -->
<!-- Fifth port defined is input with three args of type Msg -->
<port name="MsgIn" data_type="Msg" kind="async_input">
<comment>The input port of type Msg has three args</comment>
</port>
Expand Down
4 changes: 2 additions & 2 deletions Autocoders/Python/test/passive/C1ComponentAi.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@
<comment>The output port of type Void has no args</comment>
</port>

<!-- Forth port defined is output with no args of type Void -->
<!-- Fourth port defined is output with no args of type Void -->
<port name="Void" data_type="Void" kind="output">
<comment>The output port of type Void has no args and drives a sync input</comment>
</port>

<!-- Fith port defined is output with three args of type Msg1 -->
<!-- Fifth port defined is output with three args of type Msg1 -->
<port name="Msg1" data_type="Msg1" kind="output">
<comment>The output port of type Msg1 has three args and drives a sync input</comment>
</port>
Expand Down
8 changes: 4 additions & 4 deletions Fw/Logger/Logger.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ namespace Fw {
* \param a1: first argument. (Default: 0)
* \param a2: second argument. (Default: 0)
* \param a3: third argument. (Default: 0)
* \param a4: forth argument. (Default: 0)
* \param a4: fourth argument. (Default: 0)
* \param a5: fifth argument. (Default: 0)
* \param a6: sixth argument. (Default: 0)
* \param a7: seventh argument. (Default: 0)
* \param a8: eight argument. (Default: 0)
* \param a8: eighth argument. (Default: 0)
* \param a9: ninth argument. (Default: 0)
*/
virtual void log(
Expand All @@ -52,11 +52,11 @@ namespace Fw {
* \param a1: first argument. (Default: 0)
* \param a2: second argument. (Default: 0)
* \param a3: third argument. (Default: 0)
* \param a4: forth argument. (Default: 0)
* \param a4: fourth argument. (Default: 0)
* \param a5: fifth argument. (Default: 0)
* \param a6: sixth argument. (Default: 0)
* \param a7: seventh argument. (Default: 0)
* \param a8: eight argument. (Default: 0)
* \param a8: eighth argument. (Default: 0)
* \param a9: ninth argument. (Default: 0)
*/
static void logMsg(
Expand Down
4 changes: 2 additions & 2 deletions Os/Log.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ namespace Os {
* \param a1: first argument. (Default: 0)
* \param a2: second argument. (Default: 0)
* \param a3: third argument. (Default: 0)
* \param a4: forth argument. (Default: 0)
* \param a4: fourth argument. (Default: 0)
* \param a5: fifth argument. (Default: 0)
* \param a6: sixth argument. (Default: 0)
* \param a7: seventh argument. (Default: 0)
* \param a8: eight argument. (Default: 0)
* \param a8: eighth argument. (Default: 0)
* \param a9: ninth argument. (Default: 0)
*/
void log(
Expand Down