Commit: b2ca88237ebbc6397c309a0f587b16c93b45f3ce - shared_foo (git)

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

Commit MetaInfo

• Revisão: b2ca88237ebbc6397c309a0f587b16c93b45f3ce (tree)
• Hora: 2018-06-23 16:04:07
• Autor: takemasa <suikan@user...>
• Commiter: takemasa

Mensagem de Log

SPI master has been debugged. I2C is under debugging.

So far, transmission is OK. Need to check the EEProm behavior on the
secodn transmission.

Mudança Sumário

• modified: stm32_development/nucleo-l152re-fujitsubo-test/Inc/platform_defs.hpp
• modified: stm32_development/nucleo-l152re-fujitsubo-test/Src/main.c
• modified: stm32_development/nucleo-l152re-fujitsubo-test/Src/murasaki_platform.cpp
• modified: stm32_development/nucleo-l152re-fujitsubo-test/nucleo-l152re-fujitsubo-test.ioc

Diff

--- a/stm32_development/nucleo-l152re-fujitsubo-test/Inc/platform_defs.hpp
+++ b/stm32_development/nucleo-l152re-fujitsubo-test/Inc/platform_defs.hpp
@@ -83,6 +83,7 @@ struct Platform
     AbstractLogger * logger;        ///< logging class object for debugger
     AbstractSpiMaster * spi;        ///< SPIport controler
     AbstractSpiSlaveSpecifier * m95010;  ///< 1kbit EEPROM
+    AbstractI2CMaster * i2c1;       ///< I2C controler
 
     AbstractBitOut * led;
 };

--- a/stm32_development/nucleo-l152re-fujitsubo-test/Src/main.c
+++ b/stm32_development/nucleo-l152re-fujitsubo-test/Src/main.c
@@ -251,7 +251,7 @@ static void MX_SPI1_Init(void)
   hspi1.Init.CLKPolarity = SPI_POLARITY_LOW;
   hspi1.Init.CLKPhase = SPI_PHASE_1EDGE;
   hspi1.Init.NSS = SPI_NSS_SOFT;
-  hspi1.Init.BaudRatePrescaler = SPI_BAUDRATEPRESCALER_2;
+  hspi1.Init.BaudRatePrescaler = SPI_BAUDRATEPRESCALER_256;
   hspi1.Init.FirstBit = SPI_FIRSTBIT_MSB;
   hspi1.Init.TIMode = SPI_TIMODE_DISABLE;
   hspi1.Init.CRCCalculation = SPI_CRCCALCULATION_DISABLE;

--- a/stm32_development/nucleo-l152re-fujitsubo-test/Src/murasaki_platform.cpp
+++ b/stm32_development/nucleo-l152re-fujitsubo-test/Src/murasaki_platform.cpp
@@ -82,6 +82,8 @@ void InitPlatform()
             SPI_CS_GPIO_Port,
             SPI_CS_Pin);
 
+    murasaki::platform.i2c1 = new murasaki::I2cMaster(&hi2c1);
+
     // Setting the debugger
     murasaki::debugger = new murasaki::Debugger(murasaki::platform.logger);
     // Set the debugger as AutoRePrint mode, for the easy operation.
@@ -89,6 +91,8 @@ void InitPlatform()
 
 }
 
