Merge branch 'naze-updates-pb' of github.com:Pierre-A/Cleanflight into Pierre-A-naze-updates-pb
This commit is contained in:
commit
59698c5a37
|
@ -862,7 +862,7 @@ static void cliExit(char *cmdline)
|
||||||
*cliBuffer = '\0';
|
*cliBuffer = '\0';
|
||||||
bufferIndex = 0;
|
bufferIndex = 0;
|
||||||
cliMode = 0;
|
cliMode = 0;
|
||||||
// incase some idiot leaves a motor running during motortest, clear it here
|
// incase a motor was left running during motortest, clear it here
|
||||||
mixerResetMotors();
|
mixerResetMotors();
|
||||||
// save and reboot... I think this makes the most sense - otherwise config changes can be out of sync, maybe just need to applyConfig and return?
|
// save and reboot... I think this makes the most sense - otherwise config changes can be out of sync, maybe just need to applyConfig and return?
|
||||||
#if 1
|
#if 1
|
||||||
|
|
|
@ -709,9 +709,7 @@ static bool processOutCommand(uint8_t cmdMSP)
|
||||||
serialize16(0);
|
serialize16(0);
|
||||||
#endif
|
#endif
|
||||||
serialize16(sensors(SENSOR_ACC) | sensors(SENSOR_BARO) << 1 | sensors(SENSOR_MAG) << 2 | sensors(SENSOR_GPS) << 3 | sensors(SENSOR_SONAR) << 4);
|
serialize16(sensors(SENSOR_ACC) | sensors(SENSOR_BARO) << 1 | sensors(SENSOR_MAG) << 2 | sensors(SENSOR_GPS) << 3 | sensors(SENSOR_SONAR) << 4);
|
||||||
// OK, so you waste all the fucking time to have BOXNAMES and BOXINDEXES etc, and then you go ahead and serialize enabled shit simply by stuffing all
|
// ??
|
||||||
// the bits in order, instead of setting the enabled bits based on BOXINDEX. WHERE IS THE FUCKING LOGIC IN THIS, FUCKWADS.
|
|
||||||
// Serialize the boxes in the order we delivered them, until multiwii retards fix their shit
|
|
||||||
junk = 0;
|
junk = 0;
|
||||||
tmp = IS_ENABLED(FLIGHT_MODE(ANGLE_MODE)) << BOXANGLE |
|
tmp = IS_ENABLED(FLIGHT_MODE(ANGLE_MODE)) << BOXANGLE |
|
||||||
IS_ENABLED(FLIGHT_MODE(HORIZON_MODE)) << BOXHORIZON |
|
IS_ENABLED(FLIGHT_MODE(HORIZON_MODE)) << BOXHORIZON |
|
||||||
|
|
|
@ -87,7 +87,7 @@ static void performAcclerationCalibration(uint8_t gyroMovementCalibrationThresho
|
||||||
|
|
||||||
if (isOnFinalGyroCalibrationCycle()) {
|
if (isOnFinalGyroCalibrationCycle()) {
|
||||||
float dev = devStandardDeviation(&var[axis]);
|
float dev = devStandardDeviation(&var[axis]);
|
||||||
// check deviation and startover if idiot was moving the model
|
// check deviation and startover in case the model was moved
|
||||||
if (gyroMovementCalibrationThreshold && dev > gyroMovementCalibrationThreshold) {
|
if (gyroMovementCalibrationThreshold && dev > gyroMovementCalibrationThreshold) {
|
||||||
gyroSetCalibrationCycles(CALIBRATING_GYRO_CYCLES);
|
gyroSetCalibrationCycles(CALIBRATING_GYRO_CYCLES);
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -312,10 +312,10 @@ retry:
|
||||||
; // prevent compiler error
|
; // prevent compiler error
|
||||||
}
|
}
|
||||||
|
|
||||||
// Found anything? Check if user fucked up or ACC is really missing.
|
// Found anything? Check if error or ACC is really missing.
|
||||||
if (accHardware == ACC_DEFAULT) {
|
if (accHardware == ACC_DEFAULT) {
|
||||||
if (accHardwareToUse > ACC_DEFAULT) {
|
if (accHardwareToUse > ACC_DEFAULT) {
|
||||||
// Nothing was found and we have a forced sensor type. Stupid user probably chose a sensor that isn't present.
|
// Nothing was found and we have a forced sensor that isn't present.
|
||||||
accHardwareToUse = ACC_DEFAULT;
|
accHardwareToUse = ACC_DEFAULT;
|
||||||
goto retry;
|
goto retry;
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -320,7 +320,7 @@ static void sendVoltage(void)
|
||||||
uint16_t payload;
|
uint16_t payload;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Note: Fuck the pdf. Format for Voltage Data for single cells is like this:
|
* Format for Voltage Data for single cells is like this:
|
||||||
*
|
*
|
||||||
* llll llll cccc hhhh
|
* llll llll cccc hhhh
|
||||||
* l: Low voltage bits
|
* l: Low voltage bits
|
||||||
|
|
Loading…
Reference in New Issue