提交: 1a03ab6b9245bd7cbe4a601c352ad2d76b0bcab5 - shared_foo (git)

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

Commit MetaInfo

• 修訂: 1a03ab6b9245bd7cbe4a601c352ad2d76b0bcab5 (tree)
• 時間: 2018-04-21 02:52:00
• 作者: takemasa <suikan@user...>
• Commiter: takemasa

Log Message

Added GetHandle() method, to help the abnormal condition.

Change Summary

• modified: stm32_development/murasaki/NUCLEO-F746ZG.xml
• modified: stm32_development/murasaki/murasaki/abstracti2cmaster.hpp
• modified: stm32_development/murasaki/murasaki/abstractspimaster.hpp
• modified: stm32_development/murasaki/murasaki/abstractuart.hpp
• modified: stm32_development/murasaki/murasaki/i2cmaster.cpp
• modified: stm32_development/murasaki/murasaki/i2cmaster.hpp
• modified: stm32_development/murasaki/murasaki/spimaster.cpp
• modified: stm32_development/murasaki/murasaki/spimaster.hpp
• modified: stm32_development/murasaki/murasaki/uart.cpp
• modified: stm32_development/murasaki/murasaki/uart.hpp

差異

--- a/stm32_development/murasaki/NUCLEO-F746ZG.xml
+++ b/stm32_development/murasaki/NUCLEO-F746ZG.xml
@@ -12,8 +12,8 @@
 <targetDefinitions>
   <board id="nucleo-f746zg">
     <name>NUCLEO-F746ZG</name>
-    <dbgIF>JTAG</dbgIF>
     <dbgIF>SWD</dbgIF>
+    <dbgIF>JTAG</dbgIF>
     <dbgDEV>ST-Link</dbgDEV>
     <mcuId>stm32f746zgtx</mcuId>
   </board>

--- a/stm32_development/murasaki/murasaki/abstracti2cmaster.hpp
+++ b/stm32_development/murasaki/murasaki/abstracti2cmaster.hpp
@@ -121,6 +121,15 @@ class AbstractI2CMaster
      * The error handling is depend on the implementation.
      */
     virtual bool HandleError(void * ptr)= 0;
+    /**
+     * @brief Return the Platform dependent device control handle.
+     * @return Handle of device.
+     * @details
+     * The handle is the pointer ( or some ID ) which specify the control data of
+     * specific device.
+     */
+    virtual void * GetDeviceHandle() = 0;
+
 };
 
 } /* namespace murasaki */

--- a/stm32_development/murasaki/murasaki/abstractspimaster.hpp
+++ b/stm32_development/murasaki/murasaki/abstractspimaster.hpp
@@ -59,6 +59,15 @@ class AbstractSpiMaster
      * The error handling is depend on the implementation.
      */
     virtual bool HandleError(void * ptr)= 0;
+    /**
+     * @brief Return the Platform dependent device control handle.
+     * @return Handle of device.
+     * @details
+     * The handle is the pointer ( or some ID ) which specify the control data of
+     * specific device.
+     */
+    virtual void * GetDeviceHandle() = 0;
+
 };
 
 } /* namespace murasaki */

--- a/stm32_development/murasaki/murasaki/abstractuart.hpp
+++ b/stm32_development/murasaki/murasaki/abstractuart.hpp
@@ -114,6 +114,14 @@ public:
      * The error handling is depend on the implementation.
      */
     virtual bool HandleError(void * ptr)= 0;
+    /**
+     * @brief Return the Platform dependent device control handle.
+     * @return Handle of device.
+     * @details
+     * The handle is the pointer ( or some ID ) which specify the control data of
+     * specific device.
+     */
+    virtual void * GetDeviceHandle() = 0;
 };
 /**
  * \}

--- a/stm32_development/murasaki/murasaki/i2cmaster.cpp
+++ b/stm32_development/murasaki/murasaki/i2cmaster.cpp
@@ -174,6 +174,11 @@ bool I2cMaster::HandleError(void* ptr)
     }
 }
 
+void* I2cMaster::GetDeviceHandle() {
+	return peripheral_;
+}
+
 } /* namespace murasaki */
 
+
 #endif //HAL_I2C_MODULE_ENABLED

--- a/stm32_development/murasaki/murasaki/i2cmaster.hpp
+++ b/stm32_development/murasaki/murasaki/i2cmaster.hpp
@@ -160,6 +160,15 @@ class I2cMaster : public AbstractI2CMaster
      * Checks whether handle has error and if there is, print appropriate error. Then return.
      */
     virtual bool HandleError(void * ptr);
+    /**
+     * @brief Return the Platform dependent device control handle.
+     * @return Handle of device.
+     * @details
+     * The handle is the pointer ( or some ID ) which specify the control data of
+     * specific device.
+     */
+    virtual void * GetDeviceHandle();
+
  protected:
     I2C_HandleTypeDef * const peripheral_;              // SPI peripheral handle
     Synchronizer * const sync_;          // sync between task and interrupt

--- a/stm32_development/murasaki/murasaki/spimaster.cpp
+++ b/stm32_development/murasaki/murasaki/spimaster.cpp
@@ -124,6 +124,10 @@ bool SpiMaster::HandleError(void* ptr)
     }
 }
 
+void* SpiMaster::GetDeviceHandle() {
+	return peripheral_;
+}
+
 
 } /* namespace murasaki */
 

--- a/stm32_development/murasaki/murasaki/spimaster.hpp
+++ b/stm32_development/murasaki/murasaki/spimaster.hpp
@@ -104,6 +104,14 @@ class SpiMaster : public AbstractSpiMaster
      * Checks whether handle has error and if there is, print appropriate error. Then return.
      */
     virtual bool HandleError(void * ptr);
+    /**
+     * @brief Return the Platform dependent device control handle.
+     * @return Handle of device.
+     * @details
+     * The handle is the pointer ( or some ID ) which specify the control data of
+     * specific device.
+     */
+    virtual void * GetDeviceHandle();
  protected:
     SPI_HandleTypeDef * peripheral_;        // SPI peripheral handler.
     Synchronizer * sync_;          // sync between task and interrupt

--- a/stm32_development/murasaki/murasaki/uart.cpp
+++ b/stm32_development/murasaki/murasaki/uart.cpp
@@ -186,6 +186,10 @@ bool Uart::HandleError(void* const ptr)
     }
 }
 
+void* Uart::GetDeviceHandle() {
+	return peripheral_;
+}
+
 } /* namespace platform */
 
 #endif // HAL_UART_MODULE_ENABLED

--- a/stm32_development/murasaki/murasaki/uart.hpp
+++ b/stm32_development/murasaki/murasaki/uart.hpp
@@ -179,7 +179,15 @@ class Uart : public AbstractUart
      * Checks whether handle has error and if there is, print appropriate error. Then return.
      */
     virtual bool HandleError(void * const ptr);
- protected:
+    /**
+     * @brief Return the Platform dependent device control handle.
+     * @return Handle of device.
+     * @details
+     * The handle is the pointer ( or some ID ) which specify the control data of
+     * specific device.
+     */
+    virtual void * GetDeviceHandle();
+protected:
     UART_HandleTypeDef* const peripheral_;
 
     Synchronizer * tx_sync_;