Commit: a6b5e43ece6a2630c54a55b32257f2f4f4e11bee - shared_foo (git)

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

Commit MetaInfo

• Revision: a6b5e43ece6a2630c54a55b32257f2f4f4e11bee (tree)
• Zeit: 2018-04-30 23:40:15
• Autor: takemasa <suikan@user...>
• Commiter: takemasa

Log Message

Test for the SPI master.

Ändern Zusammenfassung

• modified: stm32_development/murasaki/Inc/stm32f7xx_it.h
• modified: stm32_development/murasaki/Src/main.c
• modified: stm32_development/murasaki/Src/my_test.cpp
• modified: stm32_development/murasaki/Src/stm32f7xx_hal_msp.c
• modified: stm32_development/murasaki/Src/stm32f7xx_it.c
• modified: stm32_development/murasaki/murasaki.ioc
• modified: stm32_development/murasaki/murasaki/spimaster.cpp

Diff

--- a/stm32_development/murasaki/Inc/stm32f7xx_it.h
+++ b/stm32_development/murasaki/Inc/stm32f7xx_it.h
@@ -51,6 +51,7 @@ void SysTick_Handler(void);
 void DMA1_Stream1_IRQHandler(void);
 void DMA1_Stream3_IRQHandler(void);
 void EXTI9_5_IRQHandler(void);
+void SPI1_IRQHandler(void);
 void USART3_IRQHandler(void);
 void EXTI15_10_IRQHandler(void);
 void TIM8_TRG_COM_TIM14_IRQHandler(void);

--- a/stm32_development/murasaki/Src/main.c
+++ b/stm32_development/murasaki/Src/main.c
@@ -184,29 +184,41 @@ void SystemClock_Config(void)
     */
   __HAL_RCC_PWR_CLK_ENABLE();
 
-  __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE3);
+  __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1);
 
     /**Initializes the CPU, AHB and APB busses clocks 
     */
   RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI;
   RCC_OscInitStruct.HSIState = RCC_HSI_ON;
   RCC_OscInitStruct.HSICalibrationValue = 16;
-  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE;
+  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
+  RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSI;
+  RCC_OscInitStruct.PLL.PLLM = 8;
+  RCC_OscInitStruct.PLL.PLLN = 216;
+  RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV2;
+  RCC_OscInitStruct.PLL.PLLQ = 2;
   if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
   {
     _Error_Handler(__FILE__, __LINE__);
   }
 
+    /**Activate the Over-Drive mode 
+    */
+  if (HAL_PWREx_EnableOverDrive() != HAL_OK)
+  {
+    _Error_Handler(__FILE__, __LINE__);
+  }
+
     /**Initializes the CPU, AHB and APB busses clocks 
     */
   RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK|RCC_CLOCKTYPE_SYSCLK
                               |RCC_CLOCKTYPE_PCLK1|RCC_CLOCKTYPE_PCLK2;
-  RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_HSI;
+  RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK;
   RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
-  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV2;
-  RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;
+  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV4;
+  RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV4;
 
-  if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_0) != HAL_OK)
+  if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_7) != HAL_OK)
   {
     _Error_Handler(__FILE__, __LINE__);
   }
@@ -238,17 +250,17 @@ static void MX_SPI1_Init(void)
   hspi1.Instance = SPI1;
   hspi1.Init.Mode = SPI_MODE_MASTER;
   hspi1.Init.Direction = SPI_DIRECTION_2LINES;
-  hspi1.Init.DataSize = SPI_DATASIZE_4BIT;
+  hspi1.Init.DataSize = SPI_DATASIZE_8BIT;
   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;
   hspi1.Init.CRCPolynomial = 7;
   hspi1.Init.CRCLength = SPI_CRC_LENGTH_DATASIZE;
