From 0a1af3827abde06393116ac67f6783173128b2ed Mon Sep 17 00:00:00 2001
From: "ucart@co3050-12" <dawehr@iastate.edu>
Date: Sun, 29 Jan 2017 15:47:41 -0600
Subject: [PATCH] removed the "data_type" struct from commands.h.
- removed the "ID", datatype parameters from MessateType struct in commands.h
- made equivalent changes in commands.c
---
groundStation/src/backend/commands.c | 40 ----------------------------
groundStation/src/backend/commands.h | 20 --------------
2 files changed, 60 deletions(-)
diff --git a/groundStation/src/backend/commands.c b/groundStation/src/backend/commands.c
index fe8151978..1c451d39b 100644
--- a/groundStation/src/backend/commands.c
+++ b/groundStation/src/backend/commands.c
@@ -73,111 +73,71 @@ struct MessageType MessageTypes[MAX_TYPE_ID] =
{
// DEBUG
{
- // ID
- DEBUG_ID,
// Command text
"debug",
- // Type of the command data
- stringType,
// Function pointer
&cb_debug
},
// PACKETLOG
{
- // ID
- PACKETLOG_ID,
// Command text
"packetlog",
- // Type of the command data
- stringType,
// Function pointer
&cb_packetlog
},
// GETPACKETLOGS
{
- // ID
- GETPACKETLOGS_ID,
// Command text
"getpacketlogs",
- // Type of the command data
- stringType,
// Function pointer
&cb_getpacketlogs
},
// UPDATE
{
- // ID
- UPDATE_ID,
// Command text
"update",
- // Type of the command data
- stringType,
// Function pointer
&cb_update
},
// BEGINUPDATE
{
- // ID
- BEGINUPDATE_ID,
// Command text
"beginupdate",
- // Type of the command data
- stringType,
// Function pointer
&cb_beginupdate
},
// LOG
{
- // ID
- LOG_ID,
// Command text
"log",
- // Type of the command data
- stringType,
// Function pointer
&cb_log
},
// RESPONSE
{
- // ID
- RESPONSE_ID,
// Command text
"response",
- // Type of the command data
- stringType,
// Function pointer
&cb_response
},
// SETCONTROL
{
- // ID
- SETCONTROL_ID,
// Command text
"setcontrol",
- // Type of the command data
- floatType,
// Function pointer
&cb_setcontrol
},
// GETCONTROL
{
- // ID
- GETCONTROL_ID,
// Command text
"getcontrol",
- // Type of the command data
- floatType,
// Function pointer
&cb_getcontrol
},
// RESPCONTROL
{
- // ID
- RESPCONTROL_ID,
// Command text
"respcontrol",
- // Type of the command data
- floatType,
// Function pointer
&cb_respcontrol
}
diff --git a/groundStation/src/backend/commands.h b/groundStation/src/backend/commands.h
index ecbae2c04..aeb11ad20 100644
--- a/groundStation/src/backend/commands.h
+++ b/groundStation/src/backend/commands.h
@@ -14,17 +14,6 @@ enum Message{
END_CHAR = 0xED
};
-/*
- * Enumeration of the data types that a callback function may use
- * doubleType should get added here at some point
- */
-enum DataType
-{
- floatType, // 00
- intType, // 01
- stringType // 02
-};
-
/*
* Message type IDs used to know what kind of message we are dealing with
* Enumeration used to index the MessageTypes array in commands.c
@@ -74,16 +63,7 @@ enum ControllerValueID{
* pointers located in commands.c
*/
struct MessageType{
- /* TODO The ID may not even be needed since it already an enumerated value
- * I found some instances of this being used like the following:
- * "MessageTypes[LOG_TYPE_ID].ID" which makes no sense since the ID member
- * in the MessageType is already set to be equal to the enumeration value
- * instead they could have just done "LOG_TYPE_ID" directly since
- * MessageTypes[LOG_TYPE_ID].ID always == LOG_TYPE_ID
- */
- char ID;
char cmdText[MAX_CMD_TEXT_LENGTH];
- char cmdDataType;
command_cb * functionPtr;
};
--
GitLab