From 23d91ad453f5feafeb1e871bd243e01049faec5b Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周三, 05 8月 2015 02:52:30 +0800
Subject: [PATCH] Merge lhoerl changes

---
 libscpi/inc/scpi/constants.h |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/libscpi/inc/scpi/constants.h b/libscpi/inc/scpi/constants.h
index 9316556..6023e6d 100644
--- a/libscpi/inc/scpi/constants.h
+++ b/libscpi/inc/scpi/constants.h
@@ -42,9 +42,19 @@
 #endif
 
 
-#define SCPI_MANUFACTURE "CTU FEE"
-#define SCPI_DEV_NAME "TEST SCPI INSTRUMENT TSI3225"
-#define SCPI_DEV_VERSION "v1.0"
+/*  4.1.3.6 *IDN? */
+
+#define SCPI_DEFAULT_1_MANUFACTURE "CTU FEE"
+#define SCPI_DEFAULT_2_MODEL "TSI3225"
+#define SCPI_DEFAULT_3 "0"
+#define SCPI_DEFAULT_4_REVISION "01-01"
+
+/* 21.21 :VERSion? 
+ * YYYY.V
+ * YYYY = SCPI year
+ * V = SCPI revision
+ */
+#define SCPI_STD_VERSION_REVISION "1999.0"
 
 #ifdef	__cplusplus
 }

--
Gitblit v1.9.1