-  hspi1.Init.NSSPMode = SPI_NSS_PULSE_ENABLE;
+  hspi1.Init.NSSPMode = SPI_NSS_PULSE_DISABLE;
   if (HAL_SPI_Init(&hspi1) != HAL_OK)
   {
     _Error_Handler(__FILE__, __LINE__);

--- a/stm32_development/murasaki/Src/my_test.cpp
+++ b/stm32_development/murasaki/Src/my_test.cpp
@@ -44,48 +44,37 @@ void InitTestUart(UART_HandleTypeDef * uart_handle, SPI_HandleTypeDef * spi_hand
     murasaki::platform.logger = new murasaki::UartLogger(murasaki::platform.uart_console);
 
     // Setting SPI slave devices.
-    murasaki::platform.slave_1 = new murasaki::SpiSlaveSpecifier(murasaki::kspoFallThenRise,
-                                                                 murasaki::ksphLatchThenShift,
-                                                                 SPI_CS1_GPIO_Port,
-                                                                 SPI_CS1_Pin);
-    murasaki::platform.slave_1 = new murasaki::SpiSlaveSpecifier(murasaki::kspoFallThenRise,
-                                                                 murasaki::ksphShiftThenLatch,
-                                                                 SPI_CS2_GPIO_Port,
-                                                                 SPI_CS2_Pin);
-    murasaki::platform.slave_1 = new murasaki::SpiSlaveSpecifier(murasaki::kspoRiseThenFall,
-                                                                 murasaki::ksphLatchThenShift,
-                                                                 SPI_CS3_GPIO_Port,
-                                                                 SPI_CS3_Pin);
-    murasaki::platform.slave_1 = new murasaki::SpiSlaveSpecifier(murasaki::kspoRiseThenFall,
-                                                                 murasaki::ksphShiftThenLatch,
-                                                                 SPI_CS4_GPIO_Port,
-                                                                 SPI_CS4_Pin);
+	murasaki::platform.slave_1 = new murasaki::SpiSlaveSpecifier(
+			murasaki::kspoFallThenRise,
+            murasaki::ksphLatchThenShift,
+			SPI_CS4_GPIO_Port,
+			SPI_CS4_Pin);
+
+	murasaki::platform.slave_2 = new murasaki::SpiSlaveSpecifier(
+			murasaki::kspoFallThenRise,
+            murasaki::ksphShiftThenLatch,
+			SPI_CS4_GPIO_Port,
+			SPI_CS4_Pin);
+
+	murasaki::platform.slave_3 = new murasaki::SpiSlaveSpecifier(
+			murasaki::kspoRiseThenFall,
+            murasaki::ksphLatchThenShift,
+			SPI_CS4_GPIO_Port,
+			SPI_CS4_Pin);
+
+	murasaki::platform.slave_4 = new murasaki::SpiSlaveSpecifier(
+			murasaki::kspoRiseThenFall,
+			murasaki::ksphShiftThenLatch,
+			SPI_CS4_GPIO_Port,
+			SPI_CS4_Pin);
+
     // Setting SPI master
     murasaki::platform.spi_master = new murasaki::SpiMaster(spi_handle);
 
     // Setting debugger
     murasaki::debugger = new murasaki::Debugger(murasaki::platform.logger);
     murasaki::debugger->AutoRePrint();  // 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,  // 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));
-    test_fifo->NotifyData();
-
-    murasaki::debugger->Printf("FIFO.Put(), %d data taransfered\n\r", copied);
-#endif
 
 }
 
@@ -94,32 +83,15 @@ uint8_t tx_buffer[1] = { 0x55 }, rx_buffer[1];
 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);
+#if 1
+	murasaki::platform.spi_master->TransmitAndReceive(
+			murasaki::platform.slave_4, tx_buffer, rx_buffer, 1);
 #endif
 
-#if 0
-    char data[10];
-    unsigned int copied = test_fifo->Get(reinterpret_cast<uint8_t *>(data), sizeof(data));
-    if (copied == 0)
-    {
-        murasaki::debugger->Printf("FIFO.Get(), %d data taransfered \n\r", copied);
-//        test_fifo->ReWind();
-        test_fifo->NotifyData();
-    }
-    else {
-        murasaki::debugger->Printf("FIFO.Get(), %d data taransfered : '%10s'\n\r", copied, data);
-    }
-#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++);
 
 }
 

--- a/stm32_development/murasaki/Src/stm32f7xx_hal_msp.c
+++ b/stm32_development/murasaki/Src/stm32f7xx_hal_msp.c
@@ -154,6 +154,9 @@ void HAL_SPI_MspInit(SPI_HandleTypeDef* hspi)
 
     __HAL_LINKDMA(hspi,hdmarx,hdma_spi1_rx);
 
