From b80ebc9ca11856fad533e5e84ec983d2479f6fa5 Mon Sep 17 00:00:00 2001
From: Sterling Peet <sterling.peet@ae.gatech.edu>
Date: Tue, 6 Oct 2020 22:01:38 -0400
Subject: [PATCH] Fix that pesky syntax problem, and also adjust some
 formatting.

* Fix syntax where component constructor has the wrong terminator when not storing component names in the binary.

* Consistent indents.

* Fix exerciser component auto-coder input file to point to the correct schema path.

* Make docs table easier to read.

* Reformat change log table to be easier to read.

Closes #5, again.
---
 .../{{cookiecutter.component_dir_name}}/docs/sdd.md  | 12 ++++++------
 .../{{cookiecutter.component_slug}}ComponentAi.xml   |  2 +-
 ...ommon}}{{cookiecutter.component_impl_suffix}}.cpp |  8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/{{cookiecutter.deployment_dir_name}}/{{cookiecutter.component_dir_name}}/docs/sdd.md b/{{cookiecutter.deployment_dir_name}}/{{cookiecutter.component_dir_name}}/docs/sdd.md
index a35b003..ed73f56 100644
--- a/{{cookiecutter.deployment_dir_name}}/{{cookiecutter.component_dir_name}}/docs/sdd.md
+++ b/{{cookiecutter.deployment_dir_name}}/{{cookiecutter.component_dir_name}}/docs/sdd.md
@@ -59,10 +59,10 @@ Dictionaries: [HTML]({{cookiecutter.component_slug}}{{cookiecutter.component_exp
 
 ## 4. Module Checklists
 
-Document | Link
--------- | ----
-Design Checklist | [Link](Checklist_Design.xlsx)
-Code Checklist | [Link](Checklist_Code.xlsx)
+Document            | Link
+------------------- | ----
+Design Checklist    | [Link](Checklist_Design.xlsx)
+Code Checklist      | [Link](Checklist_Code.xlsx)
 Unit Test Checklist | [Link](Checklist_Unit_Test.xls)
 
 ## 5. Unit Testing
@@ -77,8 +77,8 @@ Unit Test Checklist | [Link](Checklist_Unit_Test.xls)
 
 ## 6. Change Log
 
-Date | Description
----- | -----------
+Date       | Description
+---------- | -----------
 <TODAY> | Initial Component Design
 
 
diff --git a/{{cookiecutter.deployment_dir_name}}/{{cookiecutter.component_dir_name}}/{{cookiecutter.component_slug}}ComponentAi.xml b/{{cookiecutter.deployment_dir_name}}/{{cookiecutter.component_dir_name}}/{{cookiecutter.component_slug}}ComponentAi.xml
index 856e033..38b3cdc 100644
--- a/{{cookiecutter.deployment_dir_name}}/{{cookiecutter.component_dir_name}}/{{cookiecutter.component_slug}}ComponentAi.xml
+++ b/{{cookiecutter.deployment_dir_name}}/{{cookiecutter.component_dir_name}}/{{cookiecutter.component_slug}}ComponentAi.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-model href="{{cookiecutter.component_path_to_fprime_root}}/Autocoders/Python/schema/default/component_schema.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
+<?xml-model href="{{cookiecutter.component_path_to_fprime_root}}/../Autocoders/Python/schema/default/component_schema.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
 <component name="{{cookiecutter.component_slug}}" kind="{{cookiecutter.component_kind}}" namespace="{{cookiecutter.component_namespace}}">
     <!-- Example of importing a port type -->
     <import_port_type>Svc/Sched/SchedPortAi.xml</import_port_type>
diff --git a/{{cookiecutter.deployment_dir_name}}/{{cookiecutter.component_dir_name}}/{{cookiecutter.component_slug}}{{cookiecutter.component_explicit_component_suffix}}{{cookiecutter.component_explicit_common}}{{cookiecutter.component_impl_suffix}}.cpp b/{{cookiecutter.deployment_dir_name}}/{{cookiecutter.component_dir_name}}/{{cookiecutter.component_slug}}{{cookiecutter.component_explicit_component_suffix}}{{cookiecutter.component_explicit_common}}{{cookiecutter.component_impl_suffix}}.cpp
index ef0d0a7..5346ec9 100644
--- a/{{cookiecutter.deployment_dir_name}}/{{cookiecutter.component_dir_name}}/{{cookiecutter.component_slug}}{{cookiecutter.component_explicit_component_suffix}}{{cookiecutter.component_explicit_common}}{{cookiecutter.component_impl_suffix}}.cpp
+++ b/{{cookiecutter.deployment_dir_name}}/{{cookiecutter.component_dir_name}}/{{cookiecutter.component_slug}}{{cookiecutter.component_explicit_component_suffix}}{{cookiecutter.component_explicit_common}}{{cookiecutter.component_impl_suffix}}.cpp
@@ -21,7 +21,7 @@ namespace {{cookiecutter.component_namespace}} {
     ) :
       {{cookiecutter.component_slug}}ComponentBase(compName),
 #else
-    {{cookiecutter.component_slug}}{{cookiecutter.component_explicit_component_suffix}}{{cookiecutter.component_impl_suffix}}(void),
+    {{cookiecutter.component_slug}}{{cookiecutter.component_explicit_component_suffix}}{{cookiecutter.component_impl_suffix}}(void) :
 #endif
     m_state(false)
   {}
@@ -37,7 +37,7 @@ namespace {{cookiecutter.component_namespace}} {
   void {{cookiecutter.component_slug}}{{cookiecutter.component_explicit_component_suffix}}{{cookiecutter.component_impl_suffix}} ::
     blink()
   {
-      this->gpio_out(0, m_state);
+    this->gpio_out(0, m_state);
   }
 {% endif %}
   {{cookiecutter.component_slug}}{{cookiecutter.component_explicit_component_suffix}}{{cookiecutter.component_impl_suffix}} ::
@@ -56,8 +56,8 @@ namespace {{cookiecutter.component_namespace}} {
         NATIVE_UINT_TYPE context
     )
   {
-      blink();
-      m_state = !m_state;
+    blink();
+    m_state = !m_state;
   }
 
 } // end namespace {{cookiecutter.component_namespace}}