From d98558302ebe1bd0483e83d1602ad32a62320188 Mon Sep 17 00:00:00 2001 From: Jan Breuer <jan.breuer@jaybee.cz> Date: 周三, 23 10月 2013 22:42:55 +0800 Subject: [PATCH] Add optional keywords to pattern match --- README.md | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 0c3b6dc..b71e665 100644 --- a/README.md +++ b/README.md @@ -15,13 +15,9 @@ Pattern "SYSTem:VERsion?" mathes strings "SYST:version?", "system:ver?", "SYST:VER?", ... -SCPI standard also uses brackets "[]" to define unnecesery parts of command. This behaviour is not implemented yet. +SCPI standard also uses brackets "[]" to define unnecesery parts of command. - Pattern "SYSTem:ERRor[:NEXT]?" should match "SYST:ERR?", "system:err?" and also "system:error:next?", ... - -In current implementation, you should write two patterns to implement this behaviour - - Pattern "SYSTem:ERRor?" and "SYSTem:ERRor:NEXT?" + Pattern "SYSTem:ERRor[:NEXT]?" mathes "SYST:ERR?", "system:err?" and also "system:error:next?", ... Command callback @@ -170,11 +166,14 @@ - `SCPI_ParamNumber` - read double value with or without units or represented by special number (DEF, MIN, MAX, ...). This function is more universal then SCPI_ParamDouble. - `SCPI_ParamText` - read text value - may be encapsuled in "" - `SCPI_ParamString` - read unspecified parameter not encapsulated in "" + - `SCPI_ParamBool` - read boolean value (ON, OFF, 0, 1) + - `SCPI_ParamChoice` - read enumeration value eg. (BUS, IMMediate, EXTernal) defined by parameter These are the functions, you can use to write results - `SCPI_ResultInt` - write integer value - `SCPI_ResultDouble` - write double value - `SCPI_ResultText` - write text value encapsulated in "" - `SCPI_ResultString` - directly write string value + - `SCPI_ResultBool` - write boolean value You can use function `SCPI_NumberToStr` to convert number with units to textual representation and then use `SCPI_ResultString` to write this to the user. \ No newline at end of file -- Gitblit v1.9.1