diff --git a/main.c b/main.c --- a/main.c +++ b/main.c @@ -164,7 +164,6 @@ void update_temp() { // Assert CS HAL_GPIO_WritePin(MAX_CS, 0); - HAL_Delay(100); uint8_t rxdatah[1] = {0x00}; uint8_t rxdatal[1] = {0x00}; @@ -173,7 +172,6 @@ void update_temp() { HAL_SPI_Receive(&hspi1, rxdatal, 1, 100); // Release CS - HAL_Delay(1); HAL_GPIO_WritePin(MAX_CS, 1); // Assemble data array into one var diff --git a/spi.c b/spi.c --- a/spi.c +++ b/spi.c @@ -12,7 +12,7 @@ void init_spi() hspi1.Init.CLKPolarity = SPI_POLARITY_LOW; hspi1.Init.CLKPhase = SPI_PHASE_1EDGE; hspi1.Init.NSS = SPI_NSS_SOFT; - hspi1.Init.BaudRatePrescaler = SPI_BAUDRATEPRESCALER_64; + hspi1.Init.BaudRatePrescaler = SPI_BAUDRATEPRESCALER_16; hspi1.Init.FirstBit = SPI_FIRSTBIT_MSB; hspi1.Init.TIMode = SPI_TIMODE_DISABLED; hspi1.Init.CRCCalculation = SPI_CRCCALCULATION_DISABLED; @@ -20,37 +20,4 @@ void init_spi() HAL_SPI_Init(&hspi1); } - /* OLD: - SPI_InitTypeDef SPI_InitStructure; - - // OLED IC - SPI_Cmd(SPI1, DISABLE); - SPI_InitStructure.SPI_Direction = SPI_Direction_1Line_Tx; - SPI_InitStructure.SPI_Mode = SPI_Mode_Master; - SPI_InitStructure.SPI_DataSize = SPI_DataSize_8b; - SPI_InitStructure.SPI_CPOL = SPI_CPOL_High; - SPI_InitStructure.SPI_CPHA = SPI_CPHA_2Edge; - SPI_InitStructure.SPI_NSS = SPI_NSS_Soft; - SPI_InitStructure.SPI_BaudRatePrescaler = SPI_BaudRatePrescaler_4; - SPI_InitStructure.SPI_FirstBit = SPI_FirstBit_MSB; - SPI_InitStructure.SPI_CRCPolynomial = 7; - SPI_Init(SPI1, &SPI_InitStructure); - SPI_Cmd(SPI1, ENABLE); - - - // MAX IC - SPI_Cmd(SPI2, DISABLE); - SPI_InitStructure.SPI_Direction = SPI_Direction_2Lines_FullDuplex; - SPI_InitStructure.SPI_Mode = SPI_Mode_Master; - SPI_InitStructure.SPI_DataSize = SPI_DataSize_16b; // Andysworkshop - SPI_InitStructure.SPI_CPOL = SPI_CPOL_Low; // From andysworkshop - SPI_InitStructure.SPI_CPHA = SPI_CPHA_1Edge; // same - SPI_InitStructure.SPI_NSS = SPI_NSS_Soft; - SPI_InitStructure.SPI_BaudRatePrescaler = SPI_BaudRatePrescaler_8; - SPI_InitStructure.SPI_FirstBit = SPI_FirstBit_MSB; - SPI_InitStructure.SPI_CRCPolynomial = 7; - SPI_Init(SPI2, &SPI_InitStructure); - SPI_Cmd(SPI2, ENABLE); - */ - // vim:softtabstop=4 shiftwidth=4 expandtab