+#define M24128_ADDR 0x50
+
 /**
  * @brief The body of the real application.
  * @ingroup MURASAKI_PLATFORM_GROUP
@@ -106,23 +110,49 @@ void ExecPlatform()
     // counter for the demonstration.
     static int count = 0;
 
-    uint8_t txbuf[2];
-    uint8_t rxbuf[2];
+    uint8_t txbuf[10];
+    uint8_t rxbuf[10];
 
-    txbuf[0] = 0x09;    // RDSR instruction for m95010.
+    txbuf[0] = 0x05;    // RDSR instruction for m95010.
 
     // Loop forever
     while (true) {
         // Toggle LED.
         murasaki::platform.led->Toggle();
-
+#if 0
+        // SPI test
         murasaki::platform.spi->TransmitAndReceive(murasaki::platform.m95010,
                                                    txbuf, rxbuf, 2);
 
         // print a message with counter value to the console.
-        murasaki::debugger->Printf("Hello %d status register = 0x%02x\n\r",
+        murasaki::debugger->Printf("Hello %d SPI status register = 0x%02x\n\r",
                                    count, rxbuf[1]);
+#else
+        //I2C test
+        // Writting 0xdeadbeaf from address 0
+        txbuf[0] = 0;   // memory address upper byte
+        txbuf[1] = 0;   // memory address lower byte
+        txbuf[2] = 0xde;    // data of address 0
+        txbuf[3] = 0xad;    // data of address 0
+        txbuf[4] = 0xbe;    // data of address 0
+        txbuf[5] = 0xef;    // data of address 0
+
+        // Write data
+        murasaki::platform.i2c1->Transmit(M24128_ADDR, txbuf, 6);
+        murasaki::debugger->Printf("Hello %d I2C Transmit \n\r", count);
+
+        // Dummy write to set the address
+        murasaki::platform.i2c1->Transmit(M24128_ADDR, txbuf, 2);
+        murasaki::debugger->Printf("Hello %d I2C Transmit Dummy \n\r", count);
+
+        // Read from the address
+        murasaki::platform.i2c1->Receive(M24128_ADDR, rxbuf, 4);
 
+
+        // print a message with counter value to the console.
+        murasaki::debugger->Printf("Hello %d I2C Received 0x%02x\n\r", count,
+                                   rxbuf[0]);
+#endif
         // update the counter value.
         count++;
 
@@ -277,6 +307,8 @@ void HAL_SPI_ErrorCallback(SPI_HandleTypeDef * hspi) {
  */
 void HAL_I2C_MasterTxCpltCallback(I2C_HandleTypeDef * hi2c)
 {
+    if (murasaki::platform.i2c1->TransmitCompleteCallback(hi2c))
+        return;
 
 }
 
@@ -295,6 +327,8 @@ void HAL_I2C_MasterTxCpltCallback(I2C_HandleTypeDef * hi2c)
  * murasaki::Uart::ReceiveCompleteCallback() function.
  */
 void HAL_I2C_MasterRxCpltCallback(I2C_HandleTypeDef * hi2c) {
+    if (murasaki::platform.i2c1->ReceiveCompleteCallback(hi2c))
+        return;
 
 }
 
@@ -314,6 +348,8 @@ void HAL_I2C_MasterRxCpltCallback(I2C_HandleTypeDef * hi2c) {
  * murasaki::I2c::HandleError() function.
  */
 void HAL_I2C_ErrorCallback(I2C_HandleTypeDef * hi2c) {
+    if (murasaki::platform.i2c1->HandleError(hi2c))
+        return;
 
 }
 

--- a/stm32_development/nucleo-l152re-fujitsubo-test/nucleo-l152re-fujitsubo-test.ioc
+++ b/stm32_development/nucleo-l152re-fujitsubo-test/nucleo-l152re-fujitsubo-test.ioc
@@ -222,9 +222,10 @@ RCC.USBOutput=48000000
 RCC.VCOOutputFreq_Value=96000000
 SH.GPXTI13.0=GPIO_EXTI13
 SH.GPXTI13.ConfNb=1
-SPI1.CalculateBaudRate=16.0 MBits/s
+SPI1.BaudRatePrescaler=SPI_BAUDRATEPRESCALER_256
+SPI1.CalculateBaudRate=125.0 KBits/s
 SPI1.Direction=SPI_DIRECTION_2LINES
-SPI1.IPParameters=VirtualType,Mode,Direction,CalculateBaudRate
+SPI1.IPParameters=VirtualType,Mode,Direction,CalculateBaudRate,BaudRatePrescaler
 SPI1.Mode=SPI_MODE_MASTER
 SPI1.VirtualType=VM_MASTER
 USART2.IPParameters=VirtualMode