• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

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


Commit MetaInfo

Revisão179ccef4283415b87dd09c8291e86ee66bbea93b (tree)
Hora2018-02-11 06:08:58
Autortakemasa <suikan@user...>
Commitertakemasa

Mensagem de Log

Change the visibility from private to protected, to allow the
inheritance better.

Mudança Sumário

Diff

--- a/stm32_development/murasaki/murasaki/debug.hpp
+++ b/stm32_development/murasaki/murasaki/debug.hpp
@@ -83,7 +83,7 @@ class Debug
8383 * Becareful, this is blocking while the Debug::printf() non-blocking.
8484 */
8585 char getchFromTask();
86- private:
86+ protected:
8787 /**
8888 * \brief A pointer to the UART class.
8989 */
--- a/stm32_development/murasaki/murasaki/interruptsynchronizer.hpp
+++ b/stm32_development/murasaki/murasaki/interruptsynchronizer.hpp
@@ -52,7 +52,7 @@ class InterruptSynchronizer
5252 * Release the task waiting. This member function must be called from the interrupt context.
5353 */
5454 void ReleaseTaskFromISR();
55- private:
55+ protected:
5656 SemaphoreHandle_t semaphore_;
5757 };
5858
--- a/stm32_development/murasaki/murasaki/uartlogger.cpp
+++ b/stm32_development/murasaki/murasaki/uartlogger.cpp
@@ -22,6 +22,7 @@ UartLogger::UartLogger(AbstractUart * uart)
2222 void UartLogger::putMessage(char message[], uint16_t length)
2323 {
2424 MURASAKI_ASSERT(NULL != message)
25+ MURASAKI_ASSERT(isTaskContext());
2526 uart_->Transmit(reinterpret_cast<uint8_t *>(message), // Message to send
2627 length, // length of message by byte.
2728 static_cast<WaitMilliSeconds>( PLATFORM_CONFIG_DEBUG_SERIAL_TIMEOUT) // wait eternaly
@@ -33,6 +34,7 @@ char UartLogger::getCharacter()
3334 {
3435 char buf;
3536
37+ MURASAKI_ASSERT(isTaskContext());
3638 uart_->Receive(reinterpret_cast<uint8_t *>(&buf), // buffer to receive
3739 1, // receive one char
3840 (WaitMilliSeconds) PLATFORM_CONFIG_DEBUG_SERIAL_TIMEOUT); // wait forever
--- a/stm32_development/murasaki/murasaki/uartlogger.hpp
+++ b/stm32_development/murasaki/murasaki/uartlogger.hpp
@@ -33,7 +33,7 @@ class UartLogger : public AbstractLogger
3333 UartLogger(AbstractUart * uart);
3434 virtual void putMessage(char message[], uint16_t length);
3535 virtual char getCharacter();
36- private:
36+ protected:
3737 AbstractUart * uart_;
3838 };
3939