From 99c165c078222c789d5fc90a79c756c8fffdafea Mon Sep 17 00:00:00 2001
From: Vasilii Chernov <vchernov@inr.ru>
Date: Wed, 3 Feb 2016 16:48:45 +0100
Subject: Add python wrap for pcilib

---
 xml/test2/camera.xml |  6 ++++++
 xml/test2/names.xml  | 16 ++++++++++++++++
 xml/test2/props.xml  |  4 ++++
 xml/test2/reg2.py    |  0
 xml/test2/units.xml  | 35 +++++++++++++++++++++++++++++++++++
 xml/test2/views.xml  |  6 ++++++
 6 files changed, 67 insertions(+)
 create mode 100644 xml/test2/camera.xml
 create mode 100644 xml/test2/names.xml
 create mode 100644 xml/test2/props.xml
 create mode 100644 xml/test2/reg2.py
 create mode 100644 xml/test2/units.xml
 create mode 100644 xml/test2/views.xml

(limited to 'xml')

diff --git a/xml/test2/camera.xml b/xml/test2/camera.xml
new file mode 100644
index 0000000..4b31209
--- /dev/null
+++ b/xml/test2/camera.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<model xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <bank bar="0" size="0x0200" protocol="software_registers" read_address="0x9000" write_address="0x9000" word_size="32" endianess="little" format="0x%lx" name="fpga" description="IPECamera Registers">
+    <register address="0x00" offset="0" size="32" default="0" rwmask="0" mode="RW" name="reg1"/>
+  </bank>
+</model>
diff --git a/xml/test2/names.xml b/xml/test2/names.xml
new file mode 100644
index 0000000..f6ddbcc
--- /dev/null
+++ b/xml/test2/names.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<model xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <enum name="enumm1" description="enum towards temperatures register">
+    <name name="high" value="0x100" min="0x2" max="0x300"/>
+    <name name="low" value="0x010"/>
+  </enum>
+  <enum name="enumm2" description="enum towards sensor_temperature register">
+    <name name="high" value="0x120"/>
+    <name name="low" value="0x010" min="0x00" max="0x020"/>
+  </enum>
+  <enum name="enumm3" description="enum towards cmosis_exp_register register">
+    <name name="short" value="0x000"/>
+    <name name="mid" value="0x010"/>
+    <name name="long" value="0x100" min="0x0F0"/>
+  </enum>
+</model>
diff --git a/xml/test2/props.xml b/xml/test2/props.xml
new file mode 100644
index 0000000..f7a1329
--- /dev/null
+++ b/xml/test2/props.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<model xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <transform path="/test/prop1" register="test_prop1" unit="C" read_from_register="(503975./1024000)*${/registers/fpga/reg1} + 28715./100" description="formula to get real fpga temperature from the fpga_temperature register in decimal"/>
+</model>
diff --git a/xml/test2/reg2.py b/xml/test2/reg2.py
new file mode 100644
index 0000000..e69de29
diff --git a/xml/test2/units.xml b/xml/test2/units.xml
new file mode 100644
index 0000000..74ab9f7
--- /dev/null
+++ b/xml/test2/units.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<model xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <unit name="C">
+    <transform unit="K" transform="$value+273.15"/>
+    <transform unit="F" transform="$value*(9./5)+32"/>
+  </unit>
+  <unit name="K">
+    <transform unit="C" transform="$value-273.15"/>
+    <transform unit="F" transform="($value-273.15)*(9./5)+32"/>
+  </unit>
+  <unit name="F">
+    <transform unit="C" transform="($value-32)*5./9"/>
+    <transform unit="K" transform="($value+273.15-32)*5./9"/>
+  </unit>
+  <unit name="s">
+    <transform unit="ms" transform="$value*1000"/>
+    <transform unit="us" transform="$value*1000000"/>
+    <transform unit="ns" transform="$value*1000000000"/>
+  </unit>
+  <unit name="ms">
+    <transform unit="s" transform="$value/1000"/>
+    <transform unit="us" transform="$value*1000"/>
+    <transform unit="ns" transform="$value*1000000"/>
+  </unit>
+  <unit name="us">
+    <transform unit="s" transform="$value/1000000"/>
+    <transform unit="ms" transform="$value/1000"/>
+    <transform unit="ns" transform="$value*1000"/>
+  </unit>
+  <unit name="ns">
+    <transform unit="s" transform="$value/1000000000"/>
+    <transform unit="ms" transform="$value/1000000"/>
+    <transform unit="us" transform="$value/1000"/>
+  </unit>
+</model>
diff --git a/xml/test2/views.xml b/xml/test2/views.xml
new file mode 100644
index 0000000..c40cd0f
--- /dev/null
+++ b/xml/test2/views.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<model xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <transform name="formuu1" unit="C" read_from_register="(503975./1024000)*$value - 27315./100" write_to_register="($value + 27315./100)*(1024000./503975)" description="formula to get real fpga temperature from the fpga_temperature register in decimal"/>
+  <transform name="formuu2" unit="C1" read_from_register="((1./4)*($value - 1200)) if $freq==0 else ((3./10)*($value - 1000))" write_to_register="4*$value + 1200 if $freq==0 else (10./3)*$value + 1000" description="formula to get real sensor temperature from the sensor_temperature register in decimal"/>
+  <transform name="formuu3" unit="us" read_from_register="($value+(43./100))*129./(40*1000000)if $freq==0 else ($value+(43./100))*129./(48*1000000)" write_to_register="$value/129.*(40*1000000) - 43./100 if $freq==0 else $value/129.*(48*1000000) - 43./100" description="formula to get real exposure time from the cmosis_exp_time register in decimal"/>
+</model>
-- 
cgit v1.2.3


