Merge pull request #1362 from mikeller/make_dataflash_buffer_size_ram_dependent

Made dataflash buffer size dependent on RAM. Also, reenabled some features for NAZE.
This commit is contained in:
Martin Budden 2016-10-22 17:39:13 +01:00 committed by GitHub
commit eae47ec627
2 changed files with 16 additions and 12 deletions

View File

@ -39,7 +39,11 @@ typedef enum {
#define MSP_PORT_INBUF_SIZE 192
#ifdef USE_FLASHFS
#ifdef STM32F1
#define MSP_PORT_DATAFLASH_BUFFER_SIZE 2048
#else
#define MSP_PORT_DATAFLASH_BUFFER_SIZE 4096
#endif
#define MSP_PORT_DATAFLASH_INFO_SIZE 16
#define MSP_PORT_OUTBUF_SIZE (MSP_PORT_DATAFLASH_BUFFER_SIZE + MSP_PORT_DATAFLASH_INFO_SIZE)
#else

View File

@ -103,14 +103,14 @@
#define ACC_BMA280_ALIGN CW0_DEG
#define ACC_MPU6500_ALIGN CW0_DEG
//#define BARO
//#define USE_BARO_MS5611
//#define USE_BARO_BMP085
//#define USE_BARO_BMP280
#define BARO
#define USE_BARO_MS5611
#define USE_BARO_BMP085
#define USE_BARO_BMP280
//#define MAG
//#define USE_MAG_HMC5883
//#define MAG_HMC5883_ALIGN CW180_DEG
#define MAG
#define USE_MAG_HMC5883
#define MAG_HMC5883_ALIGN CW180_DEG
//#define SONAR
//#define SONAR_TRIGGER_PIN PB0
@ -151,11 +151,11 @@
#define RSSI_ADC_PIN PA1
#define EXTERNAL1_ADC_PIN PA5
//#define LED_STRIP
//#define WS2811_TIMER TIM3
//#define WS2811_PIN PA6
//#define WS2811_DMA_TC_FLAG DMA1_FLAG_TC6
//#define WS2811_DMA_HANDLER_IDENTIFER DMA1_CH6_HANDLER
#define LED_STRIP
#define WS2811_TIMER TIM3
#define WS2811_PIN PA6
#define WS2811_DMA_TC_FLAG DMA1_FLAG_TC6
#define WS2811_DMA_HANDLER_IDENTIFER DMA1_CH6_HANDLER
#undef GPS