Skip to content
Snippets Groups Projects
Commit 2313fbe9 authored by burneykb's avatar burneykb
Browse files

might be ok

parent 62edd197
No related branches found
No related tags found
No related merge requests found
...@@ -694,11 +694,11 @@ static void client_recv(int fd) { ...@@ -694,11 +694,11 @@ static void client_recv(int fd) {
} }
} }
// printf("packet = '"); printf("packet = '");
// for(int i = 0; i < (int)psize; ++i) { for(int i = 0; i < (int)psize; ++i) {
// printf(" %.2x ", packet[i]); printf(" %.2x ", packet[i]);
// } }
// printf("'\n"); printf("'\n");
writeQuad(packet, psize); writeQuad(packet, psize);
...@@ -777,6 +777,7 @@ static void quad_recv() { ...@@ -777,6 +777,7 @@ static void quad_recv() {
switch (m.msg_type) { switch (m.msg_type) {
case DEBUG_ID : case DEBUG_ID :
printf()
case PACKETLOG_ID : case PACKETLOG_ID :
case GETPACKETLOGS_ID : case GETPACKETLOGS_ID :
case UPDATE_ID : case UPDATE_ID :
......
...@@ -6,27 +6,21 @@ const char * respParamStrings[MAX_PARAM_COMMANDS] = { ...@@ -6,27 +6,21 @@ const char * respParamStrings[MAX_PARAM_COMMANDS] = {
"getrollp", "getrollp",
"getrolli", "getrolli",
"getrolld", "getrolld",
"getroll",
"getpitchp", "getpitchp",
"getpitchi", "getpitchi",
"getpitchd", "getpitchd",
"getpitch",
"getyawp", "getyawp",
"getyawi", "getyawi",
"getyawd", "getyawd",
"getyaw",
"getrollratep", "getrollratep",
"getrollratei", "getrollratei",
"getrollrated", "getrollrated",
"getrollrate",
"getpitchratep", "getpitchratep",
"getpitchratei", "getpitchratei",
"getpitchrated", "getpitchrated",
"getpitchrate",
"getyawratep", "getyawratep",
"getyawratei", "getyawratei",
"getyawrated", "getyawrated",
"getyawrate",
"getlatp", "getlatp",
"getlati", "getlati",
"getlatd", "getlatd",
...@@ -45,27 +39,21 @@ const char * setParamStrings[MAX_PARAM_COMMANDS] = { ...@@ -45,27 +39,21 @@ const char * setParamStrings[MAX_PARAM_COMMANDS] = {
"setrollp", "setrollp",
"setrolli", "setrolli",
"setrolld", "setrolld",
"setroll",
"setpitchp", "setpitchp",
"setpitchi", "setpitchi",
"setpitchd", "setpitchd",
"setpitch",
"setyawp", "setyawp",
"setyawi", "setyawi",
"setyawd", "setyawd",
"setyaw",
"setrollratep", "setrollratep",
"setrollratei", "setrollratei",
"setrollrated", "setrollrated",
"setrollrate",
"setpitchratep", "setpitchratep",
"setpitchratei", "setpitchratei",
"setpitchrated", "setpitchrated",
"setpitchrate",
"setyawratep", "setyawratep",
"setyawratei", "setyawratei",
"setyawrated", "setyawrated",
"setyawrate",
"setlatp", "setlatp",
"setlati", "setlati",
"setlatd", "setlatd",
...@@ -77,7 +65,7 @@ const char * setParamStrings[MAX_PARAM_COMMANDS] = { ...@@ -77,7 +65,7 @@ const char * setParamStrings[MAX_PARAM_COMMANDS] = {
"setheightp", "setheightp",
"setheighti", "setheighti",
"setheightd", "setheightd",
"setheight" "setheight",
}; };
...@@ -141,34 +129,57 @@ struct controller_message * stringToCm(const char * string, struct controller_me ...@@ -141,34 +129,57 @@ struct controller_message * stringToCm(const char * string, struct controller_me
if (index == -1) { if (index == -1) {
return NULL; return NULL;
} else { } else {
cm->value_id = i % MAX_CONTROL_PARAM_ID; cm->value_id = i % MAX_CONTROL_PARAM_ID; // Default assuming not a setpoint command
if (i <= PARAM_ROLL) { if (i <= PARAM_ROLL_D) {
cm->id = ROLL_ID; cm->id = ROLL_ID;
} else if (i <= PARAM_PITCH) { } else if (i <= PARAM_PITCH_D) {
cm->id = PITCH_ID; cm->id = PITCH_ID;
} else if (i <= PARAM_YAW) { } else if (i <= PARAM_YAW_D) {
cm->id = YAW_ID; cm->id = YAW_ID;
} else if (i <= PARAM_ROLL_RATE) { } else if (i <= PARAM_ROLL_RATE_D) {
cm->id = ROLL_RATE_ID; cm->id = ROLL_RATE_ID;
} else if (i <= PARAM_PITCH_RATE) { } else if (i <= PARAM_PITCH_RATE_D) {
cm->id = PITCH_RATE_ID; cm->id = PITCH_RATE_ID;
} else if (i <= PARAM_YAW_RATE) { } else if (i <= PARAM_YAW_RATE_D) {
cm->id = YAW_RATE_ID; cm->id = YAW_RATE_ID;
} else if (i <= PARAM_LOCAL_X) { } else if (i <= PARAM_LOCAL_X) {
// If setpoint command, change the cm->valueid and cm
cm->id = LOCAL_X_ID; if (i == PARAM_LOCAL_X) {
cm->id = X_SETPOINT_ID;
cm->value_id = 0;
} else {
// these have a slightly different value id offset
cm->id = LOCAL_X_ID;
cm->value_id = MAX_CONTROL_PARAM_ID - (PARAM_LOCAL_X - i);
}
} else if (i <= PARAM_LOCAL_Y) { } else if (i <= PARAM_LOCAL_Y) {
// If setpoint command, change the cm->valueid and cm
cm->id = LOCAL_Y_ID; if (i == PARAM_LOCAL_Y) {
cm->id = Y_SETPOINT_ID;
cm->value_id = 0;
} else {
// these have a slightly different value id offset
cm->id = LOCAL_Y_ID;
cm->value_id = MAX_CONTROL_PARAM_ID - (PARAM_LOCAL_Y - i);
}
} else if (i <= PARAM_ALT) { } else if (i <= PARAM_ALT) {
// If setpoint command, change the cm->valueid and cm
cm->id = ALT_ID; if (i == PARAM_ALT) {
cm->id = ALT_SETPOINT_ID;
cm->value_id = 0;
} else {
// these have a slightly different value id offset
cm->id = ALT_ID;
cm->value_id = MAX_CONTROL_PARAM_ID - (PARAM_ALT - i);
}
} }
} }
return cm; return cm;
......
...@@ -7,31 +7,25 @@ enum paramIndices { ...@@ -7,31 +7,25 @@ enum paramIndices {
PARAM_ROLL_P , PARAM_ROLL_P ,
PARAM_ROLL_I , PARAM_ROLL_I ,
PARAM_ROLL_D , PARAM_ROLL_D ,
PARAM_ROLL ,
PARAM_PITCH_P , PARAM_PITCH_P ,
PARAM_PITCH_I , PARAM_PITCH_I ,
PARAM_PITCH_D , PARAM_PITCH_D ,
PARAM_PITCH ,
PARAM_YAW_P , PARAM_YAW_P ,
PARAM_YAW_I , PARAM_YAW_I ,
PARAM_YAW_D , PARAM_YAW_D ,
PARAM_YAW ,
PARAM_ROLL_RATE_P, PARAM_ROLL_RATE_P,
PARAM_ROLL_RATE_I, PARAM_ROLL_RATE_I,
PARAM_ROLL_RATE_D, PARAM_ROLL_RATE_D,
PARAM_ROLL_RATE,
PARAM_PITCH_RATE_P, PARAM_PITCH_RATE_P,
PARAM_PITCH_RATE_I, PARAM_PITCH_RATE_I,
PARAM_PITCH_RATE_D, PARAM_PITCH_RATE_D,
PARAM_PITCH_RATE,
PARAM_YAW_RATE_P, PARAM_YAW_RATE_P,
PARAM_YAW_RATE_I, PARAM_YAW_RATE_I,
PARAM_YAW_RATE_D, PARAM_YAW_RATE_D,
PARAM_YAW_RATE,
PARAM_LOCAL_X_P , PARAM_LOCAL_X_P ,
PARAM_LOCAL_X_I , PARAM_LOCAL_X_I ,
PARAM_LOCAL_X_D , PARAM_LOCAL_X_D ,
PARAM_LOCAL_X , PARAM_LOCAL_X ,
PARAM_LOCAL_Y_P , PARAM_LOCAL_Y_P ,
PARAM_LOCAL_Y_I , PARAM_LOCAL_Y_I ,
PARAM_LOCAL_Y_D , PARAM_LOCAL_Y_D ,
......
...@@ -60,7 +60,10 @@ enum ControllerID{ ...@@ -60,7 +60,10 @@ enum ControllerID{
LOCAL_X_ID, // 06 - Local X PID LOCAL_X_ID, // 06 - Local X PID
LOCAL_Y_ID, // 07 - Local Y PID LOCAL_Y_ID, // 07 - Local Y PID
ALT_ID, // 08 - Altitude PID ALT_ID, // 08 - Altitude PID
MAX_CONTROLLER_ID, // 09 - Just used to keep track of the size X_SETPOINT_ID, // 09 - X Setpoint
Y_SETPOINT_ID, // 10 - Y Setpoint
ALT_SETPOINT_ID, // 11 - Z Setpoint
MAX_CONTROLLER_ID // 12 - Just used to keep track of the size
}; };
/* /*
...@@ -70,8 +73,7 @@ enum ControlParamID{ ...@@ -70,8 +73,7 @@ enum ControlParamID{
KP_ID, // 00 - P constant KP_ID, // 00 - P constant
KI_ID, // 01 - I constant KI_ID, // 01 - I constant
KD_ID, // 02 - D constant KD_ID, // 02 - D constant
SP_ID, // 03 - Setpoint value MAX_CONTROL_PARAM_ID, // 03 - Just used to keep track of the size
MAX_CONTROL_PARAM_ID, // 04 - Just used to keep track of the size
}; };
/* /*
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment