aleks/flix
1
0
Fork 0
mirror of https://github.com/okalachev/flix.git synced 2026-02-17 15:41:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change C++ code style: put curly brace on the same line

Browse Source
This commit is contained in:
Oleg Kalachev
2023-12-29 18:56:25 +03:00
parent 645b148564
commit d2296fea76
19 changed files with 65 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
flix/control.ino
View File

@@ -53,8 +53,7 @@ Vector ratesTarget;
Vector torqueTarget;
float thrustTarget;
void control()
{
void control() {
interpretRC();
if (mode == STAB) {
controlAttitude();
@@ -68,8 +67,7 @@ void control()
}
}
void interpretRC()
{
void interpretRC() {
if (controls[RC_CHANNEL_MODE] < 0.25) {
mode = MANUAL;
} else if (controls[RC_CHANNEL_MODE] < 0.75) {
@@ -108,8 +106,7 @@ void interpretRC()
}
}
void controlAttitude()
{
void controlAttitude() {
if (!armed) {
rollPID.reset();
pitchPID.reset();
@@ -131,8 +128,7 @@ void controlAttitude()
}
}
void controlRate()
{
void controlRate() {
if (!armed) {
rollRatePID.reset();
pitchRatePID.reset();
@@ -147,8 +143,7 @@ void controlRate()
torqueTarget.z = yawRatePID.update(ratesTarget.z - ratesFiltered.z, dt);
}
void controlTorque()
{
void controlTorque() {
if (!armed) {
memset(motors, 0, sizeof(motors));
return;
@@ -165,13 +160,11 @@ void controlTorque()
motors[3] = constrain(motors[3], 0, 1);
}
bool motorsActive()
{
bool motorsActive() {
return motors[0] > 0 || motors[1] > 0 || motors[2] > 0 || motors[3] > 0;
}
const char* getModeName()
{
const char* getModeName() {
switch (mode) {
case MANUAL: return "MANUAL";
case ACRO: return "ACRO";