STM32F4: removed common_stm32f4xx.h - removed defines from common.h (await PR)

This commit is contained in:
blckmn 2016-06-09 06:52:16 +10:00
parent 47ce9bb799
commit 7c7f89b4bb
6 changed files with 6 additions and 43 deletions

View File

@ -22,7 +22,6 @@
#include "stm32f4xx_rcc.h" #include "stm32f4xx_rcc.h"
#include "stm32f4xx_gpio.h" #include "stm32f4xx_gpio.h"
#include "core_cm4.h" #include "core_cm4.h"
#include "target/common_stm32f4xx.h"
// Chip Unique ID on F405 // Chip Unique ID on F405
#define U_ID_0 (*(uint32_t*)0x1fff7a10) #define U_ID_0 (*(uint32_t*)0x1fff7a10)

View File

@ -31,10 +31,6 @@
#include "drivers/system.h" #include "drivers/system.h"
#ifndef SCHEDULER_DELAY_LIMIT
#define SCHEDULER_DELAY_LIMIT 100
#endif
static cfTask_t *currentTask = NULL; static cfTask_t *currentTask = NULL;
static uint32_t totalWaitingTasks; static uint32_t totalWaitingTasks;

View File

@ -45,10 +45,6 @@ void taskBstReadWrite(void);
void taskBstMasterProcess(void); void taskBstMasterProcess(void);
#endif #endif
#ifndef TASK_GYROPID_DESIRED_PERIOD
#define TASK_GYROPID_DESIRED_PERIOD 1000
#endif
cfTask_t cfTasks[TASK_COUNT] = { cfTask_t cfTasks[TASK_COUNT] = {
[TASK_SYSTEM] = { [TASK_SYSTEM] = {
.taskName = "SYSTEM", .taskName = "SYSTEM",

View File

@ -20,9 +20,6 @@
#define TARGET_BOARD_IDENTIFIER "AFNA" // AFroNAze - NAZE might be considered misleading on Naze clones like the flip32. #define TARGET_BOARD_IDENTIFIER "AFNA" // AFroNAze - NAZE might be considered misleading on Naze clones like the flip32.
#define USE_HARDWARE_REVISION_DETECTION #define USE_HARDWARE_REVISION_DETECTION
/* remove some options from common.h due to flash size */
#undef GPS
#define BOARD_HAS_VOLTAGE_DIVIDER #define BOARD_HAS_VOLTAGE_DIVIDER
#define LED0 PB3 // PB3 (LED) #define LED0 PB3 // PB3 (LED)

View File

@ -17,30 +17,10 @@
#pragma once #pragma once
#define USE_SERVOS #ifdef STM32F4
#define USE_CLI #define TASK_GYROPID_DESIRED_PERIOD 125
#define SERIAL_RX #define SCHEDULER_DELAY_LIMIT 10
#define BLACKBOX
#if (FLASH_SIZE > 64)
#define GPS
#define GPS_PROTO_NMEA
#define GPS_PROTO_UBLOX
#define GPS_PROTO_I2C_NAV
#define GPS_PROTO_NAZA
#define TELEMETRY
#define TELEMETRY_FRSKY
#define TELEMETRY_HOTT
#define TELEMETRY_SMARTPORT
#define TELEMETRY_LTM
#endif
#if (FLASH_SIZE > 128)
#define DISPLAY
#define DISPLAY_ARMED_BITMAP
#else #else
#define SKIP_CLI_COMMAND_HELP #define TASK_GYROPID_DESIRED_PERIOD 1000
#define SKIP_RX_MSP #define SCHEDULER_DELAY_LIMIT 100
#define DISABLE_UNCOMMON_MIXERS #endif
#endif

View File

@ -1,5 +0,0 @@
/*
Common defines applicable to STM32F4
*/
#define TASK_GYROPID_DESIRED_PERIOD 125