+    /* SPI1 interrupt Init */
+    HAL_NVIC_SetPriority(SPI1_IRQn, 5, 0);
+    HAL_NVIC_EnableIRQ(SPI1_IRQn);
   /* USER CODE BEGIN SPI1_MspInit 1 */
 
   /* USER CODE END SPI1_MspInit 1 */
@@ -182,6 +185,9 @@ void HAL_SPI_MspDeInit(SPI_HandleTypeDef* hspi)
     /* SPI1 DMA DeInit */
     HAL_DMA_DeInit(hspi->hdmatx);
     HAL_DMA_DeInit(hspi->hdmarx);
+
+    /* SPI1 interrupt DeInit */
+    HAL_NVIC_DisableIRQ(SPI1_IRQn);
   /* USER CODE BEGIN SPI1_MspDeInit 1 */
 
   /* USER CODE END SPI1_MspDeInit 1 */

--- a/stm32_development/murasaki/Src/stm32f7xx_it.c
+++ b/stm32_development/murasaki/Src/stm32f7xx_it.c
@@ -43,6 +43,7 @@
 /* External variables --------------------------------------------------------*/
 extern DMA_HandleTypeDef hdma_spi1_tx;
 extern DMA_HandleTypeDef hdma_spi1_rx;
+extern SPI_HandleTypeDef hspi1;
 extern DMA_HandleTypeDef hdma_usart3_tx;
 extern DMA_HandleTypeDef hdma_usart3_rx;
 extern UART_HandleTypeDef huart3;
@@ -117,6 +118,20 @@ void EXTI9_5_IRQHandler(void)
 }
 
 /**
+* @brief This function handles SPI1 global interrupt.
+*/
+void SPI1_IRQHandler(void)
+{
+  /* USER CODE BEGIN SPI1_IRQn 0 */
+
+  /* USER CODE END SPI1_IRQn 0 */
+  HAL_SPI_IRQHandler(&hspi1);
+  /* USER CODE BEGIN SPI1_IRQn 1 */
+
+  /* USER CODE END SPI1_IRQn 1 */
+}
+
+/**
 * @brief This function handles USART3 global interrupt.
 */
 void USART3_IRQHandler(void)

--- a/stm32_development/murasaki/murasaki.ioc
+++ b/stm32_development/murasaki/murasaki.ioc
@@ -122,6 +122,7 @@ NVIC.MemoryManagement_IRQn=true\:0\:0\:false\:false\:false\:false\:true
 NVIC.NonMaskableInt_IRQn=true\:0\:0\:false\:false\:false\:false\:true
 NVIC.PendSV_IRQn=true\:15\:0\:false\:false\:false\:true\:true
 NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4
+NVIC.SPI1_IRQn=true\:5\:0\:false\:false\:true\:true\:true
 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:false\:false\:true
 NVIC.SysTick_IRQn=true\:15\:0\:false\:false\:true\:true\:true
 NVIC.TIM8_TRG_COM_TIM14_IRQn=true\:0\:0\:false\:false\:true\:false\:false
@@ -300,56 +301,60 @@ ProjectManager.functionlistsort=1-MX_GPIO_Init-GPIO-false-HAL,2-MX_DMA_Init-DMA-
 RCC.48MHZClocksFreq_Value=24000000
 RCC.ADC12outputFreq_Value=72000000
 RCC.ADC34outputFreq_Value=72000000
-RCC.AHBFreq_Value=16000000
-RCC.APB1CLKDivider=RCC_HCLK_DIV2
-RCC.APB1Freq_Value=8000000
-RCC.APB1TimFreq_Value=16000000
-RCC.APB2Freq_Value=16000000
-RCC.APB2TimFreq_Value=16000000
+RCC.AHBFreq_Value=216000000
+RCC.APB1CLKDivider=RCC_HCLK_DIV4
+RCC.APB1Freq_Value=54000000
+RCC.APB1TimFreq_Value=108000000
+RCC.APB2CLKDivider=RCC_HCLK_DIV4
+RCC.APB2Freq_Value=54000000
+RCC.APB2TimFreq_Value=108000000
 RCC.CECFreq_Value=32786.88524590164
