Skip to content

Commit 346aafb

Browse files
J-RiosJ-Rios
committed
Update code style
1 parent 7f87353 commit 346aafb

17 files changed

Lines changed: 234 additions & 237 deletions

File tree

‎examples/arduino/basic_usage/src/main.cpp‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/**
22
* @file examples/arduino/basic_usage/src/main.cpp
33
* @author Jose Miguel Rios Rubio <jrios.github@gmail.com>
4-
* @date 10-07-2022
5-
* @version 1.0.2
4+
* @date 05-03-2023
5+
* @version 1.0.3
66
*
77
* @section DESCRIPTION
88
*
@@ -84,58 +84,58 @@ void loop()
8484
t_cli_result cli_read;
8585

8686
// If any command was received
87-
if(Cli.manage(&cli_read))
87+
if (Cli.manage(&cli_read))
8888
{
8989
// Show read result element
9090
Cli.printf("Command received: %s\n", cli_read.cmd);
9191
Cli.printf("Number of arguments: %d\n"), (int)(cli_read.argc);
92-
for(int i = 0; i < cli_read.argc; i++)
93-
Cli.printf(" Argument %d: %s", i, cli_read.argv[i]);
92+
for (int i = 0; i < cli_read.argc; i++)
93+
{ Cli.printf(" Argument %d: %s", i, cli_read.argv[i]); }
9494
Cli.printf("\n");
9595

9696
// Handle Commands
97-
if(strcmp(cli_read.cmd, "help") == 0)
97+
if (strcmp(cli_read.cmd, "help") == 0)
9898
{
9999
Cli.printf("Available Commands:\n");
100100
Cli.printf(" help - Current info.\n");
101101
Cli.printf(" led [on/off] - Turn LED ON or OFF.\n");
102102
Cli.printf(" version - Shows current firmware version.\n");
103103
}
104-
else if(strcmp(cli_read.cmd, "led") == 0)
104+
else if (strcmp(cli_read.cmd, "led") == 0)
105105
{
106106
bool invalid_argv = false;
107107
char* led_mode = NULL;
108108

109109
// Check for argument
110-
if(cli_read.argc == 0)
111-
invalid_argv = true;
110+
if (cli_read.argc == 0)
111+
{ invalid_argv = true; }
112112
else
113113
{
114114
led_mode = cli_read.argv[0];
115-
if(strcmp(led_mode, "on") == 0)
115+
if (strcmp(led_mode, "on") == 0)
116116
{
117117
Cli.printf("Turning LED ON.\n");
118118
digitalWrite(COMMAND_LED, HIGH);
119119
}
120-
else if(strcmp(led_mode, "off") == 0)
120+
else if (strcmp(led_mode, "off") == 0)
121121
{
122122
Cli.printf("Turning LED OFF.\n");
123123
digitalWrite(COMMAND_LED, LOW);
124124
}
125125
else
126-
invalid_argv = true;
126+
{ invalid_argv = true; }
127127
}
128128

129-
if(invalid_argv)
130-
Cli.printf("led command needs \"on\" or \"off\" arg.\n");
129+
if (invalid_argv)
130+
{ Cli.printf("led command needs \"on\" or \"off\" arg.\n"); }
131131
}
132-
else if(strcmp(cli_read.cmd, "version") == 0)
132+
else if (strcmp(cli_read.cmd, "version") == 0)
133133
{
134134
Cli.printf("FW App Version: %s\n", FW_APP_VERSION);
135135
}
136136
// ...
137137
else
138-
Cli.printf("Unkown command.\n");
138+
{ Cli.printf("Unkown command.\n"); }
139139
Cli.printf("\n");
140140
}
141141
}

‎examples/arduino/basic_usage_callbacks/src/main.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/**
22
* @file examples/arduino/basic_usage_callbacks/src/main.cpp
33
* @author Jose Miguel Rios Rubio <jrios.github@gmail.com>
4-
* @date 09-07-2022
5-
* @version 1.0.0
4+
* @date 05-03-2023
5+
* @version 1.0.1
66
*
77
* @section DESCRIPTION
88
*
@@ -128,27 +128,27 @@ void cmd_led(MINBASECLI* Cli, int argc, char* argv[])
128128
{
129129
bool invalid_argv = false;
130130

131-
if(argc == 0)
132-
{ invalid_argv = true; }
131+
if (argc == 0)
132+
{ invalid_argv = true; }
133133
else
134134
{
135135
char* test_mode = argv[0];
136-
if(strcmp(test_mode, "on") == 0)
136+
if (strcmp(test_mode, "on") == 0)
137137
{
138138
Cli->printf("Turning LED ON.\n");
139139
digitalWrite(COMMAND_LED, HIGH);
140140
}
141-
else if(strcmp(test_mode, "off") == 0)
141+
else if (strcmp(test_mode, "off") == 0)
142142
{
143143
Cli->printf("Turning LED OFF.\n");
144144
digitalWrite(COMMAND_LED, LOW);
145145
}
146146
else
147-
{ invalid_argv = true; }
147+
{ invalid_argv = true; }
148148
}
149149

150-
if(invalid_argv)
151-
{ Cli->printf("led command needs \"on\" or \"off\" arg.\n"); }
150+
if (invalid_argv)
151+
{ Cli->printf("led command needs \"on\" or \"off\" arg.\n"); }
152152

153153
Cli->printf("\n");
154154
}

‎examples/avr/basic_usage/src/main.cpp‎

Lines changed: 29 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
/**
33
* @file main.cpp
44
* @author Jose Miguel Rios Rubio <jrios.github@gmail.com>
5-
* @date 02-04-2022
6-
* @version 1.0.1
5+
* @date 05-03-2023
6+
* @version 1.0.2
77
*
88
* @section DESCRIPTION
99
*
@@ -61,6 +61,7 @@
6161

6262
/* Global Elements */
6363

