mhu/reflow-oven-control-sw
2
0
Fork 0
Code Issues 4 Pull Requests Releases 4 Wiki Activity

Issue #6: Implement safety flag ack in shell command safety-flags

Browse Source
This commit is contained in:
Mario Hüttel 2020-09-21 21:51:00 +02:00
parent e8f59b6dc6
commit 42f6d0270d
1 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
stm-firmware/shell.c
View File

@ -49,6 +49,27 @@ static shellmatta_instance_t shell;
static char shell_buffer[512]; static char shell_buffer[512];
static char IN_SECTION(.ccm.bss) history_buffer[600]; static char IN_SECTION(.ccm.bss) history_buffer[600];
static bool check_opt(const char *args, uint32_t len, const char *opt_to_check)
{
char str[128];
const char *ptr;
static const char * const tokens = "\t ";
strncpy(str, args, sizeof(str));
str[sizeof(str) - 1] = 0;
/* Tokenize the string */
ptr = strtok(str, tokens);
while (ptr) {
if (strcmp(ptr, opt_to_check) == 0)
return true;
ptr = strtok(NULL, tokens);
}
return false;
}
static shellmatta_retCode_t shell_cmd_ver(const shellmatta_handle_t handle, static shellmatta_retCode_t shell_cmd_ver(const shellmatta_handle_t handle,
const char *arguments, const char *arguments,
uint32_t length) uint32_t length)
@ -354,10 +375,15 @@ static shellmatta_retCode_t shell_cmd_read_flags(const shellmatta_handle_t handl
uint32_t i; uint32_t i;
char name[64]; char name[64];
bool flag; bool flag;
bool tryack;
int status; int status;
enum safety_flag flag_enum;
struct analog_monitor_info amon_info; struct analog_monitor_info amon_info;
struct timing_monitor_info timing_info; struct timing_monitor_info timing_info;
/* Check for the --ack option */
tryack = check_opt(arguments, length, "--ack");
shellmatta_printf(handle, "Error flags\r\n" shellmatta_printf(handle, "Error flags\r\n"
"-----------\r\n"); "-----------\r\n");
@ -369,12 +395,15 @@ static shellmatta_retCode_t shell_cmd_read_flags(const shellmatta_handle_t handl
continue; continue;
} }
status = safety_controller_get_flag_by_index(i, &flag, NULL); status = safety_controller_get_flag_by_index(i, &flag, &flag_enum);
if (status) { if (status) {
shellmatta_printf(handle, "Error getting flag value %lu\r\n", i); shellmatta_printf(handle, "Error getting flag value %lu\r\n", i);
continue; continue;
} }
if (tryack)
safety_controller_ack_flag(flag_enum);
shellmatta_printf(handle, "\t%2lu) %-20s\t[%s]\r\n", i+1, name, (flag ? "\e[1;31mERR\e[m" : "\e[32mOK\e[m")); shellmatta_printf(handle, "\t%2lu) %-20s\t[%s]\r\n", i+1, name, (flag ? "\e[1;31mERR\e[m" : "\e[32mOK\e[m"));
} }
@ -624,8 +653,8 @@ static shellmatta_cmd_t cmd[17] = {
{ {
.cmd = "safety-flags", .cmd = "safety-flags",
.cmdAlias = "flags", .cmdAlias = "flags",
.helpText = "", .helpText = "Reads and may clear safety flags",
.usageText = "", .usageText = "flags [--ack]",
.cmdFct = shell_cmd_read_flags, .cmdFct = shell_cmd_read_flags,
.next = &cmd[13], .next = &cmd[13],
}, },