From 87978ae047fc6d2f657ac8961fff16aeb0b13cf9 Mon Sep 17 00:00:00 2001 From: Jan Breuer <jan.breuer@jaybee.cz> Date: ćšć, 30 11æ 2017 22:55:20 +0800 Subject: [PATCH] Merge pull request #96 from jfichtner/addQuesCondReg --- examples/common/scpi-def.h | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/examples/common/scpi-def.h b/examples/common/scpi-def.h index 646a653..ddce164 100644 --- a/examples/common/scpi-def.h +++ b/examples/common/scpi-def.h @@ -3,16 +3,27 @@ #include "scpi/scpi.h" +#define SCPI_INPUT_BUFFER_LENGTH 256 +#define SCPI_ERROR_QUEUE_SIZE 17 +#define SCPI_IDN1 "MANUFACTURE" +#define SCPI_IDN2 "INSTR2013" +#define SCPI_IDN3 NULL +#define SCPI_IDN4 "01-02" + +extern const scpi_command_t scpi_commands[]; +extern scpi_interface_t scpi_interface; +extern char scpi_input_buffer[]; +extern scpi_error_t scpi_error_queue_data[]; extern scpi_t scpi_context; size_t SCPI_Write(scpi_t * context, const char * data, size_t len); int SCPI_Error(scpi_t * context, int_fast16_t err); -scpi_result_t SCPI_Srq(scpi_t * context); +scpi_result_t SCPI_Control(scpi_t * context, scpi_ctrl_name_t ctrl, scpi_reg_val_t val); scpi_result_t SCPI_Reset(scpi_t * context); -scpi_result_t SCPI_Test(scpi_t * context); +scpi_result_t SCPI_Flush(scpi_t * context); +scpi_result_t SCPI_SystemCommTcpipControlQ(scpi_t * context); - -#endif // __SCPI_DEF_H_ +#endif /* __SCPI_DEF_H_ */ -- Gitblit v1.9.1