Compare commits
4 commits
Author | SHA1 | Date | |
---|---|---|---|
52c28161f8 | |||
2082ecbb06 | |||
c5a5844297 | |||
d8f2ce9f79 |
4 changed files with 8 additions and 7 deletions
|
@ -184,10 +184,10 @@ static void autotuneLogAngleTargets(float currentAngle)
|
||||||
eventData.targetAngleAtPeak = (int) targetAngleAtPeak;
|
eventData.targetAngleAtPeak = (int) targetAngleAtPeak;
|
||||||
|
|
||||||
// currentAngle is integer decidegrees divided by 10, so just reverse that process to get an integer again:
|
// currentAngle is integer decidegrees divided by 10, so just reverse that process to get an integer again:
|
||||||
eventData.currentAngle = round(currentAngle * 10);
|
eventData.currentAngle = roundf(currentAngle * 10);
|
||||||
// the peak angles are only ever set to currentAngle, so they get the same treatment:
|
// the peak angles are only ever set to currentAngle, so they get the same treatment:
|
||||||
eventData.firstPeakAngle = round(firstPeakAngle * 10);
|
eventData.firstPeakAngle = roundf(firstPeakAngle * 10);
|
||||||
eventData.secondPeakAngle = round(secondPeakAngle * 10);
|
eventData.secondPeakAngle = roundf(secondPeakAngle * 10);
|
||||||
|
|
||||||
blackboxLogEvent(FLIGHT_LOG_EVENT_AUTOTUNE_TARGETS, (flightLogEventData_t*)&eventData);
|
blackboxLogEvent(FLIGHT_LOG_EVENT_AUTOTUNE_TARGETS, (flightLogEventData_t*)&eventData);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1296,13 +1296,14 @@ static void cliMotor(char *cmdline)
|
||||||
int motor_value = 0;
|
int motor_value = 0;
|
||||||
int index = 0;
|
int index = 0;
|
||||||
char *pch = NULL;
|
char *pch = NULL;
|
||||||
|
char *saveptr;
|
||||||
|
|
||||||
if (isEmpty(cmdline)) {
|
if (isEmpty(cmdline)) {
|
||||||
cliPrint("Usage:\r\nmotor index [value] - show [or set] motor value\r\n");
|
cliPrint("Usage:\r\nmotor index [value] - show [or set] motor value\r\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
pch = strtok(cmdline, " ");
|
pch = strtok_r(cmdline, " ", &saveptr);
|
||||||
while (pch != NULL) {
|
while (pch != NULL) {
|
||||||
switch (index) {
|
switch (index) {
|
||||||
case 0:
|
case 0:
|
||||||
|
@ -1313,7 +1314,7 @@ static void cliMotor(char *cmdline)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
index++;
|
index++;
|
||||||
pch = strtok(NULL, " ");
|
pch = strtok_r(NULL, " ", &saveptr);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (motor_index < 0 || motor_index >= MAX_SUPPORTED_MOTORS) {
|
if (motor_index < 0 || motor_index >= MAX_SUPPORTED_MOTORS) {
|
||||||
|
|
|
@ -154,5 +154,5 @@ uint8_t calculateBatteryCapacityRemainingPercentage(void)
|
||||||
{
|
{
|
||||||
uint16_t batteryCapacity = batteryConfig->batteryCapacity;
|
uint16_t batteryCapacity = batteryConfig->batteryCapacity;
|
||||||
|
|
||||||
return constrain((batteryCapacity - constrain(mAhDrawn, 0, 0xFFFF)) * 100.0 / batteryCapacity , 0, 100);
|
return constrain((batteryCapacity - constrain(mAhDrawn, 0, 0xFFFF)) * 100.0f / batteryCapacity , 0, 100);
|
||||||
}
|
}
|
||||||
|
|
|
@ -230,7 +230,7 @@ static void sendSatalliteSignalQualityAsTemperature2(void)
|
||||||
if (telemetryConfig->frsky_unit == FRSKY_UNIT_METRICS) {
|
if (telemetryConfig->frsky_unit == FRSKY_UNIT_METRICS) {
|
||||||
serialize16(satellite);
|
serialize16(satellite);
|
||||||
} else {
|
} else {
|
||||||
float tmp = (satellite - 32) / 1.8;
|
float tmp = (satellite - 32) / 1.8f;
|
||||||
//Round the value
|
//Round the value
|
||||||
tmp += (tmp < 0) ? -0.5f : 0.5f;
|
tmp += (tmp < 0) ? -0.5f : 0.5f;
|
||||||
serialize16(tmp);
|
serialize16(tmp);
|
||||||
|
|
Loading…
Reference in a new issue