64+
// UART Object
6465
AvrUart Serial(UART0, F_CPU);
6566

6667
/*****************************************************************************/
@@ -88,70 +89,66 @@ int main(void)
8889

8990
// CLI init to use Serial as interface
9091
Cli.setup(&Serial);
91-
Cli.printf(PSTR("\nCommand Line Interface is ready\n\n"));
92+
Cli.printf("\nCommand Line Interface is ready\n\n");
9293

9394
while (1)
9495
{
9596
t_cli_result cli_read;
9697

9798
// If any command was received
98-
if(Cli.manage(&cli_read))
99+
if (Cli.manage(&cli_read))
99100
{
100101
// Show read result element
101-
Cli.printf(PSTR("Command received: %s\n"), cli_read.cmd);
102-
Cli.printf(PSTR("Number of arguments: %d\n"), (int)(cli_read.argc));
103-
for(int i = 0; i < cli_read.argc; i++)
104-
Cli.printf(PSTR(" Argument %d: %s"), i, cli_read.argv[i]);
105-
Cli.printf(PSTR("\n"));
102+
Cli.printf("Command received: %s\n", cli_read.cmd);
103+
Cli.printf("Number of arguments: %d\n"), (int)(cli_read.argc);
104+
for (int i = 0; i < cli_read.argc; i++)
105+
{ Cli.printf(" Argument %d: %s", i, cli_read.argv[i]); }
106+
Cli.printf("\n");
106107

107108
// Handle Commands
108-
if(strcmp(cli_read.cmd, "help") == 0)
109+
if (strcmp(cli_read.cmd, "help") == 0)
109110
{
110-
Cli.printf(PSTR("Available Commands:\n"));
111-
Cli.printf(PSTR(" help - Current info.\n"));
112-
Cli.printf(PSTR(" led [on/off] - Turn LED ON or OFF.\n"));
113-
Cli.printf( \
114-
PSTR(" version - Shows current firmware version.\n"));
111+
Cli.printf("Available Commands:\n");
112+
Cli.printf(" help - Current info.\n");
113+
Cli.printf(" led [on/off] - Turn LED ON or OFF.\n");
114+
Cli.printf(" version - Shows current firmware version.\n");
115115
}
116-
else if(strcmp(cli_read.cmd, "led") == 0)
116+
else if (strcmp(cli_read.cmd, "led") == 0)
117117
{
118118
bool invalid_argv = false;
119119
char* led_mode = NULL;
120120

121121
// Check for argument
122-
if(cli_read.argc == 0)
123-
invalid_argv = true;
122+
if (cli_read.argc == 0)
123+
{ invalid_argv = true; }
124124
else
125125
{
126126
led_mode = cli_read.argv[0];
127-
if(strcmp(led_mode, "on") == 0)
127+
if (strcmp(led_mode, "on") == 0)
128128
{
129-
Cli.printf(PSTR("Turning LED ON.\n"));
129+
Cli.printf("Turning LED ON.\n");
130130
led_on();
131131
}
132-
else if(strcmp(led_mode, "off") == 0)
132+
else if (strcmp(led_mode, "off") == 0)
133133
{
134-
Cli.printf(PSTR("Turning LED OFF.\n"));
134+
Cli.printf("Turning LED OFF.\n");
135135
led_off();
136136
}
137137
else
138-
invalid_argv = true;
138+
{ invalid_argv = true; }
139139
}
140140

141-
if(invalid_argv)
142-
{
143-
Cli.printf( \
144-
PSTR("led command needs \"on\" or \"off\" arg.\n"));
145-
}
141+
if (invalid_argv)
142+
{ Cli.printf("led command needs 'on' or 'off' arg.\n"); }
146143
}
147-
else if(strcmp(cli_read.cmd, PSTR("version")) == 0)
144+
else if (strcmp(cli_read.cmd, "version") == 0)
148145
{
149-
Cli.printf(PSTR("FW App Version: %s\n"), FW_APP_VERSION);
146+
Cli.printf("FW App Version: %s\n", FW_APP_VERSION);
150147
}
151148
// ...
152149
else
153-
Cli.printf(PSTR("Unkown command.\n"));
154-
Cli.printf(PSTR("\n"));
150+
{ Cli.printf("Unkown command.\n"); }
151+
Cli.printf("\n");
155152
}
156153
}
157154
}