-RCC.CortexFreq_Value=16000000
-RCC.EthernetFreq_Value=16000000
-RCC.FCLKCortexFreq_Value=16000000
+RCC.CortexFreq_Value=216000000
+RCC.EthernetFreq_Value=216000000
+RCC.FCLKCortexFreq_Value=216000000
 RCC.FamilyName=M
-RCC.HCLKFreq_Value=16000000
+RCC.HCLKFreq_Value=216000000
 RCC.HSE_VALUE=8000000
 RCC.HSI_VALUE=16000000
-RCC.I2C1Freq_Value=8000000
-RCC.I2C2Freq_Value=8000000
-RCC.I2C3Freq_Value=8000000
-RCC.I2C4Freq_Value=8000000
+RCC.I2C1Freq_Value=54000000
+RCC.I2C2Freq_Value=54000000
+RCC.I2C3Freq_Value=54000000
+RCC.I2C4Freq_Value=54000000
 RCC.I2SClocksFreq_Value=48000000
-RCC.I2SFreq_Value=96000000
-RCC.IPParameters=48MHZClocksFreq_Value,ADC12outputFreq_Value,ADC34outputFreq_Value,AHBFreq_Value,APB1CLKDivider,APB1Freq_Value,APB1TimFreq_Value,APB2Freq_Value,APB2TimFreq_Value,CECFreq_Value,CortexFreq_Value,EthernetFreq_Value,FCLKCortexFreq_Value,FamilyName,HCLKFreq_Value,HSE_VALUE,HSI_VALUE,I2C1Freq_Value,I2C2Freq_Value,I2C3Freq_Value,I2C4Freq_Value,I2SClocksFreq_Value,I2SFreq_Value,LCDTFToutputFreq_Value,LPTIM1Freq_Value,LSE_VALUE,LSI_VALUE,MCO1PinFreq_Value,MCO2PinFreq_Value,MCOFreq_Value,PLLCLKFreq_Value,PLLI2SPCLKFreq_Value,PLLI2SQCLKFreq_Value,PLLI2SRCLKFreq_Value,PLLI2SRoutputFreq_Value,PLLMCOFreq_Value,PLLMUL,PLLQCLKFreq_Value,PLLQoutputFreq_Value,PLLSAIPCLKFreq_Value,PLLSAIQCLKFreq_Value,PLLSAIRCLKFreq_Value,PLLSAIoutputFreq_Value,PRESCALERUSB,RNGFreq_Value,RTCFreq_Value,RTCHSEDivFreq_Value,SAI1Freq_Value,SAI2Freq_Value,SDMMCFreq_Value,SPDIFRXFreq_Value,SYSCLKFreq_VALUE,SYSCLKSourceVirtual,TIM15Freq_Value,TIM16Freq_Value,TIM17Freq_Value,TIM1Freq_Value,TIM20Freq_Value,TIM2Freq_Value,TIM3Freq_Value,TIM8Freq_Value,UART4Freq_Value,UART5Freq_Value,UART7Freq_Value,UART8Freq_Value,USART1Freq_Value,USART2Freq_Value,USART3Freq_Value,USART6Freq_Value,USBFreq_Value,VCOI2SOutputFreq_Value,VCOInputFreq_Value,VCOOutput2Freq_Value,VCOOutputFreq_Value,VCOSAIOutputFreq_Value,VcooutputI2S,WatchDogFreq_Value
-RCC.LCDTFToutputFreq_Value=48000000
-RCC.LPTIM1Freq_Value=8000000
+RCC.I2SFreq_Value=192000000
+RCC.IPParameters=48MHZClocksFreq_Value,ADC12outputFreq_Value,ADC34outputFreq_Value,AHBFreq_Value,APB1CLKDivider,APB1Freq_Value,APB1TimFreq_Value,APB2CLKDivider,APB2Freq_Value,APB2TimFreq_Value,CECFreq_Value,CortexFreq_Value,EthernetFreq_Value,FCLKCortexFreq_Value,FamilyName,HCLKFreq_Value,HSE_VALUE,HSI_VALUE,I2C1Freq_Value,I2C2Freq_Value,I2C3Freq_Value,I2C4Freq_Value,I2SClocksFreq_Value,I2SFreq_Value,LCDTFToutputFreq_Value,LPTIM1Freq_Value,LSE_VALUE,LSI_VALUE,MCO1PinFreq_Value,MCO2PinFreq_Value,MCOFreq_Value,PLLCLKFreq_Value,PLLI2SPCLKFreq_Value,PLLI2SQCLKFreq_Value,PLLI2SRCLKFreq_Value,PLLI2SRoutputFreq_Value,PLLM,PLLMCOFreq_Value,PLLMUL,PLLN,PLLQCLKFreq_Value,PLLQoutputFreq_Value,PLLSAIPCLKFreq_Value,PLLSAIQCLKFreq_Value,PLLSAIRCLKFreq_Value,PLLSAIoutputFreq_Value,PRESCALERUSB,RNGFreq_Value,RTCFreq_Value,RTCHSEDivFreq_Value,SAI1Freq_Value,SAI2Freq_Value,SDMMCFreq_Value,SPDIFRXFreq_Value,SYSCLKFreq_VALUE,SYSCLKSource,SYSCLKSourceVirtual,TIM15Freq_Value,TIM16Freq_Value,TIM17Freq_Value,TIM1Freq_Value,TIM20Freq_Value,TIM2Freq_Value,TIM3Freq_Value,TIM8Freq_Value,UART4Freq_Value,UART5Freq_Value,UART7Freq_Value,UART8Freq_Value,USART1Freq_Value,USART2Freq_Value,USART3Freq_Value,USART6Freq_Value,USBFreq_Value,VCOI2SOutputFreq_Value,VCOInputFreq_Value,VCOOutput2Freq_Value,VCOOutputFreq_Value,VCOSAIOutputFreq_Value,VcooutputI2S,WatchDogFreq_Value
+RCC.LCDTFToutputFreq_Value=96000000
+RCC.LPTIM1Freq_Value=54000000
 RCC.LSE_VALUE=32768
 RCC.LSI_VALUE=32000
 RCC.MCO1PinFreq_Value=16000000
