rusefi
/
atbetaflight
mirror of https://github.com/rusefi/atbetaflight.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2863 from martinbudden/bf_simulator_tidy 

Code tidy
This commit is contained in:
Martin Budden 2017-04-11 22:25:26 +01:00 committed by GitHub
parent 63b7f18a00 152c594151
commit cf781ba825
6 changed files with 12 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/config/config_streamer.c
View File

@ -53,6 +53,7 @@ extern uint8_t __config_end;
# define FLASH_PAGE_SIZE ((uint32_t)0x8000)
# elif defined(UNIT_TEST)
# define FLASH_PAGE_SIZE (0x400)
// SIMULATOR
# elif defined(SIMULATOR_BUILD)
# define FLASH_PAGE_SIZE (0x400)
# else
@ -87,9 +88,7 @@ void config_streamer_start(config_streamer_t *c, uintptr_t base, int size)
FLASH_ClearFlag(FLASH_FLAG_EOP | FLASH_FLAG_OPERR | FLASH_FLAG_WRPERR | FLASH_FLAG_PGAERR | FLASH_FLAG_PGPERR | FLASH_FLAG_PGSERR);
#elif defined(STM32F7)
// NOP
#elif defined(UNIT_TEST)
// NOP
#elif defined(SIMULATOR_BUILD)
#elif defined(UNIT_TEST) || defined(SIMULATOR_BUILD)
// NOP
#else
# error "Unsupported CPU"

9
src/main/drivers/bus_i2c.h
View File

@ -17,12 +17,15 @@
#pragma once
#include "platform.h"
#include "io_types.h"
#include "rcc_types.h"
#define I2C_SHORT_TIMEOUT ((uint32_t)0x1000)
#define I2C_LONG_TIMEOUT ((uint32_t)(10 * I2C_SHORT_TIMEOUT))
#define I2C_DEFAULT_TIMEOUT I2C_SHORT_TIMEOUT
#include "io_types.h"
#include "rcc_types.h"
#ifndef I2C_DEVICE
#define I2C_DEVICE I2CINVALID
@ -40,9 +43,7 @@ typedef enum I2CDevice {
} I2CDevice;
typedef struct i2cDevice_s {
#if !defined(SIMULATOR_BUILD)
I2C_TypeDef *dev;
#endif
ioTag_t scl;
ioTag_t sda;
rccPeriphTag_t rcc;

12
src/main/drivers/io.h
View File

@ -79,17 +79,7 @@
#define IOCFG_IN_FLOATING IO_CONFIG(GPIO_Mode_IN, 0, 0, GPIO_PuPd_NOPULL)
#define IOCFG_IPU_25 IO_CONFIG(GPIO_Mode_IN, GPIO_Speed_25MHz, 0, GPIO_PuPd_UP)
#elif defined(UNIT_TEST)
# define IOCFG_OUT_PP 0
# define IOCFG_OUT_OD 0
# define IOCFG_AF_PP 0
# define IOCFG_AF_OD 0
# define IOCFG_IPD 0
# define IOCFG_IPU 0
# define IOCFG_IN_FLOATING 0
#elif defined(SIMULATOR_BUILD)
#elif defined(UNIT_TEST) || defined(SIMULATOR_BUILD)
# define IOCFG_OUT_PP 0
# define IOCFG_OUT_OD 0

7
src/main/drivers/timer.h
View File

@ -45,12 +45,7 @@ typedef uint16_t timCCR_t;
typedef uint16_t timCCER_t;
typedef uint16_t timSR_t;
typedef uint16_t timCNT_t;
#elif defined(UNIT_TEST)
typedef uint32_t timCCR_t;
typedef uint32_t timCCER_t;
typedef uint32_t timSR_t;
typedef uint32_t timCNT_t;
#elif defined(SIMULATOR_BUILD)
#elif defined(UNIT_TEST) || defined(SIMULATOR_BUILD)
typedef uint32_t timCCR_t;
typedef uint32_t timCCER_t;
typedef uint32_t timSR_t;

2
src/main/fc/fc_core.c
View File

@ -603,7 +603,7 @@ void taskMainPidLoop(timeUs_t currentTimeUs)
static uint8_t pidUpdateCountdown;
#if defined(SIMULATOR_BUILD) && defined(SIMULATOR_GYROPID_SYNC)
if(lockMainPID() != 0) return;
if(lockMainPID() != 0) return;
#endif
if (debugMode == DEBUG_CYCLETIME) {

4
src/main/flight/imu.h
View File

@ -76,9 +76,9 @@ void imuInit(void);
#ifdef SIMULATOR_BUILD
void imuSetAttitudeRPY(float roll, float pitch, float yaw); // in deg
void imuSetAttitudeQuat(float w, float x, float y, float z);
#endif
#if defined(SIMULATOR_BUILD) && defined(SIMULATOR_IMU_SYNC)
#if defined(SIMULATOR_IMU_SYNC)
void imuSetHasNewData(uint32_t dt);
#endif
#endif