提交: 2608ab505cb65e6c6e71a29f86a663fae23d60c9 - shared_foo (git)

テスト用のあれこれ共用フォルダ

Commit MetaInfo

• 修訂: 2608ab505cb65e6c6e71a29f86a663fae23d60c9 (tree)
• 時間: 2018-03-03 14:07:04
• 作者: takemasa <suikan@user...>
• Commiter: takemasa

Log Message

Debugger Transmission is migrated to new style.

Change Summary

• modified: stm32_development/murasaki/Src/my_test.cpp
• modified: stm32_development/murasaki/murasaki/debugger.cpp
• modified: stm32_development/murasaki/murasaki/debugger.hpp
• modified: stm32_development/murasaki/murasaki/debuggerfifo.hpp

差異

--- a/stm32_development/murasaki/Src/my_test.cpp
+++ b/stm32_development/murasaki/Src/my_test.cpp
@@ -22,14 +22,16 @@
 murasaki::Platform murasaki::platform;
 murasaki::Debugger * murasaki::debugger;
 
+static int counter;
 
-
+#if 0
 #define MSG1 "A quick brown fox jumps over the lazy dog."
+#define MSG2 "The rain in spain is mainly in plain."
 
-static int counter;
 static murasaki::DebuggerFifo * test_fifo;
 static murasaki::AbstractTask * tx_task;
 static murasaki::LoggingHelpers helpers;
+#endif
 
 // Initialize the platfrom variables. This have to be doen before
 // using other murasaki funciton.
@@ -63,23 +65,27 @@ void InitTestUart(UART_HandleTypeDef * uart_handle, SPI_HandleTypeDef * spi_hand
 
     // Setting debugger
     murasaki::debugger = new murasaki::Debugger(murasaki::platform.logger);
-    murasaki::debugger->AutoHistory();  // type any key to show history.
-
+//    murasaki::debugger->AutoHistory();  // type any key to show history.
+#if 0
     test_fifo = new murasaki::DebuggerFifo(32);
     MURASAKI_ASSERT(test_fifo != nullptr);
 
     helpers.logger = murasaki::platform.logger;
     helpers.fifo = test_fifo;
 
-    tx_task = new murasaki::DebuggerTxTask("Debug_tx",
-                                           PLATFORM_CONFIG_DEBUG_TASK_STACK_SIZE,
-                                           PLATFORM_CONFIG_DEBUG_TASK_PRIORITY, &helpers);
+    tx_task = new murasaki::DebuggerTxTask("Debug_tx",  //
+    PLATFORM_CONFIG_DEBUG_TASK_STACK_SIZE,  //
+                                           PLATFORM_CONFIG_DEBUG_TASK_PRIORITY,  // the bigger value is the higer priority
+                                           &helpers);
     MURASAKI_ASSERT(tx_task != nullptr);
 
+    tx_task->Start();
 
     unsigned int copied = test_fifo->Put(reinterpret_cast<const uint8_t *>(MSG1), sizeof(MSG1));
-    murasaki::debugger->printf("FIFO.Put(), %d data taransfered\n\r", copied);
+    test_fifo->NotifyData();
 
+    murasaki::debugger->printf("FIFO.Put(), %d data taransfered\n\r", copied);
+#endif
 
 }
 
@@ -89,6 +95,12 @@ void DoTestUart(void)
 {
 //    MURASAKI_ASSERT(counter % 2 == 0, "Odd counter");
 #if 0
+    unsigned int copied = test_fifo->Put(reinterpret_cast<const uint8_t *>(MSG1), sizeof(MSG1));
+    test_fifo->NotifyData();
+    murasaki::debugger->printf("FIFO.Put(), %d data taransfered\n\r", copied);
+#endif
+
+#if 0
     murasaki::platform.spi_master->Transfer(murasaki::platform.slave_1, tx_buffer, rx_buffer, 1);
 #endif
 
@@ -107,7 +119,7 @@ void DoTestUart(void)
 #endif
     // by murasaki debugging output. You can use this in both task and interrupt context.
     // non blocking
-//    murasaki::debugger->printf(MSG, counter);
+    murasaki::debugger->printf(MSG, counter);
 
 }
 
@@ -152,6 +164,13 @@ void HAL_GPIO_EXTI_Callback(uint16_t GPIO_P)
 {
     if (GPIO_P == B1_Pin) {
         counter++;
+#if 0
+        unsigned int copied = test_fifo->Put(reinterpret_cast<const uint8_t *>(MSG2), sizeof(MSG2));
+        test_fifo->NotifyData();
+
+        murasaki::debugger->printf("FIFO.Put(), %d data taransfered\n\r", copied);
+#else
         murasaki::debugger->printf("Interrupt occurs %d \n\r", counter);
+#endif
     }
 }

