1212*/
1313#include "generic_thruster_checkout.h"
1414
15-
1615/*
1716** Global Variables
1817*/
19- uart_info_t Generic_thrusterUart ;
20- GENERIC_THRUSTER_Device_HK_tlm_t Generic_thrusterHK ;
21- GENERIC_THRUSTER_Device_Data_tlm_t Generic_thrusterData ;
18+ uart_info_t ThrusterUart ;
2219
2320/*
2421** Component Functions
@@ -29,14 +26,8 @@ void print_help(void)
2926 "---------------------------------------------------------------------\n"
3027 "help - Display help \n"
3128 "exit - Exit app \n"
32- "noop - No operation command to device \n"
33- " n - ^ \n"
34- "hk - Request device housekeeping \n"
35- " h - ^ \n"
36- "generic_thruster - Request generic_thruster data \n"
37- " s - ^ \n"
38- "cfg # - Send configuration # \n"
39- " c # - ^ \n"
29+ "percentage # # - Set thruster # to percentage # \n"
30+ " p # # - ^ \n"
4031 "\n"
4132 );
4233}
@@ -59,37 +50,13 @@ int get_command(const char* str)
5950 {
6051 status = CMD_EXIT ;
6152 }
62- else if (strcmp (lcmd , "noop" ) == 0 )
63- {
64- status = CMD_NOOP ;
65- }
66- else if (strcmp (lcmd , "n" ) == 0 )
67- {
68- status = CMD_NOOP ;
69- }
70- else if (strcmp (lcmd , "hk" ) == 0 )
71- {
72- status = CMD_HK ;
73- }
74- else if (strcmp (lcmd , "h" ) == 0 )
75- {
76- status = CMD_HK ;
77- }
78- else if (strcmp (lcmd , "generic_thruster" ) == 0 )
53+ else if (strcmp (lcmd , "percentage" ) == 0 )
7954 {
80- status = CMD_GENERIC_THRUSTER ;
55+ status = CMD_PERCENTAGE ;
8156 }
82- else if (strcmp (lcmd , "s " ) == 0 )
57+ else if (strcmp (lcmd , "p " ) == 0 )
8358 {
84- status = CMD_GENERIC_THRUSTER ;
85- }
86- else if (strcmp (lcmd , "cfg" ) == 0 )
87- {
88- status = CMD_CFG ;
89- }
90- else if (strcmp (lcmd , "c" ) == 0 )
91- {
92- status = CMD_CFG ;
59+ status = CMD_PERCENTAGE ;
9360 }
9461 return status ;
9562}
@@ -99,7 +66,8 @@ int process_command(int cc, int num_tokens, char tokens[MAX_INPUT_TOKENS][MAX_IN
9966{
10067 int32_t status = OS_SUCCESS ;
10168 int32_t exit_status = OS_SUCCESS ;
102- uint32_t config ;
69+ uint8_t thruster_number ;
70+ uint8_t percentage ;
10371
10472 /* Process command */
10573 switch (cc )
@@ -112,59 +80,15 @@ int process_command(int cc, int num_tokens, char tokens[MAX_INPUT_TOKENS][MAX_IN
11280 exit_status = OS_ERROR ;
11381 break ;
11482
115- case CMD_NOOP :
116- if (check_number_arguments (num_tokens , 0 ) == OS_SUCCESS )
117- {
118- status = GENERIC_THRUSTER_CommandDevice (& Generic_thrusterUart , GENERIC_THRUSTER_DEVICE_NOOP_CMD , 0 );
119- if (status == OS_SUCCESS )
120- {
121- OS_printf ("NOOP command success\n" );
122- }
123- else
124- {
125- OS_printf ("NOOP command failed!\n" );
126- }
127- }
128- break ;
129-
130- case CMD_HK :
131- if (check_number_arguments (num_tokens , 0 ) == OS_SUCCESS )
83+ case CMD_PERCENTAGE :
84+ if (check_number_arguments (num_tokens , 2 ) == OS_SUCCESS )
13285 {
133- status = GENERIC_THRUSTER_RequestHK (& Generic_thrusterUart , & Generic_thrusterHK );
86+ thruster_number = atoi (tokens [0 ]);
87+ percentage = atoi (tokens [1 ]);
88+ status = GENERIC_THRUSTER_SetPercentage (& ThrusterUart , thruster_number , percentage , GENERIC_THRUSTER_DEVICE_CMD_SIZE );
13489 if (status == OS_SUCCESS )
13590 {
136- OS_printf ("GENERIC_THRUSTER_RequestHK command success\n" );
137- }
138- else
139- {
140- OS_printf ("GENERIC_THRUSTER_RequestHK command failed!\n" );
141- }
142- }
143- break ;
144-
145- case CMD_GENERIC_THRUSTER :
146- if (check_number_arguments (num_tokens , 0 ) == OS_SUCCESS )
147- {
148- status = GENERIC_THRUSTER_RequestData (& Generic_thrusterUart , & Generic_thrusterData );
149- if (status == OS_SUCCESS )
150- {
151- OS_printf ("GENERIC_THRUSTER_RequestData command success\n" );
152- }
153- else
154- {
155- OS_printf ("GENERIC_THRUSTER_RequestData command failed!\n" );
156- }
157- }
158- break ;
159-
160- case CMD_CFG :
161- if (check_number_arguments (num_tokens , 1 ) == OS_SUCCESS )
162- {
163- config = atoi (tokens [0 ]);
164- status = GENERIC_THRUSTER_CommandDevice (& Generic_thrusterUart , GENERIC_THRUSTER_DEVICE_CFG_CMD , config );
165- if (status == OS_SUCCESS )
166- {
167- OS_printf ("Configuration command success with value %u\n" , config );
91+ OS_printf ("Thruster %d command success with value %u\n" , thruster_number , percentage );
16892 }
16993 else
17094 {
@@ -191,19 +115,24 @@ int main(int argc, char *argv[])
191115 char * token_ptr ;
192116 uint8_t run_status = OS_SUCCESS ;
193117
118+ /* Initialize HWLIB */
119+ #ifdef _NOS_ENGINE_LINK_
120+ nos_init_link ();
121+ #endif
122+
194123 /* Open device specific protocols */
195- Generic_thrusterUart .deviceString = GENERIC_THRUSTER_CFG_STRING ;
196- Generic_thrusterUart .handle = GENERIC_THRUSTER_CFG_HANDLE ;
197- Generic_thrusterUart .isOpen = PORT_CLOSED ;
198- Generic_thrusterUart .baud = GENERIC_THRUSTER_CFG_BAUDRATE_HZ ;
199- status = uart_init_port (& Generic_thrusterUart );
124+ ThrusterUart .deviceString = GENERIC_THRUSTER_CFG_STRING ;
125+ ThrusterUart .handle = GENERIC_THRUSTER_CFG_HANDLE ;
126+ ThrusterUart .isOpen = PORT_CLOSED ;
127+ ThrusterUart .baud = GENERIC_THRUSTER_CFG_BAUDRATE_HZ ;
128+ status = uart_init_port (& ThrusterUart );
200129 if (status == OS_SUCCESS )
201130 {
202- printf ("UART device %s configured with baudrate %d \n" , Generic_thrusterUart .deviceString , Generic_thrusterUart .baud );
131+ printf ("UART device %s configured with baudrate %d \n" , ThrusterUart .deviceString , ThrusterUart .baud );
203132 }
204133 else
205134 {
206- printf ("UART device %s failed to initialize! \n" , Generic_thrusterUart .deviceString );
135+ printf ("UART device %s failed to initialize! \n" , ThrusterUart .deviceString );
207136 run_status = OS_ERROR ;
208137 }
209138
@@ -244,7 +173,11 @@ int main(int argc, char *argv[])
244173 }
245174
246175 // Close the device
247- uart_close_port (& Generic_thrusterUart );
176+ uart_close_port (& ThrusterUart );
177+
178+ #ifdef _NOS_ENGINE_LINK_
179+ nos_destroy_link ();
180+ #endif
248181
249182 OS_printf ("Cleanly exiting generic_thruster application...\n\n" );
250183 return 1 ;
0 commit comments