‎examples/avr/basic_usage_callbacks/src/main.cpp‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
/**
33
* @file main.cpp
44
* @author Jose Miguel Rios Rubio <jrios.github@gmail.com>
5-
* @date 09-07-2022
6-
* @version 1.0.0
5+
* @date 05-03-2023
6+
* @version 1.0.1
77
*
88
* @section DESCRIPTION
99
*
@@ -106,14 +106,14 @@ int main(void)
106106
Cli.setup(&Serial, SERIAL_BAUDS);
107107

108108
// Add commands and bind callbacks to them
109-
Cli.add_cmd("led", &cmd_led, PSTR("led [on/off], Turn LED ON or OFF.."));
110-
Cli.add_cmd("version", &cmd_version, PSTR("Shows current firmware version."));
109+
Cli.add_cmd("led", &cmd_led, "led [on/off], Turn LED ON or OFF..");
110+
Cli.add_cmd("version", &cmd_version, "Shows current firmware version.");
111111

112112
// The "help" command is already builtin and available from the CLI, and it
113113
// will shows added command descriptions, but you can setup a custom one
114-
Cli.add_cmd("help", &cmd_help, PSTR("Shows program help information."));
114+
Cli.add_cmd("help", &cmd_help, "Shows program help information.");
115115

116-
Cli.printf(PSTR("\nCommand Line Interface is ready\n\n"));
116+
Cli.printf("\nCommand Line Interface is ready\n\n");
117117

118118
while (1)
119119
{
@@ -129,8 +129,8 @@ int main(void)
129129
void cmd_help(MINBASECLI* Cli, int argc, char* argv[])
130130
{
131131
// Show some Info text
132-
Cli->printf(PSTR("\nCustom Help Command\n"));
133-
Cli->printf(PSTR("MINBASECLI basic_usage_callbacks %s\n"), FW_APP_VERSION);
132+
Cli->printf("\nCustom Help Command\n");
133+
Cli->printf("MINBASECLI basic_usage_callbacks %s\n", FW_APP_VERSION);
134134

135135
// Call the builtin "help" function to show added command descriptions
136136
Cli->cmd_help(argc, argv);
@@ -140,34 +140,34 @@ void cmd_led(MINBASECLI* Cli, int argc, char* argv[])
140140
{
141141
bool invalid_argv = false;
142142

143-
if(argc == 0)
144-
invalid_argv = true;
143+
if (argc == 0)
144+
{ invalid_argv = true; }
145145
else
146146
{
147147
char* test_mode = argv[0];
148-
if(strcmp(test_mode, "on") == 0)
148+
if (strcmp(test_mode, "on") == 0)
149149
{
150-
Cli->printf(PSTR("Turning LED ON.\n"));
150+
Cli->printf("Turning LED ON.\n");
151151
led_on();
152152
}
153-
else if(strcmp(test_mode, "off") == 0)
153+
else if (strcmp(test_mode, "off") == 0)
154154
{
155-
Cli->printf(PSTR("Turning LED OFF.\n"));
155+
Cli->printf("Turning LED OFF.\n");
156156
led_off();
157157
}
158158
else
159-
invalid_argv = true;
159+
{ invalid_argv = true; }
160160
}
161161

162-
if(invalid_argv)
163-
Cli->printf(PSTR("led command needs \"on\" or \"off\" arg.\n"));
162+
if (invalid_argv)
163+
{ Cli->printf("led command needs 'on' or 'off' arg.\n"); }
164164

165-
Cli->printf(PSTR("\n"));
165+
Cli->printf("\n");
166166
}
167167

168168
void cmd_version(MINBASECLI* Cli, int argc, char* argv[])
169169
{
170-
Cli->printf(PSTR("FW App Version: %s\n"), FW_APP_VERSION);
170+
Cli->printf("FW App Version: %s\n", FW_APP_VERSION);
171171
}
172172

173173
/*****************************************************************************/

0 commit comments

Comments
 (0)