-RCC.MCO2PinFreq_Value=16000000
+RCC.MCO2PinFreq_Value=216000000
 RCC.MCOFreq_Value=72000000
-RCC.PLLCLKFreq_Value=96000000
-RCC.PLLI2SPCLKFreq_Value=96000000
-RCC.PLLI2SQCLKFreq_Value=96000000
-RCC.PLLI2SRCLKFreq_Value=96000000
-RCC.PLLI2SRoutputFreq_Value=96000000
+RCC.PLLCLKFreq_Value=216000000
+RCC.PLLI2SPCLKFreq_Value=192000000
+RCC.PLLI2SQCLKFreq_Value=192000000
+RCC.PLLI2SRCLKFreq_Value=192000000
+RCC.PLLI2SRoutputFreq_Value=192000000
+RCC.PLLM=8
 RCC.PLLMCOFreq_Value=72000000
 RCC.PLLMUL=RCC_PLL_MUL9
-RCC.PLLQCLKFreq_Value=96000000
-RCC.PLLQoutputFreq_Value=96000000
-RCC.PLLSAIPCLKFreq_Value=96000000
-RCC.PLLSAIQCLKFreq_Value=96000000
-RCC.PLLSAIRCLKFreq_Value=96000000
-RCC.PLLSAIoutputFreq_Value=96000000
+RCC.PLLN=216
+RCC.PLLQCLKFreq_Value=216000000
+RCC.PLLQoutputFreq_Value=216000000
+RCC.PLLSAIPCLKFreq_Value=192000000
+RCC.PLLSAIQCLKFreq_Value=192000000
+RCC.PLLSAIRCLKFreq_Value=192000000
+RCC.PLLSAIoutputFreq_Value=192000000
 RCC.PRESCALERUSB=RCC_USBCLKSOURCE_PLL_DIV1_5
-RCC.RNGFreq_Value=96000000
+RCC.RNGFreq_Value=216000000
 RCC.RTCFreq_Value=32000
 RCC.RTCHSEDivFreq_Value=4000000
