From b462ade8086399c867ad22d66d5eca81c1f252bd Mon Sep 17 00:00:00 2001
From: Jake Drahos <j@kedrahos.com>
Date: Sun, 27 Nov 2016 19:22:09 -0600
Subject: [PATCH] Renamed a "pid" to a "controller"
Because that's what it is.
---
groundStation/src/cli/cli_getpid.c | 16 ++++++++--------
groundStation/src/frontend/frontend_getpid.c | 4 ++--
groundStation/src/frontend/pid_common.h | 4 ++--
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/groundStation/src/cli/cli_getpid.c b/groundStation/src/cli/cli_getpid.c
index 55fadb4a3..4eead7543 100644
--- a/groundStation/src/cli/cli_getpid.c
+++ b/groundStation/src/cli/cli_getpid.c
@@ -34,33 +34,33 @@ int cli_getpid(struct backend_conn * conn, int argc, char **argv) {
int result;
if(getAll) {
- pid_data.pid = ROLL;
+ pid_data.controller = ROLL;
if ((result = getValues(conn, &pid_data))) {
return result;
}
- pid_data.pid = PITCH;
+ pid_data.controller = PITCH;
if ((result = getValues(conn, &pid_data))) {
return result;
}
- pid_data.pid = YAW;
+ pid_data.controller = YAW;
if ((result = getValues(conn, &pid_data))) {
return result;
}
} else {
if(getPitch) {
- pid_data.pid = PITCH;
+ pid_data.controller = PITCH;
if ((result = getValues(conn, &pid_data))) {
return result;
}
}
if(getRoll) {
- pid_data.pid = ROLL;
+ pid_data.controller = ROLL;
if ((result = getValues(conn, &pid_data))) {
return result;
}
}
if(getYaw) {
- pid_data.pid = YAW;
+ pid_data.controller = YAW;
if ((result = getValues(conn, &pid_data))) {
return result;
}
@@ -77,7 +77,7 @@ int getValues(struct backend_conn * conn, struct frontend_pid_data * pid_data) {
return 0;
- switch(pid_data->pid) {
+ switch(pid_data->controller) {
case PITCH :
printf("Pitch Constants: P = %f\tI = %f\tD = %f\n",
pid_data->p, pid_data->i, pid_data->d);
@@ -94,4 +94,4 @@ int getValues(struct backend_conn * conn, struct frontend_pid_data * pid_data) {
break;
}
return 0;
-}
\ No newline at end of file
+}
diff --git a/groundStation/src/frontend/frontend_getpid.c b/groundStation/src/frontend/frontend_getpid.c
index 0b25ec270..bd6b387cc 100644
--- a/groundStation/src/frontend/frontend_getpid.c
+++ b/groundStation/src/frontend/frontend_getpid.c
@@ -23,7 +23,7 @@ int frontend_getpid(
struct backend_conn * conn, struct frontend_pid_data * pid_data) {
char line[100] = "";
- switch (pid_data->pid) {
+ switch (pid_data->controller) {
case PITCH :
strncpy(line, "getpitchp\ngetpitchd\n", 20);
break;
@@ -43,4 +43,4 @@ int frontend_getpid(
}
return 0;
-}
\ No newline at end of file
+}
diff --git a/groundStation/src/frontend/pid_common.h b/groundStation/src/frontend/pid_common.h
index c1dac6535..e4f65625c 100644
--- a/groundStation/src/frontend/pid_common.h
+++ b/groundStation/src/frontend/pid_common.h
@@ -1,7 +1,7 @@
#ifndef PID_COMMON_H
#define PID_COMMON_H
-enum frontend_pid {
+enum pid_controller {
PITCH,
ROLL,
YAW,
@@ -9,7 +9,7 @@ enum frontend_pid {
};
struct frontend_pid_data {
- enum frontend_pid pid;
+ enum pid_controller controller;
float p;
float i;
--
GitLab