Commit: ca63d82411206680f193042915279d0ad01d3bf9 - shared_foo_backup (git)

shared_fooの不要ディレクトリ削除前のもの

Commit MetaInfo

• Revision: ca63d82411206680f193042915279d0ad01d3bf9 (tree)
• Time: 2018-03-02 07:58:15
• Author: takemasa <suikan@user...>
• Commiter: takemasa

Log Message

Added DebuTxTask.

Change Summary

• modified: stm32_development/murasaki/murasaki/abstracttask.hpp
• modified: stm32_development/murasaki/murasaki/debuggerfifo.hpp
• add: stm32_development/murasaki/murasaki/debuggertxtask.cpp
• add: stm32_development/murasaki/murasaki/debuggertxtask.hpp

Incremental Difference

--- a/stm32_development/murasaki/murasaki/abstracttask.hpp
+++ b/stm32_development/murasaki/murasaki/abstracttask.hpp
@@ -18,7 +18,7 @@ namespace murasaki {
 /**
  * @brief A mother of all tasks.
  * @details
- * Encapsulate a FreeRTOS.
+ * Encapsulate a FreeRTOS task.
  *
  * The constructor just stores given parameter internally.
  * And then, these parameter is passed to a task when Start() member function is called.
@@ -81,7 +81,7 @@ class AbstractTask
      * @details
      * The task body is called only once as task entity.
      */
-    virtual void TaskBody(const void * ptr) = 0;
+    virtual void TaskBody(void * ptr) = 0;
 };
 
 } /* namespace murasaki */

--- a/stm32_development/murasaki/murasaki/debuggerfifo.hpp
+++ b/stm32_development/murasaki/murasaki/debuggerfifo.hpp
@@ -82,8 +82,10 @@ struct LoggingHelpers
 {
     AbstractFifo * fifo;
     AbstractLogger * logger;
-    ;
 
-} /* namespace murasaki */
+};
+}
+;
+/* namespace murasaki */
 
 #endif /* DEBUGGERFIFO_HPP_ */

--- /dev/null
+++ b/stm32_development/murasaki/murasaki/debuggertxtask.cpp
@@ -0,0 +1,45 @@
+/*
+ * debuggertxtask.cpp
+ *
+ *  Created on: 2018/03/02
+ *      Author: takemasa
+ */
+
+#include <debuggertxtask.hpp>
+#include "debuggerfifo.hpp"
+#include "murasaki_assert.hpp"
+
+namespace murasaki {
+
+DebuggerTxTask::DebuggerTxTask(const char * task_name,
+                               unsigned short stack_depth,
+                               void * task_parameter,
+                               UBaseType_t task_priority)
+        // Forward initialization parameter to the parent class
+        : AbstractTask(task_name, stack_depth, task_parameter, task_priority)
+{
+        // Do nothing
+}
+
+// Copy data from FIFO to Logger.
+void DebuggerTxTask::TaskBody(void* ptr)
+{
+    MURASAKI_ASSERT(ptr != nullptr);
+
+    // ptr is regarded as pointer to the LoggingHelpers
+    // This struct contains the logger and fifo.
+    murasaki::LoggingHelpers * const helpers = static_cast<murasaki::LoggingHelpers * const >(ptr);
+
+
+    while (true) {
+        // Copy data from FIFO
+        unsigned int copy_size = helpers->fifo->Get(block, sizeof(block));
+
+        // Then, put it to logger, if data exsit.
+        if (copy_size != 0)
+            helpers->logger->putMessage(reinterpret_cast<char *>(block), copy_size);
+    }
+
+}
+
+} /* namespace murasaki */

--- /dev/null
+++ b/stm32_development/murasaki/murasaki/debuggertxtask.hpp
@@ -0,0 +1,70 @@
+/**
+ * @file debuggertxtask.hpp
+ *
+ * @date 2018/03/02
+ * @author takemasa
+ */
+
+#ifndef DEBUGGERTXTASK_HPP_
+#define DEBUGGERTXTASK_HPP_
+
+#include <abstracttask.hpp>
+
+namespace murasaki {
+/**
+ * @brief A mother of all tasks.
+ * @details
+ * Dedicated task for the murasaki::Debugger.
+ *
+ * Receives a murasaki::AbstractLogger type instance and murasaki::AbstractFifo instance
+ * through the task_param parameter of the constructor.
+ * Then, it is passed to the @ref TaskBody().
+ *
+ * TaskBody takes data form FIFO and put it into the logger.
+ *
+ * @ingroup MURASAKI_HELPER_GROUP
+ */
+
+class DebuggerTxTask : public AbstractTask
+{
+ public:
+    /**
+     * @brief Constractor. Task entity is not created here.
+     * @param task_name Name of task. Will be passed to task when started.
+     * @param stack_depth [Byte]
+     * @param task_parameter The pointer to the murasaki::LoggingHelpers type variable.
+     * @param task_priority Priority of the task. from 1 to up to configMAX_PRIORITIES -1. The high number is the high priority.
+     * @details
+     * The task implementation of the data copy task.
+     * This task is dedicated to the murasaki::Debugger.
+     *
+     * Basically, this task should have higher prority than other task in the system.
+     * Otherwise, the debug message will be kept waiting until higher priority task yields.
+     * This is up side down.
+     */
+
+    DebuggerTxTask(const char * task_name,
+                   unsigned short stack_depth,
+                   void * task_parameter,
+                   UBaseType_t task_priority);
+ private:
+    /**
+     * @brief  data backet from FIFO to logger
+     */
+    uint8_t block[100];
+
+    /**
+     * @brief Take data from FIFO and then put to logger.
+     * @param ptr The pointer to the murasaki::LoggingHelpers type variable.
+     * @details
+     * The task body of the data copy task. This task is dedicated to the murasaki::Debugger.
+     *
+     */
+    virtual void TaskBody(void * ptr);
+
+
+};
+
+} /* namespace murasaki */
+
+#endif /* DEBUGGERTXTASK_HPP_ */