From 1b3593b9d53aa016f4e484aa115cde282e8d0018 Mon Sep 17 00:00:00 2001
From: nancy.liao <huihui.liao@greentest.com.cn>
Date: 周三, 23 4月 2025 18:30:25 +0800
Subject: [PATCH] Merge branch 'greentest' of http://139.9.88.116:3000/r/sola/scpi-parser into greentest
---
libscpi/src/ieee488.c | 41 +++++++++++++++++++++++++++++------------
1 files changed, 29 insertions(+), 12 deletions(-)
diff --git a/libscpi/src/ieee488.c b/libscpi/src/ieee488.c
index f95b45e..09279ba 100644
--- a/libscpi/src/ieee488.c
+++ b/libscpi/src/ieee488.c
@@ -38,8 +38,6 @@
#include "scpi/parser.h"
#include "scpi/ieee488.h"
#include "scpi/error.h"
-#include "scpi/constants.h"
-
#include <stdio.h>
static const scpi_reg_info_t scpi_reg_details[SCPI_REG_COUNT] = {
@@ -169,22 +167,25 @@
switch (register_type) {
case SCPI_REG_CLASS_STB:
case SCPI_REG_CLASS_SRE:
- ;
+ {
scpi_reg_val_t stb = context->registers[SCPI_REG_STB] & ~STB_SRQ;
scpi_reg_val_t sre = context->registers[SCPI_REG_SRE] & ~STB_SRQ;
if (stb & sre) {
ptrans = ((old_val ^ val) & val);
context->registers[SCPI_REG_STB] |= STB_SRQ;
- if (ptrans & val) {
+ if (ptrans & val)
+ {
writeControl(context, SCPI_CTRL_SRQ, context->registers[SCPI_REG_STB]);
}
- } else {
+ } else
+ {
context->registers[SCPI_REG_STB] &= ~STB_SRQ;
}
break;
+ }
case SCPI_REG_CLASS_EVEN:
- ;
+ {
scpi_reg_val_t enable;
if(register_group.enable != SCPI_REG_NONE) {
enable = SCPI_RegGet(context, register_group.enable);
@@ -202,7 +203,9 @@
val &= ~(register_group.parent_bit);
}
break;
+ }
case SCPI_REG_CLASS_COND:
+ {
name = register_group.event;
if(register_group.ptfilt == SCPI_REG_NONE && register_group.ntfilt == SCPI_REG_NONE) {
@@ -227,6 +230,7 @@
val = ((ptrans & ptfilt) | (ntrans & ntfilt)) | SCPI_RegGet(context, register_group.event);
}
break;
+ }
case SCPI_REG_CLASS_ENAB:
case SCPI_REG_CLASS_NTR:
case SCPI_REG_CLASS_PTR:
@@ -276,7 +280,8 @@
* @param context
* @return
*/
-scpi_result_t SCPI_CoreEse(scpi_t * context) {
+scpi_result_t SCPI_CoreEse(scpi_t * context)
+{
int32_t new_ESE;
if (SCPI_ParamInt32(context, &new_ESE, TRUE)) {
SCPI_RegSet(context, SCPI_REG_ESE, (scpi_reg_val_t) new_ESE);
@@ -319,8 +324,12 @@
*/
scpi_result_t SCPI_CoreIdnQ(scpi_t * context) {
int i;
- for (i = 0; i < 4; i++) {
- if (context->idn[i]) {
+ for (i = 0; i < 4; i++)
+ {
+ if (context->idn[i])
+ {
+ char* outPut = "IDNS鍝嶅簲";
+ // context->interface->write(context,context->idn[i],0);
SCPI_ResultMnemonic(context, context->idn[i]);
} else {
SCPI_ResultMnemonic(context, "0");
@@ -334,7 +343,8 @@
* @param context
* @return
*/
-scpi_result_t SCPI_CoreOpc(scpi_t * context) {
+scpi_result_t SCPI_CoreOpc(scpi_t * context)
+{
SCPI_RegSetBits(context, SCPI_REG_ESR, ESR_OPC);
return SCPI_RES_OK;
}
@@ -381,8 +391,14 @@
* @param context
* @return
*/
-scpi_result_t SCPI_CoreSreQ(scpi_t * context) {
- SCPI_ResultInt32(context, SCPI_RegGet(context, SCPI_REG_SRE));
+scpi_result_t SCPI_CoreSreQ(scpi_t * context)
+{
+ context->interface->write(context,"Registers request start",0);
+ for(int i =0;i<SCPI_REG_COUNT;i++)
+ {
+ context->interface->write(context,(char*)context->registers[i],0);
+ }
+ context->interface->write(context,"Registers request end",0);
return SCPI_RES_OK;
}
@@ -418,3 +434,4 @@
return SCPI_RES_OK;
}
+
--
Gitblit v1.9.1