electro
/
scpi_parser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

working blob preamble parser, todo: preable body callback mechanism

Browse Source
master
Ondřej Hruška 9 years ago
parent e865a19b59
commit 29b2390442
4 changed files with 119 additions and 8 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 15
      main.c
  2. 3
      scpi.pro
  3. 2
      scpi.pro.user
  4. 107
      scpi_parser.c

15
main.c
Unescape View File

@ -8,6 +8,7 @@ void cmd_APPL_SIN_cb(const SCPI_argval_t *args);
void cmd_APPL_TRI_cb(const SCPI_argval_t *args);
void cmd_FREQ_cb(const SCPI_argval_t *args);
void cmd_DISP_TEXT_cb(const SCPI_argval_t *args);
void cmd_DATA_BLOB_cb(const SCPI_argval_t *args);
const SCPI_command_t scpi_cmd_lang[] = {
{
@ -35,6 +36,11 @@ const SCPI_command_t scpi_cmd_lang[] = {
.params = {SCPI_DT_STRING, SCPI_DT_BOOL},
.callback = cmd_DISP_TEXT_cb
},
{
.levels = {"DATA", "BLOB"},
.params = {SCPI_DT_BLOB},
.callback = cmd_DATA_BLOB_cb
},
{0} // end marker
};
@ -67,12 +73,19 @@ void cmd_DISP_TEXT_cb(const SCPI_argval_t *args)
printf("cb DISPlay:TEXT %s, %d\n", args[0].STRING, args[1].BOOL);
}
void cmd_DATA_BLOB_cb(const SCPI_argval_t *args)
{
// noop
}
int main()
{
// const char *inp = "*IDN?\n";
// const char *inp = "FREQ 50\n";
const char *inp = "DISPlay:TEXT 'banana', OFF\nDISP:TEXT \"dblquot!\", 1\r\nFREQ 50\r\n";
//const char *inp = "DISPlay:TEXT 'banana', OFF\nDISP:TEXT \"dblquot!\", 1\r\nFREQ 50\r\n";
const char *inp = "DATA:BLOB #49080\n";
for (int i = 0; i < strlen(inp); i++) {
scpi_handle_byte(inp[i]);

3
scpi.pro
Unescape View File

@ -11,7 +11,8 @@ DISTFILES += \
style.astylerc \
.gitignore \
LICENSE \
README.md
README.md \
Makefile
HEADERS += \
scpi_parser.h

2
scpi.pro.user
Unescape View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 3.5.1, 2015-12-02T17:42:47. -->
<!-- Written by QtCreator 3.5.1, 2015-12-02T18:39:29. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>

107
scpi_parser.c
Unescape View File

@ -64,6 +64,8 @@ static bool pars_match_cmd(bool partial);
static void pars_arg_char(char c);
static void pars_arg_comma(void);
static void pars_arg_newline(void);
static void pars_arg_semicolon(void);
static void pars_blob_preamble_char(uint8_t c);
static uint8_t cmd_param_count(const SCPI_command_t *cmd);
static uint8_t cmd_level_count(const SCPI_command_t *cmd);
@ -211,7 +213,7 @@ void scpi_handle_byte(const uint8_t b)
break;
case ';': // ends a command, does not reset cmd path.
// pars_cmd_semicolon();
pars_cmd_semicolon();
break;
default:
@ -242,7 +244,7 @@ void scpi_handle_byte(const uint8_t b)
break; // whitespace discarded
case PARS_ARG:
if (IS_WHITESPACE(c)) break;
if (IS_WHITESPACE(c)) break; // discard
switch (c) {
case ',':
@ -253,15 +255,24 @@ void scpi_handle_byte(const uint8_t b)
pars_arg_newline();
break;
case ';':
pars_arg_semicolon();
break;
default:
pars_arg_char(c);
}
break;
// TODO escape sequence in string
case PARS_ARG_STR_APOS:
if (c == '\'') {
// end of string
pst.state = PARS_ARG; // next will be newline or comma (or ignored spaces)
} else if (c == '\n') {
printf("ERROR string literal not terminated.\n");//TODO error
pst.state = PARS_DISCARD_LINE;
} else {
charbuf_append(c);
}
@ -271,12 +282,17 @@ void scpi_handle_byte(const uint8_t b)
if (c == '"') {
// end of string
pst.state = PARS_ARG; // next will be newline or comma (or ignored spaces)
} else if (c == '\n') {
printf("ERROR string literal not terminated.\n");//TODO error
pst.state = PARS_DISCARD_LINE;
} else {
charbuf_append(c);
}
break;
// TODO more states
case PARS_ARG_BLOB_PREAMBLE:
// #<digits><dddddd><BLOB>
pars_blob_preamble_char(c);
}
}
@ -308,6 +324,31 @@ static void pars_cmd_colon(void)
}
static void pars_cmd_semicolon(void)
{
if (pst.cur_level_i == 0 && pst.charbuf_i == 0) {
// nothing before semicolon
printf("ERROR semicolon not allowed here.\n");//TODO error
pars_reset_cmd();
return;
}
if (pars_match_cmd(false)) {
if (cmd_param_count(pst.matched_cmd) == 0) {
// no param command - OK
pars_run_callback();
pars_reset_cmd_keeplevel(); // keep level - that's what semicolon does
} else {
printf("ERROR command missing arguments.\n");//TODO error
pars_reset_cmd();
}
} else {
printf("ERROR no such command %s.\n", pst.charbuf);//TODO error
pst.state = PARS_DISCARD_LINE;
}
}
/** Newline received when collecting command - end command and execute. */
static void pars_cmd_newline(void)
{
@ -321,13 +362,14 @@ static void pars_cmd_newline(void)
if (pars_match_cmd(false)) {
if (cmd_param_count(pst.matched_cmd) == 0) {
// no param command - OK
pst.matched_cmd->callback(pst.args); // args are empty
pars_run_callback();
pars_reset_cmd();
} else {
printf("ERROR command missing arguments.\n");//TODO error
pars_reset_cmd();
}
} else {
printf("ERROR no such command (newline) %s.\n", pst.charbuf);//TODO error
printf("ERROR no such command %s.\n", pst.charbuf);//TODO error
pst.state = PARS_DISCARD_LINE;
}
}
@ -568,6 +610,22 @@ static void pars_arg_newline(void)
}
static void pars_arg_semicolon(void)
{
if (pst.arg_i < cmd_param_count(pst.matched_cmd) - 1) {
// not the last arg yet - fail
printf("ERROR not enough arguments!\n");//TODO error
pst.state = PARS_DISCARD_LINE;
return;
}
arg_convert_value();
pars_run_callback();
pars_reset_cmd_keeplevel(); // start a new command, keep level
}
/** Convert BOOL, FLOAT or INT char to arg type and advance to next */
static void arg_convert_value(void)
{
@ -628,3 +686,42 @@ static void arg_convert_value(void)
// proceed to next argument
pst.arg_i++;
}
static void pars_blob_preamble_char(uint8_t c)
{
if (pst.blob_preamble_cnt == 0) {
if (!INRANGE(c, '1', '9')) {
printf("ERROR expected ASCII 1-9 after #\n");//TODO error
pst.state = PARS_DISCARD_LINE;
return;
}
pst.blob_preamble_cnt = c - '0'; // 1-9
} else {
if (c == '\n') {
printf("ERROR unexpected newline in blob preamble\n");//TODO error
pars_reset_cmd();
return;
}
if (!IS_INT_CHAR(c)) {
printf("ERROR expected ASCII 0-9 after #n\n");//TODO error
pst.state = PARS_DISCARD_LINE;
return;
}
charbuf_append(c);
if (--pst.blob_preamble_cnt == 0) {
// end of preamble sequence
charbuf_terminate();
int bytecnt;
sscanf(pst.charbuf, "%d", &bytecnt);
printf("BLOB byte count = %d\n", bytecnt); // TODO
// Call handler, enter special blob mode
pst.state = PARS_DISCARD_LINE;//FIXME
}
}
}

Write Preview
Loading…
Cancel
Save