Fixed a regression. Updated readme.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@15008 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
This commit is contained in:
parent
3d22a387e2
commit
360ec6455a
|
@ -1,8 +1,12 @@
|
||||||
ifeq ($(USE_SMART_BUILD),yes)
|
ifeq ($(USE_SMART_BUILD),yes)
|
||||||
|
ifneq ($(findstring HAL_USE_I2S TRUE,$(HALCONF)),)
|
||||||
|
PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/LLD/SPIv1/hal_i2s_lld.c
|
||||||
|
endif
|
||||||
ifneq ($(findstring HAL_USE_SPI TRUE,$(HALCONF)),)
|
ifneq ($(findstring HAL_USE_SPI TRUE,$(HALCONF)),)
|
||||||
PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/LLD/SPIv1/hal_spi_v2_lld.c
|
PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/LLD/SPIv1/hal_spi_v2_lld.c
|
||||||
endif
|
endif
|
||||||
else
|
else
|
||||||
|
PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/LLD/SPIv1/hal_i2s_lld.c
|
||||||
PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/LLD/SPIv1/hal_spi_v2_lld.c
|
PLATFORMSRC += $(CHIBIOS)/os/hal/ports/STM32/LLD/SPIv1/hal_spi_v2_lld.c
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
|
@ -78,8 +78,8 @@
|
||||||
- NEW: Integrated FatFS with lwIP HTTPD, now it is possible to serve files
|
- NEW: Integrated FatFS with lwIP HTTPD, now it is possible to serve files
|
||||||
using HTTP from a storage device.
|
using HTTP from a storage device.
|
||||||
- NEW: Updated FatFS to version 0.14b.
|
- NEW: Updated FatFS to version 0.14b.
|
||||||
- NEW: SPIv2 driver has been implemented on: STM32F0, STM32F3, STM32F7,
|
- NEW: SPIv2 driver has been implemented on: STM32F0, STM32F3, STM32F4,
|
||||||
STM32G0, STM32G4, STM32L4, STM32L4+, STM32H7.
|
STM32F7, STM32G0, STM32G4, STM32L4, STM32L4+, STM32H7.
|
||||||
- NEW: New SPIv2 driver model, it is compatible with the previous SPI driver
|
- NEW: New SPIv2 driver model, it is compatible with the previous SPI driver
|
||||||
and introduces: better runtime errors handling, slave mode,
|
and introduces: better runtime errors handling, slave mode,
|
||||||
data synchronization function, various other improvements.
|
data synchronization function, various other improvements.
|
||||||
|
|
|
@ -35,41 +35,48 @@
|
||||||
/*===========================================================================*/
|
/*===========================================================================*/
|
||||||
|
|
||||||
void spi_circular_cb(SPIDriver *spip);
|
void spi_circular_cb(SPIDriver *spip);
|
||||||
|
void spi_error_cb(SPIDriver *spip);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Circular SPI configuration (21MHz, CPHA=0, CPOL=0, MSb first).
|
* Circular SPI configuration (21MHz, CPHA=0, CPOL=0, MSb first).
|
||||||
*/
|
*/
|
||||||
const SPIConfig c_spicfg = {
|
const SPIConfig c_spicfg = {
|
||||||
true,
|
.circular = true,
|
||||||
spi_circular_cb,
|
.slave = false,
|
||||||
GPIOB,
|
.data_cb = spi_circular_cb,
|
||||||
12,
|
.error_cb = spi_error_cb,
|
||||||
0,
|
.ssport = GPIOB,
|
||||||
0
|
.sspad = 12U,
|
||||||
|
.cr1 = 0U,
|
||||||
|
.cr2 = 0U
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Maximum speed SPI configuration (21MHz, CPHA=0, CPOL=0, MSb first).
|
* Maximum speed SPI configuration (21MHz, CPHA=0, CPOL=0, MSb first).
|
||||||
*/
|
*/
|
||||||
const SPIConfig hs_spicfg = {
|
const SPIConfig hs_spicfg = {
|
||||||
false,
|
.circular = false,
|
||||||
NULL,
|
.slave = false,
|
||||||
GPIOB,
|
.data_cb = NULL,
|
||||||
12,
|
.error_cb = spi_error_cb,
|
||||||
0,
|
.ssport = GPIOB,
|
||||||
0
|
.sspad = 12U,
|
||||||
|
.cr1 = 0U,
|
||||||
|
.cr2 = 0U
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Low speed SPI configuration (328.125kHz, CPHA=0, CPOL=0, MSb first).
|
* Low speed SPI configuration (328.125kHz, CPHA=0, CPOL=0, MSb first).
|
||||||
*/
|
*/
|
||||||
const SPIConfig ls_spicfg = {
|
const SPIConfig ls_spicfg = {
|
||||||
false,
|
.circular = false,
|
||||||
NULL,
|
.slave = false,
|
||||||
GPIOB,
|
.data_cb = NULL,
|
||||||
12,
|
.error_cb = spi_error_cb,
|
||||||
SPI_CR1_BR_2 | SPI_CR1_BR_1,
|
.ssport = GPIOB,
|
||||||
0
|
.sspad = 12U,
|
||||||
|
.cr1 = SPI_CR1_BR_2 | SPI_CR1_BR_1,
|
||||||
|
.cr2 = 0U
|
||||||
};
|
};
|
||||||
|
|
||||||
/*===========================================================================*/
|
/*===========================================================================*/
|
||||||
|
|
Loading…
Reference in New Issue