From 5349163e93a107fdfea2ad58760f6149a8d749b0 Mon Sep 17 00:00:00 2001
From: Vasilii Chernov <vchernov@inr.ru>
Date: Fri, 5 Feb 2016 12:33:48 +0100
Subject: Add support for python script properties. Correct pcilib python
 wrapping. Update examples. Update cmakelists for work in shadow build mode.

---
 xml/CMakeLists.txt            | 27 +++++++++++++++++++++++++++
 xml/model.xsd                 |  1 +
 xml/references.xsd            |  1 +
 xml/test2/camera.xml          |  6 ------
 xml/test2/names.xml           | 16 ----------------
 xml/test2/props.xml           |  4 ----
 xml/test2/reg2.py             |  0
 xml/test2/units.xml           | 35 -----------------------------------
 xml/test2/views.xml           |  6 ------
 xml/test_pywrap/camera.xml    |  6 ++++++
 xml/test_pywrap/names.xml     | 16 ++++++++++++++++
 xml/test_pywrap/props.xml     | 14 ++++++++++++++
 xml/test_pywrap/test_prop2.py |  7 +++++++
 xml/test_pywrap/test_prop3.py |  4 ++++
 xml/test_pywrap/units.xml     | 35 +++++++++++++++++++++++++++++++++++
 xml/test_pywrap/views.xml     |  6 ++++++
 xml/types.xsd                 | 11 +++++++++++
 17 files changed, 128 insertions(+), 67 deletions(-)
 delete mode 100644 xml/test2/camera.xml
 delete mode 100644 xml/test2/names.xml
 delete mode 100644 xml/test2/props.xml
 delete mode 100644 xml/test2/reg2.py
 delete mode 100644 xml/test2/units.xml
 delete mode 100644 xml/test2/views.xml
 create mode 100644 xml/test_pywrap/camera.xml
 create mode 100644 xml/test_pywrap/names.xml
 create mode 100644 xml/test_pywrap/props.xml
 create mode 100644 xml/test_pywrap/test_prop2.py
 create mode 100644 xml/test_pywrap/test_prop3.py
 create mode 100644 xml/test_pywrap/units.xml
 create mode 100644 xml/test_pywrap/views.xml

(limited to 'xml')

diff --git a/xml/CMakeLists.txt b/xml/CMakeLists.txt
index a7ac800..0b12d87 100644
--- a/xml/CMakeLists.txt
+++ b/xml/CMakeLists.txt
@@ -1,3 +1,30 @@
 install(FILES model.xsd references.xsd types.xsd
     DESTINATION ${PCILIB_MODEL_DIR}
 )
