rudimentary status register definitions, TODO: use registers, funcs for setting and clearing, defualt commands for status regs

master
Ondřej Hruška 9 years ago
parent 38aea9635e
commit 94b32ec8d6
  1. 6
      scpi.pro
  2. 2
      scpi.pro.user
  3. 10
      scpi_parser.c
  4. 8
      scpi_status.c
  5. 83
      scpi_status.h

@ -6,7 +6,8 @@ CONFIG -= qt
SOURCES += \ SOURCES += \
scpi_parser.c \ scpi_parser.c \
main.c \ main.c \
scpi_errors.c scpi_errors.c \
scpi_status.c
DISTFILES += \ DISTFILES += \
style.astylerc \ style.astylerc \
@ -17,4 +18,5 @@ DISTFILES += \
HEADERS += \ HEADERS += \
scpi_parser.h \ scpi_parser.h \
scpi_errors.h scpi_errors.h \
scpi_status.h

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject> <!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 3.5.1, 2015-12-04T17:56:40. --> <!-- Written by QtCreator 3.5.1, 2015-12-04T21:00:30. -->
<qtcreator> <qtcreator>
<data> <data>
<variable>EnvironmentId</variable> <variable>EnvironmentId</variable>

@ -127,7 +127,7 @@ static void builtin_cb_FOO(const SCPI_argval_t *args)
} }
const SCPI_command_t scpi_commands_builtin[] = { static const SCPI_command_t scpi_commands_builtin[] = {
{ {
.levels = {"FOO"}, .levels = {"FOO"},
.params = {}, .params = {},
@ -656,13 +656,13 @@ static bool match_cmd(bool partial)
strcpy(dest, pst.charbuf); strcpy(dest, pst.charbuf);
// First try builtin commands // User commands are checked first, can override builtin commands
if (match_any_cmd_from_array(scpi_commands_builtin, partial)) { if (match_any_cmd_from_array(scpi_commands, partial)) {
return true; return true;
} }
// User commands // Try the built-in commands
return match_any_cmd_from_array(scpi_commands, partial); return match_any_cmd_from_array(scpi_commands_builtin, partial);
} }

@ -0,0 +1,8 @@
#include <stdint.h>
#include <stdbool.h>
#include "scpi_status.h"
struct SCPI_SR_QUEST_struct SCPI_SR_QUEST;
struct SCPI_SR_OPER_struct SCPI_SR_OPER;
struct SCPI_SR_SESR_struct SCPI_SR_SESR;

@ -0,0 +1,83 @@
#pragma once
#include <stdint.h>
#include <stdbool.h>
struct __attribute__((packed)) SCPI_SR_QUEST_struct {
bool VOLT: 1;
bool CURR: 1;
bool TIME: 1;
bool POWER: 1;
bool TEMP: 1;
bool FREQ: 1;
bool PHASE: 1;
bool MODUL: 1;
bool CALIB: 1;
bool BIT_9: 1; // user defined
bool BIT_10: 1;
bool BIT_11: 1;
bool BIT_12: 1;
bool INSTR_SUM: 1; // instrument summary
bool COMMAND_WARNING: 1; // command warning
bool RESERVED: 1;
};
struct __attribute__((packed)) SCPI_SR_OPER_struct {
bool CALIB: 1;
bool SETTING: 1;
bool RANGING: 1;
bool SWEEP: 1;
bool MEAS: 1;
bool WAIT_TRIG: 1; // waiting for trigger
bool WAIT_ARM: 1; // waiting for ARM
bool CORRECTING: 1;
bool BIT_8: 1; // user defined
bool BIT_9: 1;
bool BIT_10: 1;
bool BIT_11: 1;
bool BIT_12: 1;
bool INSTR_SUM: 1; // instrument summary
bool PROG_RUN: 1; // program running
bool RESERVED: 1;
};
struct __attribute__((packed)) SCPI_SR_SESR_struct {
bool OP_COMPLETE: 1;
bool REQ_CONTROL: 1;
bool QUERY_ERROR: 1;
bool DEV_ERROR: 1;
bool EXE_ERROR: 1;
bool CMD_ERROR: 1;
bool USER_REQUEST: 1;
bool POWER_ON: 1;
};
struct __attribute__((packed)) SCPI_SR_STB_struct {
bool BIT_0: 1;
bool BIT_1: 1;
bool ERROR_QUEUE: 1;
bool QUEST: 1;
bool MSG_AVAIL: 1;
bool SESR: 1;
bool RQS: 1; // request service
bool OPER: 1;
};
// QUESTionable register
extern struct SCPI_SR_QUEST_struct SCPI_SR_QUEST;
extern struct SCPI_SR_QUEST_struct SCPI_SR_QUEST_EN; // picks what to use for the STB bit
// OPERation status register
extern struct SCPI_SR_OPER_struct SCPI_SR_OPER;
extern struct SCPI_SR_OPER_struct SCPI_SR_OPER_EN; // picks what to use for the STB bit
// Standard Event Status register
extern struct SCPI_SR_SESR_struct SCPI_SR_SESR;
extern struct SCPI_SR_SESR_struct SCPI_SR_SESR_EN; // ESE
// Status byte
extern struct SCPI_SR_STB_struct SCPI_SR_STB;
extern struct SCPI_SR_STB_struct SCPI_SR_STB_EN; // SRE
Loading…
Cancel
Save