Commit: ba13cd3f0c338052772fdc6fd505eabcd5d764f5 - shared_foo (git)

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

Commit MetaInfo

• Revision: ba13cd3f0c338052772fdc6fd505eabcd5d764f5 (tree)
• Time: 2018-03-03 15:05:48
• Author: takemasa <suikan@user...>
• Commiter: takemasa

Log Message

Auto History is refactored.

Change Summary

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

Incremental Difference

--- a/stm32_development/murasaki/Src/my_test.cpp
+++ b/stm32_development/murasaki/Src/my_test.cpp
@@ -65,7 +65,7 @@ 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);

--- a/stm32_development/murasaki/murasaki/debugger.cpp
+++ b/stm32_development/murasaki/murasaki/debugger.cpp
@@ -55,6 +55,8 @@ Debugger::Debugger(AbstractLogger * logger)
                                             PLATFORM_CONFIG_DEBUG_TASK_PRIORITY,           // execusion priority of task
                                             &helpers_                              // parameter to task
                                             );
+    MURASAKI_ASSERT(tx_task_ != nullptr);
+
     tx_task_->Start();
 
 #endif
@@ -224,6 +226,8 @@ void Debugger::RePrint()
 
     // tell there is data
     ::xSemaphoreGive(sem_notify_new_data_);
+#else
+    helpers_.fifo->ReWind();
 #endif
 }
 
@@ -233,6 +237,7 @@ void Debugger::AutoHistory()
     // protecting from double task creation
     if (auto_history_enabled)
         return;
+#ifdef OLDIMPLEMENTATION
 
     // start the debug task
     BaseType_t task_result = ::xTaskCreate(Debugger::LaunchAutoHistoryTask,             // task entity;
@@ -244,6 +249,17 @@ void Debugger::AutoHistory()
                                            );
     MURASAKI_ASSERT(task_result != errCOULD_NOT_ALLOCATE_REQUIRED_MEMORY);
 
+#else
+    auto_reprint_task = new murasaki::DebuggerAutoRePrintTask("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
+                                                              );
+    MURASAKI_ASSERT(auto_reprint_task != nullptr);
+
+    auto_reprint_task->Start();
+
+#endif
     auto_history_enabled = true;
 }
 

--- a/stm32_development/murasaki/murasaki/debugger.hpp
+++ b/stm32_development/murasaki/murasaki/debugger.hpp
@@ -24,6 +24,7 @@
 #else
 #include "debuggerfifo.hpp"
 #include "debuggertxtask.hpp"
+#include "debuggerautoreprinttask.hpp"
 #endif
 
 namespace murasaki {
@@ -147,6 +148,8 @@ class Debugger
      * \brief Handle to the transmission control task.
      */
     murasaki::DebuggerTxTask * tx_task_;
+
+    murasaki::DebuggerAutoRePrintTask * auto_reprint_task;
 #endif
     bool auto_history_enabled;
     /**