--- a/stm32_development/murasaki/murasaki/debugger.cpp
+++ b/stm32_development/murasaki/murasaki/debugger.cpp
@@ -21,8 +21,12 @@ Debugger::Debugger(AbstractLogger * logger)
 {
     // initialize internal variable;
     MURASAKI_ASSERT(logger != nullptr)
-    logger_ = logger;
 
+    auto_history_enabled = false;
+    auto_history_task_ = nullptr;
+
+#ifdef OLDIMPLEMENTATION
+    logger_ = logger;
     sem_notify_new_data_ = ::xSemaphoreCreateBinary();      // create semaphore as "empty" state
     MURASAKI_ASSERT(sem_notify_new_data_);
 
@@ -30,12 +34,8 @@ Debugger::Debugger(AbstractLogger * logger)
     head_ = 0;
     tail_ = 0;
 
-    auto_history_enabled = false;
-    auto_history_task_ = nullptr;
-
     for (unsigned int i = 0; i < sizeof(buffer_); i++)
         buffer_[i] = ' ';
-
     // start the debug task
     BaseType_t task_result = ::xTaskCreate(
                   Debugger::LaunchTxTask,                      // task entity;
@@ -46,11 +46,23 @@ Debugger::Debugger(AbstractLogger * logger)
                   &tx_task_                                 // receive task handle
                   );
     MURASAKI_ASSERT(task_result != errCOULD_NOT_ALLOCATE_REQUIRED_MEMORY);
+#else
+    helpers_.fifo = new murasaki::DebuggerFifo(PLATFORM_CONFIG_DEBUG_BUFFER_SIZE);
+    helpers_.logger = logger;
 
+    tx_task_ = new murasaki::DebuggerTxTask("DebugTask",                              // name of task
+                                            PLATFORM_CONFIG_DEBUG_TASK_STACK_SIZE,                        // stack depth
+                                            PLATFORM_CONFIG_DEBUG_TASK_PRIORITY,           // execusion priority of task
+                                            &helpers_                              // parameter to task
+                                            );
+    tx_task_->Start();
+
+#endif
 }
 
 Debugger::~Debugger()
 {
+#ifdef OLDIMPLEMENTATION
     // Delete task;
     if (tx_task_ != nullptr)
         ::vTaskDelete(tx_task_);
@@ -62,10 +74,13 @@ Debugger::~Debugger()
     // Delete semaphore.
     if (sem_notify_new_data_ != nullptr)
         ::vSemaphoreDelete( sem_notify_new_data_);
+#else
+#endif
 }
 
 void Debugger::printf(const char * fmt, ...)
 {
+#ifdef OLDIMPLEMENTATION
     // obtain variable parameter list
     va_list argp;
 
@@ -101,20 +116,58 @@ void Debugger::printf(const char * fmt, ...)
         ::xSemaphoreGive(sem_notify_new_data_);               // if yes
     else
         ::xSemaphoreGiveFromISR(sem_notify_new_data_, nullptr);  // if no.
+#else
+        // obtain variable parameter list
+        va_list argp;
+
+        MURASAKI_ASSERT(nullptr != fmt);// nullptr check. Perhaps, overkill.
+
+        portDISABLE_INTERRUPTS();// ARM dependent API. OK to use in task and ISR.
+        {
+#if 0
+            // Test the remains of task stack in byte.
+            // To use the uxTaskGetStackHighWaterMark(), Add following to the
+            // FreeRTOSConfig.h
+            // #define INCLUDE_uxTaskGetStackHighWaterMark 1
+
+            ::snprintf((char *) line_,
+                    sizeof(line_) - 1,
+                    "stack remains : %8d bytes. ",
+                    (int) uxTaskGetStackHighWaterMark(tx_task_));
+            AppendToBuffer();
+#endif
+            ::va_start(argp, fmt);
+            // convert the number with formt string to the line string.
+            // The string length have to be N - 1. Where N is the length of the destination variable.
+            ::vsnprintf((char *) line_, sizeof(line_) - 1, fmt, argp);
+
+            ::va_end(argp);
+            // Append the line to the buffer to be sent.
+        helpers_.fifo->Put(reinterpret_cast<uint8_t*>(line_), ::strlen(line_));
+
+        }
+        portENABLE_INTERRUPTS();
+
+        // Notify to the consumer task, the new data has come.
+    helpers_.fifo->NotifyData();
+#endif
 
 }
 
 char Debugger::GetchFromTask()
 {
     MURASAKI_ASSERT(isTaskContext());
-
+#ifdef OLDIMPLEMENTATION
     return logger_->getCharacter();  // receive successfuly.
-
+#else
+    return helpers_.logger->getCharacter();
+#endif
 }
 
 // Assumes this is called only in the critical section.
 void Debugger::AppendToBuffer()
 {
+#ifdef OLDIMPLEMENTATION
     unsigned int avairable;
 
     // check the avairable area size. Data is append to the head
@@ -145,7 +198,7 @@ void Debugger::AppendToBuffer()
         if (head_ >= sizeof(buffer_))
             head_ = 0;
     }  // end for loop.
