Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-26 01:35:41 +03:00
Code Issues Wiki Activity

Use spaces instead of tabs

Browse source
This commit is contained in:
Nicholas Sherlock 2014-12-18 18:42:22 +13:00
parent c85a172370
commit 0ed47d5e6d
4 changed files with 1027 additions and 1027 deletions
Download patch file Download diff file Expand all files Collapse all files

1266
src/main/blackbox/blackbox.c
View file

File diff suppressed because it is too large Load diff

14
src/main/blackbox/blackbox.h
View file

@ -20,15 +20,15 @@
#include <stdint.h> #include <stdint.h>
typedef struct blackboxValues_t { typedef struct blackboxValues_t {
uint32_t time; uint32_t time;
int32_t axisP[3], axisI[3], axisD[3]; int32_t axisP[3], axisI[3], axisD[3];
int16_t rcCommand[4]; int16_t rcCommand[4];
int16_t gyroData[3]; int16_t gyroData[3];
int16_t accSmooth[3]; int16_t accSmooth[3];
int16_t motor[MAX_SUPPORTED_MOTORS]; int16_t motor[MAX_SUPPORTED_MOTORS];
int16_t servo[MAX_SUPPORTED_SERVOS]; int16_t servo[MAX_SUPPORTED_SERVOS];
} blackboxValues_t; } blackboxValues_t;
void initBlackbox(void); void initBlackbox(void);

6
src/main/flight/flight.c
View file

@ -339,9 +339,9 @@ static void pidRewrite(pidProfile_t *pidProfile, controlRateConfig_t *controlRat
axisPID[axis] = PTerm + ITerm + DTerm; axisPID[axis] = PTerm + ITerm + DTerm;
#ifdef BLACKBOX #ifdef BLACKBOX
axisP[axis] = PTerm; axisP[axis] = PTerm;
axisI[axis] = ITerm; axisI[axis] = ITerm;
axisD[axis] = DTerm; axisD[axis] = DTerm;
#endif #endif
} }
} }

10
src/main/mw.c
View file

@ -307,7 +307,7 @@ void mwDisarm(void)
#ifdef BLACKBOX #ifdef BLACKBOX
if (feature(FEATURE_BLACKBOX)) { if (feature(FEATURE_BLACKBOX)) {
finishBlackbox(); finishBlackbox();
if (isSerialPortFunctionShared(FUNCTION_BLACKBOX, FUNCTION_MSP)) { if (isSerialPortFunctionShared(FUNCTION_BLACKBOX, FUNCTION_MSP)) {
mspAllocateSerialPorts(&masterConfig.serialConfig); mspAllocateSerialPorts(&masterConfig.serialConfig);
} }
@ -341,7 +341,7 @@ void mwArm(void)
if (sharedBlackboxAndMspPort) { if (sharedBlackboxAndMspPort) {
mspReleasePortIfAllocated(sharedBlackboxAndMspPort); mspReleasePortIfAllocated(sharedBlackboxAndMspPort);
} }
startBlackbox(); startBlackbox();
} }
#endif #endif
return; return;
@ -700,9 +700,9 @@ void loop(void)
writeMotors(); writeMotors();
#ifdef BLACKBOX #ifdef BLACKBOX
if (!cliMode && feature(FEATURE_BLACKBOX)) { if (!cliMode && feature(FEATURE_BLACKBOX)) {
handleBlackbox(); handleBlackbox();
} }
#endif #endif
} }