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

Merge pull request #1530 from martinbudden/bf_tabs_to_spaces 

Converted tabs to spaces
This commit is contained in:
borisbstyle 2016-11-11 08:30:05 +01:00 committed by GitHub
parent 996b1a4aa9 dea71df659
commit 882e26201a
8 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,7 +58,7 @@
#define IOCFG_AF_PP_UP IO_CONFIG(GPIO_MODE_AF_PP, GPIO_SPEED_FREQ_LOW, GPIO_PULLUP) #define IOCFG_AF_PP_UP IO_CONFIG(GPIO_MODE_AF_PP, GPIO_SPEED_FREQ_LOW, GPIO_PULLUP)
#define IOCFG_AF_OD IO_CONFIG(GPIO_MODE_AF_OD, GPIO_SPEED_FREQ_LOW, GPIO_NOPULL) #define IOCFG_AF_OD IO_CONFIG(GPIO_MODE_AF_OD, GPIO_SPEED_FREQ_LOW, GPIO_NOPULL)
#define IOCFG_IPD IO_CONFIG(GPIO_MODE_INPUT, GPIO_SPEED_FREQ_LOW, GPIO_PULLDOWN) #define IOCFG_IPD IO_CONFIG(GPIO_MODE_INPUT, GPIO_SPEED_FREQ_LOW, GPIO_PULLDOWN)
#define IOCFG_IPU IO_CONFIG(GPIO_MODE_INPUT, GPIO_SPEED_FREQ_LOW, GPIO_PULLUP) #define IOCFG_IPU IO_CONFIG(GPIO_MODE_INPUT, GPIO_SPEED_FREQ_LOW, GPIO_PULLUP)
#define IOCFG_IN_FLOATING IO_CONFIG(GPIO_MODE_INPUT, GPIO_SPEED_FREQ_LOW, GPIO_NOPULL) #define IOCFG_IN_FLOATING IO_CONFIG(GPIO_MODE_INPUT, GPIO_SPEED_FREQ_LOW, GPIO_NOPULL)
#define IOCFG_IPU_25 IO_CONFIG(GPIO_MODE_INPUT, GPIO_SPEED_FREQ_HIGH, GPIO_PULLUP) #define IOCFG_IPU_25 IO_CONFIG(GPIO_MODE_INPUT, GPIO_SPEED_FREQ_HIGH, GPIO_PULLUP)

18
src/main/drivers/max7456.c
View File