-
+#endif
 }
 
 
@@ -155,6 +208,7 @@ void Debugger::AppendToBuffer()
  */
 void Debugger::RePrint()
 {
+#ifdef OLDIMPLEMENTATION
     MURASAKI_ASSERT(isTaskContext());
 
     taskENTER_CRITICAL();
@@ -170,7 +224,7 @@ void Debugger::RePrint()
 
     // tell there is data
     ::xSemaphoreGive(sem_notify_new_data_);
-
+#endif
 }
 
 void Debugger::AutoHistory()
@@ -232,6 +286,7 @@ void Debugger::LaunchTxTask(void * this_pointer)
 #define BLOCK_SIZE 50
 void Debugger::TxTask()
 {
+#ifdef OLDIMPLEMENTATION
     unsigned int copy_size = 0;
     uint8_t block[BLOCK_SIZE];
 
@@ -275,7 +330,7 @@ void Debugger::TxTask()
             ::xSemaphoreTake(sem_notify_new_data_, 1000 / portTICK_PERIOD_MS );
 
     }  // end of while loop.
-
+#endif
 }
 
 } /* namespace platform */

--- a/stm32_development/murasaki/murasaki/debugger.hpp
+++ b/stm32_development/murasaki/murasaki/debugger.hpp
@@ -18,6 +18,13 @@
 #include "murasaki_config.hpp"
 #include "abstractlogger.hpp"
 
+//#define OLDIMPLEMENTATION
+
+#ifdef OLDIMPLEMENTATION
+#else
+#include "debuggerfifo.hpp"
+#include "debuggertxtask.hpp"
+#endif
 
 namespace murasaki {
 
@@ -110,6 +117,7 @@ class Debugger
      */
     void AutoHistory();
  protected:
+#ifdef OLDIMPLEMENTATION
     /**
      * \brief A pointer to the logger class.
      */
@@ -117,7 +125,6 @@ class Debugger
     /**
      * @brief For protecting from the double creating of the internal task.
      */
-    bool auto_history_enabled;
     /**
      * \brief Transmission notification semaphore.
      * \details
@@ -125,19 +132,27 @@ class Debugger
      * notification. Whenever the printf() method added new data to the buffer_, a nothification
      * is given through this semaphore.
      */
+    /**
+     * \brief Handle to the transmission control task.
+     */
+    TaskHandle_t tx_task_;
     SemaphoreHandle_t sem_notify_new_data_;
     /**
      * \brief transmission data circular buffer.
      */
     char buffer_[PLATFORM_CONFIG_DEBUG_BUFFER_SIZE];
+#else
+    murasaki::LoggingHelpers helpers_;
     /**
-     * \brief temporal data buffer to store the formatted string.
+     * \brief Handle to the transmission control task.
      */
-    char line_[PLATFORM_CONFIG_DEBUG_LINE_SIZE];
+    murasaki::DebuggerTxTask * tx_task_;
+#endif
+    bool auto_history_enabled;
     /**
-     * \brief Handle to the transmission control task.
+     * \brief temporal data buffer to store the formatted string.
      */
-    TaskHandle_t tx_task_;
+    char line_[PLATFORM_CONFIG_DEBUG_LINE_SIZE];
     /**
      * @brief Handle to the auto history task.
      */

--- a/stm32_development/murasaki/murasaki/debuggerfifo.hpp
+++ b/stm32_development/murasaki/murasaki/debuggerfifo.hpp
@@ -78,8 +78,8 @@ class DebuggerFifo : public AbstractFifo
  */
 struct LoggingHelpers
 {
-    AbstractFifo * fifo;
-    AbstractLogger * logger;
+    murasaki::DebuggerFifo * fifo;
+    murasaki::AbstractLogger * logger;
 
 };
 }