Merge branch 'Pierre-A-naze-updates-pb'

This commit is contained in:
Dominic Clifton 2014-11-06 19:52:21 +00:00
commit 2c8b3af88d
5 changed files with 8 additions and 8 deletions

View File

@ -862,7 +862,7 @@ static void cliExit(char *cmdline)
*cliBuffer = '\0';
bufferIndex = 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();
// 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

View File

@ -709,9 +709,9 @@ static bool processOutCommand(uint8_t cmdMSP)
serialize16(0);
#endif
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
// Serialize the flags in the order we delivered them, ignoring BOXNAMES and BOXINDEXES
// Requires new Multiwii protocol version to fix
// It would be preferable to setting the enabled bits based on BOXINDEX.
junk = 0;
tmp = IS_ENABLED(FLIGHT_MODE(ANGLE_MODE)) << BOXANGLE |
IS_ENABLED(FLIGHT_MODE(HORIZON_MODE)) << BOXHORIZON |

View File

@ -87,7 +87,7 @@ static void performAcclerationCalibration(uint8_t gyroMovementCalibrationThresho
if (isOnFinalGyroCalibrationCycle()) {
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) {
gyroSetCalibrationCycles(CALIBRATING_GYRO_CYCLES);
return;

View File

@ -312,10 +312,10 @@ retry:
; // 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 (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;
goto retry;
} else {

View File

@ -320,7 +320,7 @@ static void sendVoltage(void)
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
* l: Low voltage bits