HAL_ChibiOS: enable flash logging on Omnibus and speedybeef4

amirrezasadeqi · Jan 22, 2019 · f98bfb1 · f98bfb1
1 parent 15db7a6
commit f98bfb1
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 5 deletions.
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4/hwdef.dat
@@ -46,7 +46,7 @@ PC12 SPI3_MOSI SPI3
 PB14 MAX7456_CS CS
 
 # dataflash M25P16
-PB3 M25P16_CS CS
+PB3 FLASH_CS CS
 
 PC4 ICM20689_CS CS
 PC5 ICM20689_DRDY INPUT
@@ -141,7 +141,7 @@ define HAL_BARO_BMP280_I2C_ADDR 0x76
 
 # SPI devices
 SPIDEV mpu6000   SPI1 DEVID1 ICM20689_CS MODE3 1*MHZ 8*MHZ 
-SPIDEV dataflash SPI3 DEVID1 M25P16_CS   MODE3 32*MHZ 32*MHZ
+SPIDEV dataflash SPI3 DEVID1 FLASH_CS    MODE3 32*MHZ 32*MHZ
 SPIDEV osd       SPI3 DEVID4 MAX7456_CS  MODE0 10*MHZ 10*MHZ
 
 # enable logging to dataflash

diff --git a/libraries/AP_HAL_ChibiOS/hwdef/OmnibusNanoV6/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/OmnibusNanoV6/hwdef.dat
@@ -47,9 +47,11 @@ PA7 SPI1_MOSI SPI1
 PB10 I2C2_SCL I2C2 PULLUP
 PB11 I2C2_SDA I2C2 PULLUP
 
+# SPI2 for flash
 PB15 SPI2_MOSI SPI2
 PB14 SPI2_MISO SPI2
 PB13 SPI2_SCK SPI2
+PB12 FLASH_CS CS
 
 
 PA10 USART1_RX USART1
@@ -87,8 +89,12 @@ PC9 SBUS_INVERT_TX OUTPUT LOW
 
 # SPI Device table 
 SPIDEV mpu6000    SPI1 DEVID1 MPU6000_CS MODE3 1*MHZ 8*MHZ
-SPIDEV bmp280     SPI3 DEVID3 BMP280_CS MODE3 1*MHZ 8*MHZ
-SPIDEV osd        SPI3 DEVID4 OSD_CS MODE0 10*MHZ 10*MHZ
+SPIDEV bmp280     SPI3 DEVID3 BMP280_CS  MODE3 1*MHZ 8*MHZ
+SPIDEV osd        SPI3 DEVID4 OSD_CS     MODE0 10*MHZ 10*MHZ
+SPIDEV dataflash  SPI2 DEVID1 FLASH_CS   MODE3 32*MHZ 32*MHZ
+
+# enable logging to dataflash
+define HAL_LOGGING_DATAFLASH
 
 define CONFIG_HAL_BOARD_SUBTYPE HAL_BOARD_SUBTYPE_CHIBIOS_OMNIBUSNANOV6
 

diff --git a/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4v6/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4v6/hwdef.dat
@@ -72,6 +72,12 @@ PC12 SPI3_MOSI SPI3
 PC11 SPI3_MISO SPI3
 PC10 SPI3_SCK SPI3
 
+# SPI2 for flash
+PB15 SPI2_MOSI SPI2
+PB14 SPI2_MISO SPI2
+PB13 SPI2_SCK SPI2
+PB12 FLASH_CS CS
+
 PA4 MPU6000_CS CS #SPI1_NSS
 PA15 OSD_CS CS    #SPI3_NSS 
 PB3 BMP280_CS CS  #SPI3_NSS
@@ -105,6 +111,10 @@ PB6 TIM4_CH1 TIM4 RCININT PULLDOWN LOW
 SPIDEV mpu6000    SPI1 DEVID1 MPU6000_CS MODE3 1*MHZ 8*MHZ
 SPIDEV bmp280     SPI3 DEVID3 BMP280_CS MODE3 1*MHZ 8*MHZ
 SPIDEV osd        SPI3 DEVID4 OSD_CS MODE0 10*MHZ 10*MHZ
+SPIDEV dataflash  SPI2 DEVID1 FLASH_CS   MODE3 32*MHZ 32*MHZ
+
+# enable logging to dataflash
+define HAL_LOGGING_DATAFLASH
 
 
 define HAL_INS_DEFAULT HAL_INS_MPU60XX_SPI

diff --git a/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4/hwdef.dat
@@ -54,7 +54,7 @@ PB10 MAX7456_CS CS
 PB3 SPI3_SCK SPI3
 PB4 SPI3_MISO SPI3
 PB5 SPI3_MOSI SPI3
-PC0 M25P16_CS CS
+PC0 FLASH_CS CS
 
 PB11 MPU6000_CS CS
 
@@ -142,6 +142,10 @@ define HAL_BARO_BMP085_I2C_ADDR 0x77
 # SPI devices
 SPIDEV mpu6000   SPI1 DEVID1 MPU6000_CS MODE3 1*MHZ 8*MHZ 
 SPIDEV osd       SPI2 DEVID1 MAX7456_CS MODE0 10*MHZ 10*MHZ
+SPIDEV dataflash SPI3 DEVID1 FLASH_CS    MODE3 32*MHZ 32*MHZ
+
+# enable logging to dataflash
+define HAL_LOGGING_DATAFLASH
 
 
 # 8 PWM available by default