Partial merge of the renaming

groundStation/src/backend/backend.c

@@ -710,12 +710,11 @@ static void quad_recv() {
 			/* something like this */
 			fwrite((char *) data, sizeof(char), m.data_len, quadlog_file);
 			break;
-		case RESPONSE_ID:
-		case SETCONTROL_ID:
-		case GETCONTROL_ID:
+		case SETPARAM_ID:
+		case GETPARAM_ID:
 			printf("(Backend): Command '%s' ignored\n", MessageTypes[m.msg_type].cmdText);
 			break;
-		case RESPCONTROL_ID:
+		case RESPONSE_ID:
 			handleRespcontrol(&m, data);
 			break;
 		default:
@@ -733,7 +732,7 @@ static void handleRespcontrol(struct metadata *m, uint8_t * data)
 
 	char buffer[128];
 
-	const char * message = cmToString(RESPCONTROL_ID, &cm);
+	const char * message = cmToString(RESPONSE_ID, &cm);
 
 	size_t len = snprintf(buffer, 128, "%s %f\n", message, cm.value);
 

groundStation/src/backend/cmHandler.c

@@ -83,12 +83,11 @@ const char * cmToString(int msgType, const struct controller_message *cm)
 		case UPDATE_ID :
 		case BEGINUPDATE_ID :
 		case LOG_ID:
-		case RESPONSE_ID:
-		case SETCONTROL_ID:
-		case GETCONTROL_ID:
+		case SETPARAM_ID:
+		case GETPARAM_ID:
 			return NULL;
 			break;
-		case RESPCONTROL_ID:
+		case RESPONSE_ID:
 			return "FOOBAR";
 //			return respContStrings[cm->id + cm->value_id];
 			break;

groundStation/src/backend/controller.h

@@ -27,7 +27,7 @@ enum ControllerValueID{
 
 struct controller_message {
 	enum ControllerID id;
-	enum ControllerValueID value_id;
+	enum ControlParamID value_id;
 	float value;
 };
 

groundStation/src/backend/getcontrol.c

@@ -19,7 +19,7 @@ ssize_t EncodeGetcontrol(
         size_t data_size,           /* Max buffer size */
         const struct controller_message * cm)       /* Message to encode */
 {
-	m->msg_type = GETCONTROL_ID;
+	m->msg_type = GETPARAM_ID;
 	m->data_len = GC_DATA_SIZE;
 
 	if (data_size < GC_DATA_SIZE) {
@@ -43,7 +43,7 @@ int DecodeGetcontrol(
 	if (m->data_len < GC_DATA_SIZE) {
 		return -1;
 	}
-	if (m->msg_type != GETCONTROL_ID) {
+	if (m->msg_type != GETPARAM_ID) {
 		return -1;
 	}
 

groundStation/src/backend/respcontrol.c

@@ -23,7 +23,7 @@ ssize_t EncodeRespcontrol(
         size_t data_size,           /* Max buffer size */
         const struct controller_message * cm)       /* Message to encode */
 {
-	m->msg_type = RESPCONTROL_ID;
+	m->msg_type = RESPONSE_ID;
 	m->data_len = RC_DATA_SIZE;
 
 	if (data_size < RC_DATA_SIZE) {
@@ -51,7 +51,7 @@ int DecodeRespcontrol(
 	if (m->data_len < RC_DATA_SIZE) {
 		return -1;
 	}
-	if (m->msg_type != RESPCONTROL_ID) {
+	if (m->msg_type != RESPONSE_ID) {
 		return -1;
 	}
 

groundStation/src/backend/setcontrol.c

@@ -23,7 +23,7 @@ ssize_t EncodeSetcontrol(
         size_t data_size,           /* Max buffer size */
         const struct controller_message * cm)       /* Message to encode */
 {
-	m->msg_type = SETCONTROL_ID;
+	m->msg_type = SETPARAM_ID;
 	m->data_len = SC_DATA_SIZE;
 
 	if (data_size < SC_DATA_SIZE) {
@@ -51,7 +51,7 @@ int DecodeSetcontrol(
 	if (m->data_len < SC_DATA_SIZE) {
 		return -1;
 	}
-	if (m->msg_type != SETCONTROL_ID) {
+	if (m->msg_type != SETPARAM_ID) {
 		return -1;
 	}