-RCC.SAI1Freq_Value=96000000
-RCC.SAI2Freq_Value=96000000
-RCC.SDMMCFreq_Value=16000000
-RCC.SPDIFRXFreq_Value=96000000
-RCC.SYSCLKFreq_VALUE=16000000
+RCC.SAI1Freq_Value=192000000
+RCC.SAI2Freq_Value=192000000
+RCC.SDMMCFreq_Value=216000000
+RCC.SPDIFRXFreq_Value=192000000
+RCC.SYSCLKFreq_VALUE=216000000
+RCC.SYSCLKSource=RCC_SYSCLKSOURCE_PLLCLK
 RCC.SYSCLKSourceVirtual=RCC_SYSCLKSOURCE_PLLCLK
 RCC.TIM15Freq_Value=72000000
 RCC.TIM16Freq_Value=72000000
@@ -359,30 +364,33 @@ RCC.TIM20Freq_Value=72000000
 RCC.TIM2Freq_Value=72000000
 RCC.TIM3Freq_Value=72000000
 RCC.TIM8Freq_Value=72000000
-RCC.UART4Freq_Value=8000000
-RCC.UART5Freq_Value=8000000
-RCC.UART7Freq_Value=8000000
-RCC.UART8Freq_Value=8000000
-RCC.USART1Freq_Value=16000000
-RCC.USART2Freq_Value=8000000
-RCC.USART3Freq_Value=8000000
-RCC.USART6Freq_Value=16000000
-RCC.USBFreq_Value=96000000
-RCC.VCOI2SOutputFreq_Value=192000000
-RCC.VCOInputFreq_Value=1000000
+RCC.UART4Freq_Value=54000000
+RCC.UART5Freq_Value=54000000
+RCC.UART7Freq_Value=54000000
+RCC.UART8Freq_Value=54000000
+RCC.USART1Freq_Value=54000000
+RCC.USART2Freq_Value=54000000
+RCC.USART3Freq_Value=54000000
+RCC.USART6Freq_Value=54000000
+RCC.USBFreq_Value=216000000
+RCC.VCOI2SOutputFreq_Value=384000000
+RCC.VCOInputFreq_Value=2000000
 RCC.VCOOutput2Freq_Value=8000000
-RCC.VCOOutputFreq_Value=192000000
-RCC.VCOSAIOutputFreq_Value=192000000
+RCC.VCOOutputFreq_Value=432000000
+RCC.VCOSAIOutputFreq_Value=384000000
 RCC.VcooutputI2S=48000000
 RCC.WatchDogFreq_Value=32000
 SH.GPXTI13.0=GPIO_EXTI13
 SH.GPXTI13.ConfNb=1
 SH.GPXTI5.0=GPIO_EXTI5
 SH.GPXTI5.ConfNb=1
-SPI1.CalculateBaudRate=8.0 MBits/s
+SPI1.BaudRatePrescaler=SPI_BAUDRATEPRESCALER_256
+SPI1.CalculateBaudRate=210.937 KBits/s
+SPI1.DataSize=SPI_DATASIZE_8BIT
 SPI1.Direction=SPI_DIRECTION_2LINES
-SPI1.IPParameters=VirtualType,Mode,Direction,CalculateBaudRate
+SPI1.IPParameters=VirtualType,Mode,Direction,CalculateBaudRate,DataSize,BaudRatePrescaler,NSSPMode
 SPI1.Mode=SPI_MODE_MASTER
+SPI1.NSSPMode=SPI_NSS_PULSE_DISABLE
 SPI1.VirtualType=VM_MASTER
 USART3.IPParameters=VirtualMode-Asynchronous,WordLength
 USART3.VirtualMode-Asynchronous=VM_ASYNC

--- a/stm32_development/murasaki/murasaki/spimaster.cpp
+++ b/stm32_development/murasaki/murasaki/spimaster.cpp
@@ -80,6 +80,7 @@ bool SpiMaster::TransmitAndReceive(murasaki::AbstractSpiSlaveSpecifier* spi_spec
 
             // wait for the completion
             result = sync_->Wait(timeout_ms);   // return false if timeout
+
         }
         // Dessert the chip select for slave
         spi_spec->DeassertCs();