@ -279,10 +279,10 @@ void max7456Init(uint8_t video_system)
//just fill with spaces with some tricks //just fill with spaces with some tricks
void max7456ClearScreen(void) void max7456ClearScreen(void)
{ {
uint16_t x; uint16_t x;
uint32_t *p = (uint32_t*)&screenBuffer[0]; uint32_t *p = (uint32_t*)&screenBuffer[0];
for (x = 0; x < VIDEO_BUFFER_CHARS_PAL/4; x++) for (x = 0; x < VIDEO_BUFFER_CHARS_PAL/4; x++)
p[x] = 0x20202020; p[x] = 0x20202020;
} }
uint8_t* max7456GetScreenBuffer(void) { uint8_t* max7456GetScreenBuffer(void) {
@ -291,15 +291,15 @@ uint8_t* max7456GetScreenBuffer(void) {
void max7456WriteChar(uint8_t x, uint8_t y, uint8_t c) void max7456WriteChar(uint8_t x, uint8_t y, uint8_t c)
{ {
screenBuffer[y*30+x] = c; screenBuffer[y*30+x] = c;
} }
void max7456Write(uint8_t x, uint8_t y, const char *buff) void max7456Write(uint8_t x, uint8_t y, const char *buff)
{ {
uint8_t i = 0; uint8_t i = 0;
for (i = 0; *(buff+i); i++) for (i = 0; *(buff+i); i++)
if (x+i < 30) //do not write over screen if (x+i < 30) //do not write over screen
screenBuffer[y*30+x+i] = *(buff+i); screenBuffer[y*30+x+i] = *(buff+i);
} }
#ifdef MAX7456_DMA_CHANNEL_TX #ifdef MAX7456_DMA_CHANNEL_TX

4
src/main/drivers/system_stm32f7xx.c
View File

@ -151,9 +151,9 @@ bool isMPUSoftReset(void)
void systemInit(void) void systemInit(void)
{ {
checkForBootLoaderRequest(); checkForBootLoaderRequest();
//SystemClock_Config(); //SystemClock_Config();
// Configure NVIC preempt/priority groups // Configure NVIC preempt/priority groups
//NVIC_PriorityGroupConfig(NVIC_PRIORITY_GROUPING); //NVIC_PriorityGroupConfig(NVIC_PRIORITY_GROUPING);

4
src/main/fc/mw.c
View File

@ -545,8 +545,8 @@ void processRx(uint32_t currentTime)
if (ARMING_FLAG(ARMED) if (ARMING_FLAG(ARMED)
&& feature(FEATURE_MOTOR_STOP) && feature(FEATURE_MOTOR_STOP)
&& !STATE(FIXED_WING) && !STATE(FIXED_WING)
&& !feature(FEATURE_3D) && !feature(FEATURE_3D)
&& !isAirmodeActive() && !isAirmodeActive()
) { ) {
if (isUsingSticksForArming()) { if (isUsingSticksForArming()) {
if (throttleStatus == THROTTLE_LOW) { if (throttleStatus == THROTTLE_LOW) {

8
src/main/flight/mixer.c
View File

@ -256,8 +256,8 @@ void initEscEndpoints(void) {
disarmMotorOutput = DSHOT_DISARM_COMMAND; disarmMotorOutput = DSHOT_DISARM_COMMAND;
minMotorOutputNormal = DSHOT_MIN_THROTTLE + motorConfig->digitalIdleOffset; minMotorOutputNormal = DSHOT_MIN_THROTTLE + motorConfig->digitalIdleOffset;
maxMotorOutputNormal = DSHOT_MAX_THROTTLE; maxMotorOutputNormal = DSHOT_MAX_THROTTLE;
deadbandMotor3dHigh = DSHOT_3D_MIN_NEGATIVE; // TODO - Not working yet !! Mixer requires some throttle rescaling changes deadbandMotor3dHigh = DSHOT_3D_MIN_NEGATIVE; // TODO - Not working yet !! Mixer requires some throttle rescaling changes
deadbandMotor3dLow = DSHOT_3D_MAX_POSITIVE; // TODO - Not working yet !! Mixer requires some throttle rescaling changes deadbandMotor3dLow = DSHOT_3D_MAX_POSITIVE; // TODO - Not working yet !! Mixer requires some throttle rescaling changes
} else } else
#endif #endif
{ {
@ -376,9 +376,9 @@ void mixerResetDisarmedMotors(void)
void writeMotors(void) void writeMotors(void)
{ {
for (uint8_t i = 0; i < motorCount; i++) { for (uint8_t i = 0; i < motorCount; i++) {
pwmWriteMotor(i, motor[i]); pwmWriteMotor(i, motor[i]);
} }
if (syncMotorOutputWithPidLoop) { if (syncMotorOutputWithPidLoop) {
pwmCompleteMotorUpdate(motorCount); pwmCompleteMotorUpdate(motorCount);

2
src/main/io/ledstrip.c
View File

@ -1123,6 +1123,6 @@ static void ledStripDisable(void)
{ {
setStripColor(&HSV(BLACK)); setStripColor(&HSV(BLACK));
ws2811UpdateStrip(); ws2811UpdateStrip();
} }
#endif #endif

2
src/main/target/SPARKY2/target.h
View File

@ -22,7 +22,7 @@
#define USBD_PRODUCT_STRING "Sparky 2.0" #define USBD_PRODUCT_STRING "Sparky 2.0"
#ifdef OPBL #ifdef OPBL
#define USBD_SERIALNUMBER_STRING "0x8020000" #define USBD_SERIALNUMBER_STRING "0x8020000"
#endif #endif
#define LED0 PB5 #define LED0 PB5

4
src/main/target/YUPIF4/target.h
View File

@ -29,7 +29,7 @@
#define BEEPER PC9 #define BEEPER PC9
#define INVERTER PB15 #define INVERTER PB15
#define INVERTER_USART USART6 #define INVERTER_USART USART6
// MPU6500 interrupt // MPU6500 interrupt
@ -97,7 +97,7 @@
#define SPI1_NSS_PIN PA4 #define SPI1_NSS_PIN PA4
#define SPI1_SCK_PIN PA5 #define SPI1_SCK_PIN PA5
#define SPI1_MISO_PIN PA6 #define SPI1_MISO_PIN PA6
#define SPI1_MOSI_PIN PA7 #define SPI1_MOSI_PIN PA7
/* /*
#define USE_SPI_DEVICE_2 //Free #define USE_SPI_DEVICE_2 //Free