+
+# Copy files from source directory to destination directory, substituting any
+# variables.  Create destination directory if it does not exist.
+
+macro(configure_files srcDir destDir)
+    message(STATUS "Configuring directory ${destDir}")
+    make_directory(${destDir})
+
+    file(GLOB templateFiles RELATIVE ${srcDir} ${srcDir}/*)
+    foreach(templateFile ${templateFiles})
+        set(srcTemplatePath ${srcDir}/${templateFile})
+        if(NOT IS_DIRECTORY ${srcTemplatePath})
+            message(STATUS "Configuring file ${templateFile}")
+            configure_file(
+                    ${srcTemplatePath}
+                    ${destDir}/${templateFile}
+                    @ONLY)
+        endif(NOT IS_DIRECTORY ${srcTemplatePath})
+    endforeach(templateFile)
+endmacro(configure_files)
+
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/model.xsd ${CMAKE_CURRENT_BINARY_DIR}/model.xsd)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/references.xsd ${CMAKE_CURRENT_BINARY_DIR}/references.xsd)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/types.xsd ${CMAKE_CURRENT_BINARY_DIR}/types.xsd)
+
+configure_files(${CMAKE_CURRENT_SOURCE_DIR}/test ${CMAKE_CURRENT_BINARY_DIR}/test)
+configure_files(${CMAKE_CURRENT_SOURCE_DIR}/test_pywrap ${CMAKE_CURRENT_BINARY_DIR}/test_pywrap)
diff --git a/xml/model.xsd b/xml/model.xsd
index 164e887..f6f5ea3 100644
--- a/xml/model.xsd
+++ b/xml/model.xsd
@@ -7,6 +7,7 @@
       <xsd:choice minOccurs="1" maxOccurs="unbounded">
         <xsd:element name="bank" type="pcilib_bank_t" minOccurs="0" maxOccurs="unbounded" />
         <xsd:element name="transform" type="pcilib_transform_view_t" minOccurs="0" maxOccurs="unbounded" />
+        <xsd:element name="script" type="pcilib_script_view_t" minOccurs="0" maxOccurs="unbounded" />
         <xsd:element name="enum" type="pcilib_enum_view_t" minOccurs="0" maxOccurs="unbounded" />
         <xsd:element name="unit" type="pcilib_unit_t" minOccurs="0" maxOccurs="unbounded" />
       </xsd:choice>
diff --git a/xml/references.xsd b/xml/references.xsd
index 4474141..523daa2 100644
--- a/xml/references.xsd
+++ b/xml/references.xsd
@@ -6,6 +6,7 @@
       <xsd:choice minOccurs="1" maxOccurs="unbounded">
         <xsd:element name="bank" type="pcilib_bank_t" minOccurs="0" maxOccurs="unbounded" />
         <xsd:element name="transform" type="pcilib_transform_view_t" minOccurs="0" maxOccurs="unbounded" />
+        <xsd:element name="script" type="pcilib_script_view_t" minOccurs="0" maxOccurs="unbounded" />
         <xsd:element name="enum" type="pcilib_enum_view_t" minOccurs="0" maxOccurs="unbounded">
             <xsd:key name="pcilib_value_name_key">
                 <xsd:selector xpath="name" />
diff --git a/xml/test2/camera.xml b/xml/test2/camera.xml
deleted file mode 100644
index 4b31209..0000000
--- a/xml/test2/camera.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<model xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <bank bar="0" size="0x0200" protocol="software_registers" read_address="0x9000" write_address="0x9000" word_size="32" endianess="little" format="0x%lx" name="fpga" description="IPECamera Registers">
-    <register address="0x00" offset="0" size="32" default="0" rwmask="0" mode="RW" name="reg1"/>
-  </bank>
-</model>
diff --git a/xml/test2/names.xml b/xml/test2/names.xml
deleted file mode 100644
index f6ddbcc..0000000
--- a/xml/test2/names.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<model xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <enum name="enumm1" description="enum towards temperatures register">
-    <name name="high" value="0x100" min="0x2" max="0x300"/>
-    <name name="low" value="0x010"/>
-  </enum>
-  <enum name="enumm2" description="enum towards sensor_temperature register">
-    <name name="high" value="0x120"/>
-    <name name="low" value="0x010" min="0x00" max="0x020"/>
-  </enum>
-  <enum name="enumm3" description="enum towards cmosis_exp_register register">
-    <name name="short" value="0x000"/>
-    <name name="mid" value="0x010"/>
-    <name name="long" value="0x100" min="0x0F0"/>
-  </enum>
-</model>
diff --git a/xml/test2/props.xml b/xml/test2/props.xml
deleted file mode 100644
index f7a1329..0000000
--- a/xml/test2/props.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0"?>
-<model xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <transform path="/test/prop1" register="test_prop1" unit="C" read_from_register="(503975./1024000)*${/registers/fpga/reg1} + 28715./100" description="formula to get real fpga temperature from the fpga_temperature register in decimal"/>
-</model>
diff --git a/xml/test2/reg2.py b/xml/test2/reg2.py
deleted file mode 100644
index e69de29..0000000
diff --git a/xml/test2/units.xml b/xml/test2/units.xml
deleted file mode 100644
index 74ab9f7..0000000
--- a/xml/test2/units.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<model xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <unit name="C">
-    <transform unit="K" transform="$value+273.15"/>
-    <transform unit="F" transform="$value*(9./5)+32"/>
-  </unit>
-  <unit name="K">
-    <transform unit="C" transform="$value-273.15"/>
-    <transform unit="F" transform="($value-273.15)*(9./5)+32"/>
-  </unit>
-  <unit name="F">
-    <transform unit="C" transform="($value-32)*5./9"/>
-    <transform unit="K" transform="($value+273.15-32)*5./9"/>
-  </unit>
-  <unit name="s">
-    <transform unit="ms" transform="$value*1000"/>
-    <transform unit="us" transform="$value*1000000"/>
-    <transform unit="ns" transform="$value*1000000000"/>
-  </unit>
-  <unit name="ms">
-    <transform unit="s" transform="$value/1000"/>
-    <transform unit="us" transform="$value*1000"/>
-    <transform unit="ns" transform="$value*1000000"/>
-  </unit>
-  <unit name="us">
-    <transform unit="s" transform="$value/1000000"/>
-    <transform unit="ms" transform="$value/1000"/>
-    <transform unit="ns" transform="$value*1000"/>
-  </unit>
-  <unit name="ns">
-    <transform unit="s" transform="$value/1000000000"/>
-    <transform unit="ms" transform="$value/1000000"/>
-    <transform unit="us" transform="$value/1000"/>
-  </unit>
-</model>
diff --git a/xml/test2/views.xml b/xml/test2/views.xml
deleted file mode 100644
index c40cd0f..0000000
--- a/xml/test2/views.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<model xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <transform name="formuu1" unit="C" read_from_register="(503975./1024000)*$value - 27315./100" write_to_register="($value + 27315./100)*(1024000./503975)" description="formula to get real fpga temperature from the fpga_temperature register in decimal"/>
-  <transform name="formuu2" unit="C1" read_from_register="((1./4)*($value - 1200)) if $freq==0 else ((3./10)*($value - 1000))" write_to_register="4*$value + 1200 if $freq==0 else (10./3)*$value + 1000" description="formula to get real sensor temperature from the sensor_temperature register in decimal"/>
-  <transform name="formuu3" unit="us" read_from_register="($value+(43./100))*129./(40*1000000)if $freq==0 else ($value+(43./100))*129./(48*1000000)" write_to_register="$value/129.*(40*1000000) - 43./100 if $freq==0 else $value/129.*(48*1000000) - 43./100" description="formula to get real exposure time from the cmosis_exp_time register in decimal"/>
-</model>
diff --git a/xml/test_pywrap/camera.xml b/xml/test_pywrap/camera.xml
new file mode 100644
index 0000000..4b31209
--- /dev/null
+++ b/xml/test_pywrap/camera.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<model xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <bank bar="0" size="0x0200" protocol="software_registers" read_address="0x9000" write_address="0x9000" word_size="32" endianess="little" format="0x%lx" name="fpga" description="IPECamera Registers">
+    <register address="0x00" offset="0" size="32" default="0" rwmask="0" mode="RW" name="reg1"/>
+  </bank>
+</model>
diff --git a/xml/test_pywrap/names.xml b/xml/test_pywrap/names.xml
new file mode 100644
index 0000000..f6ddbcc
--- /dev/null
+++ b/xml/test_pywrap/names.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<model xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <enum name="enumm1" description="enum towards temperatures register">
+    <name name="high" value="0x100" min="0x2" max="0x300"/>
+    <name name="low" value="0x010"/>
+  </enum>
+  <enum name="enumm2" description="enum towards sensor_temperature register">
+    <name name="high" value="0x120"/>
+    <name name="low" value="0x010" min="0x00" max="0x020"/>
+  </enum>
+  <enum name="enumm3" description="enum towards cmosis_exp_register register">
+    <name name="short" value="0x000"/>
+    <name name="mid" value="0x010"/>
+    <name name="long" value="0x100" min="0x0F0"/>
+  </enum>
+</model>
diff --git a/xml/test_pywrap/props.xml b/xml/test_pywrap/props.xml
new file mode 100644
index 0000000..137ad04
--- /dev/null
+++ b/xml/test_pywrap/props.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<model xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <transform path="/test/prop1" register="test_prop1" unit="C" read_from_register="(503975./1024000)*${/registers/fpga/reg1} + 28715./100" description="formula to get real fpga temperature from the fpga_temperature register in decimal"/>
+  <script path="/test/prop2"
+	  register="test_prop2"
+	  unit="C"
+	  script="test_prop2.py"
+	  description="test python script #1"/>
+  <script path="/test/prop3"
+	  register="test_prop3"
+	  unit="C"
+	  script="test_prop3.py"
+	  description="test python script #2"/>
+</model>
diff --git a/xml/test_pywrap/test_prop2.py b/xml/test_pywrap/test_prop2.py
new file mode 100644
index 0000000..e9a3364
--- /dev/null
+++ b/xml/test_pywrap/test_prop2.py
@@ -0,0 +1,7 @@
+import pcipywrap
+import os
+    
+def read_from_register(): 
+    reg1_val =  pcipywrap.read_register('reg1');     
+    test_prop1_val = pcipywrap.read_register('test_prop3');
+    return test_prop1_val - reg1_val;
diff --git a/xml/test_pywrap/test_prop3.py b/xml/test_pywrap/test_prop3.py
new file mode 100644
index 0000000..c1300b3
--- /dev/null
+++ b/xml/test_pywrap/test_prop3.py
@@ -0,0 +1,4 @@
+import os
+    
+def read_from_register(): 
+    return 10;
diff --git a/xml/test_pywrap/units.xml b/xml/test_pywrap/units.xml
new file mode 100644
index 0000000..74ab9f7
--- /dev/null
+++ b/xml/test_pywrap/units.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<model xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <unit name="C">
+    <transform unit="K" transform="$value+273.15"/>
+    <transform unit="F" transform="$value*(9./5)+32"/>
+  </unit>
+  <unit name="K">
+    <transform unit="C" transform="$value-273.15"/>
+    <transform unit="F" transform="($value-273.15)*(9./5)+32"/>
+  </unit>
+  <unit name="F">
+    <transform unit="C" transform="($value-32)*5./9"/>
+    <transform unit="K" transform="($value+273.15-32)*5./9"/>
+  </unit>
+  <unit name="s">
+    <transform unit="ms" transform="$value*1000"/>
+    <transform unit="us" transform="$value*1000000"/>
+    <transform unit="ns" transform="$value*1000000000"/>
+  </unit>
+  <unit name="ms">
+    <transform unit="s" transform="$value/1000"/>
+    <transform unit="us" transform="$value*1000"/>
+    <transform unit="ns" transform="$value*1000000"/>
+  </unit>
+  <unit name="us">
+    <transform unit="s" transform="$value/1000000"/>
+    <transform unit="ms" transform="$value/1000"/>
+    <transform unit="ns" transform="$value*1000"/>
+  </unit>
+  <unit name="ns">
+    <transform unit="s" transform="$value/1000000000"/>
+    <transform unit="ms" transform="$value/1000000"/>
+    <transform unit="us" transform="$value/1000"/>
+  </unit>
+</model>
diff --git a/xml/test_pywrap/views.xml b/xml/test_pywrap/views.xml
new file mode 100644
index 0000000..c40cd0f
--- /dev/null
+++ b/xml/test_pywrap/views.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<model xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <transform name="formuu1" unit="C" read_from_register="(503975./1024000)*$value - 27315./100" write_to_register="($value + 27315./100)*(1024000./503975)" description="formula to get real fpga temperature from the fpga_temperature register in decimal"/>
+  <transform name="formuu2" unit="C1" read_from_register="((1./4)*($value - 1200)) if $freq==0 else ((3./10)*($value - 1000))" write_to_register="4*$value + 1200 if $freq==0 else (10./3)*$value + 1000" description="formula to get real sensor temperature from the sensor_temperature register in decimal"/>
+  <transform name="formuu3" unit="us" read_from_register="($value+(43./100))*129./(40*1000000)if $freq==0 else ($value+(43./100))*129./(48*1000000)" write_to_register="$value/129.*(40*1000000) - 43./100 if $freq==0 else $value/129.*(48*1000000) - 43./100" description="formula to get real exposure time from the cmosis_exp_time register in decimal"/>
+</model>
diff --git a/xml/types.xsd b/xml/types.xsd
index 78be773..239df8d 100644
--- a/xml/types.xsd
+++ b/xml/types.xsd
@@ -74,6 +74,17 @@
         </xsd:extension>
     </xsd:complexContent>
   </xsd:complexType>
+  
+  <xsd:complexType name="pcilib_script_view_t">
+    <xsd:complexContent>
+        <xsd:extension base="pcilib_view_t">
+          <xsd:attribute name="path" type="xsd:string" />
+          <xsd:attribute name="register" type="xsd:string" />
+          <xsd:attribute name="script" type="xsd:string" />
+          <!-- xsd 1.1 <xsd:assert test="(@path and not(@name)) or (not(@path) and @name)"/> -->
+        </xsd:extension>
+    </xsd:complexContent>
+  </xsd:complexType>
 
   <xsd:complexType name="pcilib_enum_view_t">
     <xsd:complexContent>
-- 
cgit v1.2.3


From e10e102b8b0ff3bf35f16b5276d56059d242e1fd Mon Sep 17 00:00:00 2001
From: Vasilii Chernov <vchernov@inr.ru>
Date: Mon, 8 Feb 2016 11:55:33 +0100
Subject: Add support for setting register value to script transfrom. Add
 set_property and get_property functions to pcipywrap. Cleaning cmakelists
 from unused dependencies

---
 xml/model.xsd                 |  1 -
 xml/references.xsd            |  1 -
 xml/test_pywrap/props.xml     | 10 +++++++---
 xml/test_pywrap/test_prop2.py | 11 ++++++-----
 xml/types.xsd                 | 10 ----------
 5 files changed, 13 insertions(+), 20 deletions(-)

(limited to 'xml')

diff --git a/xml/model.xsd b/xml/model.xsd
index f6f5ea3..164e887 100644
--- a/xml/model.xsd
+++ b/xml/model.xsd
@@ -7,7 +7,6 @@
       <xsd:choice minOccurs="1" maxOccurs="unbounded">
         <xsd:element name="bank" type="pcilib_bank_t" minOccurs="0" maxOccurs="unbounded" />
         <xsd:element name="transform" type="pcilib_transform_view_t" minOccurs="0" maxOccurs="unbounded" />
-        <xsd:element name="script" type="pcilib_script_view_t" minOccurs="0" maxOccurs="unbounded" />
         <xsd:element name="enum" type="pcilib_enum_view_t" minOccurs="0" maxOccurs="unbounded" />
         <xsd:element name="unit" type="pcilib_unit_t" minOccurs="0" maxOccurs="unbounded" />
       </xsd:choice>
diff --git a/xml/references.xsd b/xml/references.xsd
index 523daa2..4474141 100644
--- a/xml/references.xsd
+++ b/xml/references.xsd
@@ -6,7 +6,6 @@
       <xsd:choice minOccurs="1" maxOccurs="unbounded">
         <xsd:element name="bank" type="pcilib_bank_t" minOccurs="0" maxOccurs="unbounded" />
         <xsd:element name="transform" type="pcilib_transform_view_t" minOccurs="0" maxOccurs="unbounded" />
-        <xsd:element name="script" type="pcilib_script_view_t" minOccurs="0" maxOccurs="unbounded" />
         <xsd:element name="enum" type="pcilib_enum_view_t" minOccurs="0" maxOccurs="unbounded">
             <xsd:key name="pcilib_value_name_key">
                 <xsd:selector xpath="name" />
diff --git a/xml/test_pywrap/props.xml b/xml/test_pywrap/props.xml
index 137ad04..59d593c 100644
--- a/xml/test_pywrap/props.xml
+++ b/xml/test_pywrap/props.xml
@@ -1,12 +1,16 @@
 <?xml version="1.0"?>
 <model xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <transform path="/test/prop1" register="test_prop1" unit="C" read_from_register="(503975./1024000)*${/registers/fpga/reg1} + 28715./100" description="formula to get real fpga temperature from the fpga_temperature register in decimal"/>
-  <script path="/test/prop2"
+  <transform path="/test/prop1" 
+      register="test_prop1"
+      unit="C" 
+      read_from_register="(503975./1024000)*${/registers/fpga/reg1} + 28715./100" 
+      description="formula to get real fpga temperature from the fpga_temperature register in decimal"/>
+  <transform path="/test/prop2"
 	  register="test_prop2"
 	  unit="C"
 	  script="test_prop2.py"
 	  description="test python script #1"/>
-  <script path="/test/prop3"
+  <transform path="/test/prop3"
 	  register="test_prop3"
 	  unit="C"
 	  script="test_prop3.py"
diff --git a/xml/test_pywrap/test_prop2.py b/xml/test_pywrap/test_prop2.py
index e9a3364..68c6f1e 100644
--- a/xml/test_pywrap/test_prop2.py
+++ b/xml/test_pywrap/test_prop2.py
@@ -1,7 +1,8 @@
 import pcipywrap
-import os
     
-def read_from_register(): 
-    reg1_val =  pcipywrap.read_register('reg1');     
-    test_prop1_val = pcipywrap.read_register('test_prop3');
-    return test_prop1_val - reg1_val;
+def read_from_register():    
+    return pcipywrap.get_property('/registers/fpga/reg1') / 3
+    
+def write_to_register(value):    
+    pcipywrap.set_property('/registers/fpga/reg1', value*3)
+
diff --git a/xml/types.xsd b/xml/types.xsd
index 239df8d..c9e5d2f 100644
--- a/xml/types.xsd
+++ b/xml/types.xsd
@@ -70,16 +70,6 @@
           <xsd:attribute name="register" type="xsd:string" />
           <xsd:attribute name="read_from_register" type="xsd:string" />
           <xsd:attribute name="write_to_register" type="xsd:string" />
-          <!-- xsd 1.1 <xsd:assert test="(@path and not(@name)) or (not(@path) and @name)"/> -->
-        </xsd:extension>
-    </xsd:complexContent>
-  </xsd:complexType>
-  
-  <xsd:complexType name="pcilib_script_view_t">
-    <xsd:complexContent>
-        <xsd:extension base="pcilib_view_t">
-          <xsd:attribute name="path" type="xsd:string" />
-          <xsd:attribute name="register" type="xsd:string" />
           <xsd:attribute name="script" type="xsd:string" />
           <!-- xsd 1.1 <xsd:assert test="(@path and not(@name)) or (not(@path) and @name)"/> -->
         </xsd:extension>
-- 
cgit v1.2.3


From dce856c1a16098fe7a1df2338df60073261da94a Mon Sep 17 00:00:00 2001
From: Vasilii Chernov <vchernov@inr.ru>
Date: Tue, 9 Feb 2016 17:32:11 +0100
Subject: Add write_register python wrap. Add no_set_check attribute to
 pcilib_view_t type

---
 xml/test_pywrap/props.xml     | 3 ++-
 xml/test_pywrap/test_prop2.py | 2 +-
 xml/types.xsd                 | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'xml')

diff --git a/xml/test_pywrap/props.xml b/xml/test_pywrap/props.xml
index 59d593c..8e3078e 100644
--- a/xml/test_pywrap/props.xml
+++ b/xml/test_pywrap/props.xml
@@ -9,7 +9,8 @@
 	  register="test_prop2"
 	  unit="C"
 	  script="test_prop2.py"
-	  description="test python script #1"/>
+	  description="test python script #1"
+	  no_set_check="1"/>
   <transform path="/test/prop3"
 	  register="test_prop3"
 	  unit="C"
diff --git a/xml/test_pywrap/test_prop2.py b/xml/test_pywrap/test_prop2.py
index 68c6f1e..a831fdd 100644
--- a/xml/test_pywrap/test_prop2.py
+++ b/xml/test_pywrap/test_prop2.py
@@ -1,7 +1,7 @@
 import pcipywrap
     
 def read_from_register():    
-    return pcipywrap.get_property('/registers/fpga/reg1') / 3
+    return pcipywrap.get_property('/registers/fpga/reg1') / 2
     
 def write_to_register(value):    
     pcipywrap.set_property('/registers/fpga/reg1', value*3)
diff --git a/xml/types.xsd b/xml/types.xsd
index c9e5d2f..b0eb573 100644
--- a/xml/types.xsd
+++ b/xml/types.xsd
@@ -59,6 +59,7 @@
     <xsd:attribute name="unit" type="xsd:string" />
     <xsd:attribute name="type" type="pcilib_data_type_t" />
     <xsd:attribute name="mode" type="pcilib_access_mode_t" />
+    <xsd:attribute name="no_set_check" type="bool_t" default="0"/>
     <xsd:attribute name="visible" type="bool_t" default="0" />
     <xsd:attribute name="description" type="xsd:string" />
   </xsd:complexType>
-- 
cgit v1.2.3


From d7fc669bf0dbe37f46d2efec4940feb8504017c2 Mon Sep 17 00:00:00 2001
From: Vasilii Chernov <vchernov@inr.ru>
Date: Thu, 11 Feb 2016 14:24:01 +0100
Subject: Change no_set_check parameter name. Move Python wrap to separate
 directory.

---
 xml/test_pywrap/props.xml | 2 +-
 xml/types.xsd             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'xml')

diff --git a/xml/test_pywrap/props.xml b/xml/test_pywrap/props.xml
index 8e3078e..0d0078b 100644
--- a/xml/test_pywrap/props.xml
+++ b/xml/test_pywrap/props.xml
@@ -10,7 +10,7 @@
 	  unit="C"
 	  script="test_prop2.py"
 	  description="test python script #1"
-	  no_set_check="1"/>
+	  write_verification="0"/>
   <transform path="/test/prop3"
 	  register="test_prop3"
 	  unit="C"
diff --git a/xml/types.xsd b/xml/types.xsd
index b0eb573..5fc8902 100644
--- a/xml/types.xsd
+++ b/xml/types.xsd
@@ -59,7 +59,7 @@
     <xsd:attribute name="unit" type="xsd:string" />
     <xsd:attribute name="type" type="pcilib_data_type_t" />
     <xsd:attribute name="mode" type="pcilib_access_mode_t" />
-    <xsd:attribute name="no_set_check" type="bool_t" default="0"/>
+    <xsd:attribute name="write_verification" type="bool_t" default="1"/>
     <xsd:attribute name="visible" type="bool_t" default="0" />
     <xsd:attribute name="description" type="xsd:string" />
   </xsd:complexType>
-- 
cgit v1.2.3


From 55eab7196d0104c71e40136b3b22e9501d234e17 Mon Sep 17 00:00:00 2001
From: Vasilii Chernov <vchernov@inr.ru>
Date: Fri, 12 Feb 2016 14:43:20 +0100
Subject: 1. Cmakelists - move copy xml folder command to root file 2. - Move
 set python paths code to python module init funtction      - pci.c move
 python module init block code after checking model        to get paths before
 it runs.    - Fix set python path code to work with PYTHONPATH    - Update
 pci run script to work with PYTHONPATH    - Fix python finalize code 3.
 Change pcilib_script_s interacting method. Now it stores in hash. 4. Change
 names of some fucntions to more unified ones 5. Remove old unused function
 pcilib_xml_create_script_or_transform_view 6. cli - disable reading register
 after set if write_verification flag is off 7. Remove uninformative error
 messages fro Python wrap. 8. - Server.py - add read/write property/register
 command handling    - Add help message    - Correcting paths

---
 xml/CMakeLists.txt            | 27 ---------------------------
 xml/test_pywrap/test_prop2.py |  2 +-
 2 files changed, 1 insertion(+), 28 deletions(-)

(limited to 'xml')

diff --git a/xml/CMakeLists.txt b/xml/CMakeLists.txt
index 0b12d87..a7ac800 100644
--- a/xml/CMakeLists.txt
+++ b/xml/CMakeLists.txt
@@ -1,30 +1,3 @@
 install(FILES model.xsd references.xsd types.xsd
     DESTINATION ${PCILIB_MODEL_DIR}
 )
-
-# Copy files from source directory to destination directory, substituting any
-# variables.  Create destination directory if it does not exist.
-
-macro(configure_files srcDir destDir)
-    message(STATUS "Configuring directory ${destDir}")
-    make_directory(${destDir})
-
-    file(GLOB templateFiles RELATIVE ${srcDir} ${srcDir}/*)
-    foreach(templateFile ${templateFiles})
-        set(srcTemplatePath ${srcDir}/${templateFile})
-        if(NOT IS_DIRECTORY ${srcTemplatePath})
-            message(STATUS "Configuring file ${templateFile}")
-            configure_file(
-                    ${srcTemplatePath}
-                    ${destDir}/${templateFile}
-                    @ONLY)
-        endif(NOT IS_DIRECTORY ${srcTemplatePath})
-    endforeach(templateFile)
-endmacro(configure_files)
-
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/model.xsd ${CMAKE_CURRENT_BINARY_DIR}/model.xsd)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/references.xsd ${CMAKE_CURRENT_BINARY_DIR}/references.xsd)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/types.xsd ${CMAKE_CURRENT_BINARY_DIR}/types.xsd)
-
-configure_files(${CMAKE_CURRENT_SOURCE_DIR}/test ${CMAKE_CURRENT_BINARY_DIR}/test)
-configure_files(${CMAKE_CURRENT_SOURCE_DIR}/test_pywrap ${CMAKE_CURRENT_BINARY_DIR}/test_pywrap)
diff --git a/xml/test_pywrap/test_prop2.py b/xml/test_pywrap/test_prop2.py
index a831fdd..69a2190 100644
--- a/xml/test_pywrap/test_prop2.py
+++ b/xml/test_pywrap/test_prop2.py
@@ -4,5 +4,5 @@ def read_from_register():
     return pcipywrap.get_property('/registers/fpga/reg1') / 2
     
 def write_to_register(value):    
-    pcipywrap.set_property('/registers/fpga/reg1', value*3)
+    pcipywrap.set_property(value*3, '/registers/fpga/reg1')
 
-- 
cgit v1.2.3


From ed9d8f285f4d81e1ce8bb5e7a5b9e471a73c1590 Mon Sep 17 00:00:00 2001
From: Vasilii Chernov <vchernov@inr.ru>
Date: Tue, 16 Feb 2016 16:30:40 +0100
Subject: 1. Add python thread initialization to pcilib_init_py()    -Fix
 pcilib_script_run_func() work in multithread mode

2. pcilib_close() - Move free_py() code after free views to make
   view destructors work properly

3. Move script hash to pcilib_py_s

4. Move pcilib_get_logger() pcilib_get_logger_min_prio() and
   pcilib_get_logger_argument() declarations to error.h

5. Refactor pcilib_get_value_as_pyobject pcilib_set_value_from_pyobject
   to more unified form

6. Add more memory checks. Fix some string memory allocations.

7. Refactor pcilib_py_s member names.

8. Merge  pcilib_script_read() and pcilib_script_write() to
   pcilib_script_run_func()

9. Update test_pywrap views scripts
---
 xml/test_pywrap/test_prop2.py | 10 +++++-----
 xml/test_pywrap/test_prop3.py |  9 ++++++---
 2 files changed, 11 insertions(+), 8 deletions(-)

(limited to 'xml')

diff --git a/xml/test_pywrap/test_prop2.py b/xml/test_pywrap/test_prop2.py
index 69a2190..d7e10bc 100644
--- a/xml/test_pywrap/test_prop2.py
+++ b/xml/test_pywrap/test_prop2.py
@@ -1,8 +1,8 @@
 import pcipywrap
+
+def read_from_register(value):
+   return pcipywrap.get_property('/test/prop3') / 2
     
-def read_from_register():    
-    return pcipywrap.get_property('/registers/fpga/reg1') / 2
-    
-def write_to_register(value):    
-    pcipywrap.set_property(value*3, '/registers/fpga/reg1')
+def write_to_register(value):
+    pcipywrap.set_property(value*2, '/test/prop3')
 
diff --git a/xml/test_pywrap/test_prop3.py b/xml/test_pywrap/test_prop3.py
index c1300b3..9d33b63 100644
--- a/xml/test_pywrap/test_prop3.py
+++ b/xml/test_pywrap/test_prop3.py
@@ -1,4 +1,7 @@
-import os
+import pcipywrap
+
+def read_from_register(value):
+   return pcipywrap.get_property('/registers/fpga/reg1')
     
-def read_from_register(): 
-    return 10;
+def write_to_register(value):
+    pcipywrap.set_property(value, '/registers/fpga/reg1')
-- 
cgit v1.2.3


From 9a9ffd5594a5d27bbecf6160de2c33d44870f5bd Mon Sep 17 00:00:00 2001
From: Vasilii Chernov <vchernov@inr.ru>
Date: Wed, 17 Feb 2016 17:20:25 +0100
Subject: Refactor pcipywrap to object

---
 xml/test_pywrap/test_prop2.py | 10 ++++------
 xml/test_pywrap/test_prop3.py | 10 ++++------
 2 files changed, 8 insertions(+), 12 deletions(-)

(limited to 'xml')

diff --git a/xml/test_pywrap/test_prop2.py b/xml/test_pywrap/test_prop2.py
index d7e10bc..d78dbea 100644
--- a/xml/test_pywrap/test_prop2.py
+++ b/xml/test_pywrap/test_prop2.py
@@ -1,8 +1,6 @@
-import pcipywrap
-
-def read_from_register(value):
-   return pcipywrap.get_property('/test/prop3') / 2
+def read_from_register(ctx, value):
+   return ctx.get_property('/test/prop3') / 2
     
-def write_to_register(value):
-    pcipywrap.set_property(value*2, '/test/prop3')
+def write_to_register(ctx, value):
+    ctx.set_property(value*2, '/test/prop3')
 
diff --git a/xml/test_pywrap/test_prop3.py b/xml/test_pywrap/test_prop3.py
index 9d33b63..a082096 100644
--- a/xml/test_pywrap/test_prop3.py
+++ b/xml/test_pywrap/test_prop3.py
@@ -1,7 +1,5 @@
-import pcipywrap
-
-def read_from_register(value):
-   return pcipywrap.get_property('/registers/fpga/reg1')
+def read_from_register(ctx, value):
+   return ctx.get_property('/registers/fpga/reg1')
     
-def write_to_register(value):
-    pcipywrap.set_property(value, '/registers/fpga/reg1')
+def write_to_register(ctx, value):
+   ctx.set_property(value, '/registers/fpga/reg1')
-- 
cgit v1.2.3